Commit graph

7312 commits

Author SHA1 Message Date
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
kervala
3c568ce8a3 Changed: New "new" definitions for NEW_DEBUG macro defined by MFC
--HG--
branch : develop
2016-12-10 18:50:01 +01:00
kervala
ba35109fe4 Changed: Destructor for CApplicationContext to display singletons still in memory
--HG--
branch : develop
2016-12-10 18:48:53 +01:00
kervala
bbcd14cecb Removed: Empty cpp files
--HG--
branch : develop
2016-12-10 18:40:17 +01:00
kervala
27b272f012 Changed: Replace a lot of const char* by std::string parameters
--HG--
branch : develop
2016-12-10 18:40:03 +01:00
kervala
6bbe0ad774 Changed: Some warnings are specific to clang
--HG--
branch : develop
2016-12-10 18:38:46 +01:00
kervala
fe72e1c8d3 Fixed: Compilation of World Editor in Unicode
--HG--
branch : develop
2016-12-10 18:15:01 +01:00
Nimetu
5d35bb8717 Fixed: Protocol-less url in windows
--HG--
branch : develop
2016-12-10 18:56:44 +02:00
kervala
94bf8fd54e Changed: Use TCHAR functions
--HG--
branch : develop
2016-12-10 14:21:20 +01:00
kervala
f0c5b7ea40 Changed: Use TCHAR functions
--HG--
branch : develop
2016-12-10 13:43:00 +01:00
kervala
934df9bd6f Changed: Already a std::string
--HG--
branch : develop
2016-12-10 13:09:16 +01:00
kervala
699680ac4a Changed: Use addSlashR to replace \n by \r\n
--HG--
branch : develop
2016-12-10 13:08:39 +01:00
kervala
5dfa19518a Changed: NeL helpers to launch an external editor
--HG--
branch : develop
2016-12-10 13:02:26 +01:00
kervala
5658cad02e Changed: Convert std::string <> TCHAR
--HG--
branch : develop
2016-12-10 13:01:27 +01:00
kervala
22de830c26 Changed: Check return code of WaitForSingleObject and log error
--HG--
branch : develop
2016-12-10 12:36:04 +01:00
kervala
c716c48fdb Fixed: Compilation
--HG--
branch : develop
2016-12-10 12:33:44 +01:00
kervala
dbba511ee7 Changed: Replace a lot of const char* by std::string parameters
--HG--
branch : develop
2016-12-10 12:30:57 +01:00
kervala
ab44d7e809 Changed: Use a CUniquePtr macro since std::unique_ptr doesn't exist on all (yet) supported platforms
--HG--
branch : develop
2016-12-10 12:05:29 +01:00
kervala
0f6ae5e239 Changed: Release all memory when leaving in login screen
--HG--
branch : develop
2016-12-09 16:15:18 +01:00
kervala
eabfcbf708 Fixed: Release CCurrentCoTask singleton
--HG--
branch : develop
2016-12-09 16:14:16 +01:00
kervala
06cc0ddec8 Changed: Delete filenames before allocating new ones
--HG--
branch : develop
2016-12-09 16:05:13 +01:00
kervala
995ea1e64f Changed: Unimplemented functions
--HG--
branch : develop
2016-12-09 16:04:50 +01:00
kervala
b66b85cefd Changed: Unicode MFC support
--HG--
branch : develop
2016-12-09 16:04:26 +01:00
kervala
9e0b38e6e0 Changed: New tga2dds option -g to force grayscale image instead of alpha
--HG--
branch : develop
2016-12-09 13:53:43 +01:00
kervala
0b171001d1 Removed: Empty cpp files
--HG--
branch : develop
2016-12-09 13:51:52 +01:00
kervala
e2b74b77c6 Changed: Memory leaks detection
--HG--
branch : develop
2016-12-09 13:51:09 +01:00
kervala
22a8a61a75 Changed: VC++ 2005 (even if not supported...)
--HG--
branch : develop
2016-12-09 13:47:43 +01:00
kervala
80e357ffee Changed: Define _USING_V110_SDK71_ if targeting XP with VC++ 2012, 2013 and 2015
--HG--
branch : develop
2016-12-09 13:47:15 +01:00
kervala
c767e55344 Backed out changeset: 6b7af3bc4752
--HG--
branch : compatibility-develop
2016-12-08 18:20:34 +01:00
kervala
ef625959f0 Changed: Version 3.1.0
--HG--
branch : compatibility-develop
2016-12-08 18:19:36 +01:00
kervala
cf98f1fdbc Merge with develop
--HG--
branch : compatibility-develop
2016-12-08 10:51:07 +01:00
kervala
8e15feaa13 Fixed: Replace Win32 code by multiplatform one using NeL classes
--HG--
branch : develop
2016-12-07 14:22:50 +01:00
kervala
28042f6b21 Changed: Use UNICODE for all MFC projects because it's recommended by MS
--HG--
branch : develop
2016-12-07 13:04:43 +01:00
kervala
5ce03c278b Merge with develop
--HG--
branch : compatibility-develop
2016-12-06 20:29:22 +01:00
kervala
e5362bdae7 Changed: Warning
--HG--
branch : develop
2016-12-06 20:27:05 +01:00
kervala
9022dfafde Fixed: Compilation with clang
--HG--
branch : develop
2016-12-06 20:26:48 +01:00
kervala
3992b53683 Changed: Use _M and _T macros
--HG--
branch : develop
2016-12-06 20:26:26 +01:00
kervala
b112b7bc9b Fixed: Truncated pointer
--HG--
branch : develop
2016-12-06 20:25:31 +01:00
kervala
c79e47384d Fixed: Compilation
--HG--
branch : develop
2016-12-06 20:24:48 +01:00
kervala
fff0b5ce5b Changed: Don't close a display already closed
--HG--
branch : develop
2016-12-06 20:24:21 +01:00
kervala
363dfb9a3c Changed: Little less verbose warnings
--HG--
branch : develop
2016-12-06 20:23:49 +01:00
kervala
fef7cc88fb Merge with develop
--HG--
branch : compatibility-develop
2016-12-05 20:13:49 +01:00
kervala
9cdb7446ce Fixed: Compilation with clang
--HG--
branch : develop
2016-12-05 20:13:15 +01:00
kervala
4316dfaa98 Merge with develop
--HG--
branch : compatibility-develop
2016-12-05 19:53:15 +01:00
kervala
0bc80be124 Changed: Minor change
--HG--
branch : develop
2016-12-05 19:52:25 +01:00
kervala
0ae10c404e Changed: Display more warnings if using -fstack-protector
--HG--
branch : develop
2016-12-05 19:52:14 +01:00
kervala
e008cd4dae Changed: Display if using Ninja
--HG--
branch : develop
2016-12-05 19:42:21 +01:00
kervala
957bb8eeed Changed: Display all warnings excepted unused parameters
--HG--
branch : develop
2016-12-05 19:42:11 +01:00
kervala
bb9db58f0c Fixed: Only compile in c++0x in C++
--HG--
branch : develop
2016-12-05 19:40:48 +01:00
kervala
a56b938636 Changed: Only compile with libc++ in C++
--HG--
branch : develop
2016-12-05 19:40:24 +01:00
kervala
9bb46d2ae8 Fixed: Compilation with clang
--HG--
branch : develop
2016-12-05 19:39:19 +01:00
kervala
e0cb4bbe9e Changed: Use NLMISC::openURL to open a page in browser
--HG--
branch : develop
2016-12-05 19:35:55 +01:00
kervala
85bb706900 Changed: Use ADD_PLATFORM_LINKFLAGS macro
--HG--
branch : develop
2016-12-05 19:35:29 +01:00
kervala
c7f2bc6fa3 Merge with develop
--HG--
branch : compatibility-develop
2016-12-05 14:06:48 +01:00