Commit graph

343 commits

Author SHA1 Message Date
kaetemi
8d854e3e8d ryzomcore/v0.11.3 2015-03-06 23:53:34 +01:00
kaetemi
e64791ce55 Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:58:43 +01:00
kaetemi
ae1de68f3b Visual Studio 2013 compilation support for Ryzom Client 2015-02-20 17:50:58 +01:00
kervala
9718f37ec4 Merge with hotfix 2015-02-14 19:29:36 +01:00
kervala
8de4929777 Merge with hotfix 2015-02-14 17:54:50 +01:00
kervala
da7b88f052 Fixed: Warning assert always false 2015-02-14 17:47:55 +01:00
kervala
8e343db0fa Fixed: Warning comparing an enum to an int 2015-02-14 17:47:10 +01:00
kervala
abc6a50c2d Changed: Added RYZOM_COMPATIBILITY_VERSION version string for compatibility branch 2015-02-14 15:09:18 +01:00
kervala
b2d7194606 Merge with develop 2015-02-14 14:36:37 +01:00
dfighter1985
688ea1285c Merged hotfix to compatibility. 2015-02-02 02:53:15 +01:00
kervala
1675e7af3a Changed: Replaced atoi and atof by NLMISC::fromString 2015-01-13 19:47:14 +01:00
kervala
751d6de2eb Changed: Check for string length 2014-12-26 13:44:35 +01:00
kervala
bdfa7a624e Changed: Minor changes 2014-12-26 13:38:02 +01:00
kaetemi
5190cbf8ff Merge with hotfix 2014-12-22 16:40:12 +01:00
kaetemi
566a5b6e86 Fix mirror type sizes 2014-12-22 16:39:54 +01:00
kaetemi
6d16be808f Merge with default 2014-12-22 14:26:26 +01:00
kaetemi
bbaaa522cd Merge with default 2014-12-22 14:24:13 +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
39bb02454f Adjust version 2014-11-24 15:04:53 +01:00
kaetemi
c5453625b2 Merge with ryzomcore/v0.11.1 2014-11-24 15:03:07 +01:00
kaetemi
1a5f3a2875 ryzomcore/v0.11.1 2014-11-24 14:57:36 +01:00
kaetemi
1704fc9853 Merge with ryzomcore/v0.11.0 2014-11-10 23:47:23 +01:00
kaetemi
6d6926a8b8 ryzomcore/v0.11.0 2014-11-10 23:34:41 +01:00
kaetemi
2eabeb234e File name, fix #202 2014-09-13 10:08:44 +02:00
kaetemi
1cd4afa1b6 Merge with ryzomcore/v0.10.0 2014-09-12 11:19:09 +02:00
kaetemi
0222ebd096 Regenerate PLR cpp and header 2014-09-11 17:40:53 +02:00
kaetemi
3cd9e658a8 Add missing leaf 2014-09-11 15:13:17 +02:00
kaetemi
9e948bbf60 Move islands entry points to data 2014-09-10 08:25:45 +02:00
kaetemi
aa97b11910 Crashfix 2014-09-09 15:50:12 +02:00
kaetemi
0a2ce69818 Typo 2014-09-09 08:15:05 +02:00
kaetemi
fa975bedb3 Cleanup some RYZOMID code 2014-09-08 09:48:28 +02:00
kaetemi
730d0e42d1 Remove dead code 2014-09-08 08:04:09 +02:00
kaetemi
55d2685aca Change ClientApplication to DomainId in permission table 2014-09-07 08:53:10 +02:00
kaetemi
8d524ee849 Merge with ryzomcore/v0.9.1 2014-08-25 15:09:16 +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
fbcf921062 Fix r2ed 2014-09-15 18:15:40 +02:00
kaetemi
f4399190e3 Fix r2ed 2014-09-15 17:42:24 +02:00
kaetemi
4f0a79d67a Fix r2ed 2014-09-15 16:59:12 +02:00
kaetemi
536ac42f54 Add missing r2_islands_textures tool 2014-09-12 20:29:50 +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
d666ec71f4 Changed: Set official Ryzom client version and identifiers for OS X bundle 2014-05-13 10:02:32 +02:00
kaetemi
c93b04df1d Backed out changeset: 897087f1fa71, 7c3f1f0dc9d8, 61d11f94e3ea 2014-04-30 12:54:20 +02:00
kaetemi
7af85d6f2f Add command to eternally trap players ingame 2014-04-01 13:52:36 +02:00
kervala
fadb352152 Changed: Include PCH 2014-03-26 13:14:14 +01:00
kaetemi
affdb36a73 Make packed sheets behaviour consistent accross services 2014-02-20 21:53:11 +01:00
kaetemi
18ba33b02c Add sheets packer tool for CTimeDateSeasonManager 2014-02-19 00:07:22 +01:00
kaetemi
57e6b3bdbd Fix for excessive inlining of npc chat serialization, issue #97 2014-02-14 18:36:15 +01:00
kaetemi
ada90101f2 Fixup paths (could we use the search paths for this?) 2014-02-14 04:52:11 +01:00
kaetemi
29a70767b4 Merge with default 2014-02-07 00:11:12 +01:00
kaetemi
e606ea3b9f Remove weather configuration from data common 2014-02-06 23:39:05 +01:00
kaetemi
fc0406eb77 Build pacs prim list txt outside repository 2014-02-06 22:10:56 +01:00
kaetemi
80477df91e Merge with default 2014-02-06 19:54:15 +01:00
kervala
70bbc88f0f Fixed: Warning with clang 2013-11-13 22:53:26 +01:00
kervala
b7feea6c95 Fixed: Warning with clang 2013-11-13 21:40:41 +01:00
kervala
2109b536d0 Changed: Replaced math.mod by math.fmod in Ring lua files 2013-11-13 21:38:23 +01:00
kervala
753c5d6378 Changed: Replaced atof by fromString 2013-11-13 21:37:28 +01:00
kervala
58918eed85 Fixed: Some warnings 2013-09-29 13:52:53 +02:00
kaetemi
e7e7a942f8 Fix warnings 2013-09-27 01:11:19 +02:00
kaetemi
9dc9acd68f Merge with default 2013-08-01 23:02:49 +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
kaetemi
38c4b66cce Don't do EOL changes for database.xml and msg.xml, causes checksum difference 2013-07-25 18:06:32 +02:00
kaetemi
e4911a002e Remove more game data 2013-07-24 21:49:16 +02:00
kaetemi
e88951b70b Remove game data 2013-07-24 20:58:43 +02:00
kervala
3c97196d1b Fixed: Assign instead of a comparison 2013-04-29 10:34:33 +02:00
mattraykowski
aa261f28a4 merging gui editor repo. 2013-02-14 09:53:06 -06:00
dfighter1985
543488b490 Merged mainline default branch changes. 2013-02-14 10:47:10 +01:00
kervala
98606fb5b5 Changed: Typo fixes (thanks to Vagrant!) 2013-02-08 13:17:44 +01:00
kervala
2b4119c428 Fixed: Compilation with VC++ 2010 and 2012 2012-12-11 12:22:41 +01:00
kervala
4d6ab65a36 Changed: Code simplification 2012-12-08 11:24:43 +01:00
kervala
99a1c463a1 Changed: Changes in game_share 2012-11-26 20:19:14 +01:00
dfighter1985
421582d386 MODIFIED: #1471 Merged mainline default to this branch. 2012-11-25 05:22:40 +01:00
kervala
655b79ce7b Changed: Minor typos 2012-11-24 20:23:13 +01:00
kervala
084c457d85 Changed: New STRING_MANAGER type clan 2012-11-24 20:21:45 +01:00
kervala
0698f1abc2 Changed: Replaced string empty comparisons with empty() 2012-10-06 18:17:57 +02:00
kervala
2b86a180e6 Changed: Replaced string empty comparisons with empty() 2012-10-06 17:17:26 +02:00
kervala
864363165a Changed: Install data_leveldesign if ryzom_tools are enabled 2012-10-01 10:07:41 +02:00
kervala
cfa0981f0d Changed: Synchronization with SVN 2012-10-01 10:07:09 +02:00
kervala
1cc9a7b8ec Changed: Install data_leveldesign if WITH_RYZOM_TOOLS is enabled 2012-09-26 12:43:18 +02:00
kervala
182a79f2cb Changed: #825 Remove all warnings when compiling Ryzom 2012-09-25 13:20:25 +02:00
kervala
3429d7ba42 Changed: #825 Remove all warnings when compiling Ryzom 2012-09-25 12:33:02 +02:00
kervala
38c5e6840d Fixed: #1493 MultiArch support 2012-09-22 22:57:38 +02:00
kervala
78fe1850f1 Changed: Synchronization with SVN 2012-09-11 20:26:36 +02:00
dfighter1985
e24cffa79f Merged default branch into gui-refactoring. 2012-07-02 22:46:08 +02:00
kaetemi
0d4f6da330 Fixed: Valgrind warnings 2012-06-28 11:08:36 +02:00
kaetemi
87585588fc Reverted: Unnecessary changes to config and data from merge 2012-06-04 15:03:40 +02:00
kaetemi
b7d687d0c0 Merged: From default to sound_dev 2012-06-02 11:09:14 +02:00
sfb
2f9410f22d Fixed EOL issues and added .hgeol file. 2012-05-29 08:31:11 -05:00
Fabien_HENON
c2a054fe90 Changed: #1469 StringId conversion to SheetId for sounds V2 (DOES NOT COMPILE YET) 2012-05-26 19:21:19 +02:00
kervala
3b3950227e Changed: Don't include local files in PCH 2012-05-21 10:04:00 +02:00
dfighter1985
4e6e7d9a6e Extracted the CDB bank handling code into a new class CCDBBankHandler, the CDB system should be now totally independent of Ryzom. 2012-04-17 08:23:02 +02:00
dfighter1985
cf2305b1ce CDB is now part of NLMISC. However it still requires some work! 2012-04-16 06:08:12 +02:00
dfighter1985
7e3c4aa15e Moved xml auto pointer to nlmisc. 2012-04-16 02:50:18 +02:00
kervala
40fa6620bf Changed: #825 Remove all warnings when compiling Ryzom 2012-04-08 14:23:36 +02:00
kervala
bac5b8d084 Changed: #825 Remove all warnings when compiling Ryzom 2012-04-07 23:47:55 +02:00
kervala
d3bb7e1062 Changed: #825 Remove all warnings when compiling Ryzom 2012-04-07 20:04:08 +02:00
kervala
c441d086ce Changed: #825 Remove all warnings when compiling Ryzom 2012-04-07 15:04:26 +02:00
kervala
de5137d0f6 Fixed: #1448 Compilation with CLang 2012-04-07 14:57:15 +02:00
kervala
4dd62721b9 Changed: #1448 Compilation with CLang 2012-04-07 11:51:21 +02:00
kervala
5c66cbf374 Changed: #1448 Compilation with CLang (patch provided by GelluleX, thanks !) 2012-04-07 11:14:21 +02:00
kaetemi
acab58a3b9 Fixed: Compile errors under Linux. 2012-04-05 17:45:53 +02:00
sfb
47eac5203e merge inbound 2012-03-12 13:31:26 -05:00
sfb
3d7b89f77b Fixed: #1449 Added missing header, fixed CMake configuration, fixed iterators. GUS builds fine without MFC extensions. 2012-03-12 13:28:56 -05:00
sfb
cce95ffdfb Fixed: #1436 Fixed license header for deployment_configuration files - PMS should be building fine now. 2012-03-12 13:26:13 -05:00
kaetemi
5cab75f13e Fixed: Forgot to add the grouped files to the target thing 2012-03-09 18:26:53 +01:00
kaetemi
ec66027596 Changed: Some source file grouping in some projects 2012-03-09 11:30:31 +01:00
kervala
6c1e509898 Changed: #1433 Merge changes from patch 1.13 2012-03-04 14:11:28 +01:00
kervala
41551e3026 Fixed: #1441 Remove all remaining .vcproj, Makefiles, automake scripts, etc... 2012-03-03 10:49:42 +01:00
sfb
782f3edf03 Added: #1436 Missing deployment_configuration.cpp/h files. 2012-02-29 09:24:49 -06:00
kervala
87e6c19981 Changed: #1433 Merge changes from patch 1.13 2012-02-27 15:04:33 +01:00
kaetemi
221f5618fb Fixed: Errors when using the database xslt using msxsl. 2011-10-31 13:48:43 +01:00
kaetemi
fe319d60eb Removed: Visual slot file should not be in repository. It is built by the sheets packer. 2011-09-26 21:47:56 +02:00
kaetemi
1391070537 Added: Leveldesign sheets required for building client sheets used for newbieland. 2011-09-21 23:38:40 +02:00
kaetemi
a390e11ab7 Added: Missing plant and flora sheets required for building newbieland continent. 2011-09-20 18:11:12 +02:00
kaetemi
cbc1c7e4d1 Added: Missing mode2animset.string_array 2011-09-20 16:19:59 +02:00
kervala
44e3c936e4 Changed: New option WITH_INSTALL_LIBRARIES which allows user to install only final binaries and no development files (header, static libraries, etc...) 2011-09-11 14:44:37 +02:00
Fabien_HENON
95a5316a33 #1304: Guild Missions: Merge with default 2011-08-21 19:29:28 +02:00
Fabien_HENON
4c376cc56e Changed: #1304: Updating world_editor documentation. Adding a primitive for guild missions 2011-08-14 19:39:35 +02:00
Fabien_HENON
2afce02712 Changed: #1304: Debug for the guild missions. Now it works ! 2011-08-04 17:04:49 +02:00
Fabien_HENON
1a6f2ecc40 Changed: #1304: Revert modifications for the objectives in the world_editor_classes.xml (i changed the way i will do it) 2011-07-23 15:51:46 +02:00
kervala
ec90234947 Changed: #825 Remove all warnings when compiling Ryzom 2011-06-05 18:06:00 +02:00
kervala
540bc1f62f Changed: Exceptions catched by reference 2011-06-02 18:31:40 +02:00
Fabien_HENON
15e3cb3dd6 Changed: #1304: mission_compiler objectives: check and script generation
mission compiler now checks if we are not asking several guild
members to complete an objective whereas the mission is not a
guild mission.
It also generates the 'nb_guild_members_needed' parameter for
objectives in the script.
2011-05-31 16:22:57 +02:00
Fabien_HENON
a059141e57 Merge 2011-05-30 12:01:24 +02:00
kervala
785c5be8d8 Changed: #878 Fix typos in comments/code 2011-05-26 20:47:04 +02:00
kervala
30819b35a7 Changed: #1177 VS 2010 does not work under CMake 2011-05-26 16:18:38 +02:00
kervala
2827964479 Changed: Merge changes from next patch 2011-05-26 14:16:13 +02:00
Fabien_HENON
ae02411ddf Updating the world_editor_classes.xml file for the guild missions
- Adding new actions for guild missions
- Adding the guild option for some actions
- Adding the nb_guild_members_needed option for the objectives
2011-05-23 16:09:14 +02:00
kervala
4aa2c68151 Changed: #878 Fix typos in comments/code 2011-05-31 22:16:17 +02:00
kervala
bef55791a0 Fixed: Compilation with GCC 4.6 2011-03-29 17:38:25 +02:00
kervala
d97adbba91 Fixed: Compilation with GCC 4.6 2011-03-29 16:20:00 +02:00
kervala
a221b39585 Changed: #825 Remove all warnings when compiling Ryzom 2011-03-10 23:22:27 +01:00
kervala
dec67309f3 Changed: #878 Fix typos in comments/code 2011-03-09 14:30:51 +01:00
kervala
5272fdb1ec Changed: Changes from last patch 2011-03-09 14:23:57 +01:00
kervala
9fe34c7d1e Changed: #878 Fix typos in comments/code 2011-03-09 13:46:52 +01:00
kervala
0b8820ca0c Fixed: Compilation under Linux with STLport 2011-02-11 18:05:19 +01:00
kervala
552d973a0a Changed: #1230 Reverted ryzom.world 2011-01-17 15:15:54 +01:00
kervala
9395b102d2 Changed: #1230 Missing Sheets for Yubos and NPCs 2011-01-16 15:57:55 +01:00
kervala
c1dd2c5dc9 Changed: #1230 Missing Sheets for Yubos and NPCs 2011-01-11 14:24:43 +01:00
kervala
c6ee41e536 Changed: #1230 Missing Sheets for Yubos and NPCs 2011-01-11 13:50:32 +01:00
kervala
789ba7690f Changed: #1230 Fix for duplicate ma_cheveux01.(s)item and ma_cheveux02.(s)item 2011-01-11 13:42:15 +01:00
kervala
9bc2c640cb Changed: #1230 Missing Sheets for Yubos and NPCs 2011-01-10 20:48:43 +01:00