Commit graph

4895 commits

Author SHA1 Message Date
kervala
03a3a6bd3a Merge with hotfix 2015-02-15 09:54:31 +01:00
kervala
d5b620391e Fixed: Wrong include guard for admin_modules PCH 2015-02-15 09:53:56 +01:00
kervala
9718f37ec4 Merge with hotfix 2015-02-14 19:29:36 +01:00
kervala
f07c2f51b8 Fixed: Warning multichars 2015-02-14 17:54:05 +01:00
kervala
f0ebd8d428 Fixed: Unnamed semaphores are deprecated under OS X 2015-02-14 17:52:15 +01:00
kervala
da7b88f052 Fixed: Warning assert always false 2015-02-14 17:47:55 +01:00
kervala
8e343db0fa Fixed: Warning comparing an enum to an int 2015-02-14 17:47:10 +01:00
kervala
8f04f658a4 Merge with hotfix 2015-02-14 16:07:04 +01:00
kervala
c5ee1f3d95 Fixed: Compilation 2015-02-14 16:05:45 +01:00
kervala
9feac65c07 Merge with hotfix 2015-02-14 15:44:11 +01:00
kervala
b023af51cf Added: PCH for admin_modules 2015-02-14 15:43:05 +01:00
kervala
68e56e02b2 Merge with hotfix 2015-02-14 15:19:49 +01:00
kervala
f3b38eed9b Changed: Improved User Agent management 2015-02-14 15:18:53 +01:00
kervala
5221bf199c Merge with hotfix 2015-02-14 14:31:19 +01:00
kervala
44d0c95b69 Fixed: Warning with multichars to int conversion 2015-02-14 14:25:50 +01:00
kervala
539f721624 Fixed: Compilation 2015-02-14 13:57:06 +01:00
kervala
779492b262 Changed: Updated CMale modules 2015-02-14 13:47:37 +01:00
kervala
c569b03d0c Changed: Replaced atoi and atof by NLMISC::fromString 2015-02-14 13:46:21 +01:00
kervala
eca33bfb95 Changed: Minor changes 2015-02-14 13:34:45 +01:00
kervala
491613e7fa Changed: Use Ryzom user agent for CURL 2015-02-14 13:19:53 +01:00
kervala
d478bf56a3 Fixed: Missing namespace 2015-02-14 13:19:09 +01:00
kervala
5b1926aeb4 Changed: std::string already initialized to en empty string 2015-02-14 13:18:51 +01:00
kervala
b6637fa6fe Changed: Used INVALID_AI_INSTANCE in CUsedContinent::getInstanceForContinent 2015-02-14 13:03:27 +01:00
kervala
bb5dc2c471 Changed: Possible bug if string not found 2015-02-14 12:54:17 +01:00
kervala
df3cdfab70 Fixed: Unable to patch when Ryzom was located on a mounted FS 2015-02-14 12:52:57 +01:00
kervala
72a50960cb Changed: Used PCH for admin_modules 2015-02-14 12:48:29 +01:00
kervala
a6cd459f33 Changed: Check getSpawn() before calling its methods 2015-02-14 12:47:54 +01:00
kervala
a5d69a78d7 Changed: Minor changes 2015-02-14 12:47:03 +01:00
kervala
65fb1bc8c1 Changed: Replaced atof by NLMISC::fromString 2015-02-14 12:43:29 +01:00
kervala
1ce011be38 Fixed: Compilation warnings 2015-02-14 12:41:59 +01:00
kervala
14046699bc Fixed: Only keep Release and Debug configurations in CMake 2015-02-14 12:06:19 +01:00
dfighter1985
8b095f97b3 Merged in hotfix (pull request #114)
Merging hotfix branch
2015-02-13 19:48:42 +01:00
dfighter1985
f76650bb21 Add the data directory to the search path. 2015-02-11 20:42:31 +01:00
dfighter1985
a6ebf62e40 Added ryzom.ttf, it will be installed to the data directory. 2015-02-11 19:55:16 +01:00
dfighter1985
991a3fdf99 Include rgba.h in libwww.h. Thanks Nimetu! 2015-02-09 20:07:35 +01:00
dfighter1985
0f8c8f6655 Change the cursor to a wait cursor when applying settings in the settings dialog. 2015-02-09 19:55:27 +01:00
dfighter1985
70a83dbc45 We can now set whether to use OpenGL in WE in the WE settings page. For whatever reason VMware despises the OpenGL viewport so it's a good idea to turn it off inside VMware. 2015-02-09 19:49:16 +01:00
dfighter1985
05c3405e1b Renamed the studio startup settings dialog to avoid name conflict with the core plugin's settings dialog. 2015-02-09 17:54:27 +01:00
dfighter1985
4ea7c2025d Read the GUI Editor widget and expression definition XML files from the right directory. 2015-02-09 01:48:39 +01:00
dfighter1985
1c31ac6f05 Install the GUI Editor widget and expression definition files to the data dir. 2015-02-08 23:46:33 +01:00
dfighter1985
eaf5d26bae Handle relative paths when loading .worldedit files in World Editor. 2015-02-08 00:24:29 +01:00
dfighter1985
ac2833e78d Merged in hotfix (pull request #111)
Merge hotfix
2015-02-06 02:32:03 +01:00
dfighter1985
23873f2e3a Erm. Initialize Nel3D on other platforms too... 2015-02-06 02:29:33 +01:00
dfighter1985
aa6bc451c1 Merged in hotfix (pull request #108)
Merge hotfix branch.
2015-02-06 00:45:36 +01:00
dfighter1985
47f43b2a2e CPack should use the install prefix. 2015-02-06 00:31:51 +01:00
dfighter1985
689a9e0883 We need the LIGO config file, not directory in the first start settings dialog. 2015-02-05 23:50:38 +01:00
dfighter1985
5537d4b627 Merged in hotfix (pull request #105)
Merge hotfix
2015-02-02 23:32:08 +01:00
dfighter1985
b5e9dfbc9e Use release squish if debug not found. Fixes s3tc compressor tool build. 2015-02-02 23:25:11 +01:00
dfighter1985
94338a3742 Some CPack renames. 2015-02-02 22:51:43 +01:00
dfighter1985
c4fa07e1a9 Install tile editor's plugin spec to the right directory. 2015-02-02 22:41:29 +01:00
dfighter1985
8498b4aacd Fixed build of Object Viewer Widget Qt ( old, not part of Studio ). 2015-02-02 22:01:16 +01:00
dfighter1985
711261cb0d Merged hotfix 2015-02-02 03:54:50 +01:00
dfighter1985
41e2e8b4db Merged mainline 2015-02-02 02:03:00 +01:00
dfighter1985
44760221f2 Initialize Nel3D in the Object Viewer plugin too. 2015-02-01 20:29:26 +01:00
kervala
e3de253702 Changed: Optimize sorting of files (instead of doing it several times for each directory, do it only once) 2015-01-23 21:11:15 +01:00
kervala
9981f07921 Fixed: Guilds with same characters and not same spaces 2015-01-21 13:20:56 +01:00
Nimetu
44663f0a6c Include chat message channel/type to chatlog file 2015-01-15 20:08:28 +02:00
kervala
1c543641c9 Fixed: Compilation 2015-01-13 20:35:34 +01:00
kervala
1675e7af3a Changed: Replaced atoi and atof by NLMISC::fromString 2015-01-13 19:47:14 +01:00
kervala
ef645e5421 Fixed: Compilation 2015-01-13 15:15:07 +01:00
kervala
d52a60b837 Fixed: Compilation 2015-01-13 15:08:13 +01:00
kervala
d6a2af6abd Changed: Minor changes 2015-01-13 14:11:07 +01:00
kervala
7987db85ca Changed: Replaced ~0 by corresponding std::numeric_limits<T>::max() 2015-01-13 13:47:19 +01:00
kaetemi
52cdc1e341 Lightmap debug message 2015-01-13 13:21:56 +01:00
kaetemi
f65356079e Unhide layers in max export 2015-01-13 13:21:56 +01:00
kervala
9dfc7944d7 Changed: Fixed a wrong copy-paste 2015-01-11 18:27:06 +01:00
kervala
b8b68c4ec1 Changed: Use defined directories prefixed by a default directory 2015-01-11 18:01:32 +01:00
kervala
9891de01ce Changed: Allow to use a readable and writable data path for IG patch (usefull when data are read only) 2015-01-11 15:06:02 +01:00
kervala
c90a3049c4 Changed: Append getAppBundlePath() to search paths under OS X 2015-01-11 14:59:15 +01:00
kervala
ef405c2f87 Changed: Don't use replaceApplicationDirToken anymore 2015-01-11 14:57:40 +01:00
kervala
5b492fdebe Changed: Typo 2015-01-11 14:56:51 +01:00
kervala
8880047f69 Fixed: Compilation with OS X SDK 10.10 2015-01-10 20:33:02 +01:00
kervala
afac054306 Fixed: Removed raw mouse mode for OS X too 2015-01-10 19:55:05 +01:00
kervala
541fd4a25c Fixed: OpenGL driver compilation 2015-01-10 19:53:27 +01:00
kervala
223de1a1a4 Merge 2015-01-10 19:08:55 +01:00
kervala
ba6cbc76c9 Changed: Minor changes 2015-01-10 18:45:14 +01:00
kervala
741d3b6275 Fixed: OpenGL ES driver compilation 2015-01-10 18:41:54 +01:00
kervala
2a6478b505 Changed: More aliases for OpenGL ES functions and defines to simplify code 2015-01-10 18:41:18 +01:00
Jan Boon
fce776f93e Merged in nimetu/ryzomcore/fix-issue-225 (pull request #98)
CGroupEditBox: ignore enter key when ctrl is pressed (ctrl+m combo) (issue #225)
2015-01-09 18:09:17 +01:00
Nimetu
e2517b8ebc Fix html submit button value that is included with form data (issue #226) 2015-01-09 13:11:20 +02:00
Nimetu
c05b296472 CGroupEditBox: ignore enter key when ctrl is pressed (ctrl+m combo) (issue #225) 2015-01-09 12:59:53 +02:00
kervala
751d6de2eb Changed: Check for string length 2014-12-26 13:44:35 +01:00
kervala
a728ae6b36 Changed: Allow to enable UAC for Windows client 2014-12-26 13:44:03 +01:00
kervala
25d1aa1d1f Changed: Give priority to Luabind library filenames with specific Lua version 2014-12-26 13:43:20 +01:00
kervala
bdfa7a624e Changed: Minor changes 2014-12-26 13:38:02 +01:00
kervala
fe9e52931d Changed: Minor changes 2014-12-26 13:12:56 +01:00
kaetemi
5190cbf8ff Merge with hotfix 2014-12-22 16:40:12 +01:00
kaetemi
566a5b6e86 Fix mirror type sizes 2014-12-22 16:39:54 +01:00
kaetemi
6d16be808f Merge with default 2014-12-22 14:26:26 +01:00
kaetemi
c522248f2d ryzomcore/v0.11.2 2014-12-22 14:21:01 +01:00
kaetemi
7af4bb69d4 Move to feature-light_cycle: c5207e1f862a 2014-12-22 14:10:37 +01:00
kaetemi
936276f789 Backed out changeset: 3694176c26bf 2014-12-22 14:08:54 +01:00
kaetemi
f146593561 Move to hotfix: 287c1142e5ea 2014-12-22 14:08:29 +01:00
dfighter1985
9a61380b37 Ported changeset 9878ab4: CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219. 2014-12-22 01:26:04 +01:00
dfighter1985
fe5c94505f CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219. 2014-12-21 22:55:27 +01:00
kaetemi
00156b1d59 Override sun direction from sky dome [breaks packed sheets] 2014-12-12 21:17:13 +01:00
kaetemi
d7ea4033f7 Also export non-root shapes 2014-12-12 21:17:13 +01:00
kaetemi
c6d7da9d61 Merge 2014-12-12 01:24:56 +01:00
kaetemi
d0b4aa5681 Adjust sky batch 2014-12-12 01:22:19 +01:00
kaetemi
f7ad6e1a94 Allow different light cycle for different continents [breaks packed sheets] 2014-12-12 01:22:19 +01:00
kaetemi
661bb29406 Add sky batch script 2014-12-12 01:22:18 +01:00
kaetemi
a4f5c03293 Fix choppy sky animation 2014-12-12 01:22:18 +01:00
kaetemi
ebb1e06c85 Merge 2014-12-09 23:10:27 +01:00
kaetemi
e6f8faaf58 Merge 2014-12-09 23:07:58 +01:00
kaetemi
8f1bfa05ce Add zone snapshot script example 2014-12-09 23:06:08 +01:00
kaetemi
04ce266c03 Fix NeLLigoMakeSnapShot 2014-12-09 23:06:08 +01:00
kaetemi
dbe3ee5d9e Fix offscreen rendering mode 2014-12-09 23:06:08 +01:00
kaetemi
5edbf6d63d Add script to generate zone names 2014-12-09 23:06:07 +01:00
kaetemi
cfba18092d Handle window close message in painter 2014-12-09 23:06:07 +01:00
botanicvelious
90f72fdef0 add some additional checking for database errors 2014-12-07 06:42:57 -08:00
botanicvelious
5055d68e3f Update with added Domain_Auto_Add settings 2014-12-07 05:01:05 -08:00
kaetemi
18a52f8f92 Adjust patch orientation script 2014-12-04 13:28:30 +01:00
kaetemi
670412f630 Add key in patch painter to reset a patch mesh 2014-12-04 13:21:45 +01:00
kaetemi
b6e162bb05 Merge with hotfix 2014-12-04 13:21:40 +01:00
kaetemi
ea25449029 Fix crash with patch mesh attach 2014-12-04 13:21:12 +01:00
kaetemi
b7dbbcac54 Add script to orient zone patches automatically 2014-12-03 15:16:39 +01:00
kaetemi
c7e0627bb5 Increase patch painter distance 2014-12-03 15:16:39 +01:00
kaetemi
972611e5c0 Separate version string 2014-11-24 16:07:17 +01:00
kaetemi
39bb02454f Adjust version 2014-11-24 15:04:53 +01:00
kaetemi
c02d285b4d Merge with hotfix 2014-11-24 15:04:16 +01:00
kaetemi
1a5f3a2875 ryzomcore/v0.11.1 2014-11-24 14:57:36 +01:00
kaetemi
899c0c441e Fix #218 erratic mouse behaviour 2014-11-24 14:53:28 +01:00
kaetemi
9fba7eff72 Fix bug causing patch painter fail to open more than once 2014-11-19 16:30:14 +01:00
kaetemi
2e94bc1d15 Fix bug causing patch painter fail to open more than once 2014-11-19 16:30:14 +01:00
kaetemi
fb44ccb82d Remove PIC library 2014-11-19 16:20:14 +01:00
kaetemi
6d6926a8b8 ryzomcore/v0.11.0 2014-11-10 23:34:41 +01:00
kaetemi
d76c9c5018 Fix PHP error "Only variables should be passed by reference" 2014-11-08 00:29:50 +01:00
kaetemi
04c57350d9 Fix PHP error "Only variables should be passed by reference" 2014-11-07 23:51:42 +01:00
kaetemi
80105b365c Print callstack 2014-11-07 23:37:39 +01:00
kaetemi
aee9f17acb Fix patchman scripts 2014-11-07 19:32:18 +01:00
kaetemi
feeccbdea8 Update default path 2014-11-07 19:21:05 +01:00
kaetemi
a2457910c4 Backed out merge changeset: 361eb082ec5e
Does not compile. FindLibLZMA missing on Ubunty 12.04 LTS
2014-11-07 19:17:43 +01:00
kaetemi
0e119941b6 Update default patchman cfg 2014-11-07 19:16:45 +01:00
kaetemi
6245a68f76 Change patchman example domain 2014-11-07 19:02:50 +01:00
dfighter1985
b6c9cc5498 CDBViewQuantity shouldn't crash in the editor. 2014-10-20 22:49:46 +02:00
dfighter1985
173bf9e773 Default text for DBViewNumber. 2014-10-20 22:27:33 +02:00
dfighter1985
38d2366a71 it's not a bad idea to store the value in the right variable... 2014-10-20 22:21:59 +02:00
dfighter1985
112d137add DBViewNumber shouldn't crash anymore. 2014-10-20 20:57:08 +02:00
dfighter1985
3193ab11de When setting the Id of the decorated edit box, set the Id of the text as well. 2014-10-20 18:51:53 +02:00
Jan Boon
841f06be25 Merged in nimetu/ryzomcore/html-table-rendering (pull request #92)
Some improvements to table rendering
2014-10-18 04:44:34 +02:00
Nimetu
754a0ff04d Fix html img not showing on some cases, clean up addImage method 2014-10-18 01:20:56 +03:00
Nimetu
a24400c059 Fix crash when using textarea without form 2014-10-18 00:15:51 +03:00
dfighter1985
c96c030b25 set the Id of the text properly when loading the decorated edit box. 2014-10-17 22:25:30 +02:00
dfighter1985
50486109df Don't add non-selectable widgets to the hierarchy tree. 2014-10-17 21:23:00 +02:00
dfighter1985
68fa126867 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. 2014-10-17 21:18:26 +02:00
dfighter1985
25b5750239 Fixed a typo that messed up the textures of decorated editbox. 2014-10-17 16:01:50 +02:00
dfighter1985
2a07542bf2 Save decorated edit box as such. 2014-10-16 21:03:58 +02:00
dfighter1985
50625d3e29 Update decorated edit box decoration coords while dragging. 2014-10-16 20:58:47 +02:00
dfighter1985
9b8991038d Allow selection of CGroupEditBox. 2014-10-16 20:29:36 +02:00
dfighter1985
715fdd1ddf Implemented CGroupEditBoxDecor a decorated CGroupEditBox. 2014-10-16 20:25:19 +02:00
dfighter1985
42a0a7d443 Render every 25ms instead of 200ms 2014-10-15 23:30:36 +02:00
dfighter1985
f7d0f496c4 A Kami will be the default texture for Bitmaps. 2014-10-15 20:20:44 +02:00
dfighter1985
ab3a68a647 CtrlButton textures should be selectable in the texture chooser! 2014-10-15 20:07:13 +02:00
dfighter1985
090502f105 Default texture for CtrlButton. 2014-10-15 20:03:46 +02:00
dfighter1985
7d831ac5aa TEMPORARILY add the login texture map to new project by default. 2014-10-15 19:54:35 +02:00
dfighter1985
03c6a69141 Fix parent pos and size parsing. 2014-10-15 19:46:43 +02:00
dfighter1985
c91be5a563 Don't drop the texture property just because there's no texture assigned... 2014-10-15 12:09:57 +02:00
Nimetu
11442b15ae Change table defaults valign=middle, cellpadding=1, cellspacing=2 2014-10-15 00:02:38 +03:00
Nimetu
66ca072948 Render table with rowspan, colspan.
Borders, if enabled, adds +1 to cell padding.
2014-10-14 15:29:06 +03:00
Nimetu
23d51172c2 Add rowspan and colspan attributes 2014-10-14 15:26:14 +03:00
dfighter1985
6ecd9bc5ae Don't disable the active group before serializing. 2014-10-13 20:15:41 +02:00
dfighter1985
898f399730 It's not a bad idea to actually retrieve the version if we load it... 2014-10-13 19:15:59 +02:00
dfighter1985
7af967cc7b Don't reject an action property just because it's empty... 2014-10-13 18:55:17 +02:00
dfighter1985
3511589f2f Map files can now be specified when creating a new GUI project. 2014-10-13 18:53:26 +02:00
dfighter1985
284de64589 When creating a new GUI set the base color to white. 2014-10-13 17:47:42 +02:00
dfighter1985
b8d16d8b9b Pos and Size parent setters should now use the widget directly as well. 2014-10-13 15:43:10 +02:00
dfighter1985
126631020f Size parent is now queried directly from the widget. 2014-10-13 15:26:47 +02:00
Nimetu
d938a90da6 Render table and cell borders 2014-10-13 01:59:20 +03:00
Nimetu
13b947861d Add bordercolor attribute to table tag 2014-10-13 01:10:46 +03:00
dfighter1985
cc3e44ac2b GUI Editor should show the right parent position. 2014-10-12 23:07:08 +02:00
dfighter1985
a96cdafb29 Parent positions should now be saved right again. 2014-10-12 23:05:22 +02:00
dfighter1985
f27f391724 Some refactoring regarding saving. 2014-10-12 21:15:13 +02:00
dfighter1985
bc3a6b83e5 When creating a new project, save it right away. 2014-10-12 20:09:42 +02:00
Nimetu
80e2d7fa35 Fix table cellpadding 2014-10-12 17:43:18 +03:00
dfighter1985
479625968d Implemented new action. 2014-10-11 21:43:28 +02:00
dfighter1985
f5826add20 Moved CRootGroup out of CInterfaceParser. 2014-10-11 19:30:30 +02:00
dfighter1985
983c9febc9 Added dialog for the new GUI action. 2014-10-11 18:56:24 +02:00
dfighter1985
174655dad9 Some defaults. 2014-10-11 16:47:39 +02:00
dfighter1985
559b4b4a6f Another classname. 2014-10-11 16:40:41 +02:00
dfighter1985
c47188179a CInterfaceParser in editor mode should look for files in the working directory first. 2014-10-11 16:26:38 +02:00
dfighter1985
9a5d082583 Restored lost class names 2014-10-11 14:44:16 +02:00
dfighter1985
f6d34ddb37 Added limits to pch, should fix Linux build. 2014-10-11 13:04:03 +02:00
dfighter1985
c7bfb9cf20 Merged develop 2014-10-11 02:15:07 +02:00
dfighter1985
6c05ced558 Added support for grouping widgets. 2014-10-11 00:42:43 +02:00
dfighter1985
0aead6db70 Allow multiselection. 2014-10-10 20:25:25 +02:00
dfighter1985
20ccee370b Unselect selection when clicking 'nothing'. 2014-10-10 17:33:57 +02:00
kervala
e4ab2467c1 Minor changes 2014-10-10 13:08:14 +02:00
kervala
9995543f47 Fix some warnings 2014-10-10 13:07:54 +02:00
kaetemi
d6586fa42a Configure shadow outline in applications 2014-10-08 23:20:35 +02:00
kaetemi
a1262b71b2 Handle shadow outline in gui 2014-10-08 23:20:35 +02:00
kaetemi
523761d7b7 Implement text shade outline 2014-10-08 23:20:34 +02:00
dfighter1985
733fb56703 A little crash fix. 2014-10-08 21:28:20 +02:00
dfighter1985
a4dfd8c95e Sizes should remain the same when ungrouping. 2014-10-08 21:00:56 +02:00
dfighter1985
003ddd6881 Added support for ungrouping. 2014-10-08 20:36:16 +02:00
dfighter1985
e9f5fef158 Make group selection optional. 2014-10-08 18:45:17 +02:00
dfighter1985
01cdcaa480 Only select a group first in editor mode. 2014-10-08 18:00:54 +02:00
dfighter1985
b524c9fec1 Don't try to handle the right mouse button actions in editor mode. 2014-10-08 17:59:39 +02:00
dfighter1985
1111a022af When moving a group draw it's children too. 2014-10-08 17:52:56 +02:00
dfighter1985
d06ed834b6 Reparent items in widget hierarchy instead of deleting and creating a new item... 2014-10-08 17:42:18 +02:00
dfighter1985
4d06c3c278 Select groups first. 2014-10-08 17:37:05 +02:00