kervala
|
6f4c2c843f
|
Merge with develop
|
2016-12-24 14:24:44 +01:00 |
|
kervala
|
30545b8f7c
|
Changed: Temporary comment Lua functions registration (crash when reselect characters)
|
2016-12-24 14:02:33 +01:00 |
|
kervala
|
16b5e22864
|
Changed: Don't need to release twice CEditor
|
2016-12-24 14:01:51 +01:00 |
|
kervala
|
7cca6c1443
|
Changed: Minor change
|
2016-12-24 14:01:35 +01:00 |
|
kervala
|
73663e30dc
|
Changed: Use a global C64BitsParts union to avoid strict aliasing warnings
|
2016-12-24 14:01:21 +01:00 |
|
kervala
|
31cf9a5349
|
Fixed: Steam latest client API changes
|
2016-12-23 13:49:49 +01:00 |
|
kervala
|
a11e74f18e
|
Merge with develop
|
2016-12-23 09:59:27 +01:00 |
|
kervala
|
67583eb186
|
Changed: Define new variables for VC++ 2015
|
2016-12-23 09:58:44 +01:00 |
|
kervala
|
dcfed04005
|
Changed: Use hg log -r . instead of hg tip to get last revision
|
2016-12-23 09:58:30 +01:00 |
|
Nimetu
|
485c4721bc
|
Merge with develop
|
2016-12-21 23:48:28 +02:00 |
|
Nimetu
|
9655669de6
|
Fixed: Wrong element width when using scaled texture.
|
2016-12-21 23:47:50 +02:00 |
|
Nimetu
|
b6ab159229
|
Backed out changeset: c1085bbb3dae
|
2016-12-21 23:46:32 +02:00 |
|
Nimetu
|
d994a29d79
|
Merge with develop
|
2016-12-21 23:16:48 +02:00 |
|
Nimetu
|
b149858441
|
Fixed: Wrong element width when using scaled texture.
|
2016-12-21 23:16:27 +02:00 |
|
kervala
|
63b7d0f8fd
|
Merge with develop
|
2016-12-21 15:18:59 +01:00 |
|
kervala
|
9e4f603051
|
Fixed: Servers compilation under Linux
|
2016-12-21 15:18:26 +01:00 |
|
kervala
|
8e3c7cd588
|
Fixed: cpptest is using std::auto_ptr
|
2016-12-21 14:51:09 +01:00 |
|
kervala
|
8bf9a665ce
|
Merge with develop
|
2016-12-19 17:48:07 +01:00 |
|
kervala
|
c9413d7b63
|
Changed: Warnings
|
2016-12-19 17:47:15 +01:00 |
|
kervala
|
65be422fb7
|
Fixed: Recursive call
|
2016-12-19 17:46:48 +01:00 |
|
kervala
|
259552ed0d
|
Changed: Don't change x or y in these cases
|
2016-12-19 17:46:38 +01:00 |
|
kervala
|
236522fe11
|
Fixed: Memory leak
|
2016-12-19 17:46:17 +01:00 |
|
kervala
|
67e3108c25
|
Fixed: Virtual methods with different parameters
|
2016-12-19 17:46:07 +01:00 |
|
kervala
|
dcad84bbb9
|
Fixed: done() is a method of QDialog
|
2016-12-19 17:43:47 +01:00 |
|
kervala
|
c3bce8874e
|
Fixed: Virtual method with different parameters warning
|
2016-12-19 16:37:16 +01:00 |
|
kervala
|
0da48b0abb
|
Merge with develop
|
2016-12-19 15:58:48 +01:00 |
|
kervala
|
4e9788116f
|
Changed: Check return value of fwrite
|
2016-12-19 15:50:54 +01:00 |
|
kervala
|
3f8aa231a5
|
Fixed: Compilation under Linux
|
2016-12-19 15:50:21 +01:00 |
|
kervala
|
e30ba1d186
|
Fixed: Strict aliasing warnings
|
2016-12-19 15:49:50 +01:00 |
|
kervala
|
34520c8f29
|
Fixed: Use a string (default was a bool)
|
2016-12-19 15:46:05 +01:00 |
|
kervala
|
4123e6149e
|
Fixed: Uninitialized variable
|
2016-12-19 15:44:08 +01:00 |
|
kervala
|
82d8e04ab2
|
Fixed: Uninitialized variables
|
2016-12-19 15:43:38 +01:00 |
|
kervala
|
d58b347a99
|
Changed: Display line numbers instead of a pointer
|
2016-12-19 15:21:59 +01:00 |
|
kervala
|
c7ef9d9773
|
Merge with develop
|
2016-12-19 13:58:14 +01:00 |
|
kervala
|
05a91ecd97
|
Changed: Unicode
|
2016-12-19 13:33:44 +01:00 |
|
kervala
|
5c36c08b60
|
Changed: Use std::string instead of const char*
|
2016-12-19 13:33:24 +01:00 |
|
kervala
|
0cf4af4443
|
Changed: Unicode
|
2016-12-19 13:17:07 +01:00 |
|
kervala
|
0e26ff44b6
|
Changed: Minor changes
|
2016-12-19 13:16:48 +01:00 |
|
kervala
|
d0a87e5210
|
Changed: New DEV command to display a bubble with a long text
|
2016-12-19 13:16:27 +01:00 |
|
kervala
|
4b36ad57cb
|
Changed: Replace size() comparisons by empty() ones
|
2016-12-19 13:15:25 +01:00 |
|
kervala
|
bbf15b7a80
|
Merge with develop
|
2016-12-19 12:02:47 +01:00 |
|
kervala
|
5203c18a69
|
Fixed: Truncated bubble texts
|
2016-12-19 12:01:55 +01:00 |
|
kervala
|
03aeffdda7
|
Merge with develop
|
2016-12-19 09:27:18 +01:00 |
|
kervala
|
76848d6172
|
Changed: Minor changes
|
2016-12-19 09:26:46 +01:00 |
|
kervala
|
93b0557ca1
|
Fixed: Wrong argument checked
|
2016-12-19 09:26:28 +01:00 |
|
kervala
|
1fdd44a673
|
Fixed: Servers compilation
|
2016-12-19 09:25:51 +01:00 |
|
kervala
|
1e8d28759a
|
Merge with develop
|
2016-12-18 20:44:33 +01:00 |
|
kervala
|
5152d83666
|
Fixed: Compilation
|
2016-12-18 20:39:47 +01:00 |
|
kervala
|
3c1ff1f14b
|
Changed: Minor changes
|
2016-12-18 20:39:35 +01:00 |
|
kervala
|
44a7872135
|
Changed: Merged changes from compatibility-develop that should also be in develop
|
2016-12-18 20:39:16 +01:00 |
|
kervala
|
bb28b25e71
|
Merge with develop
|
2016-12-18 14:47:16 +01:00 |
|
kervala
|
8cbdf6917a
|
Fixed: Unicode MFC use
|
2016-12-18 14:42:04 +01:00 |
|
kervala
|
9032a98096
|
Changed: Strings initialization
|
2016-12-18 14:41:47 +01:00 |
|
kervala
|
e2f3e5ee89
|
Changed: Replaced comparisons with string("") by empty() check
|
2016-12-18 14:40:54 +01:00 |
|
kervala
|
b87ce2c134
|
Changed: Use NLMISC::toString instead of sprintf
|
2016-12-18 14:03:29 +01:00 |
|
kervala
|
525ec6b487
|
Fixed: Warning when generating DLU
|
2016-12-18 14:00:55 +01:00 |
|
kervala
|
22e236f2fe
|
Changed: Use %u instead of %d for uint
|
2016-12-18 14:00:20 +01:00 |
|
kervala
|
c4cd6ccfc2
|
Fixed: Compilation
|
2016-12-18 13:59:17 +01:00 |
|
kervala
|
ff0581a402
|
Fixed: Unicode MFC use
|
2016-12-18 13:59:02 +01:00 |
|
kervala
|
33983dec8d
|
Changed: Make 2 different upgd_nl.bat depending on compiler
|
2016-12-18 13:58:20 +01:00 |
|
kervala
|
5756137e9f
|
Changed: Memory leaks detection
|
2016-12-18 13:57:26 +01:00 |
|
kervala
|
288b13dbfb
|
Changed: Replace some const char* by std::string
|
2016-12-18 13:45:07 +01:00 |
|
Guillaume Dupuy
|
116769bc4e
|
Remove duplicate code
|
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 |
|
kervala
|
487a6eacfa
|
Merge with develop
|
2016-12-15 21:12:19 +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
|
fd1f324c5c
|
Fixed: Load Scenographic Editor lua files
|
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
|
569793d779
|
Added: sceneedit.lua and json.lua used by Scenographic Editor
|
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
|
66a34ace54
|
Fusion
|
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 |
|
|
a6339b7fd9
|
Merge branch 'feature/v3+CI' into 'develop'
Feature/v3+ci
Toujours le merge de la v3...
See merge request !28
|
2016-12-13 13:54:26 +00:00 |
|
kervala
|
d3dc21ad46
|
Merge with develop
|
2016-12-12 12:03:15 +01:00 |
|
kervala
|
e084c2014a
|
Fixed: Compilation
|
2016-12-12 12:02:25 +01:00 |
|
|
0e55d39f53
|
Update egs_mirror.cpp (ajout ChaScore1 ) warning dans le shard
|
2016-12-12 09:34:03 +00:00 |
|
kervala
|
5acd03d77d
|
Merge with develop
|
2016-12-11 19:27:27 +01:00 |
|
kervala
|
ea2caaeb55
|
Changed: Fix warning
|
2016-12-11 19:26:38 +01:00 |
|
kervala
|
64bcfd92fa
|
Fixed: Compilation with clang
|
2016-12-11 19:26:23 +01:00 |
|
kervala
|
861a9b399a
|
Merge with develop
|
2016-12-11 14:25:19 +01:00 |
|
kervala
|
3e98e267a2
|
Fixed: Use -Wno-...
|
2016-12-11 14:24:43 +01:00 |
|
kervala
|
879cac9d29
|
Changed: GCC warnings
|
2016-12-11 14:23:58 +01:00 |
|
kervala
|
bb3f3370b8
|
Fixed: Wrong indent
|
2016-12-11 14:21:28 +01:00 |
|
kervala
|
43a3391a98
|
Chnged: Sign comparison warning
|
2016-12-11 14:20:52 +01:00 |
|
kervala
|
b4d5bb9af5
|
Changed: Removed unused variables
|
2016-12-11 14:20:31 +01:00 |
|
kervala
|
f3147c7616
|
Merge with develop
|
2016-12-11 12:43:05 +01:00 |
|
kervala
|
e8b906c59b
|
Fixed: Compilation
|
2016-12-11 12:42:06 +01:00 |
|
kervala
|
486a5e4638
|
Merge with develop
|
2016-12-11 12:32:05 +01:00 |
|
kervala
|
3665c79b3a
|
Fixed: Use std::vector instead of CUniquePtr for arrays
|
2016-12-11 12:31:24 +01:00 |
|
kervala
|
ffdbcd1ab8
|
Changed: Use %u for uint
|
2016-12-11 11:59:30 +01:00 |
|
kervala
|
42497fed77
|
Changed: Display line number instead of a pointer on a string
|
2016-12-11 11:59:10 +01:00 |
|
kervala
|
93fa57d25c
|
Fixed: %s needs a const char*
|
2016-12-11 11:58:30 +01:00 |
|
kervala
|
27d3fd12d9
|
Fixed: Don't crash if a file is not unique in BNPs
|
2016-12-11 11:57:02 +01:00 |
|
ulukyn
|
2a7615b2f4
|
Added: ARKPACSBorders to enable/disable the display of collisions by user
|
2016-12-10 22:05:38 +01:00 |
|
ulukyn
|
512d300741
|
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
|
2016-12-10 22:04:33 +01:00 |
|
ulukyn
|
18b024f0c7
|
Added: Add lua function to have an icon at left of menu option
|
2016-12-10 21:58:15 +01:00 |
|
kervala
|
dab3de7a74
|
Merge with develop
|
2016-12-10 19:52:43 +01:00 |
|
kervala
|
f2368f2a91
|
Merge
|
2016-12-10 19:47:19 +01:00 |
|
kervala
|
f3fae4fc60
|
Changed: Replace Win32 calls by NeL methods
|
2016-12-10 19:46:51 +01:00 |
|