Commit graph

795 commits

Author SHA1 Message Date
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
kervala
4027e82360 Changed: #825 Remove all warnings when compiling Ryzom 2011-06-05 18:06:00 +02:00
kervala
5cd98b6e45 Changed: Replaced NLMISC::strlwr by NLMISC::toLower 2011-06-05 17:52:40 +02:00
kervala
f0f64cab63 Changed: Merge changes from next patch 2011-06-04 14:20:01 +02:00
kervala
f03da8e338 Changed: #878 Fix typos in comments/code 2011-06-04 13:48:27 +02:00
kervala
2a3e170bee Changed: #142 Replace atoi and sscanf by fromString when it's possible 2011-06-04 13:25:58 +02:00
kervala
8350856a05 Changed: Merge changes from next patch 2011-06-04 13:23:14 +02:00
kervala
714bb3aa3b Changed: #878 Fix typos in comments/code 2011-06-03 15:17:23 +02:00
kervala
16460bcf97 Changed: #825 Remove all warnings when compiling Ryzom 2011-06-03 10:51:03 +02:00
kervala
7a081ca8b5 Changed: Exceptions catched by reference 2011-06-03 10:42:40 +02:00
kervala
7c27c233eb Changed: Exceptions catched by reference 2011-06-03 10:35:25 +02:00
kervala
1312ede370 Changed: Exceptions catched by reference 2011-06-02 18:43:58 +02:00
kervala
f9cc842b82 Changed: Exceptions catched by reference 2011-06-02 18:31:40 +02:00
kervala
2d80b547fc Changed: Merge changes from next patch 2011-06-02 17:28:30 +02:00
kervala
d4a78b6fd1 Changed: Merge changes from next patch 2011-06-02 17:26:04 +02:00
Fabien_HENON
91fef65450 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.

