Commit graph

295 commits

Author SHA1 Message Date
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
3c66481476 Merge 2016-01-26 22:45:40 +01:00
kervala
2583139ea9 Merge with develop 2016-01-26 22:44:40 +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
0d8b09001a Merge with develop 2016-01-16 10:52:18 +01:00
kaetemi
c4f5b5d521 And more VS2015 fixes 2016-01-15 12:33:27 +01:00
kaetemi
9c1d333924 More of the VS2015 stuff 2016-01-15 12:29:05 +01:00
kervala
7b075b979f Merge with 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
304297e284 Merge with develop 2016-01-02 20:29:55 +01:00
kervala
ae43a9ce4e Fixed: Warnings with GCC 2016-01-02 19:19:39 +01:00
kervala
4a45f10c75 Merge with 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
3d988133b4 Merge with 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
556333ca38 Merge with develop 2015-12-29 18:03:21 +01:00
kervala
0e71d30714 Changed: Minor changes 2015-12-29 16:19:46 +01:00
kervala
6ac8c6abdb Merge with develop 2015-12-15 22:52:28 +01:00
kervala
7311a5b9b9 Changed: Include limits 2015-12-15 22:51:37 +01:00
kervala
7c5222ec52 Merge with 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
076af98123 Changed: Minor changes 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
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
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
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
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
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
ddca407f68 Changed: Implement a TODO 2015-11-14 18:21:44 +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
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
380bac5728 Changed: Replaced some NLMISC::strlwr by NLMISC::toLower 2015-11-13 16:22:49 +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
acec665b40 Changed: Revert back to official client version (revision will be displayed in Ryzom Core client) 2015-11-05 17:42:43 +01:00
kaetemi
d0d8155e4e Merge with develop (ryzomcore/v0.12.0) 2015-04-14 11:57:40 +02:00
kaetemi
dc7e040d94 ryzomcore/v0.12.0 2015-04-14 11:55:08 +02:00
kervala
4896487f69 Merge with develop 2015-04-05 16:45:34 +02:00
kaetemi
0a2d358e31 Fix CHashCode compare operator 2015-03-29 16:58:07 +02:00
kervala
d51e2fb861 Merge with develop 2015-03-07 17:03:34 +01:00