kervala
|
ef5b22045c
|
Changed: Version 3.0.0
--HG--
branch : compatibility-develop
|
2016-04-09 12:53:30 +02:00 |
|
kervala
|
2d8407157b
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-04-06 09:34:34 +02:00 |
|
kervala
|
a002b20c7f
|
Changed: Minor changes
--HG--
branch : develop
|
2016-04-06 09:29:37 +02:00 |
|
kervala
|
f93dfcfefe
|
Changed: Minor changes
|
2016-04-06 09:29:37 +02:00 |
|
depyraken
|
d6ef802487
|
merge aquatic to lirria
|
2016-03-30 23:13:00 +02:00 |
|
kervala
|
8f6a72e86f
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-03-29 14:00:04 +02:00 |
|
kervala
|
7517200cc7
|
Merge with develop
|
2016-03-29 14:00:04 +02:00 |
|
kervala
|
e785de2a6e
|
Fixed: Typo
--HG--
branch : develop
|
2016-03-29 13:59:34 +02:00 |
|
kervala
|
8b5c38392a
|
Fixed: Typo
|
2016-03-29 13:59:34 +02:00 |
|
SIELA1915
|
52702f64f1
|
merged from compatibility-develop
|
2016-03-28 02:12:19 +02:00 |
|
kervala
|
7bcde43a63
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-03-20 17:09:13 +01:00 |
|
kervala
|
323d981318
|
Merge with develop
|
2016-03-20 17:09:13 +01:00 |
|
kervala
|
55de2f0bd2
|
Fixed: Compilation (missing NLMISC namespaces for nlfopen)
--HG--
branch : develop
|
2016-03-20 17:08:44 +01:00 |
|
kervala
|
d11053aa03
|
Fixed: Compilation (missing NLMISC namespaces for nlfopen)
|
2016-03-20 17:08:44 +01:00 |
|
kervala
|
1eddef3c93
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-03-18 22:27:43 +01:00 |
|
kervala
|
894ee5a47b
|
Merge with develop
|
2016-03-18 22:27:43 +01:00 |
|
kervala
|
a7b3532687
|
Changed: Minor changes
--HG--
branch : develop
|
2016-03-18 22:26:58 +01:00 |
|
kervala
|
78c7a925c7
|
Changed: Minor changes
|
2016-03-18 22:26:58 +01:00 |
|
kaetemi
|
b9d366372e
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-03-10 12:09:18 +01:00 |
|
kaetemi
|
4a581d89fa
|
Merge with develop
|
2016-03-10 12:09:18 +01:00 |
|
kaetemi
|
c8646b26d1
|
Fix rounding error in _RyzomDay and _RyzomTime calculation
--HG--
branch : develop
|
2016-03-10 12:08:48 +01:00 |
|
kaetemi
|
af0568e131
|
Fix rounding error in _RyzomDay and _RyzomTime calculation
|
2016-03-10 12:08:48 +01:00 |
|
Yann
|
0ce6b3c411
|
Adding new talents in mdehaviours in common
|
2016-03-04 20:16:16 +01:00 |
|
kervala
|
e23f32e902
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-02-23 17:05:57 +01:00 |
|
kervala
|
4a8741a9b0
|
Merge with develop
|
2016-02-23 17:05:57 +01:00 |
|
kervala
|
79be594f54
|
Changed: Trim URL before to display it
--HG--
branch : develop
|
2016-02-23 17:05:04 +01:00 |
|
kervala
|
6c1cf58572
|
Changed: Trim URL before to display it
|
2016-02-23 17:05:04 +01:00 |
|
kervala
|
14f46e884b
|
Changed: Updated world_editor_classes.xml
--HG--
branch : develop
|
2016-02-21 17:10:28 +01:00 |
|
kervala
|
db2c2c64a7
|
Changed: Updated world_editor_classes.xml
|
2016-02-21 17:10:28 +01:00 |
|
kervala
|
89f4131e8d
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-02-21 17:06:38 +01:00 |
|
kervala
|
d0261d2fc5
|
Merge with develop
|
2016-02-21 17:06:38 +01:00 |
|
kervala
|
3dfcdb758a
|
Fixed: Add unlearn_brick command for missions (a big thanks to Depyraken for the patch!)
--HG--
branch : develop
|
2016-02-21 17:05:54 +01:00 |
|
kervala
|
a58a3451b8
|
Fixed: Add unlearn_brick command for missions (a big thanks to Depyraken for the patch!)
|
2016-02-21 17:05:54 +01:00 |
|
kervala
|
537f6ab83e
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-02-21 13:57:35 +01:00 |
|
kervala
|
24302acc35
|
Merge with develop
|
2016-02-21 13:57:35 +01:00 |
|
kervala
|
776542be27
|
Changed: Updated world_editor_classes.xml
--HG--
branch : compatibility-develop
|
2016-02-21 13:52:20 +01:00 |
|
kervala
|
af54e427c8
|
Changed: Updated world_editor_classes.xml
|
2016-02-21 13:52:20 +01:00 |
|
kervala
|
35e3ef1d68
|
Changed: Minor changes (replaced l: by L:)
--HG--
branch : develop
|
2016-02-21 13:30:48 +01:00 |
|
kervala
|
9f7e192926
|
Changed: Minor changes (replaced l: by L:)
|
2016-02-21 13:30:48 +01:00 |
|
kervala
|
5284bd37f1
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-02-21 13:22:22 +01:00 |
|
kervala
|
b552f850e8
|
Merge with 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
|
045d255a09
|
Changed: Use L:/ path instead of R:/ for leveldesign
|
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
|
c217f28626
|
Merge with 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
|
35570eb0a3
|
Adapt CSTLoader to use nlfopen and some simplifications, issue #261
|
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
|
e9f8202701
|
Changed: Minor changes
|
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
|
bfb32b811d
|
Removed useless comments/commented code
|
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
|
808f7b2c30
|
Use new wrapper insteaf of fopen, issue #261
|
2016-02-20 17:56:25 +01:00 |
|
Yann
|
c76fdbf7db
|
Deleting tries to delete unused continents - doesn't suffice, weather_everywhere.cpp ask for a different number of continents
q
|
2016-02-09 23:36:10 +01:00 |
|
Yann
|
37c45bebac
|
Changing somelines in continent.cpp
|
2016-02-09 21:54:52 +01:00 |
|
Yann
|
3fa275e64d
|
merging to lirria
|
2016-02-09 21:32:08 +01:00 |
|
Yann
|
0dd802f677
|
Deleting unused continents from code
|
2016-02-09 21:31:30 +01:00 |
|
SIELA1915
|
68d97aeb0e
|
fixed use of CI18N (it is in namespace NLMISC)
|
2016-01-31 19:36:58 +01:00 |
|
SIELA1915
|
095bc1b04c
|
merged with compatibility-develop
|
2016-01-31 15:42:41 +01:00 |
|
SIELA1915
|
db771f1d2b
|
fixed missing include for server when trying to get the date
|
2016-01-31 15:39:32 +01:00 |
|
SIELA1915
|
223139d53c
|
merged
|
2016-01-30 20:51:30 +01:00 |
|
SIELA1915
|
5c77c15107
|
Changed date to match Khanat
|
2016-01-30 20:43:01 +01:00 |
|
kervala
|
8cd6d46d1d
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-30 16:23:28 +01:00 |
|
kervala
|
51a54813f3
|
Merge with 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
|
976ebabf74
|
Changed: Minor changes (thanks to SIELA1915)
|
2016-01-30 16:22:55 +01:00 |
|
kervala
|
3c66481476
|
Merge
|
2016-01-26 22:45:40 +01:00 |
|
kervala
|
0540c386a6
|
Merge
--HG--
branch : compatibility-develop
|
2016-01-26 22:45:40 +01:00 |
|
kervala
|
2583139ea9
|
Merge with develop
|
2016-01-26 22:44: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
|
3faeb82290
|
Changed: Removed more useless dependencies
|
2016-01-26 22:43:35 +01:00 |
|
kervala
|
9bf34dd055
|
Fixed: Use same XML files as on Atys
|
2016-01-24 17:08:32 +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
|
0d8b09001a
|
Merge with develop
|
2016-01-16 10:52:18 +01:00 |
|
kervala
|
cca0dd450e
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-16 10:52:18 +01:00 |
|
kaetemi
|
c4f5b5d521
|
And more VS2015 fixes
|
2016-01-15 12:33:27 +01:00 |
|
kaetemi
|
5c6edf6cee
|
And more VS2015 fixes
--HG--
branch : develop
|
2016-01-15 12:33:27 +01:00 |
|
kaetemi
|
9c1d333924
|
More of the VS2015 stuff
|
2016-01-15 12:29:05 +01:00 |
|
kaetemi
|
e4b72e63a1
|
More of the VS2015 stuff
--HG--
branch : develop
|
2016-01-15 12:29:05 +01:00 |
|
kervala
|
7b075b979f
|
Merge with develop
|
2016-01-13 20:05:06 +01:00 |
|
kervala
|
3c4f324bfe
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-13 20:05:06 +01:00 |
|
kervala
|
d55b781374
|
Fixed: Use map for faster search for example (implemented a TODO of GUIGUI)
|
2016-01-13 20:04:01 +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
|
304297e284
|
Merge with develop
|
2016-01-02 20:29:55 +01:00 |
|
kervala
|
47364c47c3
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-02 20:29:55 +01:00 |
|
kervala
|
ae43a9ce4e
|
Fixed: Warnings with GCC
|
2016-01-02 19:19:39 +01:00 |
|
kervala
|
844b1e3d02
|
Fixed: Warnings with GCC
--HG--
branch : develop
|
2016-01-02 19:19:39 +01:00 |
|
kervala
|
4a45f10c75
|
Merge with develop
|
2016-01-02 17:11:59 +01:00 |
|
kervala
|
11c0a073ed
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-02 17:11:59 +01:00 |
|
kervala
|
3020f03333
|
Changed: Don't need to cast since it's already a sint32
|
2016-01-02 17:10:50 +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
|
3d988133b4
|
Merge with develop
|
2015-12-29 22:36:04 +01:00 |
|
kervala
|
2f45ff1ebe
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-29 22:36:04 +01:00 |
|
kervala
|
a5e23cb0f9
|
Changed: Merge code from private repository
|
2015-12-29 22:06:49 +01:00 |
|
kervala
|
ab4dc8ec01
|
Changed: Merge code from private repository
--HG--
branch : develop
|
2015-12-29 22:06:49 +01:00 |
|
kervala
|
556333ca38
|
Merge with develop
|
2015-12-29 18:03:21 +01:00 |
|
kervala
|
98c485bd94
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-29 18:03:21 +01:00 |
|
kervala
|
0e71d30714
|
Changed: Minor changes
|
2015-12-29 16:19:46 +01:00 |
|
kervala
|
88042cc28d
|
Changed: Minor changes
--HG--
branch : develop
|
2015-12-29 16:19:46 +01:00 |
|
kervala
|
6ac8c6abdb
|
Merge with develop
|
2015-12-15 22:52:28 +01:00 |
|
kervala
|
050a3679f1
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-15 22:52:28 +01:00 |
|
kervala
|
7311a5b9b9
|
Changed: Include limits
|
2015-12-15 22:51:37 +01:00 |
|
kervala
|
7105749d94
|
Changed: Include limits
--HG--
branch : develop
|
2015-12-15 22:51:37 +01:00 |
|
kervala
|
7c5222ec52
|
Merge with develop
|
2015-12-15 15:09:50 +01:00 |
|
kervala
|
0e63e81565
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-15 15:09:50 +01:00 |
|
kervala
|
e382e2c781
|
Changed: Replace (uint16)~0 by std::numeric_limits<uint16>::max()
|
2015-12-15 14:33:59 +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
|
076af98123
|
Changed: Minor changes
|
2015-12-15 13:39:02 +01:00 |
|
kervala
|
189fc7a2d9
|
Changed: Minor changes
--HG--
branch : develop
|
2015-12-15 13:39:02 +01:00 |
|
kervala
|
68f5cb447f
|
Changed: Use std::string insteaf of const char* for filenames in CPersistentDataRecord
|
2015-12-15 13:35:04 +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
|
c938092faf
|
Merge with develop
|
2015-12-13 15:26:37 +01:00 |
|
kervala
|
542c29ded7
|
Fixed: Clang warnings
|
2015-12-13 15:25:28 +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
|
6c54c82b0b
|
Merge with develop
|
2015-12-07 21:49:21 +01:00 |
|
kervala
|
c4235f7b1e
|
Changed: Let dependencies propagate to other targets
|
2015-12-07 21:48:32 +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
|
a49f29f741
|
Merge with develop
|
2015-12-03 12:50:55 +01:00 |
|
kervala
|
3c6e3c4eaa
|
Fixed: Completely remove Yubo Chat since it's not used anymore (patch by Kaetemi)
|
2015-12-03 12:49:51 +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 |
|
kervala
|
83a3455343
|
Merge with develop
|
2015-11-25 16:02:08 +01:00 |
|
kaetemi
|
5e13d65bd8
|
Apply patch #231, new weather values, must be applied server-side as well. Needs to be tested
|
2015-11-24 19:33:57 +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
|
c318c8d254
|
Merge with develop
|
2015-11-14 19:29:43 +01:00 |
|
kervala
|
2ad5f18f71
|
Changed: Minor changes
|
2015-11-14 18:33:13 +01:00 |
|
kervala
|
fb1d5134ba
|
Changed: Minor changes
--HG--
branch : develop
|
2015-11-14 18:33:13 +01:00 |
|
kervala
|
ddca407f68
|
Changed: Implement a TODO
|
2015-11-14 18:21:44 +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
|
b48bce61e0
|
Merge with develop
|
2015-11-14 12:13:12 +01:00 |
|
kervala
|
3ea4340ce6
|
Changed: Support for integer types in Lua 5.3, fixes #253
|
2015-11-14 11:46:17 +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
|
8fb01830e7
|
Merge with develop
|
2015-11-13 19:52:35 +01:00 |
|
kervala
|
c27e1062e4
|
Changed: Support for integer types in Lua 5.3, fixes #253
|
2015-11-13 18:42:50 +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
|
380bac5728
|
Changed: Replaced some NLMISC::strlwr by NLMISC::toLower
|
2015-11-13 16:22:49 +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 |
|
kervala
|
a115626d74
|
Merge with develop
|
2015-11-06 15:49:55 +01:00 |
|
kervala
|
63366b4c9b
|
Fixed: clang warnings
|
2015-11-06 15:24:19 +01:00 |
|
kervala
|
93a03b5db0
|
Fixed: clang warnings
--HG--
branch : develop
|
2015-11-06 15:24:19 +01:00 |
|
kervala
|
2e96c40211
|
Changed: Revert back to official client version (revision will be displayed in Ryzom Core client)
--HG--
branch : compatibility-develop
|
2015-11-05 17:42:43 +01:00 |
|
kervala
|
acec665b40
|
Changed: Revert back to official client version (revision will be displayed in Ryzom Core client)
|
2015-11-05 17:42:43 +01:00 |
|