Commit graph

409 commits

Author SHA1 Message Date
Botanic
46c1952de6 changed default skin to cerulean and constrained proportions in css
--HG--
branch : rc-botanic-webdev
2013-06-16 23:28:58 -07:00
Botanic
0b8c4968e9 changed index.php to correct file and created charisma index for backup
--HG--
branch : rc-botanic-webdev
2013-06-16 23:13:38 -07:00
Botanic
19f7b3ec9c cleaned up formatting and added custom.css
--HG--
branch : rc-botanic-webdev
2013-06-16 22:57:09 -07:00
Botanic
b596502982 changed to default will override with custom.css
--HG--
branch : rc-botanic-webdev
2013-06-16 22:46:50 -07:00
Botanic
08d3d766a2 updated the index pages with home register and login
--HG--
branch : rc-botanic-webdev
2013-06-16 20:11:11 -07:00
Botanic
7f7c2cfb44 Merge with quitta-gsoc-2013
--HG--
branch : rc-botanic-webdev
2013-06-16 00:59:10 -07:00
Quitta
9f6349843c Fixed layout for register.tpl and login.tpl, it now uses also layout.tpl but with a parameter 'no_visible_elements' => 'TRUE'
--HG--
branch : quitta-gsoc-2013
2013-06-16 01:40:13 +02:00
Botanic
af6dac032b added .tpl.php and removed extra files
--HG--
branch : rc-botanic-webdev
2013-06-15 15:20:16 -07:00
Botanic
1b7f8f8370 Merge with quitta-gsoc-2013
--HG--
branch : rc-botanic-webdev
2013-06-15 15:16:57 -07:00
Quitta
260315d1ef Basic template integration with css
--HG--
branch : quitta-gsoc-2013
2013-06-16 00:13:13 +02:00
Botanic
6973070230 fixed to proper path
--HG--
branch : rc-botanic-webdev
2013-06-15 07:11:03 -07:00
Botanic
d7db141324 changed to use .php not html
--HG--
branch : rc-botanic-webdev
2013-06-15 07:08:38 -07:00
Botanic
4438e87a8c added charisma
--HG--
branch : rc-botanic-webdev
2013-06-15 07:01:11 -07:00
Botanic
900ce13318 forgot global
--HG--
branch : rc-botanic-webdev
2013-06-13 14:41:58 -07:00
Botanic
102a4c3950 auto create folders
--HG--
branch : rc-botanic-webdev
2013-06-13 14:33:23 -07:00
Botanic
1f648910ed latest changes to work on getting registration working
--HG--
branch : rc-botanic-webdev
2013-06-10 04:17:55 -07:00
Botanic
3e2278d692 updated template for registration and setting up add_user functions
--HG--
branch : rc-botanic-webdev
2013-06-07 04:05:28 -07:00
Botanic
40ba525e5a added base drupal module and removed old phtml file
--HG--
branch : rc-botanic-webdev
2013-06-06 23:07:47 -07:00
Botanic
524e338f68 cleaned up templates and got languages working
--HG--
branch : rc-botanic-webdev
2013-06-06 22:59:11 -07:00
Botanic
9ed3f20570 added in smarty, still need to finish making it load the correct template properly
--HG--
branch : rc-botanic-webdev
2013-06-06 21:43:11 -07:00
Botanic
e66c77470f updated files that were not merged
--HG--
branch : rc-botanic-webdev
2013-06-06 03:38:24 -07:00
Botanic
ae9ffef35d fixed thanks kervala
--HG--
branch : rc-botanic-webdev
2013-06-06 01:28:12 -07:00
Botanic
0a3020e971 added in-game template file
--HG--
branch : rc-botanic-webdev
2013-06-05 23:39:33 -07:00
Botanic
4d3acc9cc0 added base class file for sql as well as updated users to use class
--HG--
branch : rc-botanic-webdev
2013-06-05 23:19:40 -07:00
Botanic
c66d9cf225 changed to use class
--HG--
branch : rc-botanic-webdev
2013-06-05 23:10:00 -07:00
Botanic
c256187ead initial work on ams_lib
--HG--
branch : rc-botanic-webdev
2013-06-05 23:04:46 -07:00
Botanic
b76fe233da why the hell make the faster values for "debug only" waiting it so 1990's
--HG--
branch : rc-botanic-webdev
2013-06-05 19:59:53 -07:00
Botanic
26c4b51d01 fixed warning
--HG--
branch : rc-botanic-webdev
2013-06-05 19:43:10 -07:00
Botanic
3439d1063b fixed warning
--HG--
branch : rc-botanic-webdev
2013-06-05 19:27:06 -07:00
Botanic
515a665339 no reason to make people change the logs path every time
--HG--
branch : rc-botanic-webdev
2013-06-05 19:19:09 -07:00
Botanic
e4b24f08da Fixed warnings and logout
--HG--
branch : rc-botanic-webdev
2013-06-05 19:14:53 -07:00
Botanic
ea42101296 No reason to hardcode the path
--HG--
branch : rc-botanic-webdev
2013-06-05 19:14:49 -07:00
Botanic
395c194acc bad eol's
--HG--
branch : rc-botanic-webdev
2013-06-06 02:47:26 -07:00
dfighter1985
d2a7c66e9f Use to .toUTF8() instead of .toStdString().
--HG--
branch : client_config_qt
2013-05-04 21:55:41 +02:00
dfighter1985
e950834079 Merged default
--HG--
branch : client_config_qt
2013-05-04 21:23:55 +02:00
kervala
6eec6cb861 Changed: Typo fixes and French comments translated to English (Thanks to DuDraig!) 2013-02-13 14:40:41 +01:00
kervala
f5dec3c1ca Changed: Typo fixes and French comments translated to English (Thanks to DuDraig!) 2013-02-12 22:48:37 +01:00
mattraykowski
de3371cae9 merging 2013-02-12 12:53:19 -06:00
sfb
9343d45e22 fixes #16 - forces tool to create an empty file in the root tool directory as a basis for initial patch generation 2013-02-12 12:45:46 -06:00
mattraykowski
cd2134e671 merging 2013-02-12 10:28:20 -06:00
mattraykowski
8ced186cfd merge from default
--HG--
branch : gsoc2012-achievements
2013-02-12 10:24:22 -06:00
kervala
671827225d Changed: French comments translated to English 2013-02-11 22:24:48 +01:00
kervala
6e498aefad Changed: Typo fixes (thanks to Vagrant!) 2013-02-09 10:05:32 +01:00
kervala
45c8b20f39 Changed: Typo fixes (thanks to Vagrant!) 2013-02-08 13:17:44 +01:00
mattraykowski
6f64abe84a fixes issue #8 - checks for RYZOM_PATH env var, starts in build folder and turns on status line display in screen. 2013-02-01 13:07:51 -06:00
kervala
5efeb5ba62 Fixed: Compilation with VC++ 2010 and 2012 2012-12-11 12:22:41 +01:00
kervala
b83b8563a6 Fixed: Compilation with GCC 2012-12-08 13:12:29 +01:00
kervala
f89fdf3c24 Fixed: PCH for Georges editor Qt 2012-12-08 13:12:15 +01:00
kervala
0cabe14089 Changed: Code simplification 2012-12-08 11:24:43 +01:00
kervala
11e88fed8f Changed: Minor changes 2012-10-28 13:47:09 +01:00
kervala
eb6ccdaad8 Fixed: MFC tools compilation with STLport 2012-10-28 13:41:50 +01:00
kervala
a3376d32a4 fixes #3 allow Qt without STLport to link to NeL with STLport 2012-10-28 13:34:58 +01:00
kervala
34bf41082f Fixed: Compilation with 64 bits MFC 2012-10-28 12:22:30 +01:00
kervala
b7be696848 Move all PACS headers in nel/include/pacs directory (fixes #2) 2012-10-28 11:55:21 +01:00
mattraykowski
8438fdda44 merged default, resvolved conflicts.
--HG--
branch : gsoc2012-achievements
2012-10-17 10:00:28 -05:00
mattraykowski
92399cb5d2 merged from default
--HG--
branch : gsoc2012-achievements
2012-10-17 08:52:01 -05:00
sfb
050835b535 merging gsoc2012-achievements
--HG--
branch : gsoc2012-achievements
2012-10-16 12:05:23 -05:00
kervala
d8c7fa52f9 Changed: Replaced string empty comparisons with empty() 2012-10-06 18:17:57 +02:00
kervala
8eaf7d889a Changed: Use *_PREFIX instead of fixed values with INSTALL 2012-09-27 22:17:47 +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
sfb
b858478e31 Removed: #1378 Removed the reference implementation, the full implementation is available at code/web/app and code/web/api. 2012-09-24 08:18:46 -05:00
kervala
ece10f2965 Fixed: Compilation with GCC 2012-09-23 20:26:26 +02:00
kervala
8ab293a6ec Changed: #1493 Fixed some directories 2012-09-22 23:42:40 +02:00
kervala
7a04e920e1 Fixed: #1493 MultiArch support 2012-09-22 22:57:38 +02:00
kaetemi
09c3e0880d Added: CMake projects for ryzom MFC tools (georges edit and world editor plugins) 2012-07-27 12:36:36 +02:00
kaetemi
59bdae308e Fixed: Compile error in mfc world editor primitive plugin 2012-07-25 10:13:58 +02:00
sfb
af454dd1cf Fixed EOL issues and added .hgeol file. 2012-05-29 08:31:11 -05:00
kervala
4be2469c8b Fixed: Compilation under Windows 2012-05-19 23:47:43 +02:00
vl
f333236a6b Merge 2012-05-04 12:08:04 +02:00
kervala
36fcd706fa Changed: #825 Remove all warnings when compiling Ryzom 2012-04-07 23:47:55 +02:00
kervala
de9b4be9c6 Changed: #825 Remove all warnings when compiling Ryzom 2012-04-07 22:30:39 +02:00
sfb
e2b2b8ffca Fixed: #1378 Imported nimetu's WebIG reference implementation. 2012-03-22 15:48:13 -05:00
sfb
4c2a3b6801 Fixed: #1414 Copied index.ctp to listdir.ctp and admin_index.ctp to eliminate symlinks. 2012-03-22 15:18:17 -05:00
sfb
a3ca1d10bc Changed: #1414 Removing symlinks. 2012-03-22 15:17:12 -05:00
sfb
1279aa5d3a merge from default
--HG--
branch : gsoc2011-kerozcak
2012-03-22 14:31:07 -05:00
dfighter1985
28e3393dce Translation files are now embedded into the binary, also made the source groups a bit more sane.
--HG--
branch : client_config_qt
2012-03-16 17:35:37 +01:00
dfighter1985
9796bc02b2 The Qt Ryzom client configuration tool can now be built with CMake!
--HG--
branch : client_config_qt
2012-03-16 04:34:16 +01:00
dfighter1985
fd516bcf82 Adding the Qt client config tool files from the other repo.
--HG--
branch : client_config_qt
2012-03-16 00:50:04 +01:00
kervala
3c47b9f8d5 Fixed: #1441 Remove all remaining .vcproj, Makefiles, automake scripts, etc... 2012-03-03 10:49:42 +01: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
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
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
kervala
fbf81fc0b9 Fixed: #1380 pdr_util, -o command line option (patch provided by nimetu) 2011-10-21 11:34:58 +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
ab4468c48f Changed: #28 Clean comments 2011-09-23 00:20:20 +02:00
kaetemi
5a5304f823 Changed: #1093 Added generic helmets directory to export shape sources. 2011-09-21 23:17:39 +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
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
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
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
kerozcak
ccf80ff9d3 Changed: #1315 Added files forgotten to track.
--HG--
branch : gsoc2011-kerozcak
2011-07-20 12:21:20 +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
kerozcak
0055bd7c4e Changed: #1315 Update.
--HG--
branch : gsoc2011-kerozcak
2011-07-14 16:49:25 +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
kervala
81d2817c44 Changed: #878 Fix typos in comments/code 2011-06-08 10:14:14 +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
f03da8e338 Changed: #878 Fix typos in comments/code 2011-06-04 13:48:27 +02:00
kervala
7c27c233eb Changed: Exceptions catched by reference 2011-06-03 10:35:25 +02:00
kervala
f9cc842b82 Changed: Exceptions catched by reference 2011-06-02 18:31:40 +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
d245af6529 Changed: #878 Added new actions comments for translation_tools 2011-05-30 13:31:18 +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
8208ec219b Changed: Compilation with VC++ 2010 without STLport 2011-05-28 15:52:48 +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
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
73bf79340d Changed: #878 Fix typos in comments/code 2011-05-31 22:16:17 +02:00
rti
31e9d7cc28 Fixed: Compilation with GCC 4.6 2011-04-12 17:15:35 +02:00
rti
02949cbf84 Fixed: GEQT build on gcc 2011-03-10 00:54:37 +01:00
aquiles
553f11d111 Changed: #1150 Added splash screen & new dialog + minor changes 2011-03-04 20:52:53 +01:00
aquiles
8504c5a72a Changed: #1150 Moved private headers 2011-02-18 21:27:31 +01:00
kervala
56dc241c3d Fixed: Compilation under Linux with STLport 2011-02-11 18:05:19 +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
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
462f0fdbbd Added: mp_generator and named_items_2_csv CMake projects 2011-01-09 15:51:12 +01:00
sfb
72d1b7fe02 Changed: Remove "rc2" file from World Editor compilation - not used. 2010-12-21 11:32:56 -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
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
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