Commit graph

269 commits

Author SHA1 Message Date
dfighter1985
fcb736c387 Merged mainline default branch changes.
--HG--
branch : gsoc2012-gui-editor
2013-02-14 10:47:10 +01:00
kervala
45c8b20f39 Changed: Typo fixes (thanks to Vagrant!) 2013-02-08 13:17:44 +01:00
kervala
5efeb5ba62 Fixed: Compilation with VC++ 2010 and 2012 2012-12-11 12:22:41 +01:00
kervala
0cabe14089 Changed: Code simplification 2012-12-08 11:24:43 +01:00
kervala
b94b59c9b7 Changed: Changes in game_share 2012-11-26 20:19:14 +01:00
dfighter1985
cb13ce46cd MODIFIED: #1471 Merged mainline default to this branch.
--HG--
branch : gsoc2012-gui-editor
2012-11-25 05:22:40 +01:00
kervala
d2da18ff10 Changed: Minor typos 2012-11-24 20:23:13 +01:00
kervala
ef19fc9ec6 Changed: New STRING_MANAGER type clan 2012-11-24 20:21:45 +01:00
kervala
d8c7fa52f9 Changed: Replaced string empty comparisons with empty() 2012-10-06 18:17:57 +02:00
kervala
25dd379d7e Changed: Replaced string empty comparisons with empty() 2012-10-06 17:17:26 +02:00
kervala
0cf5c1f44a Changed: Install data_leveldesign if ryzom_tools are enabled 2012-10-01 10:07:41 +02:00
kervala
9bbbb79ba6 Changed: Synchronization with SVN 2012-10-01 10:07:09 +02:00
kervala
a9fa9bb78a Changed: Install data_leveldesign if WITH_RYZOM_TOOLS is enabled 2012-09-26 12:43:18 +02:00
kervala
1374286cab Changed: #825 Remove all warnings when compiling Ryzom 2012-09-25 13:20:25 +02:00
kervala
0795a61516 Changed: #825 Remove all warnings when compiling Ryzom 2012-09-25 12:33:02 +02:00
kervala
7a04e920e1 Fixed: #1493 MultiArch support 2012-09-22 22:57:38 +02:00
kervala
8922f96b9a Changed: Synchronization with SVN 2012-09-11 20:26:36 +02:00
dfighter1985
d301c46c27 Merged default branch into gui-refactoring.
--HG--
branch : gui-refactoring
2012-07-02 22:46:08 +02:00
kaetemi
e9f75e639d Fixed: Valgrind warnings 2012-06-28 11:08:36 +02:00
kaetemi
c618a29276 Reverted: Unnecessary changes to config and data from merge 2012-06-04 15:03:40 +02:00
kaetemi
cab401fa13 Merged: From default to sound_dev
--HG--
branch : sound_dev
2012-06-02 11:09:14 +02:00
sfb
af454dd1cf Fixed EOL issues and added .hgeol file. 2012-05-29 08:31:11 -05:00
Fabien_HENON
f70bdc4032 Changed: #1469 StringId conversion to SheetId for sounds V2 (DOES NOT COMPILE YET)
--HG--
branch : gsoc2012-fabien
2012-05-26 19:21:19 +02:00
kervala
f6178de16c Changed: Don't include local files in PCH 2012-05-21 10:04:00 +02:00
dfighter1985
decc92e75d Extracted the CDB bank handling code into a new class CCDBBankHandler, the CDB system should be now totally independent of Ryzom.
--HG--
branch : cdb-refactoring
2012-04-17 08:23:02 +02:00
dfighter1985
17eab4ef52 CDB is now part of NLMISC. However it still requires some work!
--HG--
branch : cdb-refactoring
2012-04-16 06:08:12 +02:00
dfighter1985
29cde6e15b Moved xml auto pointer to nlmisc.
--HG--
branch : cdb-refactoring
2012-04-16 02:50:18 +02:00
kervala
55f7150202 Changed: #825 Remove all warnings when compiling Ryzom 2012-04-08 14:23:36 +02:00
kervala
36fcd706fa Changed: #825 Remove all warnings when compiling Ryzom 2012-04-07 23:47:55 +02:00
kervala
48e05d0056 Changed: #825 Remove all warnings when compiling Ryzom 2012-04-07 20:04:08 +02:00
kervala
0ac33d338a Changed: #825 Remove all warnings when compiling Ryzom 2012-04-07 15:04:26 +02:00
kervala
cdcdc05e88 Fixed: #1448 Compilation with CLang 2012-04-07 14:57:15 +02:00
kervala
6c768a144a Changed: #1448 Compilation with CLang 2012-04-07 11:51:21 +02:00
kervala
425927cd50 Changed: #1448 Compilation with CLang (patch provided by GelluleX, thanks !) 2012-04-07 11:14:21 +02:00
kaetemi
fab5ddfd74 Fixed: Compile errors under Linux. 2012-04-05 17:45:53 +02:00
sfb
5bbff4201d merge inbound 2012-03-12 13:31:26 -05:00
sfb
66d5b0b879 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
ade9ab1689 Fixed: #1436 Fixed license header for deployment_configuration files - PMS should be building fine now. 2012-03-12 13:26:13 -05:00
kaetemi
d0ff6b9c80 Fixed: Forgot to add the grouped files to the target thing 2012-03-09 18:26:53 +01:00
kaetemi
33842ea6ed Changed: Some source file grouping in some projects 2012-03-09 11:30:31 +01:00
kervala
ea0804b153 Changed: #1433 Merge changes from patch 1.13 2012-03-04 14:11:28 +01:00
kervala
3c47b9f8d5 Fixed: #1441 Remove all remaining .vcproj, Makefiles, automake scripts, etc... 2012-03-03 10:49:42 +01:00
sfb
a00d451e09 Added: #1436 Missing deployment_configuration.cpp/h files. 2012-02-29 09:24:49 -06:00
kervala
457704b2b6 Changed: #1433 Merge changes from patch 1.13 2012-02-27 15:04:33 +01:00
kaetemi
d0a628a444 Fixed: Errors when using the database xslt using msxsl. 2011-10-31 13:48:43 +01:00
kaetemi
4040f56691 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
9501c90654 Added: Leveldesign sheets required for building client sheets used for newbieland. 2011-09-21 23:38:40 +02:00
kaetemi
cf560a4898 Added: Missing plant and flora sheets required for building newbieland continent. 2011-09-20 18:11:12 +02:00
kaetemi
9956eec019 Added: Missing mode2animset.string_array 2011-09-20 16:19:59 +02:00
kervala
6306833423 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
594d939c0b #1304: Guild Missions: Merge with default
--HG--
branch : gsoc2011-guildmissions
2011-08-21 19:29:28 +02:00
Fabien_HENON
55e1452fe1 Changed: #1304: Updating world_editor documentation. Adding a primitive for guild missions
--HG--
branch : gsoc2011-guildmissions
2011-08-14 19:39:35 +02:00
Fabien_HENON
ff5da0aa22 Changed: #1304: Debug for the guild missions. Now it works !
--HG--
branch : gsoc2011-guildmissions
2011-08-04 17:04:49 +02:00
Fabien_HENON
12fe8693d5 Changed: #1304: Revert modifications for the objectives in the world_editor_classes.xml (i changed the way i will do it)
--HG--
branch : gsoc2011-guildmissions
2011-07-23 15:51:46 +02:00
kervala
4027e82360 Changed: #825 Remove all warnings when compiling Ryzom 2011-06-05 18:06:00 +02:00
kervala
f9cc842b82 Changed: Exceptions catched by reference 2011-06-02 18:31:40 +02:00
Fabien_HENON
bab4b3af21 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.

