Commit graph

7365 commits

Author SHA1 Message Date
Nimetu
4e4985d647 Merge with develop
--HG--
branch : compatibility-develop
2016-12-21 23:48:28 +02:00
Nimetu
3fbfa4743b Fixed: Wrong element width when using scaled texture.
--HG--
branch : develop
2016-12-21 23:47:50 +02:00
Nimetu
04e774dc37 Backed out changeset: c1085bbb3dae
--HG--
branch : develop
2016-12-21 23:46:32 +02:00
Nimetu
b95fed61f2 Merge with develop
--HG--
branch : compatibility-develop
2016-12-21 23:16:48 +02:00
Nimetu
254c7690f8 Fixed: Wrong element width when using scaled texture.
--HG--
branch : develop
2016-12-21 23:16:27 +02:00
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
03ad7b63d4 Fixed: cpptest is using std::auto_ptr
--HG--
branch : develop
2016-12-21 14:51:09 +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
798fde40f6 Fixed: Recursive call
--HG--
branch : develop
2016-12-19 17:46:48 +01:00
kervala
3defbbbc89 Changed: Don't change x or y in these cases
--HG--
branch : develop
2016-12-19 17:46:38 +01:00
kervala
e2f776d21e Fixed: Memory leak
--HG--
branch : develop
2016-12-19 17:46:17 +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
c178730b80 Fixed: Virtual method with different parameters warning
--HG--
branch : develop
2016-12-19 16:37:16 +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
f921040f80 Fixed: Use a string (default was a bool)
--HG--
branch : develop
2016-12-19 15:46:05 +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
e29fa9a719 Changed: Display line numbers instead of a pointer
--HG--
branch : develop
2016-12-19 15:21:59 +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
148c748d31 Fixed: Compilation
--HG--
branch : develop
2016-12-18 20:39:47 +01:00
kervala
0668ff8f04 Changed: Minor changes
--HG--
branch : develop
2016-12-18 20:39:35 +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
c458084b59 Fixed: Unicode MFC use
--HG--
branch : develop
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
cbf407f9a1 Changed: Replaced comparisons with string("") by empty() check
--HG--
branch : develop
2016-12-18 14:40:54 +01:00
kervala
4d6e569f98 Changed: Use NLMISC::toString instead of sprintf
--HG--
branch : develop
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
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
c3b3db07f1 Changed: Memory leaks detection
--HG--
branch : develop
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
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
c14d0733c9 Merge with develop
--HG--
branch : compatibility-develop
2016-12-11 19:27:27 +01:00
kervala
bca1722bdd Changed: Fix warning
--HG--
branch : develop
2016-12-11 19:26:38 +01:00
kervala
b766a01c8a Fixed: Compilation with clang
--HG--
branch : develop
2016-12-11 19:26:23 +01:00
kervala
2b53cc82aa Merge with develop
--HG--
branch : compatibility-develop
2016-12-11 14:25:19 +01:00
kervala
c94ce037bb Fixed: Use -Wno-...
--HG--
branch : develop
2016-12-11 14:24:43 +01:00
kervala
e4109490cd Changed: GCC warnings
--HG--
branch : develop
2016-12-11 14:23:58 +01:00
kervala
bd8cdb46e0 Fixed: Wrong indent
--HG--
branch : develop
2016-12-11 14:21:28 +01:00
kervala
e7d1710747 Chnged: Sign comparison warning
--HG--
branch : develop
2016-12-11 14:20:52 +01:00
kervala
c240c45514 Changed: Removed unused variables
--HG--
branch : develop
2016-12-11 14:20:31 +01:00
kervala
035a267e92 Merge with develop
--HG--
branch : compatibility-develop
2016-12-11 12:43:05 +01:00
kervala
71b5a1734e Fixed: Compilation
--HG--
branch : develop
2016-12-11 12:42:06 +01:00
kervala
ac404a2c8f Merge with develop
--HG--
branch : compatibility-develop
2016-12-11 12:32:05 +01:00
kervala
106c924f49 Fixed: Use std::vector instead of CUniquePtr for arrays
--HG--
branch : develop
2016-12-11 12:31:24 +01:00
kervala
34d454c835 Changed: Use %u for uint
--HG--
branch : develop
2016-12-11 11:59:30 +01:00
kervala
62d4d8ccc0 Changed: Display line number instead of a pointer on a string
--HG--
branch : develop
2016-12-11 11:59:10 +01:00
kervala
10f7abb26f Fixed: %s needs a const char*
--HG--
branch : develop
2016-12-11 11:58:30 +01:00
kervala
1920a81a23 Fixed: Don't crash if a file is not unique in BNPs
--HG--
branch : develop
2016-12-11 11:57:02 +01:00
ulukyn@gmail.com
1a4c020e56 Added: ARKPACSBorders to enable/disable the display of collisions by user
--HG--
branch : compatibility-develop
2016-12-10 22:05:38 +01:00
ulukyn@gmail.com
9e73cd8d22 Added: Export usefull cursor and shape functions in lua:
getGroundAtMouse
getMousePos
getMouseDown
getMouseMiddleDown
getMouseRightDown
setMouseCursor
setupShape
getShapeIdAt
addShape
moveShape
rotateShape
getShapePos
getShapeScale
getShapeRot
getShapeColPos
getShapeColScale
getShapeColOrient
deleteShape

--HG--
branch : compatibility-develop
2016-12-10 22:04:33 +01:00
ulukyn@gmail.com
bd7b703f3a Added: Add lua function to have an icon at left of menu option
--HG--
branch : compatibility-develop
2016-12-10 21:58:15 +01:00
kervala
f085121937 Merge with develop
--HG--
branch : compatibility-develop
2016-12-10 19:52:43 +01:00
kervala
9d6f842f05 Merge
--HG--
branch : develop
2016-12-10 19:47:19 +01:00
kervala
86c82181ca Changed: Replace Win32 calls by NeL methods
--HG--
branch : develop
2016-12-10 19:46:51 +01:00
kervala
3d36a4bfb5 Changed: Removed unused methods and used TCHARs
--HG--
branch : develop
2016-12-10 19:42:02 +01:00
kervala
a1baec9de2 Changed: Use _T macro
--HG--
branch : develop
2016-12-10 19:39:39 +01:00
kervala
083f44ec32 Fixed: Compilation
--HG--
branch : develop
2016-12-10 19:36:41 +01:00
kervala
30b40568ed Changed: Use 3dsmax SDK definitions
--HG--
branch : develop
2016-12-10 19:07:15 +01:00
kervala
8ef8b60ab8 Fixed: Warning on 64 bits
--HG--
branch : develop
2016-12-10 19:05:24 +01:00
kervala
829092aa8c Fixed: Compilation with 3dsmax 2017 SDK
--HG--
branch : develop
2016-12-10 19:05:05 +01:00
kervala
dbf443beb7 Fixed: C++11 forbids to throw exception in destructor
--HG--
branch : develop
2016-12-10 19:04:29 +01:00
kervala
faecd5b952 Changed: extern keyword useless there
--HG--
branch : develop
2016-12-10 19:02:06 +01:00
kervala
d37a1e032c Fixed: Don't call CCoTask::releaseInstance() because allocated on heap
--HG--
branch : develop
2016-12-10 19:01:34 +01:00
kervala
9a6b3c91b7 Changed: Minor changes
--HG--
branch : develop
2016-12-10 18:58:13 +01:00
kervala
50b6af6d3d Fixed: Strict aliasing warnings
--HG--
branch : develop
2016-12-10 18:55:31 +01:00