Commit graph

830 commits

Author SHA1 Message Date
sfb
1279aa5d3a merge from default
--HG--
branch : gsoc2011-kerozcak
2012-03-22 14:31:07 -05:00
kervala
a840c0fa56 Changed: #878 Fix typos in comments/code 2012-03-17 15:01:27 +01:00
kervala
1af368b7e4 Changed: #1433 Merge changes from patch 1.13 2012-03-17 15:00:24 +01: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
kervala
35b2270fe8 Fixed: ryzom_servershare CMakeLists.txt typo 2012-03-10 13:08:13 +01:00
kaetemi
d0ff6b9c80 Fixed: Forgot to add the grouped files to the target thing 2012-03-09 18:26:53 +01:00
kervala
346920f1fd Merge 2012-03-09 13:06:52 +01:00
kervala
b27b2a0817 Changed: #1433 Merge changes from patch 1.13 (patch provided by Molator) 2012-03-09 13:03:47 +01:00
kaetemi
33842ea6ed Changed: Some source file grouping in some projects 2012-03-09 11:30:31 +01:00
kervala
d5731ad5ea Changed: #1433 Merge changes from patch 1.13 2012-03-08 16:59:03 +01:00
kervala
b40f9b933d Changed: #1433 Merge changes from patch 1.13 2012-03-05 18:56:30 +01:00
kervala
b1ad39a21b Changed: #1433 Merge changes from patch 1.13 2012-03-05 11:59:00 +01:00
kervala
6b293ca23a Fixed: #1433 Merge changes from patch 1.13 2012-03-04 16:54:37 +01:00
kervala
247e920543 Changed: #1433 Merge changes from patch 1.13 2012-03-04 14:35:44 +01:00
kervala
ea0804b153 Changed: #1433 Merge changes from patch 1.13 2012-03-04 14:11:28 +01:00
kervala
01a3479288 Changed: #1433 Merge changes from patch 1.13 2012-03-04 14:09:23 +01:00
kervala
f179ef28b1 Changed: #1433 Merge changes from patch 1.13 2012-03-04 14:06:07 +01:00
kervala
e7a69b6950 Changed: #1433 Merge changes from patch 1.13 2012-03-04 14:01:11 +01:00
kervala
3c47b9f8d5 Fixed: #1441 Remove all remaining .vcproj, Makefiles, automake scripts, etc... 2012-03-03 10:49:42 +01:00
kervala
5c458d4c65 Fixed: Compilation under Mac OS X 2012-02-29 23:12:07 +01:00
sfb
acc6ce1b59 merge 2012-02-29 09:33:05 -06:00
sfb
efa4fbdbf1 merge 2012-02-29 09:32:53 -06:00
sfb
d4e185c741 Changed: #1436 Enabled patchman build, fixed its CMakeLists added missing header includes, eliminated static-ness of extern'd functions. 2012-02-29 09:26:31 -06:00
sfb
a00d451e09 Added: #1436 Missing deployment_configuration.cpp/h files. 2012-02-29 09:24:49 -06:00
kaetemi
93d3a4fea4 Fixed: Use $_POST and $_GET instead of deprecated $HTTP_GET_VARS and $HTTP_POST_VARS in the admin tool. 2012-02-29 13:10:59 +01:00
kervala
a09943f1f0 Changed: #1433 Merge changes from patch 1.13 2012-02-27 23:48:36 +01:00
kervala
6c43baaa1c Changed: #1433 Merge changes from patch 1.13 2012-02-27 22:42:30 +01:00
kervala
86eaabd0a2 Changed: #1433 Merge changes from patch 1.13 2012-02-27 16:10:47 +01:00
kervala
457704b2b6 Changed: #1433 Merge changes from patch 1.13 2012-02-27 15:04:33 +01:00
kervala
dd05742f88 Fixed: Bad check in emote tokens 2012-02-13 11:31:28 +01:00
kervala
6a6115061c Fixed: #1420 Client patcher compilation under Mac OS X 2012-01-10 10:19:52 +01:00
kervala
15fa0b67f7 Fixed: ryzom_client_patcher missing file 2012-01-07 19:14:24 +01:00
kervala
2014543ec1 Fixed: Missing "stdpch.h" include 2012-01-02 15:53:21 +01:00
sfb
acbd3bd2c5 merge 2011-12-21 09:50:08 -06:00
sfb
45c720b874 Fixed: #1334 Applied Ulukyn's patch. Adds two new config variables - WebIgMainDomain and WebIgTrustedDomains. 2011-12-21 09:49:30 -06:00
sfb
7c3522da9e Fixed: #1385 patch_gen uses tmpnam function instead of 'nul' for files with no pre-existing version. Note - used tmpnam instead of mkstemp due to cross-platform compatibility. 2011-12-12 14:38:41 -06:00
kaetemi
3fc7b8abb9 Added: Default cfg values for textures interfaces. 2011-11-12 13:40:44 +01:00
kaetemi
d0a628a444 Fixed: Errors when using the database xslt using msxsl. 2011-10-31 13:48:43 +01:00
kervala
fbf81fc0b9 Fixed: #1380 pdr_util, -o command line option (patch provided by nimetu) 2011-10-21 11:34:58 +02:00
kervala
2e1a4591b2 Changed: Use all existing icons for Ryzom 2011-10-08 11:13:38 +02:00
kaetemi
8c92768c98 Changed: #1093 Build pacs prim list to correct location. 2011-09-28 09:49:16 +02:00
kaetemi
83e79fa761 Changed: #1093 Move the visual_slot.tab to the right place after running sheets packer. 2011-09-26 22:10:48 +02: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
ab4468c48f Changed: #28 Clean comments 2011-09-23 00:20:20 +02:00
kaetemi
3346764013 Fixed: #1364 Only transfer bonus item infos when context help string is used for tooltip 2011-09-23 00:14:51 +02:00
kaetemi
9501c90654 Added: Leveldesign sheets required for building client sheets used for newbieland. 2011-09-21 23:38:40 +02:00
kaetemi
5a5304f823 Changed: #1093 Added generic helmets directory to export shape sources. 2011-09-21 23:17:39 +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
kaetemi
7b033676cb Added: #1093 Missing panoply_generique.cfg file. 2011-09-17 15:58:17 +02:00
kaetemi
3a520e2fb8 Changed: #1093 Also try ryzom_client_r.exe instead of client_ryzom_r.exe for copying exedll bnp... 2011-09-16 13:57:13 +02:00
kervala
54bfe9aff4 Changed: Replaced 32x32 pixmap by a 48x48 one 2011-09-11 16:41:16 +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
kerozcak
89fd0e92c0 Changed: #1315
--HG--
branch : gsoc2011-kerozcak
2011-08-21 02:54:22 +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
kervala
55f26e7f16 Fixed: Icons name 2011-08-14 16:05:47 +02:00
kervala
84fd111146 Fixed: Icons path 2011-08-14 14:15:20 +02:00
kervala
80983a5ab6 Added: Hicolor and XPM icons for GNU/Linux 2011-08-14 11:47:34 +02:00
kervala
1ef3c1fada Removed: Backup files 2011-08-13 17:39:55 +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
1f057afe91 Changed: #1304: Message concerning the number of times a mission needs to be completed
--HG--
branch : gsoc2011-guildmissions
2011-07-25 14:09:13 +02:00
Fabien_HENON
6462021f14 Changed: #1304: Update of CMissionStepDoMissions to support missions done several times (by different guild members)
--HG--
branch : gsoc2011-guildmissions
2011-07-25 12:27:19 +02:00
Fabien_HENON
78dbefb759 Changed: #1304: Checks in the mission compiler if the do_mission objective is correct (for a guild mission) when we add a number (the number of members from the guild needed to complete the mission) after a mission name
--HG--
branch : gsoc2011-guildmissions
2011-07-23 18:14:31 +02:00
Fabien_HENON
9f05d66a81 Changed: #1304: Revert modifications for the objectives in the mission compiler (i changed the way i will do it)
--HG--
branch : gsoc2011-guildmissions
2011-07-23 15:56:32 +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
Fabien_HENON
5762e00236 Changed: #1304: Implementation of the "guild" parameter for the "destroy_item" action
--HG--
branch : gsoc2011-guildmissions
2011-07-20 22:09:01 +02:00
Fabien_HENON
757f393db1 Changed: #1304: Implementation of the "guild" parameter for the "recv_named_item" action
--HG--
branch : gsoc2011-guildmissions
2011-07-20 21:08:53 +02:00
Fabien_HENON
5ac224b5af Changed: #1304: Implementation of the "guild" parameter for the "recv_item" action
--HG--
branch : gsoc2011-guildmissions
2011-07-20 20:33:52 +02:00
Fabien_HENON
cb6b4ac917 Changed: #1304: Implementation of the "guild" parameter for the "recv_fame" action
--HG--
branch : gsoc2011-guildmissions
2011-07-20 18:41:30 +02:00
kerozcak
ccf80ff9d3 Changed: #1315 Added files forgotten to track.
--HG--
branch : gsoc2011-kerozcak
2011-07-20 12:21:20 +02:00
Fabien_HENON
af4d2d6236 Changed: #1304: Implementation of the "guild" parameter for the "recv_money" action
--HG--
branch : gsoc2011-guildmissions
2011-07-19 19:10:12 +02:00
Fabien_HENON
2d1ce64c38 Changed: #1304: Parsing the "guild" parameter for the actions that need it.
--HG--
branch : gsoc2011-guildmissions
2011-07-19 18:39:29 +02:00
Fabien_HENON
185603b5e6 Changed: #1304: Debug of the options added in the script (';' replaced by ':' for parameters separation)
--HG--
branch : gsoc2011-guildmissions
2011-07-19 18:10:28 +02:00
Fabien_HENON
875d46f9b5 Changed: #1304: Implementation of the cbClientGroupAbandonMission for the guilds
--HG--
branch : gsoc2011-guildmissions
2011-07-18 19:37:59 +02:00
kerozcak
660ab4a153 merge from default
--HG--
branch : gsoc2011-kerozcak
2011-07-14 17:17:29 +02:00
kerozcak
0055bd7c4e Changed: #1315 Update.
--HG--
branch : gsoc2011-kerozcak
2011-07-14 16:49:25 +02:00
Fabien_HENON
e46422c041 Changed: #1304: Add implementation of functions to process mission events for guild missions
--HG--
branch : gsoc2011-guildmissions
2011-07-04 15:57:02 +02:00
Fabien_HENON
e92762ad8b Changed: #1304: Adding mission histories for CGuild
--HG--
branch : gsoc2011-guildmissions
2011-07-04 15:06:11 +02:00
Fabien_HENON
74a6cc26e6 Changed: #1304: Adding guild mission support in functions acceptExchange and processMissionEventList of the CCharacter class
--HG--
branch : gsoc2011-guildmissions
2011-07-04 13:57:11 +02:00
Fabien_HENON
c175338c7f Changed: #1304: Adding Guild mission support in function tickUpdate of CCharacter
--HG--
branch : gsoc2011-guildmissions
2011-07-04 12:38:42 +02:00
Fabien_HENON
19cfe26032 Changed: #1304: Implementation of basic CGuild functions for guild missions
--HG--
branch : gsoc2011-guildmissions
2011-06-29 14:44:30 +02:00
Fabien_HENON
a7f4bfa718 Changed: #1304: Add guild missions prerequisites.
--HG--
branch : gsoc2011-guildmissions
2011-06-20 16:08:12 +02:00
Fabien_HENON
ef009ebc90 Changed: #1304: Instanciation of guild missions.
--HG--
branch : gsoc2011-guildmissions
2011-06-20 15:15:07 +02:00
kervala
68ab06f7c0 Changed: Updated client_default.cfg.in from client_default.cfg 2011-06-14 20:11:44 +02:00
kervala
d52dead6af Changed: Merge changes from next patch 2011-06-14 19:34:28 +02:00
kervala
7adc1ec629 Changed: #878 Fix typos in comments/code 2011-06-14 19:31:59 +02:00
kerozcak
4d7293d0f5 Changed: #1315 Adding work i have done so far.
--HG--
branch : gsoc2011-kerozcak
2011-06-09 18:23:29 +02:00
kerozcak
c45be93014 Changed: #1315 Adding CakePHP app structure.
--HG--
branch : gsoc2011-kerozcak
2011-06-09 17:53:42 +02:00
kerozcak
87fed6cd85 merge from default
--HG--
branch : gsoc2011-kerozcak
2011-06-09 17:52:42 +02:00
kerozcak
471f5100e2 Changed: #1315 Directory name changed.
--HG--
branch : gsoc2011-kerozcak
2011-06-09 17:51:49 +02:00
vl
0e3465b6a1 Changed: chapter 5 2011-06-09 00:36:58 +02:00
vl
529edfcb9a Fixed: must not be lowered or the tooltip in milkopad doesn't work 2011-06-08 18:36:27 +02:00
kervala
0f63f56969 Changed: Replaced NLMISC::strlwr by NLMISC::toLower 2011-06-08 10:15:16 +02:00
kervala
e4fba623dc Fixed: Bad font default size 2011-06-08 10:14:48 +02:00
kervala
81d2817c44 Changed: #878 Fix typos in comments/code 2011-06-08 10:14:14 +02:00
kervala
4ab971d2fe Changed: #878 Fix typos in comments/code 2011-06-07 15:58:18 +02:00
Fabien_HENON
c4d39b2f98 Changed: #1304: Updating CMissionGuild for guild missions.
Implementation of the functions:
- updateUsersJournalEntry
- clearUsersJournalEntry

--HG--
branch : gsoc2011-guildmissions
2011-06-07 14:42:00 +02:00