Commit graph

825 commits

Author SHA1 Message Date
Fabien_HENON
95a5316a33 #1304: Guild Missions: Merge with default 2011-08-21 19:29:28 +02:00
kerozcak
29ec7931f3 Changed: #1315 2011-08-21 02:54:22 +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
kervala
6820d39355 Fixed: Icons name 2011-08-14 16:05:47 +02:00
kervala
9106770977 Fixed: Icons path 2011-08-14 14:15:20 +02:00
kervala
741f523983 Added: Hicolor and XPM icons for GNU/Linux 2011-08-14 11:47:34 +02:00
kervala
2d1cc56da3 Removed: Backup files 2011-08-13 17:39:55 +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
27d920c495 Changed: #1304: Message concerning the number of times a mission needs to be completed 2011-07-25 14:09:13 +02:00
Fabien_HENON
12f624a7a5 Changed: #1304: Update of CMissionStepDoMissions to support missions done several times (by different guild members) 2011-07-25 12:27:19 +02:00
Fabien_HENON
6f34bec144 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 2011-07-23 18:14:31 +02:00
Fabien_HENON
c56fb0762d Changed: #1304: Revert modifications for the objectives in the mission compiler (i changed the way i will do it) 2011-07-23 15:56:32 +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
Fabien_HENON
72629b83b9 Changed: #1304: Implementation of the "guild" parameter for the "destroy_item" action 2011-07-20 22:09:01 +02:00
Fabien_HENON
2558e79ea1 Changed: #1304: Implementation of the "guild" parameter for the "recv_named_item" action 2011-07-20 21:08:53 +02:00
Fabien_HENON
42adc7f469 Changed: #1304: Implementation of the "guild" parameter for the "recv_item" action 2011-07-20 20:33:52 +02:00
Fabien_HENON
bc4ac5dac6 Changed: #1304: Implementation of the "guild" parameter for the "recv_fame" action 2011-07-20 18:41:30 +02:00
kerozcak
15c74a1f95 Changed: #1315 Added files forgotten to track. 2011-07-20 12:21:20 +02:00
Fabien_HENON
0feeb05359 Changed: #1304: Implementation of the "guild" parameter for the "recv_money" action 2011-07-19 19:10:12 +02:00
Fabien_HENON
310d027d2c Changed: #1304: Parsing the "guild" parameter for the actions that need it. 2011-07-19 18:39:29 +02:00
Fabien_HENON
67bc278aea Changed: #1304: Debug of the options added in the script (';' replaced by ':' for parameters separation) 2011-07-19 18:10:28 +02:00
Fabien_HENON
713f976748 Changed: #1304: Implementation of the cbClientGroupAbandonMission for the guilds 2011-07-18 19:37:59 +02:00
kerozcak
fe24308696 merge from default 2011-07-14 17:17:29 +02:00
kerozcak
a7d008495a Changed: #1315 Update. 2011-07-14 16:49:25 +02:00
Fabien_HENON
d5b1fbd5b0 Changed: #1304: Add implementation of functions to process mission events for guild missions 2011-07-04 15:57:02 +02:00
Fabien_HENON
70b16fc877 Changed: #1304: Adding mission histories for CGuild 2011-07-04 15:06:11 +02:00
Fabien_HENON
46b592db13 Changed: #1304: Adding guild mission support in functions acceptExchange and processMissionEventList of the CCharacter class 2011-07-04 13:57:11 +02:00
Fabien_HENON
f41994dfff Changed: #1304: Adding Guild mission support in function tickUpdate of CCharacter 2011-07-04 12:38:42 +02:00
Fabien_HENON
5955b44550 Changed: #1304: Implementation of basic CGuild functions for guild missions 2011-06-29 14:44:30 +02:00
Fabien_HENON
a369dbc942 Changed: #1304: Add guild missions prerequisites. 2011-06-20 16:08:12 +02:00
Fabien_HENON
3479178476 Changed: #1304: Instanciation of guild missions. 2011-06-20 15:15:07 +02:00
kervala
be60684f1b Changed: Updated client_default.cfg.in from client_default.cfg 2011-06-14 20:11:44 +02:00
kervala
d0987263bd Changed: Merge changes from next patch 2011-06-14 19:34:28 +02:00
kervala
9a975ceea1 Changed: #878 Fix typos in comments/code 2011-06-14 19:31:59 +02:00
kerozcak
0cd318bcb8 Changed: #1315 Adding work i have done so far. 2011-06-09 18:23:29 +02:00
kerozcak
7f77a27119 Changed: #1315 Adding CakePHP app structure. 2011-06-09 17:53:42 +02:00
kerozcak
e0e710641e merge from default 2011-06-09 17:52:42 +02:00
kerozcak
7aa0429922 Changed: #1315 Directory name changed. 2011-06-09 17:51:49 +02:00
vl
57676424d9 Changed: chapter 5 2011-06-09 00:36:58 +02:00
vl
2d1ed58a4f Fixed: must not be lowered or the tooltip in milkopad doesn't work 2011-06-08 18:36:27 +02:00
kervala
5746e96dcd Changed: Replaced NLMISC::strlwr by NLMISC::toLower 2011-06-08 10:15:16 +02:00
kervala
b5fdad1d11 Fixed: Bad font default size 2011-06-08 10:14:48 +02:00
kervala
f06916b4fa Changed: #878 Fix typos in comments/code 2011-06-08 10:14:14 +02:00
kervala
fad4a00075 Changed: #878 Fix typos in comments/code 2011-06-07 15:58:18 +02:00
Fabien_HENON
7264e6c1bf Changed: #1304: Updating CMissionGuild for guild missions.
Implementation of the functions:
- updateUsersJournalEntry
- clearUsersJournalEntry
2011-06-07 14:42:00 +02:00
kervala
ec90234947 Changed: #825 Remove all warnings when compiling Ryzom 2011-06-05 18:06:00 +02:00
kervala
73b6bee421 Changed: Replaced NLMISC::strlwr by NLMISC::toLower 2011-06-05 17:52:40 +02:00
kervala
16ea78ecb3 Changed: Merge changes from next patch 2011-06-04 14:20:01 +02:00
kervala
9652969097 Changed: #878 Fix typos in comments/code 2011-06-04 13:48:27 +02:00
kervala
787fffd092 Changed: #142 Replace atoi and sscanf by fromString when it's possible 2011-06-04 13:25:58 +02:00
kervala
dc66068f94 Changed: Merge changes from next patch 2011-06-04 13:23:14 +02:00
kervala
6deae3686b Changed: #878 Fix typos in comments/code 2011-06-03 15:17:23 +02:00
kervala
900dc9e5da Changed: #825 Remove all warnings when compiling Ryzom 2011-06-03 10:51:03 +02:00
kervala
cbc41fb73a Changed: Exceptions catched by reference 2011-06-03 10:42:40 +02:00
kervala
5b5a050616 Changed: Exceptions catched by reference 2011-06-03 10:35:25 +02:00
kervala
e896f53b6b Changed: Exceptions catched by reference 2011-06-02 18:43:58 +02:00
kervala
540bc1f62f Changed: Exceptions catched by reference 2011-06-02 18:31:40 +02:00
kervala
8d099d236a Changed: Merge changes from next patch 2011-06-02 17:28:30 +02:00
kervala
15158c4514 Changed: Merge changes from next patch 2011-06-02 17:26:04 +02:00
Fabien_HENON
9128f754fc Changed: #1304: mission_compiler actions: add new ones, check and script generation
Add 2 new actions for the mission compiler: recv_charge_point and
give_control.
Add the 'guild' option for some actions: check if the mission is
valid, and change the script generation to add this option.
2011-05-31 22:00:27 +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
kervala
aee331a52c Merge with gsoc2011-guildmissions 2011-05-30 13:33:07 +02:00
kervala
cce05665dd Changed: #878 Added new actions comments for translation_tools 2011-05-30 13:31:18 +02:00
Fabien_HENON
a059141e57 Merge 2011-05-30 12:01:24 +02:00
sfb
4dd8f89943 merge 2011-05-29 14:09:15 -05:00
sfb
50d15e4c86 Changed: Applied patch fixing the mission_compiler_lib build under Linux 2011-05-29 14:08:46 -05:00
kervala
5da70e5d9d Changed: #825 Remove all warnings when compiling Ryzom 2011-05-29 13:57:31 +02:00
kervala
fbec2565e9 Changed: Compilation with VC++ 2010 without STLport 2011-05-28 15:52:48 +02:00
kervala
785c5be8d8 Changed: #878 Fix typos in comments/code 2011-05-26 20:47:04 +02:00
kervala
39c30152b9 Added: CMake project for mission_compiler_fe 2011-05-26 18:21:06 +02:00
kervala
bc3a3f6f7c Added: CMake project for mission_compiler_lib 2011-05-26 18:08:04 +02:00
kervala
30819b35a7 Changed: #1177 VS 2010 does not work under CMake 2011-05-26 16:18:38 +02:00
kervala
e655b0a777 Changed: Use static_assert in nlctassert macro if C++0X is supported by compiler 2011-05-26 16:14:45 +02:00
kervala
28d1e2538b Changed: #825 Remove all warnings when compiling Ryzom 2011-05-26 16:07:35 +02:00
kervala
35ccf29935 Changed: Merge changes from next patch 2011-05-26 16:06:21 +02:00
kervala
db6f3defa2 Changed: Merge changes from next patch 2011-05-26 14:33:04 +02:00
kervala
2827964479 Changed: Merge changes from next patch 2011-05-26 14:16:13 +02:00
rti
1c7d8571d7 Fixed: crash when using SelectCharacter = [0,4] (thanks ace) 2011-05-25 16:52:52 +02:00
kervala
dd36396d72 Fixed: #1272 Compilation with GCC 4.6 (patch provided by Krop) 2011-05-24 13:46:40 +02:00
kervala
4d8038085c Changed: #825 Remove all warnings when compiling Ryzom 2011-05-24 13:40:23 +02:00
kervala
6058264aed Changed: Renamed monitor_service to ryzom_monitor_service for homogeneity 2011-05-24 13:38:34 +02:00
kervala
570051bbbd Changed: #1272 Fixed compilation with GCC 4.6 (patch provided by Naush) 2011-05-24 13:37:04 +02:00
kervala
0d4ed33812 Changed: #1272 Fixed gpm_service compilation with GCC 4.6 (and added PCH to project) 2011-05-24 10:54:17 +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
5d5f8a964f Fixed: #1177 VS 2010 does not work under CMake 2011-05-12 12:49:17 +02:00
dnk-88
5cfaa92c70 Changed: Added preview particle system in geqt. 2011-05-08 01:11:10 +03:00
dnk-88
dc07038a82 Fixed: geqt correctly handles in the FileOpenDialog of cancel action and empty icon 2011-05-07 18:23:23 +03:00
dnk-88
1af3224bc9 Header cascading section resizes is enabled. 2011-05-07 15:51:15 +03:00
Piotr Kaczmarek
d6fde74b27 add web-based translation tool directory 2011-04-29 21:40:17 +02:00
kervala
23f89c8d90 Changed: Merge changes from next patch 2011-05-31 22:16:29 +02:00
kervala
4aa2c68151 Changed: #878 Fix typos in comments/code 2011-05-31 22:16:17 +02:00
kervala
37cfa5a9f2 Changed: Merge changes from next patch 2011-05-31 21:51:26 +02:00
rti
c913b2700e merge 2011-05-31 18:12:25 +02:00
rti
b55e9e210e Fixed: #1006 On Mac OS X, do glFinish() after vertex program upload to ensure program is ready to use. 2011-05-31 18:10:32 +02:00
rti
494628f330 Fixed: Compilation with GCC 4.6 2011-04-12 17:15:35 +02:00
rti
bb98e4985a Fixed: Compilation with GCC 4.6 2011-04-11 17:16:00 +02:00
rti
926f5f9818 Fixed: Compilation with GCC 4.6 2011-04-11 17:12:48 +02:00
kervala
d6fefddc98 Changed: Changes from last patch 2011-03-31 22:20:16 +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
eaf5f1179b Changed: Changes from last patch 2011-03-11 18:40:06 +01:00
kervala
a221b39585 Changed: #825 Remove all warnings when compiling Ryzom 2011-03-10 23:22:27 +01:00
rti
7e542e0201 Fixed: GEQT build on gcc 2011-03-10 00:54:37 +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
6abf79f20e Changed: Changes from last patch 2011-03-09 13:52:52 +01:00
kervala
9fe34c7d1e Changed: #878 Fix typos in comments/code 2011-03-09 13:46:52 +01:00
kervala
5ac53fb64e Changed: Changes from last patch 2011-03-09 13:40:44 +01:00
kervala
030bdfd729 Changed: #878 Fix typos in comments/code 2011-03-09 13:28:01 +01:00
aquiles
bccf9e45cb Changed: #1150 Added splash screen & new dialog + minor changes 2011-03-04 20:52:53 +01:00
kervala
84de30eb8f Changed: Changes from next patch 2011-03-03 19:32:52 +01:00
kervala
3a51ef7f07 Fixed: #868 0:Invalid account (2101) error caused by Shard Unifier Service and MySQL (patch provided by kerozcak) 2011-02-28 13:54:00 +01:00
aquiles
7d76796ee6 Changed: #1150 Moved private headers 2011-02-18 21:27:31 +01:00
vl
88a5ca2a20 Fixed: lookup the cert file 2011-02-18 09:44:40 +01:00
vl
4e1f9f0bbb Changed: make the in game creation account working 2011-02-18 09:02:47 +01:00
vl
4c7c4f8a21 Changed: Merge 2011-02-14 18:04:46 +01:00
vl
04d082ced8 Changed: use bundle resource if default cfg is not found 2011-02-14 18:03:49 +01:00
vl
5b59e4f95b Changed: disabled veget on mac since it crash 2011-02-14 18:03:35 +01:00
kervala
0b8820ca0c Fixed: Compilation under Linux with STLport 2011-02-11 18:05:19 +01:00
kervala
0d66aff643 Changed: #878 Fix typos in comments/code 2011-02-09 14:42:30 +01:00
kervala
50843ded97 Changed: #825 Remove all warnings when compiling Ryzom 2011-02-09 14:42:03 +01:00
kervala
d6ba3db1ad Fixed: NPC merchants with type 'sale' 2011-02-09 14:36:30 +01:00
kervala
d7e8b51c80 Changed: #1249 Endianness problems while access to disk or memory 2011-02-01 18:56:55 +01:00
kervala
8e1a1acb5d Changed: #1249 Endianness problems while access to disk or memory 2011-02-01 18:29:03 +01:00
kervala
fad58e7b19 Changed: #1246 Build on PPC machines (patch provided by Jeru) 2011-01-30 15:48:02 +01:00
sfb
8dc5927ff4 merge 2011-01-18 12:45:20 -06:00
sfb
4103b2a033 Fixed: #1236 Applied PackPro's fix for the EGS crash in PD messages, using memcpy instead of casts into the union. 2011-01-18 12:43:31 -06: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
96561a980c Fixed: Compilation under Linux 2011-01-14 17:00:39 +01:00
kervala
70c83d483f Fixed: Compilation under Linux 2011-01-14 16:23:22 +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
kervala
2c626e66df Changed: Cleanup missing continents in ryzom.world 2011-01-10 14:34:23 +01:00
kervala
12323e6df4 Changed: #1230 Missing Sheets for Yubos and NPCs 2011-01-10 14:18:39 +01:00
kervala
356816cba7 Changed: #1231 Remove VC++ projects and solutions which are not needed by Nevrax Linux makefiles 2011-01-10 13:50:07 +01:00
kervala
249c3189bb Fixed: #1230 Missing Sheets for Yubos and NPCs 2011-01-10 11:13:09 +01:00
kervala
10e8d60c8a Added: mp_generator and named_items_2_csv CMake projects 2011-01-09 15:51:12 +01:00
kervala
18785f0fbd Fixed: Compilation with luabind 0.7 (include luabind/version.hpp only when existing) 2010-12-30 12:20:42 +01:00
sfb
546749fedf Changed: Corrected typo in file and folder name for an sbrick sheet. 2010-12-21 11:48:09 -06:00
sfb
1b1e9e2f6b Changed: Remove "rc2" file from World Editor compilation - not used. 2010-12-21 11:32:56 -06:00
sfb
10cd011253 Changed: Sorted out sbrick files into usable hierarchy. 2010-12-21 11:31:11 -06:00
sfb
619d13ba44 Update: Organized sphrase sheets for easier browsing. 2010-12-21 08:27:55 -06:00
aquiles
27af1924fb Merge 2010-12-19 16:52:13 +01:00
aquiles
69122decec Changed: #1206 icon location; reinit timer on visible 2010-12-19 16:50:38 +01:00
rti
e316e95579 Fixed: missing include 2010-12-14 18:12:15 +01:00
aquiles
4c3a646465 Changed: #1206 icon location; reinit timer on visible 2010-12-12 23:28:03 +01:00
rti
99e60e2047 Fixed: #1216 plugin and resource paths 2010-12-12 22:12:45 +01:00