Commit graph

4793 commits

Author SHA1 Message Date
kervala
9d6b9daebe Fixed: Wrong include guard for admin_modules PCH
--HG--
branch : hotfix
2015-02-15 09:53:56 +01:00
kervala
6784301afc Merge with hotfix
--HG--
branch : develop
2015-02-14 19:29:36 +01:00
kervala
bd054ea776 Fixed: Warning multichars
--HG--
branch : hotfix
2015-02-14 17:54:05 +01:00
kervala
1690f777a1 Fixed: Unnamed semaphores are deprecated under OS X
--HG--
branch : hotfix
2015-02-14 17:52:15 +01:00
kervala
5aa8a1d615 Fixed: Warning assert always false
--HG--
branch : hotfix
2015-02-14 17:47:55 +01:00
kervala
3509d75ad6 Fixed: Warning comparing an enum to an int
--HG--
branch : hotfix
2015-02-14 17:47:10 +01:00
kervala
3aa1661c90 Merge with hotfix
--HG--
branch : develop
2015-02-14 16:07:04 +01:00
kervala
859387758d Fixed: Compilation
--HG--
branch : hotfix
2015-02-14 16:05:45 +01:00
kervala
a723f9261b Merge with hotfix
--HG--
branch : develop
2015-02-14 15:44:11 +01:00
kervala
a42569ad24 Added: PCH for admin_modules
--HG--
branch : hotfix
2015-02-14 15:43:05 +01:00
kervala
e9b5cc4410 Merge with hotfix
--HG--
branch : develop
2015-02-14 15:19:49 +01:00
kervala
4b397f3e5b Changed: Improved User Agent management
--HG--
branch : hotfix
2015-02-14 15:18:53 +01:00
kervala
e8b0765e7c Merge with hotfix
--HG--
branch : develop
2015-02-14 14:31:19 +01:00
kervala
cdd35f58a1 Fixed: Warning with multichars to int conversion
--HG--
branch : hotfix
2015-02-14 14:25:50 +01:00
kervala
8472a6ff7f Fixed: Compilation
--HG--
branch : hotfix
2015-02-14 13:57:06 +01:00
kervala
e0c95a74af Changed: Updated CMale modules
--HG--
branch : hotfix
2015-02-14 13:47:37 +01:00
kervala
943131b802 Changed: Replaced atoi and atof by NLMISC::fromString
--HG--
branch : hotfix
2015-02-14 13:46:21 +01:00
kervala
1742997984 Changed: Minor changes
--HG--
branch : hotfix
2015-02-14 13:34:45 +01:00
kervala
d774dcac3e Changed: Use Ryzom user agent for CURL
--HG--
branch : hotfix
2015-02-14 13:19:53 +01:00
kervala
49bbb10b58 Fixed: Missing namespace
--HG--
branch : hotfix
2015-02-14 13:19:09 +01:00
kervala
1960f5c448 Changed: std::string already initialized to en empty string
--HG--
branch : hotfix
2015-02-14 13:18:51 +01:00
kervala
76e64fcb42 Changed: Used INVALID_AI_INSTANCE in CUsedContinent::getInstanceForContinent
--HG--
branch : hotfix
2015-02-14 13:03:27 +01:00
kervala
ee7008ae02 Changed: Possible bug if string not found
--HG--
branch : hotfix
2015-02-14 12:54:17 +01:00
kervala
6e1abd80d3 Fixed: Unable to patch when Ryzom was located on a mounted FS
--HG--
branch : hotfix
2015-02-14 12:52:57 +01:00
kervala
165524d1df Changed: Used PCH for admin_modules
--HG--
branch : hotfix
2015-02-14 12:48:29 +01:00
kervala
4de072865b Changed: Check getSpawn() before calling its methods
--HG--
branch : hotfix
2015-02-14 12:47:54 +01:00
kervala
b0937ec02b Changed: Minor changes
--HG--
branch : hotfix
2015-02-14 12:47:03 +01:00
kervala
6853497593 Changed: Replaced atof by NLMISC::fromString
--HG--
branch : hotfix
2015-02-14 12:43:29 +01:00
kervala
3039428094 Fixed: Compilation warnings
--HG--
branch : hotfix
2015-02-14 12:41:59 +01:00
kervala
eb5fecf8ce Fixed: Only keep Release and Debug configurations in CMake
--HG--
branch : hotfix
2015-02-14 12:06:19 +01:00
dfighter1985
225d786e7f Merged in hotfix (pull request #114)
Merging hotfix branch

--HG--
branch : develop
2015-02-13 19:48:42 +01:00
dfighter1985
b381ef6fae Add the data directory to the search path.
--HG--
branch : hotfix
2015-02-11 20:42:31 +01:00
dfighter1985
26f1cc6fac Added ryzom.ttf, it will be installed to the data directory.
--HG--
branch : hotfix
2015-02-11 19:55:16 +01:00
dfighter1985
79cd6bfaee Include rgba.h in libwww.h. Thanks Nimetu!
--HG--
branch : hotfix
2015-02-09 20:07:35 +01:00
dfighter1985
28b0a0a040 Change the cursor to a wait cursor when applying settings in the settings dialog.
--HG--
branch : hotfix
2015-02-09 19:55:27 +01:00
dfighter1985
44c6f93b26 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.
--HG--
branch : hotfix
2015-02-09 19:49:16 +01:00
dfighter1985
b530d99bf1 Renamed the studio startup settings dialog to avoid name conflict with the core plugin's settings dialog.
--HG--
branch : hotfix
2015-02-09 17:54:27 +01:00
dfighter1985
b881f9558b Read the GUI Editor widget and expression definition XML files from the right directory.
--HG--
branch : hotfix
2015-02-09 01:48:39 +01:00
dfighter1985
a2c96c3053 Install the GUI Editor widget and expression definition files to the data dir.
--HG--
branch : hotfix
2015-02-08 23:46:33 +01:00
dfighter1985
46cc31d0d0 Handle relative paths when loading .worldedit files in World Editor.
--HG--
branch : hotfix
2015-02-08 00:24:29 +01:00
dfighter1985
7f35c5959a Merged in hotfix (pull request #111)
Merge hotfix

--HG--
branch : develop
2015-02-06 02:32:03 +01:00
dfighter1985
5e55a7b7bb Erm. Initialize Nel3D on other platforms too...
--HG--
branch : hotfix
2015-02-06 02:29:33 +01:00
dfighter1985
c85b83fcdb Merged in hotfix (pull request #108)
Merge hotfix branch.

--HG--
branch : develop
2015-02-06 00:45:36 +01:00
dfighter1985
6c153a30b4 CPack should use the install prefix.
--HG--
branch : hotfix
2015-02-06 00:31:51 +01:00
dfighter1985
ea3b16069b We need the LIGO config file, not directory in the first start settings dialog.
--HG--
branch : hotfix
2015-02-05 23:50:38 +01:00
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