--HG--
branch : gsoc2011-guildmissions
2011-05-31 22:00:27 +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
kervala
437657af2d Merge with gsoc2011-guildmissions 2011-05-30 13:33:07 +02:00
kervala
d245af6529 Changed: #878 Added new actions comments for translation_tools 2011-05-30 13:31:18 +02:00
Fabien_HENON
5fc9d23984 Merge
--HG--
branch : gsoc2011-guildmissions
2011-05-30 12:01:24 +02:00
sfb
2039038973 merge 2011-05-29 14:09:15 -05:00
sfb
977a6a7fd0 Changed: Applied patch fixing the mission_compiler_lib build under Linux 2011-05-29 14:08:46 -05:00
kervala
bf23d8c3a4 Changed: #825 Remove all warnings when compiling Ryzom 2011-05-29 13:57:31 +02:00
kervala
8208ec219b Changed: Compilation with VC++ 2010 without STLport 2011-05-28 15:52:48 +02:00
kervala
2efa01d373 Changed: #878 Fix typos in comments/code 2011-05-26 20:47:04 +02:00
kervala
697f8760b2 Added: CMake project for mission_compiler_fe 2011-05-26 18:21:06 +02:00
kervala
09f1eba8dc Added: CMake project for mission_compiler_lib 2011-05-26 18:08:04 +02:00
kervala
e909556883 Changed: #1177 VS 2010 does not work under CMake 2011-05-26 16:18:38 +02:00
kervala
d8c73a8772 Changed: Use static_assert in nlctassert macro if C++0X is supported by compiler 2011-05-26 16:14:45 +02:00
kervala
db57bd0c11 Changed: #825 Remove all warnings when compiling Ryzom 2011-05-26 16:07:35 +02:00
kervala
9008bb14ef Changed: Merge changes from next patch 2011-05-26 16:06:21 +02:00
kervala
0c69122378 Changed: Merge changes from next patch 2011-05-26 14:33:04 +02:00
kervala
ddc0180e74 Changed: Merge changes from next patch 2011-05-26 14:16:13 +02:00
rti
002af69d22 Fixed: crash when using SelectCharacter = [0,4] (thanks ace) 2011-05-25 16:52:52 +02:00
kervala
eab2812a63 Fixed: #1272 Compilation with GCC 4.6 (patch provided by Krop) 2011-05-24 13:46:40 +02:00
kervala
0831b95502 Changed: #825 Remove all warnings when compiling Ryzom 2011-05-24 13:40:23 +02:00
kervala
53b8976e80 Changed: Renamed monitor_service to ryzom_monitor_service for homogeneity 2011-05-24 13:38:34 +02:00
kervala
abdd31fa8c Changed: #1272 Fixed compilation with GCC 4.6 (patch provided by Naush) 2011-05-24 13:37:04 +02:00
kervala
14622fdf7d 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
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
2e4b7777bd Fixed: #1177 VS 2010 does not work under CMake 2011-05-12 12:49:17 +02:00
dnk-88
87a197cba5 Changed: Added preview particle system in geqt. 2011-05-08 01:11:10 +03:00
dnk-88
c4ce6dcdcc Fixed: geqt correctly handles in the FileOpenDialog of cancel action and empty icon 2011-05-07 18:23:23 +03:00
dnk-88
a3d7d31bad Header cascading section resizes is enabled. 2011-05-07 15:51:15 +03:00
Piotr Kaczmarek
f4cad3ea00 add web-based translation tool directory
--HG--
branch : gsoc2011-kerozcak
2011-04-29 21:40:17 +02:00
kervala
2c1cc5cbee Changed: Merge changes from next patch 2011-05-31 22:16:29 +02:00
kervala
73bf79340d Changed: #878 Fix typos in comments/code 2011-05-31 22:16:17 +02:00
kervala
89197ae54f Changed: Merge changes from next patch 2011-05-31 21:51:26 +02:00
rti
cd61e1531a merge 2011-05-31 18:12:25 +02:00
rti
1457deeb5e 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
31e9d7cc28 Fixed: Compilation with GCC 4.6 2011-04-12 17:15:35 +02:00
rti
33d45c3ca8 Fixed: Compilation with GCC 4.6 2011-04-11 17:16:00 +02:00
rti
6284c481b4 Fixed: Compilation with GCC 4.6 2011-04-11 17:12:48 +02:00
kervala
5ef788bbfb Changed: Changes from last patch 2011-03-31 22:20:16 +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
f4040f6c1b Changed: Changes from last patch 2011-03-11 18:40:06 +01:00
kervala
3fd9f30695 Changed: #825 Remove all warnings when compiling Ryzom 2011-03-10 23:22:27 +01:00
rti
02949cbf84 Fixed: GEQT build on gcc 2011-03-10 00:54:37 +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
0d159da185 Changed: Changes from last patch 2011-03-09 13:52:52 +01:00
kervala
cb73ccd99a Changed: #878 Fix typos in comments/code 2011-03-09 13:46:52 +01:00
kervala
0f5605e537 Changed: Changes from last patch 2011-03-09 13:40:44 +01:00
kervala
dc5b3628ec Changed: #878 Fix typos in comments/code 2011-03-09 13:28:01 +01:00
aquiles
553f11d111 Changed: #1150 Added splash screen & new dialog + minor changes 2011-03-04 20:52:53 +01:00
kervala
364f7fddff Changed: Changes from next patch 2011-03-03 19:32:52 +01:00
kervala
3360af02b0 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
8504c5a72a Changed: #1150 Moved private headers 2011-02-18 21:27:31 +01:00
vl
649756b3a2 Fixed: lookup the cert file 2011-02-18 09:44:40 +01:00
vl
d4452538cb Changed: make the in game creation account working 2011-02-18 09:02:47 +01:00
vl
e8c6bc896a Changed: Merge 2011-02-14 18:04:46 +01:00
vl
a91c6ea0a8 Changed: use bundle resource if default cfg is not found 2011-02-14 18:03:49 +01:00
vl
7659ba10f5 Changed: disabled veget on mac since it crash 2011-02-14 18:03:35 +01:00
kervala
56dc241c3d Fixed: Compilation under Linux with STLport 2011-02-11 18:05:19 +01:00
kervala
e9023e9a49 Changed: #878 Fix typos in comments/code 2011-02-09 14:42:30 +01:00
kervala
6881ee0ec2 Changed: #825 Remove all warnings when compiling Ryzom 2011-02-09 14:42:03 +01:00
kervala
558abd0470 Fixed: NPC merchants with type 'sale' 2011-02-09 14:36:30 +01:00
kervala
84b99dbbcc Changed: #1249 Endianness problems while access to disk or memory 2011-02-01 18:56:55 +01:00
kervala
51d09f375a Changed: #1249 Endianness problems while access to disk or memory 2011-02-01 18:29:03 +01:00
kervala
fc1deec2e8 Changed: #1246 Build on PPC machines (patch provided by Jeru) 2011-01-30 15:48:02 +01:00
sfb
6b8b28b908 merge 2011-01-18 12:45:20 -06:00
sfb
5636c930a5 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
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
807f26ffec Fixed: Compilation under Linux 2011-01-14 17:00:39 +01:00
kervala
5b4e12448f Fixed: Compilation under Linux 2011-01-14 16:23:22 +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
ed64aaeb62 Changed: #1231 Remove VC++ projects and solutions which are not needed by Nevrax Linux makefiles 2011-01-10 13:50:07 +01:00
kervala
ede0dcc1ab Fixed: #1230 Missing Sheets for Yubos and NPCs 2011-01-10 11:13:09 +01:00
kervala
462f0fdbbd Added: mp_generator and named_items_2_csv CMake projects 2011-01-09 15:51:12 +01:00
kervala
2c5001ee1b Fixed: Compilation with luabind 0.7 (include luabind/version.hpp only when existing) 2010-12-30 12:20:42 +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
72d1b7fe02 Changed: Remove "rc2" file from World Editor compilation - not used. 2010-12-21 11:32:56 -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
aquiles
f2a709828f Merge 2010-12-19 16:52:13 +01:00
aquiles
3ce6514c26 Changed: #1206 icon location; reinit timer on visible 2010-12-19 16:50:38 +01:00
rti
85872f0da5 Fixed: missing include 2010-12-14 18:12:15 +01:00
aquiles
8907ae1601 Changed: #1206 icon location; reinit timer on visible 2010-12-12 23:28:03 +01:00
rti
5a8f6fa208 Fixed: #1216 plugin and resource paths 2010-12-12 22:12:45 +01:00
rti
15bd88d6cc Added: Georges Editor Qt Logo 2010-12-12 19:18:52 +01:00
rti
8ff3df26b3 Fixed: #1190 Run Georges Editor Qt on Mac OS X 2010-12-12 19:10:58 +01:00
rti
9f0b717db6 merge 2010-12-12 16:02:52 +01:00
rti
e2fd59391b Changed: #1153 app bundle plist references atys.icns 2010-12-12 16:00:51 +01:00
aquiles
1c19d17a29 Changed: #1206 fixed missing stuff 2010-12-12 15:57:34 +01:00
kervala
50926ae62b Fixed: Compilation under Linux 2010-12-12 15:15:10 +01:00
kervala
2763a3ece2 Changed: #878 Fix typos in comments/code 2010-12-12 15:12:49 +01:00
kervala
626f05bcb9 Changed: #878 Fix typos in comments/code 2010-12-08 14:47:17 +01:00
kervala
ce5296a6bc Changed: #1016 entities_game_service segfault in ubuntu 64biten 2010-12-04 15:10:48 +01:00
kervala
dabb47d18a Changed: #1016 entities_game_service segfault in ubuntu 64biten 2010-12-03 15:18:39 +01:00
aquiles
656399e8be Changed: #1150 Switched to 3d view plugin 2010-11-29 15:43:46 +01:00
"Matt Raykowski"
7e56c729b0 Changed: Forgot to make World Editor an MFC-only tool. 2010-11-22 20:31:25 -06:00
aquiles
74d5adb2bb Changed: #1150 reactivated 3d view and improved behaviour 2010-11-22 21:21:07 +01:00
aquiles
6465db378b Fixed: #1163 files for new dialog 2010-11-21 18:59:29 +01:00
aquiles
ad1b7e27e8 Fixed: #1163 icons show up small in table and full size in tooltip over icon cell - dblClk on cell opens filedialog for changing icon 2010-11-21 17:43:38 +01:00
aquiles
2038260b3c Changed: #1150 added progress dialog to show CPath progress and changed config behaviour 2010-11-21 17:40:58 +01:00
kervala
f215136c20 Changed: #825 Remove all warnings when compiling Ryzom 2010-11-21 15:07:59 +01:00
kervala
d9ea939698 Changed: #878 Fix typos in comments/code 2010-11-19 11:20:59 +01:00
kervala
c9c9a24eb7 Changed: #825 Remove all warnings when compiling Ryzom 2010-11-19 11:20:46 +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
b3deb0ffd5 Changed: Fix crashes if interface doesn't have specified controls 2010-11-18 19:41:53 +01:00
kervala
6fe307b61d Changed: #878 Fix typos in comments/code 2010-11-18 19:38:10 +01:00
kervala
719513e31e Changed: Use auto ScreenAspectRatio by default (it works well everytime) 2010-11-18 19:33:34 +01:00
sfb
e663794d09 merge 2010-11-18 09:13:19 -06:00
sfb
78742785a8 Added: Windows shard start/stop script for the CMake build. 2010-11-18 09:09:30 -06:00
sfb
4ee53acaf1 Changed: Fixed paths that reference a moved NLLIGO header. 2010-11-18 09:09:03 -06:00
sfb
b84e13493d Changed: #842 Started adding World Editor to CMake build. 2010-11-18 09:08:24 -06:00
kervala
8e019a7fa4 Fixed: #1198 Window is too large when switching from fullscreen to windowed mode 2010-11-18 15:04:18 +01:00
kervala
09553acc5b Fixed: #1195 EGS crashing on client exit (Windows) 2010-11-18 09:52:38 +01:00