Commit graph

3485 commits

Author SHA1 Message Date
sfb
436970dc46 Bad merge resolution, fixed the build files that merged poorly. 2013-10-28 11:24:02 -05:00
Matthew Lagoe
25c7eec853 Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #43)
added rrd_graphs directory
2013-10-26 20:59:38 -07:00
Botanic
19086063e2 added rrd_graphs directory 2013-10-26 20:57:16 -07:00
Botanic
5efa0315d6 Merge 2013-10-26 19:12:27 -07:00
Botanic
c50e0cd8a3 config.default.php 2013-10-26 03:19:59 -07:00
Botanic
5b73e366f0 added folder placeholders 2013-10-26 02:04:54 -07:00
Botanic
d467027f11 fixed bad merge 2013-10-26 00:57:50 -07:00
Botanic
906da99801 Merge 2013-10-26 00:50:56 -07:00
Botanic
bf059cccec Changed installer page to no_visible_elements 2013-10-24 21:58:11 -07:00
Botanic
31a8b188fc added installer for nel_tool database 2013-10-24 20:25:04 -07:00
Botanic
9640354dd6 fixed css 2013-10-24 05:43:38 -07:00
Botanic
7be3abdb06 made logo clickable 2013-10-24 05:03:01 -07:00
Botanic
e3c9670869 fixed more warnings 2013-10-24 04:43:42 -07:00
Botanic
ddb06c7f8c fixed php warning 2013-10-24 04:10:39 -07:00
Botanic
aa92d18666 made users a dropdown for adding users to group 2013-10-24 02:21:43 -07:00
Botanic
df0f710e96 fixed missing </div> 2013-10-24 01:25:05 -07:00
Botanic
73dc75fa5b Fixed Support Groups 2013-10-24 01:12:09 -07:00
Botanic
d47d351122 added option for assigned and unassigned ie "both" 2013-10-23 23:58:34 -07:00
Botanic
32d6f42d29 fixed div in settings template 2013-10-23 18:35:44 -07:00
Botanic
f465807b06 fixed some more static non-static warnings 2013-10-23 18:26:59 -07:00
Botanic
51fdfe97a2 fixed missing index errors 2013-10-23 18:07:09 -07:00
Botanic
c3343a0e0f fixed groupid if there are no groups 2013-10-23 17:12:47 -07:00
Botanic
d3d406a177 cleanup sync 2013-10-23 17:08:27 -07:00
Botanic
b02584407b fixed static call to non static 2013-10-23 17:06:42 -07:00
Botanic
8439f8f952 added fork on linux as well as implimented pid file to check for other running crons 2013-10-23 15:26:36 -07:00
Botanic
7617bd3edc Implimented lazy cron and fixed syncronize button. 2013-10-23 15:06:41 -07:00
sfb
e9b8e2edba merge from default 2013-10-23 12:08:09 -05:00
Botanic
1c5480a0e0 added installing nel db 2013-10-22 22:03:33 -07:00
Botanic
b830995450 Fixed path bugs 2013-10-21 23:57:27 -07:00
Botanic
601cbc8fde remove install.php from sql 2013-10-21 23:31:58 -07:00
Botanic
3c37b2bf13 added installer 2013-10-21 23:31:13 -07:00
Botanic
4e86785fc1 updated TOS url to http://www.gnu.org/licenses/agpl-3.0.html 2013-10-21 23:14:26 -07:00
Botanic
cbed910d11 added installer for when database is missing 2013-10-21 23:02:01 -07:00
Botanic
96691a1a9b Moved Android app 2013-10-21 20:05:16 -07:00
kervala
1e5fe9a8c1 Changed: Search for default installation paths under Windows 2013-10-21 17:50:21 +02:00
Matt Raykowski
8c046cf4c0 Merged in DJanssens/quitta-ryzomcore (pull request #25)
Ryzom AMS - GSOC Project
2013-10-19 16:02:52 -05:00
Botanic
7e768261d1 changed to tabs 2013-10-18 02:25:48 -07:00
Botanic
912ca661cc connection failure message if mysql conneciton fails 2013-10-18 01:51:30 -07:00
kervala
34e4b6aafa Removed: Backup files 2013-10-13 13:34:38 +02:00
kaetemi
2c6d2a3bd3 Merge with default 2013-10-06 20:09:25 +02:00
kaetemi
08a4d9eb11 Fix #67 bad NELID in vertex program parser 2013-10-06 20:06:53 +02:00
kaetemi
03b6dceaa9 Merge with default 2013-10-06 15:50:49 +02:00
kervala
88b2a1a38d Fixed: Use multiarch library path under Linux 2013-09-30 09:11:35 +02:00
kervala
926f046518 Fixed: server_share needs MySQL headers 2013-09-29 20:33:07 +02:00
kervala
4005f3d660 Changed: Link to opengl library 2013-09-29 18:11:05 +02:00
kervala
2becb762f8 Fixed: Some warnings 2013-09-29 16:26:24 +02:00
kervala
58918eed85 Fixed: Some warnings 2013-09-29 13:52:53 +02:00
kervala
329f1aeab9 Changed: Search for OpenGL Qt 4 module 2013-09-29 13:52:21 +02:00
kervala
43cb482d7e Changed: Don't check for D3D radio button under other OSes 2013-09-29 13:51:43 +02:00
kervala
49550556ac Changed: Minor change 2013-09-29 13:51:08 +02:00
kervala
d8cede8381 Changed: Disable D3D radio button for other OSes 2013-09-29 13:50:38 +02:00
kervala
81942a6e4a Changed: Virtual destructors 2013-09-29 13:49:53 +02:00
kervala
16d0137b8a Fixed: Compilation under Linux 2013-09-29 13:49:07 +02:00
kervala
dcd26e09f9 Changed: Minor changes 2013-09-29 13:47:30 +02:00
kervala
da67ac8517 Fixed: Wrong driver version in Ryzom Configurator
Fixed: Typo in "width"
2013-09-29 13:46:43 +02:00
kervala
d4ca2673cb Changed: Added PCH for ryzom configurator qt 2013-09-29 13:44:04 +02:00
kervala
713e7b75b3 Changed: Detect Windows 8 and Windows Server 2012 2013-09-29 13:41:42 +02:00
kervala
be6a77e9de Fixed: Compilation under Linux 2013-09-28 10:18:35 +02:00
Cédric OCHS
ffb407d789 Merged in nimetu/ryzomcore (pull request #28)
Fixed: restore correct resolution
2013-09-27 20:07:08 +02:00
kervala
6b9e9b8486 Changed: Include Lua headers directory for GUI Editor 2013-09-27 16:43:02 +02:00
kervala
9889049239 Fixed: Some warnings 2013-09-27 16:30:55 +02:00
Nimetu
894232c4c9 Fixed: Do not save client.cfg when exiting from char selection screen or correct window size is lost 2013-09-27 12:58:34 +03:00
Nimetu
0b1125e253 Fixed: restore correct fullscreen resolution 2013-09-27 12:16:13 +03:00
kervala
d2749d1857 Changed: Detect Express versions 2013-09-27 11:05:52 +02:00
kervala
3ab977f4d7 Changed: Don't use anymore the current SDK in registry (very unreliable)
Changed: Use the Windows SDK installed with VC++ or the most recent compatible one
2013-09-27 10:52:44 +02:00
kervala
f6ddcacd56 Fixed: Windows SDK detection for some previous versions 2013-09-27 09:26:22 +02:00
kaetemi
185709734d Fix warnings 2013-09-27 01:32:01 +02:00
kaetemi
e7e7a942f8 Fix warnings 2013-09-27 01:11:19 +02:00
kaetemi
3d53e078a5 Fix line endings 2013-09-27 00:08:49 +02:00
kervala
2709a72e43 Fixed: LNK2011 when using external libraries 2013-09-26 22:50:13 +02:00
kervala
2af24d272b Changed: Improved Windows SDK detection 2013-09-26 22:49:30 +02:00
Nimetu
87a11924ca Fixed: remember selected resolution in login screen (issue #36) 2013-09-26 21:34:55 +03:00
Cédric OCHS
46cf1584de Merged in nimetu/ryzomcore (pull request #26)
Fixed: map landmark bug (issue #15)
2013-09-25 08:52:30 +02:00
kervala
b5c625f261 Changed: Created NELID macro to fix warning "multi-character character constant" 2013-09-24 21:33:59 +02:00
Nimetu
3d0ea8c433 Fixed: map landmark bug (issue #15) 2013-09-23 17:34:01 +03:00
Quitta
753893d8a9 updated client_default.cfg and removed rhe anon login 2013-09-23 03:52:20 +02:00
Quitta
3d7a7dc191 Merge with quitta-gsoc-2013 2013-09-23 00:49:16 +02:00
Quitta
66401ff317 Added empty ssl_ca_cert.pem to fix missing cert error 2013-09-23 00:39:05 +02:00
kervala
4b6ca1e628 Fixed: Wrong variable used to compute array length 2013-09-22 13:23:03 +02:00
kervala
4f1897208c Fixed: OpenGL ES driver compilation 2013-09-22 13:20:53 +02:00
kervala
26370c962d Fixed: Warnings with GCC 2013-09-22 13:20:19 +02:00
kervala
e66b5d82ba Changed: Typo 2013-09-22 13:18:28 +02:00
kervala
df8c6e9b08 Changed: Created NELID macro to fix warning "multi-character character constant" 2013-09-22 13:10:57 +02:00
kervala
725093587d Changed: FIX_PRECOMPILED_HEADER now useless 2013-09-22 11:05:13 +02:00
kervala
3545bc8527 Changed: Link to CURL_LIBRARIES 2013-09-22 11:04:40 +02:00
kervala
15d97b9893 Changed: Don't include files from project in PCH 2013-09-22 11:01:17 +02:00
kervala
482e37bed2 Fixed: #55 ryzom_client crashes on start with unprotected error in call to Lua API 2013-09-22 10:47:12 +02:00
StudioEtrange
16b23da06b FindMSVC fix 2013-09-21 14:14:29 +02:00
Quitta
f93034248d forgot to change one button, quick fix 2013-09-21 00:35:04 +02:00
Quitta
b03930ce00 changed button sizes and added the forgot password link to the client_cfg.cpp 2013-09-21 00:28:53 +02:00
Quitta
54342837ff forgot password added 2013-09-20 23:36:19 +02:00
Quitta
1376158cb1 Made it possible to redirect to a specific page after login in 2013-09-20 05:33:39 +02:00
Quitta
17233ba735 renamed the config to config.default.php 2013-09-20 03:11:04 +02:00
Quitta
b1c10fbf10 some extra information added + changed the default hardcoded register & support url in the client_cfg.cpp 2013-09-20 02:41:57 +02:00
Quitta
2e68196b2a tried to fix error messages being shown 2013-09-17 05:26:09 +02:00
Quitta
6cc2c8cfc3 it works, though this will also forward the client to the success page 2013-09-17 04:58:02 +02:00
Quitta
e889c639db bah, its late and I'm not working in c++... 2013-09-17 04:35:37 +02:00
Quitta
7b1c32176d this should fix it :D! 2013-09-17 04:24:57 +02:00
Quitta
4da16dbaad wasn't completely fixed yet, hopefuly it now is 2013-09-17 02:31:02 +02:00
Quitta
4c3aedef87 small fix 2013-09-17 01:59:40 +02:00
Quitta
b0f075a22e updated the help page! 2013-09-15 20:11:34 +02:00
Quitta
eb138a8760 syncing small fix 2013-09-15 19:44:24 +02:00
Quitta
8f4e3d39aa putted image files in the www folder too, because else it can't be accessed from outside! 2013-09-15 19:38:49 +02:00
Quitta
1884997714 added function that imports the users from the nel db into the ams/ticket_user 2013-09-15 19:15:17 +02:00
Quitta
dfa885fcca updated the docs! 2013-09-15 18:27:07 +02:00
kaetemi
af51bdbc7a Cleanup vr config interface 2013-09-15 02:14:38 +02:00
kaetemi
c26a06b79e Add ingame configuration interface for virtual reality devices 2013-09-15 01:34:06 +02:00
kaetemi
64d8faddd0 Fix typo 2013-09-14 19:05:54 +02:00
kaetemi
adcb3e032b Fix regression from stereo branch in wind tree 2013-09-14 18:58:23 +02:00
kaetemi
60cd1f6116 Fix compile error in vertex program 2013-09-14 17:53:47 +02:00
kaetemi
4adbfd4e4e Update supportVertexProgram calls 2013-09-14 16:43:36 +02:00
kaetemi
7967709e0e Remove old interface 2013-09-14 16:45:00 +02:00
kaetemi
102f0080af Cleanup unused code 2013-09-14 16:23:11 +02:00
kaetemi
0386673d13 Rename 2013-09-14 00:46:10 +02:00
Quitta
2d776a65ed Added more documentations, this time also the inc/func files are documented and changed the doxygen config file with the help of Botanic 2013-09-14 00:39:03 +02:00
kaetemi
08f37643b7 Cleanup 2013-09-14 00:36:06 +02:00
kaetemi
93b5536036 Merge with default 2013-09-13 23:24:13 +02:00
kaetemi
4f193231a1 Fix compile errors caused by missing includes 2013-09-13 23:23:19 +02:00
kaetemi
7d0a84b2d1 Merge with default 2013-09-13 23:07:49 +02:00
kaetemi
291c5d6012 Cleanup 2013-09-13 23:02:35 +02:00
kaetemi
881949a5d7 Use named indices with wind tree program 2013-09-13 22:20:52 +02:00
kaetemi
7176cbc0af Use named indices for per pixel light vertex program 2013-09-13 21:47:42 +02:00
kaetemi
edec14807f Use named uniform indices for lighted vertex program 2013-09-13 21:31:47 +02:00
kaetemi
a0fbb152ee Updated wind tree program container 2013-09-13 20:45:06 +02:00
kaetemi
ba945f30a8 Use lighted vertex program container for per pixel light program 2013-09-13 20:00:20 +02:00
kaetemi
482c13fd1a Add container for lighted vertex program 2013-09-13 19:03:05 +02:00
kaetemi
f7e80187ad Adjust order for meshvp 2013-09-13 18:25:52 +02:00
kaetemi
ce7357ffa4 Do not use old interface here 2013-09-13 17:17:11 +02:00
kaetemi
7d854d54d1 Modify calls in bloom effect 2013-09-13 17:11:42 +02:00
kaetemi
2f384d9789 Update veget implementation 2013-09-13 17:09:05 +02:00
kaetemi
2ee6843cd9 Fixes for d3d 2013-09-13 17:08:56 +02:00
Quitta
ef3f24d8df Added the doxygen generated pages + config file in ryzom/tools/server/ryzom_ams_docs 2013-09-13 00:27:49 +02:00
Quitta
75dcaa9ec3 the lib is entirely documented, still webusers and func/inc folders to go :D 2013-09-12 19:28:56 +02:00
Quitta
3030d4c650 some more documented classes.. 2013-09-12 06:13:28 +02:00
Quitta
ce36454383 added extra documentation. Man, writing documentation for the ticket class was quite a job :D 2013-09-11 23:51:23 +02:00
Quitta
135e57720c Even more docs! writing documentation sucks.. 2013-09-11 16:56:00 +02:00
Quitta
bef4d1d029 added more documentation.. 2013-09-11 01:38:53 +02:00
kaetemi
b77101cdd4 Update d3d implementation and add some debugging code 2013-09-11 01:12:37 +02:00
Quitta
e07bd3e2a5 added documentation for assigned, dblayer and forwarded class 2013-09-10 21:26:03 +02:00
kaetemi
f0177268b4 Rename of a d3d specific class 2013-09-10 19:53:41 +02:00
kaetemi
a798aecd71 Partial update of veget vp 2013-09-10 19:52:14 +02:00
kaetemi
e6658bdef0 Update decal vp 2013-09-10 17:01:33 +02:00
kaetemi
776f198df3 Update some test code 2013-09-10 16:42:51 +02:00
kaetemi
7462d731f1 Small adjustment to landscape vp parameter setting 2013-09-10 16:24:45 +02:00
kaetemi
26f4073ad7 Simplify 2013-09-10 15:59:31 +02:00
kaetemi
4de5eeb586 Adjust landscape vertex program to use new interface 2013-09-10 15:42:42 +02:00
Quitta
8ab4b6ba84 Just retested the mailing functionality, which seems to still work proper 2013-09-10 04:42:36 +02:00
kaetemi
32288eabe8 Use new program interface for water vertex program 2013-09-10 02:07:16 +02:00
kaetemi
dd490a0cc4 Set driver parameters 2013-09-10 02:01:57 +02:00
kaetemi
c9a2f9dbfc Some fixes 2013-09-10 01:29:53 +02:00
kaetemi
680f260803 Use CSmartPtr for vertex program 2013-09-10 00:31:26 +02:00
kaetemi
14026e6f08 Set params from storage 2013-09-09 23:39:18 +02:00
Quitta
9b74660631 removed my testing pass out of the config file :D 2013-09-09 23:31:49 +02:00
Quitta
1b2475281f Added CreatePermissions + handling it while syncing + changed image path to refer to the image locations dir + other fixes 2013-09-09 23:30:45 +02:00
kaetemi
f46ef4fd07 Fix incorrectly removed line 2013-09-09 23:03:52 +02:00
kaetemi
b6fde3c706 Missed file in last commit 2013-09-09 23:01:43 +02:00
kaetemi
1447e2f2d8 Replace temporary CMaterial code 2013-09-09 21:44:14 +02:00
kaetemi
01577f9f95 Implement param storage copy 2013-09-09 21:05:12 +02:00
kaetemi
aa85673b3b Flag some TODO's 2013-09-09 20:55:23 +02:00
kaetemi
0bcb0d6ffd Add glsl pixel program for stereo distortion 2013-09-09 20:49:59 +02:00
kaetemi
057eab4680 Cleanup abstract gpu program interface 2013-09-09 18:33:38 +02:00
kaetemi
fcb0ee720e Implement new driver interface in Direct3D driver 2013-09-09 16:36:29 +02:00
kaetemi
99a48d5511 Implement new driver interface in OpenGL driver 2013-09-09 14:43:10 +02:00
kaetemi
ea25e5375d Expand parameter interface 2013-09-09 12:18:20 +02:00
Quitta
91c9c04dc3 Biggest push ever! :D Kinda made it possible to only need a few files in the inc/func of the drupal module, all others can be copied of the www version 2013-09-09 03:47:32 +02:00
kaetemi
0cf5dbab8a Reduce function duplication 2013-09-09 02:03:40 +02:00
kaetemi
060bd3035e Builtin parameter set functions 2013-09-09 01:53:02 +02:00
kaetemi
c512dfbb3d Separate count and size 2013-09-09 01:31:15 +02:00
Quitta
e01c0c0913 Soem fixes + also using the createPermissions() function of the module atm! 2013-09-08 22:49:39 +02:00
kaetemi
7be6891bd7 Cleanup driver interface 2013-09-08 21:57:27 +02:00
kervala
7f6959ce39 Changed: lua, luabind, libwww and libxml2 already linked to previous libraries (NLMISC and NLGUI) 2013-09-08 12:57:34 +02:00
kervala
a023ab89d7 Changed: Updated Freetype libraries variable 2013-09-08 12:54:05 +02:00
kervala
e5423d5a3a Changed: Look for Debug versions of libwww libraries 2013-09-08 12:53:35 +02:00
kervala
811dca71ee Changed: Moved lua, luabind and curl FIND_PACKAGE in root CMakeLists.txt 2013-09-08 12:52:00 +02:00
kervala
d5baba13e8 Changed: Look for Debug version of freetype and use it for Debug configuration 2013-09-08 10:26:23 +02:00
Quitta
a33288c5f2 Huge update! ingame part should work! 2013-09-08 06:01:01 +02:00
kaetemi
48493b225d Add additional set functions 2013-09-08 01:49:34 +02:00
kaetemi
58a8982ba5 Add gpu program params storage structure 2013-09-08 01:36:01 +02:00
kaetemi
f4d05d25c5 Implement new gpu program interface in direct3d driver 2013-09-07 22:00:07 +02:00
kaetemi
fca15bd084 Merge with default 2013-09-07 21:36:08 +02:00
kaetemi
f4fccab548 Implement new gpu program interface in opengl driver 2013-09-07 21:30:40 +02:00
kaetemi
47716d7247 Make gpu programs use abstract gpu program class 2013-09-07 20:41:07 +02:00
StudioEtrange
3721135484 Merged ryzom/ryzomcore into default 2013-09-07 20:16:17 +02:00
kaetemi
d54774f978 Add abstract gpu program and source classes 2013-09-07 18:33:18 +02:00
kervala
6489e9e04f Removed: S3TC module because not used anymore 2013-09-07 17:01:06 +02:00
kaetemi
ddbb65bd34 Fix compile error 2013-09-07 16:05:28 +02:00
kaetemi
b5b170ad84 Merge 2013-09-07 15:54:36 +02:00
kaetemi
576e508860 Use distSqTo instead of distTo 2013-09-07 15:53:17 +02:00
kaetemi
9d3bb1c76b Add distSqTo to CAIVector 2013-09-07 15:53:10 +02:00
kaetemi
1d1fb14fc8 Comment if-check around commented unused client-side speed limiting code 2013-09-07 15:53:00 +02:00
kaetemi
035fd1d40a Move r2 plot item security off the AIS to the EGS and remove hardcoded sheet ids 2013-09-07 15:51:30 +02:00
Quitta
67f5741243 Ingame version works now too more or less 2013-09-07 04:12:47 +02:00
StudioEtrange
93f9ca83f6 Merged ryzom/ryzomcore into default 2013-09-07 01:39:45 +02:00
kervala
8d27acc654 Changed: Minor changes 2013-09-06 15:00:35 +02:00
kervala
2a0d588cb5 Changed: Merged code from official client 2013-09-06 15:00:01 +02:00
kervala
a886559bf6 Fixed: Define math.fmod as a function for Lua 5.0 2013-09-06 14:53:40 +02:00
kervala
712f9ad2a0 Fixed: Integer 32 bits conversion to 64 bits pointer 2013-09-06 14:51:21 +02:00
kervala
53d5e56a2a Changed: Don't use NLMISC includes in NLMISC PCH 2013-09-06 14:50:19 +02:00
kervala
12cd9083de Changed: Cleanlooks doesn't exist anymore in Qt 5, so use default style 2013-09-06 14:49:12 +02:00
kervala
b16d904bb2 Fixed: Use 32 bits libraries from Windows SDK in 64 bits 2013-09-06 14:48:21 +02:00