Commit graph

22706 commits

Author SHA1 Message Date
kervala
bb28b25e71 Merge with develop 2016-12-18 14:47:16 +01:00
kervala
4e99767ae2 Merge with develop
--HG--
branch : compatibility-develop
2016-12-18 14:47:16 +01:00
kervala
c458084b59 Fixed: Unicode MFC use
--HG--
branch : develop
2016-12-18 14:42:04 +01:00
kervala
8cbdf6917a Fixed: Unicode MFC use 2016-12-18 14:42:04 +01:00
kervala
a0b4bb2397 Changed: Strings initialization
--HG--
branch : develop
2016-12-18 14:41:47 +01:00
kervala
9032a98096 Changed: Strings initialization 2016-12-18 14:41:47 +01:00
kervala
cbf407f9a1 Changed: Replaced comparisons with string("") by empty() check
--HG--
branch : develop
2016-12-18 14:40:54 +01:00
kervala
e2f3e5ee89 Changed: Replaced comparisons with string("") by empty() check 2016-12-18 14:40:54 +01:00
kervala
257b17385b Fixed: Only compile with Lua 5.1 under Ubuntu 12.04 (Travis CI)
--HG--
branch : develop
2016-12-18 14:04:35 +01:00
kervala
9f8a8d1603 Fixed: Only compile with Lua 5.1 under Ubuntu 12.04 (Travis CI) 2016-12-18 14:04:35 +01:00
kervala
4d6e569f98 Changed: Use NLMISC::toString instead of sprintf
--HG--
branch : develop
2016-12-18 14:03:29 +01:00
kervala
b87ce2c134 Changed: Use NLMISC::toString instead of sprintf 2016-12-18 14:03:29 +01:00
kervala
6ac49adb8b Fixed: Warning when generating DLU
--HG--
branch : develop
2016-12-18 14:00:55 +01:00
kervala
525ec6b487 Fixed: Warning when generating DLU 2016-12-18 14:00:55 +01:00
kervala
1ed5dcdda9 Changed: Use %u instead of %d for uint
--HG--
branch : develop
2016-12-18 14:00:20 +01:00
kervala
22e236f2fe Changed: Use %u instead of %d for uint 2016-12-18 14:00:20 +01:00
kervala
32fbf8163d Fixed: Compilation
--HG--
branch : develop
2016-12-18 13:59:17 +01:00
kervala
c4cd6ccfc2 Fixed: Compilation 2016-12-18 13:59:17 +01:00
kervala
b52daf9519 Fixed: Unicode MFC use
--HG--
branch : develop
2016-12-18 13:59:02 +01:00
kervala
ff0581a402 Fixed: Unicode MFC use 2016-12-18 13:59:02 +01:00
kervala
c4d8565185 Changed: Make 2 different upgd_nl.bat depending on compiler
--HG--
branch : develop
2016-12-18 13:58:20 +01:00
kervala
33983dec8d Changed: Make 2 different upgd_nl.bat depending on compiler 2016-12-18 13:58:20 +01:00
kervala
c3b3db07f1 Changed: Memory leaks detection
--HG--
branch : develop
2016-12-18 13:57:26 +01:00
kervala
5756137e9f Changed: Memory leaks detection 2016-12-18 13:57:26 +01:00
kervala
cbf2c744f0 Changed: Replace some const char* by std::string
--HG--
branch : develop
2016-12-18 13:45:07 +01:00
kervala
288b13dbfb Changed: Replace some const char* by std::string 2016-12-18 13:45:07 +01:00
C?dric OCHS
c551307ff7 Merged in Glorf/ryzomcore/fix_freezing (pull request #143)
Fix a bug where a monster could be stuck after dropping aggro while rooted
2016-12-17 15:04:08 +01:00
Cédric OCHS
0c830e00e1 Merged in Glorf/ryzomcore/fix_freezing (pull request #143)
Fix a bug where a monster could be stuck after dropping aggro while rooted

--HG--
branch : compatibility-develop
2016-12-17 15:04:08 +01:00
Guillaume Dupuy
116769bc4e Remove duplicate code 2016-12-17 14:31:27 +01:00
Guillaume Dupuy
73191a2388 Remove duplicate code
--HG--
branch : fix_freezing
2016-12-17 14:31:27 +01:00
Guillaume Dupuy
82dcde8aa6 Fix a bug where a monster could be stuck after dropping aggro while rooted 2016-12-17 02:47:05 +01:00
Guillaume Dupuy
fb280101f1 Fix a bug where a monster could be stuck after dropping aggro while rooted
--HG--
branch : fix_freezing
2016-12-17 02:47:05 +01:00
kervala
487a6eacfa Merge with develop 2016-12-15 21:12:19 +01:00
kervala
81008cd9ff Merge with develop
--HG--
branch : compatibility-develop
2016-12-15 21:12:19 +01:00
kervala
3142a8d99f Changed: Support VC++ 2013 DLLs
--HG--
branch : develop
2016-12-15 21:11:27 +01:00
kervala
77c4520ce3 Changed: Support VC++ 2013 DLLs 2016-12-15 21:11:27 +01:00
ulukyn
ae32111ea2 Fixed: Load Scenographic Editor lua files 2016-12-14 22:24:49 +01:00
ulukyn@gmail.com
3f58cbd077 Fixed: Load Scenographic Editor lua files
--HG--
branch : compatibility-develop
2016-12-14 22:24:49 +01:00
ulukyn
fd1f324c5c Fixed: Load Scenographic Editor lua files 2016-12-14 20:16:42 +01:00
ulukyn@gmail.com
b0dc979718 Fixed: Load Scenographic Editor lua files
--HG--
branch : compatibility-develop
2016-12-14 20:16:42 +01:00
ulukyn
8fc66a4af4 Fixed: Load Scenographic Editor lua files 2016-12-14 16:14:33 +01:00
ulukyn@gmail.com
6238139c08 Fixed: Load Scenographic Editor lua files
--HG--
branch : compatibility-develop
2016-12-14 16:14:33 +01:00
ulukyn
569793d779 Added: sceneedit.lua and json.lua used by Scenographic Editor 2016-12-14 13:36:59 +01:00
ulukyn@gmail.com
6ff3cc9d77 Added: sceneedit.lua and json.lua used by Scenographic Editor
--HG--
branch : compatibility-develop
2016-12-14 13:36:59 +01:00
ulukyn
390765d49f Fixed: updateVector don't need return a boolean 2016-12-13 23:42:02 +01:00
ulukyn@gmail.com
c6f10d493d Fixed: updateVector don't need return a boolean
--HG--
branch : compatibility-develop
2016-12-13 23:42:02 +01:00
ulukyn
66a34ace54 Fusion 2016-12-13 21:16:30 +01:00
ulukyn@gmail.com
68e6dbaf9a Fusion
--HG--
branch : compatibility-develop
2016-12-13 21:16:30 +01:00
ulukyn
448da5375d Fixed: Removing some nlinfo and correction getMouseRightDown 2016-12-13 21:08:33 +01:00
ulukyn@gmail.com
80fc274813 Fixed: Removing some nlinfo and correction getMouseRightDown
--HG--
branch : compatibility-develop
2016-12-13 21:08:33 +01:00