Commit graph

3546 commits

Author SHA1 Message Date
kervala
f069df82b3 Merge with develop
--HG--
branch : compatibility-develop
2016-12-21 15:18:59 +01:00
kervala
43195f71a5 Fixed: Servers compilation under Linux
--HG--
branch : develop
2016-12-21 15:18:26 +01:00
kervala
8884a8fcb1 Merge with develop
--HG--
branch : compatibility-develop
2016-12-19 17:48:07 +01:00
kervala
1b1e08b7f6 Changed: Warnings
--HG--
branch : develop
2016-12-19 17:47:15 +01:00
kervala
6570b26297 Fixed: Virtual methods with different parameters
--HG--
branch : develop
2016-12-19 17:46:07 +01:00
kervala
07606ffd77 Fixed: done() is a method of QDialog
--HG--
branch : develop
2016-12-19 17:43:47 +01:00
kervala
b04451c473 Merge with develop
--HG--
branch : compatibility-develop
2016-12-19 15:58:48 +01:00
kervala
4e0a19205c Changed: Check return value of fwrite
--HG--
branch : develop
2016-12-19 15:50:54 +01:00
kervala
7aabc217b0 Fixed: Compilation under Linux
--HG--
branch : develop
2016-12-19 15:50:21 +01:00
kervala
db9fbd2746 Fixed: Strict aliasing warnings
--HG--
branch : develop
2016-12-19 15:49:50 +01:00
kervala
408dbb64f6 Fixed: Uninitialized variable
--HG--
branch : develop
2016-12-19 15:44:08 +01:00
kervala
8db7d75e7e Fixed: Uninitialized variables
--HG--
branch : develop
2016-12-19 15:43:38 +01:00
kervala
929cf93b87 Merge with develop
--HG--
branch : compatibility-develop
2016-12-19 13:58:14 +01:00
kervala
89347cd6a0 Changed: Unicode
--HG--
branch : develop
2016-12-19 13:33:44 +01:00
kervala
6978dc9bee Changed: Use std::string instead of const char*
--HG--
branch : develop
2016-12-19 13:33:24 +01:00
kervala
0a4ce7e4e1 Changed: Unicode
--HG--
branch : develop
2016-12-19 13:17:07 +01:00
kervala
cbb1233ce2 Changed: Minor changes
--HG--
branch : develop
2016-12-19 13:16:48 +01:00
kervala
e186c7796b Changed: New DEV command to display a bubble with a long text
--HG--
branch : develop
2016-12-19 13:16:27 +01:00
kervala
31a540b35d Changed: Replace size() comparisons by empty() ones
--HG--
branch : develop
2016-12-19 13:15:25 +01:00
kervala
89318ea69d Merge with develop
--HG--
branch : compatibility-develop
2016-12-19 12:02:47 +01:00
kervala
1e45f7bd45 Fixed: Truncated bubble texts
--HG--
branch : develop
2016-12-19 12:01:55 +01:00
kervala
0328f16c6c Merge with develop
--HG--
branch : compatibility-develop
2016-12-19 09:27:18 +01:00
kervala
61b76ad106 Changed: Minor changes
--HG--
branch : develop
2016-12-19 09:26:46 +01:00
kervala
bd13cabb13 Fixed: Wrong argument checked
--HG--
branch : develop
2016-12-19 09:26:28 +01:00
kervala
ede5a5a53b Fixed: Servers compilation
--HG--
branch : develop
2016-12-19 09:25:51 +01:00
kervala
c8bc57d0a4 Merge with develop
--HG--
branch : compatibility-develop
2016-12-18 20:44:33 +01:00
kervala
8da20b30cc Changed: Merged changes from compatibility-develop that should also be in develop
--HG--
branch : develop
2016-12-18 20:39:16 +01:00
kervala
4e99767ae2 Merge with develop
--HG--
branch : compatibility-develop
2016-12-18 14:47:16 +01:00
kervala
a0b4bb2397 Changed: Strings initialization
--HG--
branch : develop
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
1ed5dcdda9 Changed: Use %u instead of %d for uint
--HG--
branch : develop
2016-12-18 14:00:20 +01:00
kervala
32fbf8163d Fixed: Compilation
--HG--
branch : develop
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
c4d8565185 Changed: Make 2 different upgd_nl.bat depending on compiler
--HG--
branch : develop
2016-12-18 13:58:20 +01:00
kervala
cbf2c744f0 Changed: Replace some const char* by std::string
--HG--
branch : develop
2016-12-18 13:45:07 +01:00
Guillaume Dupuy
73191a2388 Remove duplicate code
--HG--
branch : fix_freezing
2016-12-17 14:31:27 +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
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
ulukyn@gmail.com
3f58cbd077 Fixed: Load Scenographic Editor lua files
--HG--
branch : compatibility-develop
2016-12-14 22:24:49 +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@gmail.com
6238139c08 Fixed: Load Scenographic Editor lua files
--HG--
branch : compatibility-develop
2016-12-14 16:14:33 +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@gmail.com
c6f10d493d Fixed: updateVector don't need return a boolean
--HG--
branch : compatibility-develop
2016-12-13 23:42:02 +01:00
ulukyn@gmail.com
68e6dbaf9a Fusion
--HG--
branch : compatibility-develop
2016-12-13 21:16:30 +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
kervala
afe3863f0f Merge with develop
--HG--
branch : compatibility-develop
2016-12-12 12:03:15 +01:00
kervala
d039598225 Fixed: Compilation
--HG--
branch : develop
2016-12-12 12:02:25 +01:00
kervala
2b53cc82aa Merge with develop
--HG--
branch : compatibility-develop
2016-12-11 14:25:19 +01:00
kervala
bd8cdb46e0 Fixed: Wrong indent
--HG--
branch : develop
2016-12-11 14:21:28 +01:00