Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity
4990 commits 14 branches 1 tag 255 MiB
Commit graph

4798 commits

Author SHA1 Message Date
dfighter1985
972d270bfc Merged in hotfix (pull request #105) 
Merge hotfix

--HG--
branch : develop
 2015-02-02 23:32:08 +01:00
dfighter1985
bdb633cf83 Use release squish if debug not found. Fixes s3tc compressor tool build. 
--HG--
branch : hotfix
 2015-02-02 23:25:11 +01:00
dfighter1985
e7066c1384 Some CPack renames. 
--HG--
branch : hotfix
 2015-02-02 22:51:43 +01:00
dfighter1985
35c870c793 Install tile editor's plugin spec to the right directory. 
--HG--
branch : hotfix
 2015-02-02 22:41:29 +01:00
dfighter1985
2d308dc6e7 Fixed build of Object Viewer Widget Qt ( old, not part of Studio ). 
--HG--
branch : hotfix
 2015-02-02 22:01:16 +01:00
dfighter1985
e21d926336 Merged hotfix 
--HG--
branch : develop
 2015-02-02 03:54:50 +01:00
dfighter1985
f902bf6ed6 Merged mainline 
--HG--
branch : hotfix
 2015-02-02 02:03:00 +01:00
dfighter1985
e311547a39 Initialize Nel3D in the Object Viewer plugin too. 
--HG--
branch : hotfix
 2015-02-01 20:29:26 +01:00
kervala
6205b16fbf Changed: Optimize sorting of files (instead of doing it several times for each directory, do it only once) 
--HG--
branch : develop
 2015-01-23 21:11:15 +01:00
kervala
eea09d8893 Fixed: Guilds with same characters and not same spaces 
--HG--
branch : develop
 2015-01-21 13:20:56 +01:00
Nimetu
53f6adb041 Include chat message channel/type to chatlog file 
--HG--
branch : issue-221
 2015-01-15 20:08:28 +02:00
kervala
b26e7f4c1b Fixed: Compilation 
--HG--
branch : develop
 2015-01-13 20:35:34 +01:00
kervala
3aa448ba24 Changed: Replaced atoi and atof by NLMISC::fromString 
--HG--
branch : develop
 2015-01-13 19:47:14 +01:00
kervala
b70e8d3e7b Fixed: Compilation 
--HG--
branch : develop
 2015-01-13 15:15:07 +01:00
kervala
5ee2864491 Fixed: Compilation 
--HG--
branch : develop
 2015-01-13 15:08:13 +01:00
kervala
303f7d2e79 Changed: Minor changes 
--HG--
branch : develop
 2015-01-13 14:11:07 +01:00
kervala
704610668d Changed: Replaced ~0 by corresponding std::numeric_limits<T>::max() 
--HG--
branch : develop
 2015-01-13 13:47:19 +01:00
kaetemi
dade81e02e Lightmap debug message 
--HG--
branch : develop
 2015-01-13 13:21:56 +01:00
kaetemi
1ab170b7d8 Unhide layers in max export 
--HG--
branch : develop
 2015-01-13 13:21:56 +01:00
kervala
bc78734602 Changed: Fixed a wrong copy-paste 
--HG--
branch : develop
 2015-01-11 18:27:06 +01:00
kervala
8fc8c3aa39 Changed: Use defined directories prefixed by a default directory 
--HG--
branch : develop
 2015-01-11 18:01:32 +01:00
kervala
08c557ae76 Changed: Allow to use a readable and writable data path for IG patch (usefull when data are read only) 
--HG--
branch : develop
 2015-01-11 15:06:02 +01:00
kervala
3367eb3205 Changed: Append getAppBundlePath() to search paths under OS X 
--HG--
branch : develop
 2015-01-11 14:59:15 +01:00
kervala
acf677e635 Changed: Don't use replaceApplicationDirToken anymore 
--HG--
branch : develop
 2015-01-11 14:57:40 +01:00
kervala
3bca3f41cc Changed: Typo 
--HG--
branch : develop
 2015-01-11 14:56:51 +01:00
kervala
fad0e9af4e Fixed: Compilation with OS X SDK 10.10 
--HG--
branch : develop
 2015-01-10 20:33:02 +01:00
kervala
e8ff07fe7d Fixed: Removed raw mouse mode for OS X too 
--HG--
branch : develop
 2015-01-10 19:55:05 +01:00
kervala
5b9ac59f49 Fixed: OpenGL driver compilation 
--HG--
branch : develop
 2015-01-10 19:53:27 +01:00
kervala
418e0ee7b7 Merge 
--HG--
branch : develop
 2015-01-10 19:08:55 +01:00
kervala
99c88bd515 Changed: Minor changes 
--HG--
branch : develop
 2015-01-10 18:45:14 +01:00
kervala
2869d5f1ac Fixed: OpenGL ES driver compilation 
--HG--
branch : develop
 2015-01-10 18:41:54 +01:00
kervala
0f22ea7777 Changed: More aliases for OpenGL ES functions and defines to simplify code 
--HG--
branch : develop
 2015-01-10 18:41:18 +01:00
Jan Boon
d360f78a1c Merged in nimetu/ryzomcore/fix-issue-225 (pull request #98) 
CGroupEditBox: ignore enter key when ctrl is pressed (ctrl+m combo) (issue #225)

--HG--
branch : develop
 2015-01-09 18:09:17 +01:00
Nimetu
85f63b7db3 Fix html submit button value that is included with form data (issue #226) 
--HG--
branch : fix-issue-226
 2015-01-09 13:11:20 +02:00
Nimetu
fbea1d2173 CGroupEditBox: ignore enter key when ctrl is pressed (ctrl+m combo) (issue #225) 
--HG--
branch : fix-issue-225
 2015-01-09 12:59:53 +02:00
kervala
4fc639671c Changed: Check for string length 
--HG--
branch : develop
 2014-12-26 13:44:35 +01:00
kervala
ec12e6a75e Changed: Allow to enable UAC for Windows client 
--HG--
branch : develop
 2014-12-26 13:44:03 +01:00
kervala
f745f82455 Changed: Give priority to Luabind library filenames with specific Lua version 
--HG--
branch : develop
 2014-12-26 13:43:20 +01:00
kervala
6596af9682 Changed: Minor changes 
--HG--
branch : develop
 2014-12-26 13:38:02 +01:00
kervala
3bfcd8644d Changed: Minor changes 
--HG--
branch : develop
 2014-12-26 13:12:56 +01:00
kaetemi
0a7462f7e1 Merge with hotfix 
--HG--
branch : develop
 2014-12-22 16:40:12 +01:00
kaetemi
bb8eb7dcec Fix mirror type sizes 
--HG--
branch : hotfix
 2014-12-22 16:39:54 +01:00
kaetemi
c03c0f532b Merge with default 
--HG--
branch : develop
 2014-12-22 14:26:26 +01:00
kaetemi
f9c81f3740 ryzomcore/v0.11.2 
--HG--
branch : hotfix
 2014-12-22 14:21:01 +01:00
kaetemi
11ae94ab21 Move to feature-light_cycle: c5207e1f862a 
--HG--
branch : develop
 2014-12-22 14:10:37 +01:00
kaetemi
b9d372b144 Backed out changeset: 3694176c26bf 
--HG--
branch : develop
 2014-12-22 14:08:54 +01:00
kaetemi
a43fb4dba8 Move to hotfix: 287c1142e5ea 
--HG--
branch : develop
 2014-12-22 14:08:29 +01:00
dfighter1985
f189a98422 Ported changeset 9878ab4: CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219. 
--HG--
branch : develop
 2014-12-22 01:26:04 +01:00
dfighter1985
4d67a41f94 CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219. 
--HG--
branch : hotfix
 2014-12-21 22:55:27 +01:00
kaetemi
93d5ffddb6 Override sun direction from sky dome [breaks packed sheets] 
--HG--
branch : develop
 2014-12-12 21:17:13 +01:00
kaetemi
eb2f4555b1 Also export non-root shapes 
--HG--
branch : develop
 2014-12-12 21:17:13 +01:00
kaetemi
5346da559e Merge 
--HG--
branch : develop
 2014-12-12 01:24:56 +01:00
kaetemi
0c77c91e95 Adjust sky batch 
--HG--
branch : develop
 2014-12-12 01:22:19 +01:00
kaetemi
c3df884b13 Allow different light cycle for different continents [breaks packed sheets] 
--HG--
branch : develop
 2014-12-12 01:22:19 +01:00
kaetemi
44286f7ade Add sky batch script 
--HG--
branch : develop
 2014-12-12 01:22:18 +01:00
kaetemi
f411d2b230 Fix choppy sky animation 
--HG--
branch : develop
 2014-12-12 01:22:18 +01:00
kaetemi
7fbe24f27f Merge 
--HG--
branch : develop
 2014-12-09 23:10:27 +01:00
kaetemi
7cb61f8796 Merge 
--HG--
branch : develop
 2014-12-09 23:07:58 +01:00
kaetemi
da166c81db Add zone snapshot script example 
--HG--
branch : develop
 2014-12-09 23:06:08 +01:00
kaetemi
4c4b96bcfd Fix NeLLigoMakeSnapShot 
--HG--
branch : develop
 2014-12-09 23:06:08 +01:00
kaetemi
58590a9e7e Fix offscreen rendering mode 
--HG--
branch : develop
 2014-12-09 23:06:08 +01:00
kaetemi
6db29c375a Add script to generate zone names 
--HG--
branch : develop
 2014-12-09 23:06:07 +01:00
kaetemi
56339c6f93 Handle window close message in painter 
--HG--
branch : develop
 2014-12-09 23:06:07 +01:00
botanicvelious
1df52a45ad add some additional checking for database errors 
--HG--
branch : develop
 2014-12-07 06:42:57 -08:00
botanicvelious
a79e141193 Update with added Domain_Auto_Add settings 
--HG--
branch : develop
 2014-12-07 05:01:05 -08:00
kaetemi
07286c14d1 Adjust patch orientation script 
--HG--
branch : develop
 2014-12-04 13:28:30 +01:00
kaetemi
90f1234ed0 Add key in patch painter to reset a patch mesh 
--HG--
branch : develop
 2014-12-04 13:21:45 +01:00
kaetemi
b762356a16 Merge with hotfix 
--HG--
branch : develop
 2014-12-04 13:21:40 +01:00
kaetemi
59a5cb7e6b Fix crash with patch mesh attach 
--HG--
branch : hotfix
 2014-12-04 13:21:12 +01:00
kaetemi
39c776ec30 Add script to orient zone patches automatically 
--HG--
branch : develop
 2014-12-03 15:16:39 +01:00
kaetemi
ff283f5070 Increase patch painter distance 
--HG--
branch : develop
 2014-12-03 15:16:39 +01:00
kaetemi
dfe0b2977a Separate version string 
--HG--
branch : develop
 2014-11-24 16:07:17 +01:00
kaetemi
7bdf719cb9 Adjust version 
--HG--
branch : develop
 2014-11-24 15:04:53 +01:00
kaetemi
91a4207f93 Merge with hotfix 
--HG--
branch : develop
 2014-11-24 15:04:16 +01:00
kaetemi
6b1ea30f9c ryzomcore/v0.11.1 
--HG--
branch : hotfix
 2014-11-24 14:57:36 +01:00
kaetemi
1676b3b46f Fix #218 erratic mouse behaviour 
--HG--
branch : hotfix
 2014-11-24 14:53:28 +01:00
kaetemi
fef6543e0c Fix bug causing patch painter fail to open more than once 
--HG--
branch : develop
 2014-11-19 16:30:14 +01:00
kaetemi
0a765bde8c Fix bug causing patch painter fail to open more than once 
--HG--
branch : hotfix
 2014-11-19 16:30:14 +01:00
kaetemi
f05c52aa0b Remove PIC library 
--HG--
branch : develop
 2014-11-19 16:20:14 +01:00
kaetemi
0c1ff0df2a ryzomcore/v0.11.0 
--HG--
branch : develop
 2014-11-10 23:34:41 +01:00
kaetemi
2df9cb5f87 Fix PHP error "Only variables should be passed by reference" 
--HG--
branch : develop
 2014-11-08 00:29:50 +01:00
kaetemi
ef2415257b Fix PHP error "Only variables should be passed by reference" 
--HG--
branch : develop
 2014-11-07 23:51:42 +01:00
kaetemi
70ace8b7d4 Print callstack 
--HG--
branch : develop
 2014-11-07 23:37:39 +01:00
kaetemi
91ad193104 Fix patchman scripts 
--HG--
branch : develop
 2014-11-07 19:32:18 +01:00
kaetemi
ee92cb0702 Update default path 
--HG--
branch : develop
 2014-11-07 19:21:05 +01:00
kaetemi
d30cca34f0 Backed out merge changeset: 361eb082ec5e 
Does not compile. FindLibLZMA missing on Ubunty 12.04 LTS

--HG--
branch : develop
 2014-11-07 19:17:43 +01:00
kaetemi
c3cf5c7af4 Update default patchman cfg 
--HG--
branch : develop
 2014-11-07 19:16:45 +01:00
kaetemi
933420690b Change patchman example domain 
--HG--
branch : develop
 2014-11-07 19:02:50 +01:00
dfighter1985
0ac94e3e72 CDBViewQuantity shouldn't crash in the editor. 
--HG--
branch : dfighter-tools
 2014-10-20 22:49:46 +02:00
dfighter1985
d2ca66c574 Default text for DBViewNumber. 
--HG--
branch : dfighter-tools
 2014-10-20 22:27:33 +02:00
dfighter1985
8c5ad81199 it's not a bad idea to store the value in the right variable... 
--HG--
branch : dfighter-tools
 2014-10-20 22:21:59 +02:00
dfighter1985
b6d9e3285f DBViewNumber shouldn't crash anymore. 
--HG--
branch : dfighter-tools
 2014-10-20 20:57:08 +02:00
dfighter1985
2fe2077170 When setting the Id of the decorated edit box, set the Id of the text as well. 
--HG--
branch : dfighter-tools
 2014-10-20 18:51:53 +02:00
Jan Boon
e2eb5d739c Merged in nimetu/ryzomcore/html-table-rendering (pull request #92) 
Some improvements to table rendering

--HG--
branch : develop
 2014-10-18 04:44:34 +02:00
Nimetu
78e1bb6147 Fix html img not showing on some cases, clean up addImage method 
--HG--
branch : develop
 2014-10-18 01:20:56 +03:00
Nimetu
48b346fed8 Fix crash when using textarea without form 
--HG--
branch : develop
 2014-10-18 00:15:51 +03:00
dfighter1985
67aa7a50d2 set the Id of the text properly when loading the decorated edit box. 
--HG--
branch : dfighter-tools
 2014-10-17 22:25:30 +02:00
dfighter1985
fd5a1a6834 Don't add non-selectable widgets to the hierarchy tree. 
--HG--
branch : dfighter-tools
 2014-10-17 21:23:00 +02:00
dfighter1985
923b36f0e5 Create the viewtext of the decorated edit box when the box is created, also adjust it so the text is drawn to the right of the left texture. 
--HG--
branch : dfighter-tools
 2014-10-17 21:18:26 +02:00
dfighter1985
ba1e3c9919 Fixed a typo that messed up the textures of decorated editbox. 
--HG--
branch : dfighter-tools
 2014-10-17 16:01:50 +02:00
dfighter1985
210f93a4f2 Save decorated edit box as such. 
--HG--
branch : dfighter-tools
 2014-10-16 21:03:58 +02:00
dfighter1985
18866c88af Update decorated edit box decoration coords while dragging. 
--HG--
branch : dfighter-tools
 2014-10-16 20:58:47 +02:00
dfighter1985
274efe6798 Allow selection of CGroupEditBox. 
--HG--
branch : dfighter-tools
 2014-10-16 20:29:36 +02:00
dfighter1985
42ebad94f6 Implemented CGroupEditBoxDecor a decorated CGroupEditBox. 
--HG--
branch : dfighter-tools
 2014-10-16 20:25:19 +02:00
dfighter1985
f7f74b5398 Render every 25ms instead of 200ms 
--HG--
branch : dfighter-tools
 2014-10-15 23:30:36 +02:00
dfighter1985
66fe76fc06 A Kami will be the default texture for Bitmaps. 
--HG--
branch : dfighter-tools
 2014-10-15 20:20:44 +02:00
dfighter1985
c9b528081e CtrlButton textures should be selectable in the texture chooser! 
--HG--
branch : dfighter-tools
 2014-10-15 20:07:13 +02:00
dfighter1985
cfa4129754 Default texture for CtrlButton. 
--HG--
branch : dfighter-tools
 2014-10-15 20:03:46 +02:00
dfighter1985
bd942ba62b TEMPORARILY add the login texture map to new project by default. 
--HG--
branch : dfighter-tools
 2014-10-15 19:54:35 +02:00
dfighter1985
f91846c970 Fix parent pos and size parsing. 
--HG--
branch : dfighter-tools
 2014-10-15 19:46:43 +02:00
dfighter1985
3209f48daa Don't drop the texture property just because there's no texture assigned... 
--HG--
branch : dfighter-tools
 2014-10-15 12:09:57 +02:00
Nimetu
0a1a1244ae Change table defaults valign=middle, cellpadding=1, cellspacing=2 
--HG--
branch : html-table-rendering
 2014-10-15 00:02:38 +03:00
Nimetu
799705b7ed Render table with rowspan, colspan. 
Borders, if enabled, adds +1 to cell padding.

--HG--
branch : html-table-rendering
 2014-10-14 15:29:06 +03:00
Nimetu
a53b9305a2 Add rowspan and colspan attributes 
--HG--
branch : html-table-rendering
 2014-10-14 15:26:14 +03:00
dfighter1985
2b5898565f Don't disable the active group before serializing. 
--HG--
branch : dfighter-tools
 2014-10-13 20:15:41 +02:00
dfighter1985
ab76b7ed85 It's not a bad idea to actually retrieve the version if we load it... 
--HG--
branch : dfighter-tools
 2014-10-13 19:15:59 +02:00
dfighter1985
fae1e39039 Don't reject an action property just because it's empty... 
--HG--
branch : dfighter-tools
 2014-10-13 18:55:17 +02:00
dfighter1985
22a1d39ac7 Map files can now be specified when creating a new GUI project. 
--HG--
branch : dfighter-tools
 2014-10-13 18:53:26 +02:00
dfighter1985
c5cd6990fe When creating a new GUI set the base color to white. 
--HG--
branch : dfighter-tools
 2014-10-13 17:47:42 +02:00
dfighter1985
8066717aa2 Pos and Size parent setters should now use the widget directly as well. 
--HG--
branch : dfighter-tools
 2014-10-13 15:43:10 +02:00
dfighter1985
2dd6278771 Size parent is now queried directly from the widget. 
--HG--
branch : dfighter-tools
 2014-10-13 15:26:47 +02:00
Nimetu
11927cca93 Render table and cell borders 
--HG--
branch : html-table-rendering
 2014-10-13 01:59:20 +03:00
Nimetu
283cbe8092 Add bordercolor attribute to table tag 
--HG--
branch : html-table-rendering
 2014-10-13 01:10:46 +03:00
dfighter1985
487c6a3440 GUI Editor should show the right parent position. 
--HG--
branch : dfighter-tools
 2014-10-12 23:07:08 +02:00
dfighter1985
b3dd26e01c Parent positions should now be saved right again. 
--HG--
branch : dfighter-tools
 2014-10-12 23:05:22 +02:00
dfighter1985
b587acb135 Some refactoring regarding saving. 
--HG--
branch : dfighter-tools
 2014-10-12 21:15:13 +02:00
dfighter1985
2c5617cea7 When creating a new project, save it right away. 
--HG--
branch : dfighter-tools
 2014-10-12 20:09:42 +02:00
Nimetu
2de4315027 Fix table cellpadding 
--HG--
branch : html-table-rendering
 2014-10-12 17:43:18 +03:00
dfighter1985
ded18b266c Implemented new action. 
--HG--
branch : dfighter-tools
 2014-10-11 21:43:28 +02:00
dfighter1985
e5d2e9293d Moved CRootGroup out of CInterfaceParser. 
--HG--
branch : dfighter-tools
 2014-10-11 19:30:30 +02:00
dfighter1985
03c041310e Added dialog for the new GUI action. 
--HG--
branch : dfighter-tools
 2014-10-11 18:56:24 +02:00
dfighter1985
5217b38f58 Some defaults. 
--HG--
branch : dfighter-tools
 2014-10-11 16:47:39 +02:00
dfighter1985
816e89c967 Another classname. 
--HG--
branch : dfighter-tools
 2014-10-11 16:40:41 +02:00
dfighter1985
7e16e95c35 CInterfaceParser in editor mode should look for files in the working directory first. 
--HG--
branch : dfighter-tools
 2014-10-11 16:26:38 +02:00
dfighter1985
99a3b93703 Restored lost class names 
--HG--
branch : dfighter-tools
 2014-10-11 14:44:16 +02:00
dfighter1985
fe89e8f77c Added limits to pch, should fix Linux build. 
--HG--
branch : dfighter-tools
 2014-10-11 13:04:03 +02:00
dfighter1985
481298b9f1 Merged develop 
--HG--
branch : dfighter-tools
 2014-10-11 02:15:07 +02:00
dfighter1985
7b45a05562 Added support for grouping widgets. 
--HG--
branch : dfighter-tools
 2014-10-11 00:42:43 +02:00
dfighter1985
aac2fd41a1 Allow multiselection. 
--HG--
branch : dfighter-tools
 2014-10-10 20:25:25 +02:00
dfighter1985
8cec8de3a0 Unselect selection when clicking 'nothing'. 
--HG--
branch : dfighter-tools
 2014-10-10 17:33:57 +02:00
kervala
e34ba83f26 Minor changes 
--HG--
branch : develop
 2014-10-10 13:08:14 +02:00
kervala
aaa044203e Fix some warnings 
--HG--
branch : develop
 2014-10-10 13:07:54 +02:00
kaetemi
5fd4f96a59 Configure shadow outline in applications 
--HG--
branch : develop
 2014-10-08 23:20:35 +02:00
kaetemi
74827a1808 Handle shadow outline in gui 
--HG--
branch : develop
 2014-10-08 23:20:35 +02:00
kaetemi
3edfd56c75 Implement text shade outline 
--HG--
branch : develop
 2014-10-08 23:20:34 +02:00
dfighter1985
a1e2c5667a A little crash fix. 
--HG--
branch : dfighter-tools
 2014-10-08 21:28:20 +02:00
dfighter1985
bec078af25 Sizes should remain the same when ungrouping. 
--HG--
branch : dfighter-tools
 2014-10-08 21:00:56 +02:00
dfighter1985
3ffe56b862 Added support for ungrouping. 
--HG--
branch : dfighter-tools
 2014-10-08 20:36:16 +02:00
dfighter1985
d7d62e690c Make group selection optional. 
--HG--
branch : dfighter-tools
 2014-10-08 18:45:17 +02:00
dfighter1985
08b6675b3d Only select a group first in editor mode. 
--HG--
branch : dfighter-tools
 2014-10-08 18:00:54 +02:00