Commit graph

1209 commits

Author SHA1 Message Date
Quitta
9806ea6ef0 Trying to intigrate the home template in the inheritance structure of smarty
--HG--
branch : quitta-gsoc-2013
2013-06-17 15:39:55 +02:00
Botanic
983ea23da6 fixed js issue
--HG--
branch : rc-botanic-webdev
2013-06-17 03:08:45 -07:00
Quitta
879f28e45f Tour seems to work here, not sure though
--HG--
branch : quitta-gsoc-2013
2013-06-17 11:03:31 +02:00
Botanic
b1c97cab76 working on help tips
--HG--
branch : rc-botanic-webdev
2013-06-17 00:25:04 -07:00
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
2aea567fe2 Changed: Moved Ryzom detailed version in client 2013-04-29 14:46:53 +02:00
kervala
f68cda5cd2 Changed: Process EventCloseWindowId by client 2013-04-29 14:44:39 +02:00
kervala
920cbf55ca Fixed: Assign instead of a comparison 2013-04-29 10:34:33 +02:00
kervala
b0e717728b Changed: French comments translated to English 2013-04-29 10:33:33 +02:00
kervala
33c73f3f16 fixes #33 build failure/error using clang 2013-03-26 19:57:00 +01:00
dfighter1985
2bdceaecda Resolved some build errors occuring after previous commit. 2013-02-21 01:25:50 +01:00
mattraykowski
6e309fee7a changed #20 - moved the libwww package discovery and fixed include paths in library project. 2013-02-19 10:04:40 -06:00
dfighter1985
8d54b6f77d MODIFIED: Resolved build error with FINAL_VERSION set. 2013-02-18 01:26:56 +01:00
dfighter1985
ecbcdf388f MODIFIED: Resolved some GCC build errors. 2013-02-17 14:30:05 +01:00
mattraykowski
e7e51f01e0 merging gui editor repo. 2013-02-14 09:53:06 -06:00
mattraykowski
0eeeaa401f removed line from a bad merge of the character achievement code, sorry 2013-02-14 07:47:40 -06:00
dfighter1985
a920c7e261 another merge from mainline 2013-02-14 13:56:05 +01:00
dfighter1985
fcb736c387 Merged mainline default branch changes.
--HG--
branch : gsoc2012-gui-editor
2013-02-14 10:47:10 +01: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
c71e6e82f1 Changed: Typo fixes (thanks to Vagrant!) 2013-02-08 13:26:07 +01:00
kervala
45c8b20f39 Changed: Typo fixes (thanks to Vagrant!) 2013-02-08 13:17:44 +01:00
kervala
be0cd80674 Changed: Use OpenGL by default with an ATI card and without a warning dialog 2013-02-01 21:58:05 +01:00
mattraykowski
f370f767ef fixes issue #9 - deleted the 'highres' graphvars from config files. 2013-02-01 13:09:53 -06: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
mattraykowski
af14e1e591 merge, fixed inconsistent newlines 2013-01-30 09:57:53 -06:00
mattraykowski
971c2ba4a3 Fixed: #5 Applied check to validate parent skeleton is valid, patch provided by Vinicius Arroya. 2013-01-30 09:54:55 -06:00
kervala
b275536528 Changed: Included "fe_types.h" 2012-12-28 15:42:31 +01:00
kervala
16dc8db7ca Changed: GCC warnings 2012-12-21 16:51:10 +01:00
kervala
e6036c3047 Changed: frontend_service PCH compilation 2012-12-21 16:47:34 +01:00
kervala
df5376cc2a Changed: ai_service PCH compilation 2012-12-21 14:39:38 +01:00
kervala
5efeb5ba62 Fixed: Compilation with VC++ 2010 and 2012 2012-12-11 12:22:41 +01:00
kervala
d53a4bca98 Fixed: PCH for client_sheets 2012-12-09 08:48:15 +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
3de412e4d5 Changed: Sorted landmarks 2012-12-01 12:01:24 +01:00
kervala
518a30ee6c Changed: Disabled some useless temporary files 2012-12-01 12:00:46 +01:00
kervala
2c5d5a3bcd Changed: Typos 2012-12-01 11:34:03 +01:00
kervala
0b9fc06b7e Fixed: clang compile issue with stream operator >> confusion (patch provided by tebruno99, thanks!) 2012-11-29 19:19:34 +01:00
kervala
b94b59c9b7 Changed: Changes in game_share 2012-11-26 20:19:14 +01:00
kervala
681836f620 Fixed: Server side issues 2012-11-26 18:41:30 +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
f21fa78062 Fixed: Client side issues 2012-11-24 20:24:06 +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
8be848dd2b Fixed: Server side issues 2012-11-24 20:20:21 +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
kervala
0d782993f9 Fixed #1: Implement anisotropic filtering for textures 2012-10-27 17:46:13 +02: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
25dd379d7e Changed: Replaced string empty comparisons with empty() 2012-10-06 17:17:26 +02:00
kervala
65a3946ea8 Fixed: #1498 Client fails to switch shortcut bars on ctrl + number hotkeys 2012-10-06 17:12:23 +02:00
kervala
3d50e0160d Changed: #878 Fix typos in comments/code 2012-10-06 17:09:03 +02:00
kervala
7c4be0fb74 Changed: Synchronization with SVN 2012-10-05 20:37:15 +02:00
kervala
e4e12ff6c4 Changed: Synchronization with SVN 2012-10-05 14:57:05 +02:00
kervala
6f53c4cc23 Changed: #878 Fix typos in comments/code 2012-10-01 10:08:52 +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
5c82fcd39c Fixed: #1497 optimize the drawing of radar by removing multiple access to local db (patch provided by yricl, a big thanks!) 2012-09-29 14:35:43 +02:00
kervala
c82a9d7304 Changed: Use ryzom_client as icons 2012-09-28 20:52:56 +02:00
kervala
b04836f40e Fixed: #1444 Add details for user-agent 2012-09-28 20:51:53 +02:00
kervala
04d9b961bc Changed: Renamed some Linux files to not conflict with Ryzom package 2012-09-27 22:23:06 +02:00
kervala
8eaf7d889a Changed: Use *_PREFIX instead of fixed values with INSTALL 2012-09-27 22:17:47 +02:00
kervala
a5218b9258 Changed: Synchronization with SVN 2012-09-26 12:45:34 +02:00
kervala
2e4df39c5b Fixed: Don't compress textures in DXTC when used as buttons 2012-09-26 12:44:52 +02:00
kervala
62435e4f2f Changed: Don't compile 7zDec if WITH_RYZOM_TOOLS is disabled 2012-09-26 12:44:03 +02:00
kervala
a9fa9bb78a Changed: Install data_leveldesign if WITH_RYZOM_TOOLS is enabled 2012-09-26 12:43:18 +02:00
kervala
edee553e1b Fixed: Don't compress textures in DXTC when used as buttons 2012-09-25 21:21:58 +02:00
kervala
e7d490d9a8 Changed: #825 Remove all warnings when compiling Ryzom 2012-09-25 14:15:04 +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
e8e75d05c0 Changed: Synchronization with SVN 2012-09-22 23:53:46 +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
kervala
a2aefedfb5 Fixed: ryzom.xpm should be 32x32 instead of 48x48 2012-09-22 21:07:35 +02:00
kervala
49900c0be3 Fixed: Compilation under unices (syslog.h included before chat_displayer.h creates a conflict with LOG_WARNING) 2012-09-18 09:11:23 +02:00
sfb
e48a8bd13e Fixed: #1490 Added a 'no context' object in the createNamedItemInBag admin function. 2012-09-12 14:25:01 -05:00
kervala
e2237d3971 Changed: Reverted another previous fix (sorry again) 2012-09-11 23:15:56 +02:00
kervala
32c376fefa Changed: Reverted a previous fix (sorry) 2012-09-11 22:50:10 +02:00
kervala
f3828a0b92 Changed: Synchronization with SVN 2012-09-11 21:49:37 +02:00
kervala
eea1360021 Changed: Synchronization with SVN 2012-09-11 21:39:30 +02:00
kervala
8922f96b9a Changed: Synchronization with SVN 2012-09-11 20:26:36 +02:00
SirCotare
c96ff882cd #1470 initial EGS with achievements
--HG--
branch : gsoc2012-achievements
2012-08-07 17:42:25 +02:00
kaetemi
ebabe8ed73 Fixed: Missed something 2012-07-27 22:51:38 +02:00
kaetemi
6404f8eafa Changed: Use the high resolution local time function instead of the funky code when getting the local time in the client. Use the timer probe function to check if it is necessary to set the cpu mask in the client 2012-07-27 22:35:26 +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
kervala
0e1d8836a7 Fixed: Bad path in ryzom.desktop.in 2012-07-20 18:51:50 +02:00
dfighter1985
44643839be CHANGED: #1471 The local string mapper is now instantiated by CWidgetManager.
--HG--
branch : gui-refactoring
2012-07-16 06:16:43 +02:00
dfighter1985
63f7fa81e9 CHANGED: #1471 it's a good idea to register GUI widget classes with the reflection system if we want to use them!
--HG--
branch : gui-refactoring
2012-07-14 05:16:09 +02:00
dfighter1985
b8030b966a CHANGED: #1471 Apparently it's a bad idea for NLMISC to depend on a global in Ryzom client, since then it cannot be linked with other binaries.
--HG--
branch : gui-refactoring
2012-07-14 01:46:22 +02:00
dfighter1985
e2abe1e33e CHANGED: #1471 CInterfaceParser is now a component of CWidgetManager, and is instantiated by an abstract factory method. (IParser::createParser())
--HG--
branch : gui-refactoring
2012-07-13 05:37:09 +02:00
dfighter1985
bab0ca184a CHANGED: #1471 no need to go thru CInterfaceManager, when CViewRenderer has it's own Singleton.
--HG--
branch : gui-refactoring
2012-07-12 23:04:36 +02:00
dfighter1985
ba6fd68efc CHANGED: #1474 CInterfaceManager is no longer a subclass of CInterfaceParser, instead CInterfaceParser is a component of CInterfaceManager.
--HG--
branch : gui-refactoring
2012-07-12 21:39:51 +02:00
dfighter1985
f9cda42c8d CHANGED: #1471 Moved some Lua related code from CInterfaceManager to CLuaManager and CInterfaceParser.
--HG--
branch : gui-refactoring
2012-07-12 09:01:35 +02:00
dfighter1985
11d2efb96f CHANGED: #1471 Moved CProcedure code to it's own files, and also moved the procedure handling code from CInterfaceManager to CWidgetManager.
--HG--
branch : gui-refactoring
2012-07-12 05:29:33 +02:00
dfighter1985
530b542e4a CHANGED: #1471 Moved some more GUI code from CInterfaceManager to CWidgetManager.
--HG--
branch : gui-refactoring
2012-07-11 22:27:22 +02:00
dfighter1985
b8f3aff5b1 CHANGED: #1471 Moved the input event handling code from CInterfaceManager to CWidgetManager.
--HG--
branch : gui-refactoring
2012-07-11 06:44:34 +02:00
dfighter1985
ad764e7bf0 CHANGED: #1471 Moved the widget drawing code from CInterfaceManager to CWidgetManager, so the GUI library can now draw the widgets!
--HG--
branch : gui-refactoring
2012-07-10 23:01:09 +02:00
dfighter1985
42a282de48 CHANGED: #1471 Moved the contexthelp drawing/controlling code to the GUI library.
--HG--
branch : gui-refactoring
2012-07-10 06:25:15 +02:00
dfighter1985
dcadeb9095 CHANGED: #1471 CInterfaceParser is now part of the Nel GUI library and is under the NLGUI namespace.
--HG--
branch : gui-refactoring
2012-07-09 03:45:00 +02:00