Commit graph

605 commits

Author SHA1 Message Date
kervala
976ebabf74 Changed: Minor changes (thanks to SIELA1915) 2016-01-30 16:22:55 +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
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
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
kaetemi
f07e471597 Merge with develop (ryzomcore/v0.12.0)
--HG--
branch : compatibility-develop
2015-04-14 11:57:40 +02:00
kaetemi
d0d8155e4e Merge with develop (ryzomcore/v0.12.0) 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
kaetemi
dc7e040d94 ryzomcore/v0.12.0 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
kervala
4896487f69 Merge with 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
kaetemi
0a2d358e31 Fix CHashCode compare operator 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
kervala
d51e2fb861 Merge with 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
e8d8503631 Merge ryzomcore/v0.11.3 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
42944adf1d Merge with hotfix 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
8d854e3e8d ryzomcore/v0.11.3 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
e64791ce55 Visual Studio 2013 compilation support for Ryzom Server 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
kaetemi
ae1de68f3b Visual Studio 2013 compilation support for Ryzom Client 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
9718f37ec4 Merge with hotfix 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
8de4929777 Merge with hotfix 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
da7b88f052 Fixed: Warning assert always false 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
8e343db0fa Fixed: Warning comparing an enum to an int 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
abc6a50c2d Changed: Added RYZOM_COMPATIBILITY_VERSION version string for compatibility branch 2015-02-14 15:09:18 +01:00
kervala
eb05c962de Merge with develop
--HG--
branch : compatibility
2015-02-14 14:36:37 +01:00
kervala
b2d7194606 Merge with develop 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
dfighter1985
688ea1285c Merged hotfix to 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
1675e7af3a Changed: Replaced atoi and atof by NLMISC::fromString 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
751d6de2eb Changed: Check for string length 2014-12-26 13:44:35 +01:00
kaetemi
0a7462f7e1 Merge with hotfix
--HG--
branch : develop
2014-12-22 16:40:12 +01:00
kaetemi
5190cbf8ff Merge with hotfix 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
566a5b6e86 Fix mirror type sizes 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
6d16be808f Merge with default 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
bbaaa522cd Merge with default 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
c522248f2d ryzomcore/v0.11.2 2014-12-22 14:21:01 +01:00
kaetemi
972611e5c0 Separate version string 2014-11-24 16:07:17 +01:00
kaetemi
dfe0b2977a Separate version string
--HG--
branch : develop
2014-11-24 16:07:17 +01:00
kaetemi
39bb02454f Adjust version 2014-11-24 15:04:53 +01:00
kaetemi
7bdf719cb9 Adjust version
--HG--
branch : develop
2014-11-24 15:04:53 +01:00
kaetemi
358f19acae Merge with ryzomcore/v0.11.1
--HG--
branch : compatibility
2014-11-24 15:03:07 +01:00
kaetemi
c5453625b2 Merge with ryzomcore/v0.11.1 2014-11-24 15:03:07 +01:00
kaetemi
6b1ea30f9c ryzomcore/v0.11.1
--HG--
branch : hotfix
2014-11-24 14:57:36 +01:00
kaetemi
1a5f3a2875 ryzomcore/v0.11.1 2014-11-24 14:57:36 +01:00
kaetemi
53b3a51b54 Merge with ryzomcore/v0.11.0
--HG--
branch : compatibility
2014-11-10 23:47:23 +01:00
kaetemi
1704fc9853 Merge with ryzomcore/v0.11.0 2014-11-10 23:47:23 +01:00
kaetemi
0c1ff0df2a ryzomcore/v0.11.0
--HG--
branch : develop
2014-11-10 23:34:41 +01:00
kaetemi
6d6926a8b8 ryzomcore/v0.11.0 2014-11-10 23:34:41 +01:00
kaetemi
fe4c2becf8 File name, fix #202
--HG--
branch : compatibility
2014-09-13 10:08:44 +02:00
kaetemi
2eabeb234e File name, fix #202 2014-09-13 10:08:44 +02:00
kaetemi
b698c10475 Merge with ryzomcore/v0.10.0
--HG--
branch : compatibility
2014-09-12 11:19:09 +02:00
kaetemi
1cd4afa1b6 Merge with ryzomcore/v0.10.0 2014-09-12 11:19:09 +02:00
kaetemi
9e74156181 Move islands entry points to data 2014-09-10 08:25:45 +02:00
kaetemi
9e948bbf60 Move islands entry points to data 2014-09-10 08:25:45 +02:00
kaetemi
55ca1e7a2a Crashfix 2014-09-09 15:50:12 +02:00
kaetemi
aa97b11910 Crashfix 2014-09-09 15:50:12 +02:00
kaetemi
ea9cf3db93 Typo 2014-09-09 08:15:05 +02:00
kaetemi
0a2ce69818 Typo 2014-09-09 08:15:05 +02:00
kaetemi
d651eff10b Cleanup some RYZOMID code 2014-09-08 09:48:28 +02:00
kaetemi
fa975bedb3 Cleanup some RYZOMID code 2014-09-08 09:48:28 +02:00
kaetemi
4dda4099de Remove dead code 2014-09-08 08:04:09 +02:00
kaetemi
730d0e42d1 Remove dead code 2014-09-08 08:04:09 +02:00
kaetemi
b0c0439b39 Change ClientApplication to DomainId in permission table 2014-09-07 08:53:10 +02:00
kaetemi
55d2685aca Change ClientApplication to DomainId in permission table 2014-09-07 08:53:10 +02:00
kaetemi
fad363efb5 Merge with ryzomcore/v0.9.1
--HG--
branch : compatibility
2014-08-25 15:09:16 +02:00
kaetemi
8d524ee849 Merge with ryzomcore/v0.9.1 2014-08-25 15:09:16 +02:00
kaetemi
025d7b6260 Fix crypt
--HG--
branch : sha512-auth
2014-10-07 03:00:34 +02:00
kaetemi
e6c0c70fc9 Compile fixes
--HG--
branch : sha512-auth
2014-10-07 01:44:43 +02:00
kaetemi
f900f80b36 Merge with develop
--HG--
branch : sha512-auth
2014-10-07 01:15:35 +02:00
kaetemi
b98c6f6a59 Set version
--HG--
branch : develop
2014-10-07 01:14:03 +02:00
Rodolphe Breard
4c2be7ea1f ref #206 : hacking the types so it may compile on windows
--HG--
branch : sha512-auth
2014-10-02 19:14:25 +02:00
Rodolphe Breard
81d5294fc3 ref #206 : removing unused crypt lib reference
--HG--
branch : sha512-auth
2014-10-02 18:21:56 +02:00
Rodolphe Breard
65b902970a ref #206 : rolling back to include a crypt(3) implementation and adding sha512 support
--HG--
branch : sha512-auth
2014-10-01 21:29:10 +02:00
Rodolphe Breard
094a23bd09 fixing #206 : passwords are now stored using SHA-512 instead of traditional DES
--HG--
branch : sha512-auth
2014-09-16 20:34:26 +02:00
kaetemi
07ee9a4469 Add missing r2_islands_textures tool
--HG--
branch : develop
2014-09-12 20:29:50 +02:00
kaetemi
961669ef5c Fix crypt 2014-10-07 03:00:34 +02:00
kaetemi
8d550ca356 Compile fixes 2014-10-07 01:44:43 +02:00
kaetemi
499155b9d5 Merge with develop 2014-10-07 01:15:35 +02:00
kaetemi
bf1f843f16 Set version 2014-10-07 01:14:03 +02:00
Rodolphe Breard
a0ec4645cc ref #206 : hacking the types so it may compile on windows 2014-10-02 19:14:25 +02:00
Rodolphe Breard
1f54bf31e6 ref #206 : removing unused crypt lib reference 2014-10-02 18:21:56 +02:00
Rodolphe Breard
31a08ab8d7 rolling back to include a crypt(3) implementation and adding sha512 support 2014-09-26 22:30:56 +02:00
Rodolphe Breard
16bc8449c1 fixing #206 : passwords are now stored using SHA-512 instead of traditional DES 2014-09-16 20:34:26 +02:00
kaetemi
536ac42f54 Add missing r2_islands_textures tool 2014-09-12 20:29:50 +02:00
kaetemi
b18203fc4e Fix Ryzom server compile under MinGW 2014-06-19 20:19:39 +02:00
kaetemi
2e096a9b36 Fix Ryzom client compile under MinGW 2014-06-19 01:17:35 +02:00
kaetemi
00528e1cd6 Fix Ryzom server compile under MinGW 2014-06-19 20:19:39 +02:00
kaetemi
6fa7ddd5a4 Fix Ryzom client compile under MinGW 2014-06-19 01:17:35 +02:00
kervala
574382fcbb Changed: Set official Ryzom client version and identifiers for OS X bundle
--HG--
branch : compatibility
2014-05-13 10:02:32 +02:00
kervala
d666ec71f4 Changed: Set official Ryzom client version and identifiers for OS X bundle 2014-05-13 10:02:32 +02:00
kervala
e2797c2567 Changed: Include PCH 2014-03-26 13:14:14 +01:00
kervala
fadb352152 Changed: Include PCH 2014-03-26 13:14:14 +01:00
kaetemi
91d453dd63 Make packed sheets behaviour consistent accross services 2014-02-20 21:53:11 +01:00
kaetemi
affdb36a73 Make packed sheets behaviour consistent accross services 2014-02-20 21:53:11 +01:00
kaetemi
2555e93771 Add sheets packer tool for CTimeDateSeasonManager 2014-02-19 00:07:22 +01:00
kaetemi
18ba33b02c Add sheets packer tool for CTimeDateSeasonManager 2014-02-19 00:07:22 +01:00
kaetemi
cb6661b10d Fix for excessive inlining of npc chat serialization, issue #97 2014-02-14 18:36:15 +01:00
kaetemi
57e6b3bdbd Fix for excessive inlining of npc chat serialization, issue #97 2014-02-14 18:36:15 +01:00
kervala
ae5becbb0b Fixed: Warning with clang 2013-11-13 22:53:26 +01:00
kervala
70bbc88f0f Fixed: Warning with clang 2013-11-13 22:53:26 +01:00
kervala
d8a6c9f966 Fixed: Warning with clang 2013-11-13 21:40:41 +01:00
kervala
b7feea6c95 Fixed: Warning with clang 2013-11-13 21:40:41 +01:00
kervala
36a537a88e Changed: Replaced atof by fromString 2013-11-13 21:37:28 +01:00
kervala
753c5d6378 Changed: Replaced atof by fromString 2013-11-13 21:37:28 +01:00
kervala
de42e4d7ff Fixed: Some warnings 2013-09-29 13:52:53 +02:00
kervala
58918eed85 Fixed: Some warnings 2013-09-29 13:52:53 +02:00
kaetemi
3b1d4e3915 Fix warnings 2013-09-27 01:11:19 +02:00
kaetemi
e7e7a942f8 Fix warnings 2013-09-27 01:11:19 +02:00
kervala
0cbc471341 Fixed: prtab function not compiling with VC++ (define DEBUG_CRYPT if you want to debug crypt() method) 2013-07-26 09:33:32 +02:00
kervala
8577277bfd Fixed: prtab function not compiling with VC++ (define DEBUG_CRYPT if you want to debug crypt() method) 2013-07-26 09:33:32 +02:00
kervala
920cbf55ca Fixed: Assign instead of a comparison 2013-04-29 10:34:33 +02:00