Commit graph

374 commits

Author SHA1 Message Date
kervala
a9685ac366 Merge with develop
--HG--
branch : compatibility-develop
2016-05-08 13:42:53 +02:00
kervala
b932c31546 Fixed: Use correct formatted HTTP 1.1 query, previous one was blocked by some security software (a big thanks to Vojtech Vobr from AVG Technologies for his investigation to help us to fix this issue)
--HG--
branch : develop
2016-05-08 13:39:17 +02:00
kervala
a0916ca14a Changed: Useless to put a space after method name (if needed, we'll add ourself later)
--HG--
branch : develop
2016-05-08 13:33:21 +02:00
kervala
8099537d02 Changed: Minor changes
--HG--
branch : develop
2016-05-08 13:31:54 +02:00
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
8f6a72e86f Merge with develop
--HG--
branch : compatibility-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
7bcde43a63 Merge with develop
--HG--
branch : compatibility-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
1eddef3c93 Merge with develop
--HG--
branch : compatibility-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
kaetemi
b9d366372e Merge with develop
--HG--
branch : compatibility-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
kervala
e23f32e902 Merge with develop
--HG--
branch : compatibility-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
14f46e884b Changed: Updated world_editor_classes.xml
--HG--
branch : develop
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
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
537f6ab83e Merge with develop
--HG--
branch : compatibility-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
35e3ef1d68 Changed: Minor changes (replaced l: by L:)
--HG--
branch : develop
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
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
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
kaetemi
f07e471597 Merge with develop (ryzomcore/v0.12.0)
--HG--
branch : compatibility-develop
2015-04-14 11:57:40 +02:00
kaetemi
d9f3efc4e3 ryzomcore/v0.12.0
--HG--
branch : develop
2015-04-14 11:55:08 +02:00
kervala
9882d17a45 Merge with develop
--HG--
branch : compatibility-develop
2015-04-05 16:45:34 +02:00
kaetemi
1a5a0d5acb Fix CHashCode compare operator
--HG--
branch : develop
2015-03-29 16:58:07 +02:00
kervala
97eac497ff Merge with develop
--HG--
branch : compatibility-develop
2015-03-07 17:03:34 +01:00
kaetemi
3c04d70f28 Merge ryzomcore/v0.11.3
--HG--
branch : compatibility
2015-03-07 00:03:48 +01:00
kaetemi
9d36ac8cb0 Merge with hotfix
--HG--
branch : develop
2015-03-07 00:01:02 +01:00
kaetemi
621a9e8f7c ryzomcore/v0.11.3
--HG--
branch : hotfix
2015-03-06 23:53:34 +01:00
kaetemi
77d17265eb Visual Studio 2013 compilation support for Ryzom Server
--HG--
branch : develop
2015-02-23 12:58:43 +01:00
kaetemi
32b3b4ac80 Visual Studio 2013 compilation support for Ryzom Client
--HG--
branch : develop
2015-02-20 17:50:58 +01:00
kervala
6784301afc Merge with hotfix
--HG--
branch : develop
2015-02-14 19:29:36 +01:00
kervala
e7166c1161 Merge with hotfix
--HG--
branch : compatibility
2015-02-14 17:54:50 +01:00
kervala
5aa8a1d615 Fixed: Warning assert always false
--HG--
branch : hotfix
2015-02-14 17:47:55 +01:00
kervala
3509d75ad6 Fixed: Warning comparing an enum to an int
--HG--
branch : hotfix
2015-02-14 17:47:10 +01:00
kervala
47051791fa Changed: Added RYZOM_COMPATIBILITY_VERSION version string for compatibility branch
--HG--
branch : compatibility
2015-02-14 15:09:18 +01:00
kervala
eb05c962de Merge with develop
--HG--
branch : compatibility
2015-02-14 14:36:37 +01:00
dfighter1985
b2d137eb07 Merged hotfix to compatibility.
--HG--
branch : compatibility
2015-02-02 02:53:15 +01:00
kervala
3aa448ba24 Changed: Replaced atoi and atof by NLMISC::fromString
--HG--
branch : develop
2015-01-13 19:47:14 +01:00
kervala
4fc639671c Changed: Check for string length
--HG--
branch : develop
2014-12-26 13:44:35 +01:00
kervala
6596af9682 Changed: Minor changes
--HG--
branch : develop
2014-12-26 13:38:02 +01:00
kaetemi
0a7462f7e1 Merge with hotfix
--HG--
branch : develop
2014-12-22 16:40:12 +01:00
kaetemi
bb8eb7dcec Fix mirror type sizes
--HG--
branch : hotfix
2014-12-22 16:39:54 +01:00
kaetemi
c03c0f532b Merge with default
--HG--
branch : develop
2014-12-22 14:26:26 +01:00
kaetemi
79b6fcae28 Merge with default
--HG--
branch : compatibility
2014-12-22 14:24:13 +01:00
kaetemi
f9c81f3740 ryzomcore/v0.11.2
--HG--
branch : hotfix
2014-12-22 14:21:01 +01:00
kaetemi
dfe0b2977a Separate version string
--HG--
branch : develop
2014-11-24 16:07:17 +01:00