Commit graph

5083 commits

Author SHA1 Message Date
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
Jan Boon
449c7bec71 Merged in nimetu/ryzomcore/fix-issue-226 (pull request #99)
Fix html submit button value that is included with form data (issue #226)

--HG--
branch : develop
2015-01-09 18:08:49 +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
0d1c319b2f Added tag ryzomcore/v0.11.2 for changeset 9e583b717fd6 2014-12-22 14:22:12 +01:00
kaetemi
cc59df1c14 ryzomcore/v0.11.2 2014-12-22 14:21:54 +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