Commit graph

1196 commits

Author SHA1 Message Date
Botanic
545b6c12b3 Merge with quitta-gsoc-2013 2013-06-15 15:16:57 -07:00
Quitta
a5f6716f88 Basic template integration with css 2013-06-16 00:13:13 +02:00
Botanic
55ae58511a fixed to proper path 2013-06-15 07:11:03 -07:00
Botanic
6b6313fa52 changed to use .php not html 2013-06-15 07:08:38 -07:00
Botanic
ac753b17a0 added charisma 2013-06-15 07:01:11 -07:00
Botanic
80e8daa0be forgot global 2013-06-13 14:41:58 -07:00
Botanic
e657d24824 auto create folders 2013-06-13 14:33:23 -07:00
Botanic
aad9d74e40 latest changes to work on getting registration working 2013-06-10 04:17:55 -07:00
Botanic
d476f58a94 updated template for registration and setting up add_user functions 2013-06-07 04:05:28 -07:00
Botanic
80e7f92637 added base drupal module and removed old phtml file 2013-06-06 23:07:47 -07:00
Botanic
931d59d420 cleaned up templates and got languages working 2013-06-06 22:59:11 -07:00
Botanic
f02620b4ff added in smarty, still need to finish making it load the correct template properly 2013-06-06 21:43:11 -07:00
Botanic
89ae4f94de updated files that were not merged 2013-06-06 03:38:24 -07:00
Botanic
d6e146e864 fixed thanks kervala 2013-06-06 01:28:12 -07:00
Botanic
409376af8d added in-game template file 2013-06-05 23:39:33 -07:00
Botanic
1b276e849a added base class file for sql as well as updated users to use class 2013-06-05 23:19:40 -07:00
Botanic
b4ec05e9b3 changed to use class 2013-06-05 23:10:00 -07:00
Botanic
bc25fb664d initial work on ams_lib 2013-06-05 23:04:46 -07:00
Botanic
c2119e322d why the hell make the faster values for "debug only" waiting it so 1990's 2013-06-05 19:59:53 -07:00
Botanic
e0bcc7802c fixed warning 2013-06-05 19:43:10 -07:00
Botanic
82af1c860e fixed warning 2013-06-05 19:27:06 -07:00
Botanic
e289da824f no reason to make people change the logs path every time 2013-06-05 19:19:09 -07:00
Botanic
e68ab3ca71 Fixed warnings and logout 2013-06-05 19:14:53 -07:00
Botanic
d9e85cba47 No reason to hardcode the path 2013-06-05 19:14:49 -07:00
Botanic
b22b2a174e bad eol's 2013-06-06 02:47:26 -07:00
dfighter1985
ab7d2c1a53 Use to .toUTF8() instead of .toStdString(). 2013-05-04 21:55:41 +02:00
dfighter1985
29793ee97b Merged default 2013-05-04 21:23:55 +02:00
kervala
8a68c5e54f Changed: Moved Ryzom detailed version in client 2013-04-29 14:46:53 +02:00
kervala
b35bc728d3 Changed: Process EventCloseWindowId by client 2013-04-29 14:44:39 +02:00
kervala
3c97196d1b Fixed: Assign instead of a comparison 2013-04-29 10:34:33 +02:00
kervala
2186e92527 Changed: French comments translated to English 2013-04-29 10:33:33 +02:00
kervala
3edb0e439c fixes #33 build failure/error using clang 2013-03-26 19:57:00 +01:00
dfighter1985
1210f92ffe Resolved some build errors occuring after previous commit. 2013-02-21 01:25:50 +01:00
mattraykowski
9048c3bb21 changed #20 - moved the libwww package discovery and fixed include paths in library project. 2013-02-19 10:04:40 -06:00
dfighter1985
4243639143 MODIFIED: Resolved build error with FINAL_VERSION set. 2013-02-18 01:26:56 +01:00
dfighter1985
b25d4b628f MODIFIED: Resolved some GCC build errors. 2013-02-17 14:30:05 +01:00
mattraykowski
aa261f28a4 merging gui editor repo. 2013-02-14 09:53:06 -06:00
mattraykowski
104ac66fae removed line from a bad merge of the character achievement code, sorry 2013-02-14 07:47:40 -06:00
dfighter1985
dee1b19544 another merge from mainline 2013-02-14 13:56:05 +01:00
dfighter1985
543488b490 Merged mainline default branch changes. 2013-02-14 10:47:10 +01:00
kervala
2e7540370a Changed: Typo fixes and French comments translated to English (Thanks to DuDraig!) 2013-02-13 14:40:41 +01:00
kervala
ba089f8548 Changed: Typo fixes and French comments translated to English (Thanks to DuDraig!) 2013-02-12 22:48:37 +01:00
mattraykowski
1740fc306c merging 2013-02-12 12:53:19 -06:00
sfb
847f455a97 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
d285e4c6df merging 2013-02-12 10:28:20 -06:00
mattraykowski
47098b3a63 merge from default 2013-02-12 10:24:22 -06:00
kervala
5794497a79 Changed: French comments translated to English 2013-02-11 22:24:48 +01:00
kervala
8409d5a371 Changed: Typo fixes (thanks to Vagrant!) 2013-02-09 10:05:32 +01:00
kervala
39668984c1 Changed: Typo fixes (thanks to Vagrant!) 2013-02-08 13:26:07 +01:00
kervala
98606fb5b5 Changed: Typo fixes (thanks to Vagrant!) 2013-02-08 13:17:44 +01:00
kervala
2dd0bed9d9 Changed: Use OpenGL by default with an ATI card and without a warning dialog 2013-02-01 21:58:05 +01:00
mattraykowski
22e4fd9610 fixes issue #9 - deleted the 'highres' graphvars from config files. 2013-02-01 13:09:53 -06:00
mattraykowski
50e6c8c278 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
75f40c9e79 merge, fixed inconsistent newlines 2013-01-30 09:57:53 -06:00
mattraykowski
302d4bd5c9 Fixed: #5 Applied check to validate parent skeleton is valid, patch provided by Vinicius Arroya. 2013-01-30 09:54:55 -06:00
kervala
bf1e4360fc Changed: Included "fe_types.h" 2012-12-28 15:42:31 +01:00
kervala
e9c3e19125 Changed: GCC warnings 2012-12-21 16:51:10 +01:00
kervala
375832b61e Changed: frontend_service PCH compilation 2012-12-21 16:47:34 +01:00
kervala
3e68f0b51f Changed: ai_service PCH compilation 2012-12-21 14:39:38 +01:00
kervala
2b4119c428 Fixed: Compilation with VC++ 2010 and 2012 2012-12-11 12:22:41 +01:00
kervala
3b835a5407 Fixed: PCH for client_sheets 2012-12-09 08:48:15 +01:00
kervala
970a3220d0 Fixed: Compilation with GCC 2012-12-08 13:12:29 +01:00
kervala
43104cd2e9 Fixed: PCH for Georges editor Qt 2012-12-08 13:12:15 +01:00
kervala
4d6ab65a36 Changed: Code simplification 2012-12-08 11:24:43 +01:00
kervala
6777822ce8 Changed: Sorted landmarks 2012-12-01 12:01:24 +01:00
kervala
4eaad58d6a Changed: Disabled some useless temporary files 2012-12-01 12:00:46 +01:00
kervala
1adc7d8efa Changed: Typos 2012-12-01 11:34:03 +01:00
kervala
82fd464c39 Fixed: clang compile issue with stream operator >> confusion (patch provided by tebruno99, thanks!) 2012-11-29 19:19:34 +01:00
kervala
99a1c463a1 Changed: Changes in game_share 2012-11-26 20:19:14 +01:00
kervala
3378daf329 Fixed: Server side issues 2012-11-26 18:41:30 +01:00
dfighter1985
421582d386 MODIFIED: #1471 Merged mainline default to this branch. 2012-11-25 05:22:40 +01:00
kervala
8ffcceaffd Fixed: Client side issues 2012-11-24 20:24:06 +01:00
kervala
655b79ce7b Changed: Minor typos 2012-11-24 20:23:13 +01:00
kervala
084c457d85 Changed: New STRING_MANAGER type clan 2012-11-24 20:21:45 +01:00
kervala
97e517f5b5 Fixed: Server side issues 2012-11-24 20:20:21 +01:00
kervala
05ae6371c1 Changed: Minor changes 2012-10-28 13:47:09 +01:00
kervala
89e78b8ad2 Fixed: MFC tools compilation with STLport 2012-10-28 13:41:50 +01:00
kervala
c4706adc76 fixes #3 allow Qt without STLport to link to NeL with STLport 2012-10-28 13:34:58 +01:00
kervala
8e110a8bb8 Fixed: Compilation with 64 bits MFC 2012-10-28 12:22:30 +01:00
kervala
b9fd49ebc3 Move all PACS headers in nel/include/pacs directory (fixes #2) 2012-10-28 11:55:21 +01:00
kervala
40227ccec5 Fixed #1: Implement anisotropic filtering for textures 2012-10-27 17:46:13 +02:00
mattraykowski
01cd3859ca merged default, resvolved conflicts. 2012-10-17 10:00:28 -05:00
mattraykowski
1c8841eb57 merged from default 2012-10-17 08:52:01 -05:00
sfb
7387d6c47d merging gsoc2012-achievements 2012-10-16 12:05:23 -05:00
kervala
0698f1abc2 Changed: Replaced string empty comparisons with empty() 2012-10-06 18:17:57 +02:00
kervala
2b86a180e6 Changed: Replaced string empty comparisons with empty() 2012-10-06 17:17:26 +02:00
kervala
9a12a5b4c2 Fixed: #1498 Client fails to switch shortcut bars on ctrl + number hotkeys 2012-10-06 17:12:23 +02:00
kervala
3a361f1c9a Changed: #878 Fix typos in comments/code 2012-10-06 17:09:03 +02:00
kervala
790bd4d0ef Changed: Synchronization with SVN 2012-10-05 20:37:15 +02:00
kervala
e8b1eedc97 Changed: Synchronization with SVN 2012-10-05 14:57:05 +02:00
kervala
c9a3e9efbc Changed: #878 Fix typos in comments/code 2012-10-01 10:08:52 +02:00
kervala
864363165a Changed: Install data_leveldesign if ryzom_tools are enabled 2012-10-01 10:07:41 +02:00
kervala
cfa0981f0d Changed: Synchronization with SVN 2012-10-01 10:07:09 +02:00
kervala
fb17aa63e1 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
cb8b6a0e9f Changed: Use ryzom_client as icons 2012-09-28 20:52:56 +02:00
kervala
7d12dd6058 Fixed: #1444 Add details for user-agent 2012-09-28 20:51:53 +02:00
kervala
21c7be0b17 Changed: Renamed some Linux files to not conflict with Ryzom package 2012-09-27 22:23:06 +02:00
kervala
34d1e33c1c Changed: Use *_PREFIX instead of fixed values with INSTALL 2012-09-27 22:17:47 +02:00
kervala
03db8750ad Changed: Synchronization with SVN 2012-09-26 12:45:34 +02:00
kervala
f21467c466 Fixed: Don't compress textures in DXTC when used as buttons 2012-09-26 12:44:52 +02:00
kervala
3250ae42b2 Changed: Don't compile 7zDec if WITH_RYZOM_TOOLS is disabled 2012-09-26 12:44:03 +02:00
kervala
1cc9a7b8ec Changed: Install data_leveldesign if WITH_RYZOM_TOOLS is enabled 2012-09-26 12:43:18 +02:00
kervala
6fa100fef8 Fixed: Don't compress textures in DXTC when used as buttons 2012-09-25 21:21:58 +02:00
kervala
25bfadcff8 Changed: #825 Remove all warnings when compiling Ryzom 2012-09-25 14:15:04 +02:00
kervala
182a79f2cb Changed: #825 Remove all warnings when compiling Ryzom 2012-09-25 13:20:25 +02:00
kervala
3429d7ba42 Changed: #825 Remove all warnings when compiling Ryzom 2012-09-25 12:33:02 +02:00
sfb
53077ccd40 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
898c87ebe1 Fixed: Compilation with GCC 2012-09-23 20:26:26 +02:00
kervala
853e110ac5 Changed: Synchronization with SVN 2012-09-22 23:53:46 +02:00
kervala
29396158d8 Changed: #1493 Fixed some directories 2012-09-22 23:42:40 +02:00
kervala
38c5e6840d Fixed: #1493 MultiArch support 2012-09-22 22:57:38 +02:00
kervala
9ee7196f5b Fixed: ryzom.xpm should be 32x32 instead of 48x48 2012-09-22 21:07:35 +02:00
kervala
9cd35a8a5d 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
15dd01caf7 Fixed: #1490 Added a 'no context' object in the createNamedItemInBag admin function. 2012-09-12 14:25:01 -05:00
kervala
13c5b17e61 Changed: Reverted another previous fix (sorry again) 2012-09-11 23:15:56 +02:00
kervala
d6d7f75c68 Changed: Reverted a previous fix (sorry) 2012-09-11 22:50:10 +02:00
kervala
972a8d79a5 Changed: Synchronization with SVN 2012-09-11 21:49:37 +02:00
kervala
fc892c0424 Changed: Synchronization with SVN 2012-09-11 21:39:30 +02:00
kervala
78fe1850f1 Changed: Synchronization with SVN 2012-09-11 20:26:36 +02:00
SirCotare
c521b9e080 #1470 initial EGS with achievements 2012-08-07 17:42:25 +02:00
kaetemi
1710b9bb6a Fixed: Missed something 2012-07-27 22:51:38 +02:00
kaetemi
b03895fff7 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
f1be1d9801 Added: CMake projects for ryzom MFC tools (georges edit and world editor plugins) 2012-07-27 12:36:36 +02:00
kaetemi
f4f7965550 Fixed: Compile error in mfc world editor primitive plugin 2012-07-25 10:13:58 +02:00
kervala
8a1af615a1 Fixed: Bad path in ryzom.desktop.in 2012-07-20 18:51:50 +02:00
dfighter1985
da53ae9206 CHANGED: #1471 The local string mapper is now instantiated by CWidgetManager. 2012-07-16 06:16:43 +02:00
dfighter1985
73c63a99c7 CHANGED: #1471 it's a good idea to register GUI widget classes with the reflection system if we want to use them! 2012-07-14 05:16:09 +02:00
dfighter1985
5f49fab257 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. 2012-07-14 01:46:22 +02:00
dfighter1985
f2c3c55bde CHANGED: #1471 CInterfaceParser is now a component of CWidgetManager, and is instantiated by an abstract factory method. (IParser::createParser()) 2012-07-13 05:37:09 +02:00
dfighter1985
99b8ee5758 CHANGED: #1471 no need to go thru CInterfaceManager, when CViewRenderer has it's own Singleton. 2012-07-12 23:04:36 +02:00
dfighter1985
3e5137810b CHANGED: #1474 CInterfaceManager is no longer a subclass of CInterfaceParser, instead CInterfaceParser is a component of CInterfaceManager. 2012-07-12 21:39:51 +02:00
dfighter1985
c9692cfc05 CHANGED: #1471 Moved some Lua related code from CInterfaceManager to CLuaManager and CInterfaceParser. 2012-07-12 09:01:35 +02:00
dfighter1985
7e8e21e2f6 CHANGED: #1471 Moved CProcedure code to it's own files, and also moved the procedure handling code from CInterfaceManager to CWidgetManager. 2012-07-12 05:29:33 +02:00
dfighter1985
b2ee4d275c CHANGED: #1471 Moved some more GUI code from CInterfaceManager to CWidgetManager. 2012-07-11 22:27:22 +02:00
dfighter1985
6506989e14 CHANGED: #1471 Moved the input event handling code from CInterfaceManager to CWidgetManager. 2012-07-11 06:44:34 +02:00
dfighter1985
86302f6a39 CHANGED: #1471 Moved the widget drawing code from CInterfaceManager to CWidgetManager, so the GUI library can now draw the widgets! 2012-07-10 23:01:09 +02:00
dfighter1985
27953ec7e8 CHANGED: #1471 Moved the contexthelp drawing/controlling code to the GUI library. 2012-07-10 06:25:15 +02:00
dfighter1985
e97ec6788e CHANGED: #1471 CInterfaceParser is now part of the Nel GUI library and is under the NLGUI namespace. 2012-07-09 03:45:00 +02:00
dfighter1985
e1bbfb74fa CHANGED: #1471 CInterfaceParser no longer depends on CLuaIHMRyzom. 2012-07-09 03:07:19 +02:00
dfighter1985
7142b94449 CHANGED: #1471 Modularized CInterfaceParser. It is now extendable with parser modules, so it can parse Ryzom game related stuff without the parser code having to be in the class itself. 2012-07-09 02:36:17 +02:00
dfighter1985
4ed62dc1c4 CHANGED: #1471 Classes derived from CInterfaceOptions are now instantiated using a factory. 2012-07-08 01:56:49 +02:00
dfighter1985
5ffd1d3067 CHANGED: #1471 Some more cleanup in CInterfaceParser, removed some unused code, which also means less coupling and less refactoring to do :P 2012-07-07 21:17:15 +02:00
dfighter1985
28288d2543 CHANGED: #1471 Moved CSheetSelectionGroup and CSheetSelection to the GUI library. 2012-07-07 20:38:45 +02:00
dfighter1985
097ee504f6 CHANGED: #1471 Little cleanup in CInterfaceParser. 2012-07-07 19:49:13 +02:00
dfighter1985
e24cffa79f Merged default branch into gui-refactoring. 2012-07-02 22:46:08 +02:00
dfighter1985
5a76ae7b38 CHANGED: #1471 Moved the basic interface expression user functions into the NELGUI library under the NLGUI namespace. 2012-07-02 05:07:13 +02:00
dfighter1985
363bb731c7 CHANGED: #1471 CViewPointer is now part of the NELGUI library and is under the NLGUI namespace. 2012-07-02 03:21:42 +02:00
dfighter1985
923695fe70 CHANGED: #1471 Broke up CViewPointer into a generic and a Ryzom game related class. 2012-07-02 02:50:47 +02:00
dfighter1985
66293a4fd9 CHANGED: #1471 CInterfaceTrack and CInterfaceAnim are now part of the NELGUI library and are under the NLGUI namespace. 2012-07-01 04:13:24 +02:00
dfighter1985
70fb3d6412 CHANGED: #1471 CInterfaceAnim no longer depends on Ryzom game related code. 2012-07-01 03:45:38 +02:00