kervala
|
776542be27
|
Changed: Updated world_editor_classes.xml
--HG--
branch : compatibility-develop
|
2016-02-21 13:52:20 +01:00 |
|
kervala
|
5284bd37f1
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-02-21 13:22:22 +01:00 |
|
kervala
|
460708a015
|
Changed: Use L:/ path instead of R:/ for leveldesign
--HG--
branch : develop
|
2016-02-21 13:10:16 +01:00 |
|
kervala
|
3161ec2a77
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-02-20 19:29:00 +01:00 |
|
kervala
|
baecfcf944
|
Adapt CSTLoader to use nlfopen and some simplifications, issue #261
--HG--
branch : develop
|
2016-02-20 18:56:21 +01:00 |
|
kervala
|
e68d6e3617
|
Changed: Minor changes
--HG--
branch : develop
|
2016-02-20 18:53:39 +01:00 |
|
kervala
|
9370e93dd6
|
Removed useless comments/commented code
--HG--
branch : develop
|
2016-02-20 18:09:24 +01:00 |
|
kervala
|
aaecf96b67
|
Use new wrapper insteaf of fopen, issue #261
--HG--
branch : develop
|
2016-02-20 17:56:25 +01:00 |
|
kervala
|
8cd6d46d1d
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-30 16:23:28 +01:00 |
|
kervala
|
75307d00da
|
Changed: Minor changes (thanks to SIELA1915)
--HG--
branch : develop
|
2016-01-30 16:22:55 +01:00 |
|
kervala
|
0540c386a6
|
Merge
--HG--
branch : compatibility-develop
|
2016-01-26 22:45:40 +01:00 |
|
kervala
|
325242c2e4
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-26 22:44:40 +01:00 |
|
kervala
|
36f886f5f1
|
Changed: Removed more useless dependencies
--HG--
branch : develop
|
2016-01-26 22:43:35 +01:00 |
|
kervala
|
2be87f3c3e
|
Fixed: Use same XML files as on Atys
--HG--
branch : compatibility-develop
|
2016-01-24 17:08:32 +01:00 |
|
kervala
|
cca0dd450e
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-16 10:52:18 +01:00 |
|
kaetemi
|
5c6edf6cee
|
And more VS2015 fixes
--HG--
branch : develop
|
2016-01-15 12:33:27 +01:00 |
|
kaetemi
|
e4b72e63a1
|
More of the VS2015 stuff
--HG--
branch : develop
|
2016-01-15 12:29:05 +01:00 |
|
kervala
|
3c4f324bfe
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-13 20:05:06 +01:00 |
|
kervala
|
bcb1aa242d
|
Fixed: Use map for faster search for example (implemented a TODO of GUIGUI)
--HG--
branch : develop
|
2016-01-13 20:04:01 +01:00 |
|
kervala
|
47364c47c3
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-02 20:29:55 +01:00 |
|
kervala
|
844b1e3d02
|
Fixed: Warnings with GCC
--HG--
branch : develop
|
2016-01-02 19:19:39 +01:00 |
|
kervala
|
11c0a073ed
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-02 17:11:59 +01:00 |
|
kervala
|
de77bb634d
|
Changed: Don't need to cast since it's already a sint32
--HG--
branch : develop
|
2016-01-02 17:10:50 +01:00 |
|
kervala
|
2f45ff1ebe
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-29 22:36:04 +01:00 |
|
kervala
|
ab4dc8ec01
|
Changed: Merge code from private repository
--HG--
branch : develop
|
2015-12-29 22:06:49 +01:00 |
|
kervala
|
98c485bd94
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-29 18:03:21 +01:00 |
|
kervala
|
88042cc28d
|
Changed: Minor changes
--HG--
branch : develop
|
2015-12-29 16:19:46 +01:00 |
|
kervala
|
050a3679f1
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-15 22:52:28 +01:00 |
|
kervala
|
7105749d94
|
Changed: Include limits
--HG--
branch : develop
|
2015-12-15 22:51:37 +01:00 |
|
kervala
|
0e63e81565
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-15 15:09:50 +01:00 |
|
kervala
|
3a3a8752d1
|
Changed: Replace (uint16)~0 by std::numeric_limits<uint16>::max()
--HG--
branch : develop
|
2015-12-15 14:33:59 +01:00 |
|
kervala
|
189fc7a2d9
|
Changed: Minor changes
--HG--
branch : develop
|
2015-12-15 13:39:02 +01:00 |
|
kervala
|
84831a4b34
|
Changed: Use std::string insteaf of const char* for filenames in CPersistentDataRecord
--HG--
branch : develop
|
2015-12-15 13:35:04 +01:00 |
|
kervala
|
74f297f588
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-13 15:26:37 +01:00 |
|
kervala
|
8aff509f0f
|
Fixed: Clang warnings
--HG--
branch : develop
|
2015-12-13 15:25:28 +01:00 |
|
kervala
|
9e60db1a89
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-07 21:49:21 +01:00 |
|
kervala
|
079ea3e5c5
|
Changed: Let dependencies propagate to other targets
--HG--
branch : develop
|
2015-12-07 21:48:32 +01:00 |
|
kervala
|
fd4519f447
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-03 12:50:55 +01:00 |
|
kervala
|
86a866d4cb
|
Fixed: Completely remove Yubo Chat since it's not used anymore (patch by Kaetemi)
--HG--
branch : develop
|
2015-12-03 12:49:51 +01:00 |
|
kervala
|
ba2cfee2b1
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-25 16:02:08 +01:00 |
|
kaetemi
|
525b0f1643
|
Apply patch #231, new weather values, must be applied server-side as well. Needs to be tested
--HG--
branch : develop
|
2015-11-24 19:33:57 +01:00 |
|
kervala
|
a2ba342e06
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-14 19:29:43 +01:00 |
|
kervala
|
fb1d5134ba
|
Changed: Minor changes
--HG--
branch : develop
|
2015-11-14 18:33:13 +01:00 |
|
kervala
|
45597ebd8a
|
Changed: Implement a TODO
--HG--
branch : develop
|
2015-11-14 18:21:44 +01:00 |
|
kervala
|
64e4468943
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-14 12:13:12 +01:00 |
|
kervala
|
53f46eb5fa
|
Changed: Support for integer types in Lua 5.3, fixes #253
--HG--
branch : develop
|
2015-11-14 11:46:17 +01:00 |
|
kervala
|
7f62faa794
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-13 19:52:35 +01:00 |
|
kervala
|
a8d81c689b
|
Changed: Support for integer types in Lua 5.3, fixes #253
--HG--
branch : develop
|
2015-11-13 18:42:50 +01:00 |
|
kervala
|
4a97f339a3
|
Changed: Replaced some NLMISC::strlwr by NLMISC::toLower
--HG--
branch : develop
|
2015-11-13 16:22:49 +01:00 |
|
kervala
|
f095121991
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-06 15:49:55 +01:00 |
|