--HG--
branch : gsoc2011-guildmissions
2011-05-31 16:22:57 +02:00
Fabien_HENON
5fc9d23984 Merge
--HG--
branch : gsoc2011-guildmissions
2011-05-30 12:01:24 +02:00
kervala
2efa01d373 Changed: #878 Fix typos in comments/code 2011-05-26 20:47:04 +02:00
kervala
e909556883 Changed: #1177 VS 2010 does not work under CMake 2011-05-26 16:18:38 +02:00
kervala
ddc0180e74 Changed: Merge changes from next patch 2011-05-26 14:16:13 +02:00
Fabien_HENON
aa4a3391e8 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

--HG--
branch : gsoc2011-guildmissions
2011-05-23 16:09:14 +02:00
kervala
73bf79340d Changed: #878 Fix typos in comments/code 2011-05-31 22:16:17 +02:00
kervala
c01c622076 Fixed: Compilation with GCC 4.6 2011-03-29 17:38:25 +02:00
kervala
47ebe49fbd Fixed: Compilation with GCC 4.6 2011-03-29 16:20:00 +02:00
kervala
3fd9f30695 Changed: #825 Remove all warnings when compiling Ryzom 2011-03-10 23:22:27 +01:00
kervala
5baccb8b54 Changed: #878 Fix typos in comments/code 2011-03-09 14:30:51 +01:00
kervala
72992ee877 Changed: Changes from last patch 2011-03-09 14:23:57 +01:00
kervala
cb73ccd99a Changed: #878 Fix typos in comments/code 2011-03-09 13:46:52 +01:00
kervala
56dc241c3d Fixed: Compilation under Linux with STLport 2011-02-11 18:05:19 +01:00
kervala
9100d0216b Changed: #1230 Reverted ryzom.world 2011-01-17 15:15:54 +01:00
kervala
c7bffec6ae Changed: #1230 Missing Sheets for Yubos and NPCs 2011-01-16 15:57:55 +01:00
kervala
8278931800 Changed: #1230 Missing Sheets for Yubos and NPCs 2011-01-11 14:24:43 +01:00
kervala
683721e943 Changed: #1230 Missing Sheets for Yubos and NPCs 2011-01-11 13:50:32 +01:00
kervala
33d38cf3a4 Changed: #1230 Fix for duplicate ma_cheveux01.(s)item and ma_cheveux02.(s)item 2011-01-11 13:42:15 +01:00
kervala
ce0495b21c Changed: #1230 Missing Sheets for Yubos and NPCs 2011-01-10 20:48:43 +01:00
kervala
4149a0cb0d Changed: Cleanup missing continents in ryzom.world 2011-01-10 14:34:23 +01:00
kervala
faf50ba03b Changed: #1230 Missing Sheets for Yubos and NPCs 2011-01-10 14:18:39 +01:00
kervala
ede0dcc1ab Fixed: #1230 Missing Sheets for Yubos and NPCs 2011-01-10 11:13:09 +01:00
sfb
2e5237fbc2 Changed: Corrected typo in file and folder name for an sbrick sheet. 2010-12-21 11:48:09 -06:00
sfb
6e7dbb8604 Changed: Sorted out sbrick files into usable hierarchy. 2010-12-21 11:31:11 -06:00
sfb
61a87f13ce Update: Organized sphrase sheets for easier browsing. 2010-12-21 08:27:55 -06:00
kervala
626f05bcb9 Changed: #878 Fix typos in comments/code 2010-12-08 14:47:17 +01:00
kervala
dabb47d18a Changed: #1016 entities_game_service segfault in ubuntu 64biten 2010-12-03 15:18:39 +01:00
kervala
2efa82be4e Changed: #841 Change the wrong header in the source code 2010-11-18 21:35:17 +01:00
kervala
56db70265f Changed: #878 Fix typos in comments/code 2010-11-18 21:33:35 +01:00
kervala
54b6685a9e Changed: #878 Fix typos in comments/code 2010-11-13 18:33:01 +01:00
kervala
9550ed9d36 Changed: #878 Fix typos in comments/code 2010-11-12 14:26:38 +01:00
kervala
4cf6b46cc2 Changed: Save r2_buffer.dat in "save" instead of "data" 2010-11-12 13:37:40 +01:00
kervala
e7d0bb4671 Fixed: Lua bug with wander_destination_reached 2010-11-10 22:13:00 +01:00
aquiles
c336c70d64 Fixed: #1173 wrong crafting tool type in basic armor file 2010-11-08 14:15:16 +01:00
kervala
16a086697d Changed: #825 Remove all warning when compiling Ryzom 2010-11-04 19:27:35 +01:00
kervala
39d099f21d Changed: #825 Remove all warning when compiling Ryzom 2010-10-30 14:20:26 +02:00
kervala
95e24bab2c Changed: #1135 Merge changes from Ryzom patch 1.10 2010-10-25 19:50:22 +02:00
kervala
5512b47d68 Changed: #1135 Merge changes from Ryzom patch 1.10 2010-10-18 19:42:16 +02:00
kervala
da4281e176 Changed: #841 Change the wrong header in the source code 2010-10-18 13:50:31 +02:00
kervala
812cfa71f9 Changed: #142 Replace atoi and sscanf by fromString when it's possible 2010-10-18 13:50:08 +02:00
kervala
a8eb2591d2 Changed: #825 Remove all warning when compiling Ryzom 2010-10-18 13:48:40 +02:00
kervala
c3e7de0df1 Changed: #825 Remove all warning when compiling Ryzom 2010-10-18 09:59:59 +02:00
kervala
4c4a67255e Changed: Added titles associated to title enum 2010-10-18 09:58:10 +02:00
kervala
10e30641e9 Changed: #841 Change the wrong header in the source code 2010-10-18 09:57:15 +02:00
kervala
0c33f7cfe1 Changed: #825 Remove all warning when compiling Ryzom 2010-10-18 09:44:19 +02:00
sfb
535cf01de9 Added: .flora and .plant sheets for the jungle ecosystem - trees now build correctly via build_gamedata 2010-10-15 20:46:01 -05:00
sfb
e4c7a21ba6 Added: indoors.continent sheet - the ai_wmap section of build_gamedata needs this. 2010-10-15 20:43:06 -05:00
kervala
dadbe664c5 Fixed: Compilation under GCC 4.0.1 2010-10-03 22:47:27 +02:00
kervala
9228e00c18 Changed: Display of headers from game_share 2010-10-03 18:40:05 +02:00
kervala
b485e6e986 Changed: #825 Remove all warning when compiling Ryzom 2010-10-03 18:35:16 +02:00
kervala
f1c8d140aa Fixed: Removed dummyToAvoidStupidCompilerWarning functions to fix compilation if std*.cpp are included more than once 2010-09-28 11:25:37 +02:00
kervala
01eb101355 Fixed: Compilation with STLport under Linux (and probably Mac OS X) 2010-09-26 23:27:52 +02:00
kervala
123c773bae Changed: #825 Commented out all #pragma message 2010-09-25 18:12:37 +02:00
vl
8bde6fa98d Fixed: missing endline 2010-09-23 16:03:49 +02:00
acemtp@acemtp-desktop
0f4fd77f3b Added: include dir of zlib because game_share need zlib 2010-09-23 15:48:20 +02:00
kervala
e1ae7e0c4d Changed: Added NL_ADD_RUNTIME_FLAGS 2010-09-20 21:43:14 +02:00
kervala
db4a842b44 Fixed: Changed from Color to String (patch provided by aquiles) 2010-09-20 08:59:46 +02:00
kervala
256062307b Changed: #825 Remove all warnings when compiling Ryzom (patch provided by Abelgar) 2010-09-16 19:04:18 +02:00
kervala
3f8bc64bca Changed: #825 Remove all warnings when compiling Ryzom 2010-09-03 22:55:29 +02:00
mattraykowski
c3e4ffbe26 merge while working on rebase root source dir 2010-09-03 08:02:04 -06:00
mattraykowski
1b511949c9 Update: #842 Added "NeL" before NeL project labels, moved some files, fixed Qt builds, fixed libwww find on Windows. 2010-09-02 13:53:33 -06:00
kervala
65062f5dee Changed: #825 Remove all warnings when compiling Ryzom 2010-08-28 15:02:00 +02:00
kervala
4b294f9402 Fixed: libc functions wouldn't be replaced by intrinsics equivalent 2010-08-11 15:05:03 +02:00
kervala
a3ae822a88 Changed: #878 Fix typos in comments/code 2010-07-27 13:21:11 +02:00
kervala
c6d7643b4b Changed: #825 Remove all warning when compiling Ryzom 2010-07-24 22:29:42 +02:00
kervala
3334163590 Changed: #842 Added new files for X11 applications 2010-07-17 17:54:43 +02:00
kervala
f4c0778e45 Changed: #878 Fix typos in comments/code 2010-07-16 22:26:02 +02:00
kervala
31236e1dea Changed: #860 Remove/convert/update old projects 2010-07-10 15:08:21 +02:00
kervala
0383b14169 Changed: optimizations for PCH 2010-07-10 14:06:33 +02:00
vl
39b6194f02 Changed: misc things 2010-07-08 16:06:34 +02:00
kervala
082676ea80 Changed: CFile::copyFile takes now 2 std::string as parameters 2010-07-01 11:51:27 +02:00
kervala
de9ba8fbe4 Changed: #841 Change the wrong header in the source code 2010-07-01 09:34:20 +02:00
kervala
ae239a6b94 Changed: #880 Use PCH under Linux with CMake 2010-06-30 15:31:31 +02:00
vl
74bcf2dd7e Fixed: #965 added missing leveldesign files 2010-06-17 09:55:55 +02:00
kervala
4095bf6a4c Fixed: #977 Characters without heads. 2010-06-14 16:10:15 +02:00
kervala
dcf1277953 Changed: #842 Added SOVERSION property to shared libraries 2010-06-14 10:30:17 +02:00
kervala
7cbe65d2ef Changed: #878 Fix typos in comments/code 2010-06-14 10:02:51 +02:00
kervala
f381f335e1 Changed: #878 Fix typos in comments/code 2010-06-13 16:58:11 +02:00
kervala
1f1981e0ad Changed: #825 Remove all warning when compiling Ryzom on Linux 2010-06-12 16:33:45 +02:00
kervala
59bdca45fe Changed: #842 Prefix all Ryzom binaries by ryzom_ 2010-06-11 21:56:43 +02:00
kervala
004f5b3f83 Changed: #825 Remove all warning when compiling Ryzom on Linux 2010-06-11 13:20:13 +02:00
kervala
b8e5331ffe Changed: #842 Prefix all Ryzom binaries by ryzom_ 2010-06-11 11:57:10 +02:00
kervala
a6b5c5f453 Changed: #825 Remove all warning when compiling Ryzom on Linux (patch provided by Letto) 2010-06-11 11:40:43 +02:00
kervala
ab7adb557f Changed: #825 Remove all warning when compiling Ryzom on Linux 2010-06-11 11:20:51 +02:00
kervala
4b15d7273e Changed: #878 Fix typos in comments/code 2010-06-10 11:50:19 +02:00
vl
8fcec5faf7 Changed: moved nelns file in ryzom directories 2010-06-08 16:25:41 +02:00
kervala
e823e9ece2 Changed: #878 Fix typos in comments/code 2010-06-03 14:45:51 +02:00
rti
80e7cb03c7 Fixed: #910 - NeL and Ryzom client should build out of the box using CMake on mac os x now. 2010-05-29 21:49:31 +02:00
kervala
eda4939a41 Fixed: #912 Arrays not initialized and other minor bugs 2010-05-18 12:01:37 +02:00
vl
4773981bdf Fixed: #906 move code from .h to .cpp to resolve a libxml allocator problem 2010-05-17 14:51:04 +02:00
vl
d1cb8fde2d Changed: char* into const char*. string_constant_to_char.patch provided by vhelsing 2010-05-17 12:24:49 +02:00
vl
bec9f0f252 Changed: #825 remove some warning 2010-05-15 18:47:21 +02:00
Matt Raykowski
2742738c4b Update: #825 More initialization order issues. 2010-05-14 07:48:23 -05:00