Commit graph

1632 commits

Author SHA1 Message Date
botanic
0a48856319 a positive and a negative is supposted to be NEGATIVE stupid php 2013-12-16 23:38:24 -08:00
botanic
31de51af19 updated words file 2013-12-16 23:19:29 -08:00
botanic
8aa71de2bc helps if i use the right file... 2013-12-16 23:14:24 -08:00
botanic
8cbc6f01ec forgot a few ; 2013-12-16 23:11:30 -08:00
botanic
4e4d925e54 fixed some permissions issues, setup system so that it has a is_installed file to determin if it should install or not 2013-12-16 22:59:06 -08:00
botanic
09e5cfc5ef Merge 2013-12-14 19:36:36 -08:00
botanic
fe3a7c0e1c fix for new install 2013-12-14 19:34:07 -08:00
kervala
291c961776 Changed: #71 Crash when entering rooms (patch provided by Tierry Anthony, thanks!) 2013-12-14 09:18:51 +01:00
kervala
ae5becbb0b Fixed: Warning with clang 2013-11-13 22:53:26 +01:00
kervala
d8a6c9f966 Fixed: Warning with clang 2013-11-13 21:40:41 +01:00
kervala
8099217145 Changed: Replaced math.mod by math.fmod in Ring lua files 2013-11-13 21:38:23 +01:00
kervala
36a537a88e Changed: Replaced atof by fromString 2013-11-13 21:37:28 +01:00
kervala
0ce9bca0ac Changed: Replaced strlwr by toLower 2013-11-13 21:33:29 +01:00
botanic
be87039624 added reload link to if config permissions are wack 2013-11-11 13:23:33 -08:00
botanic
80e168886a properly write the hostname for permissions creation 2013-11-11 13:17:19 -08:00
botanic
036dac452f changed it to error on bad permissions copying config.php 2013-11-11 10:54:09 -08:00
Matthew Lagoe
61f021f635 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
9e67d9ea09 added rrd_graphs directory
--HG--
branch : rc-botanic-webdev
2013-10-26 20:57:16 -07:00
Botanic
4c5832204f config.default.php 2013-10-26 03:19:59 -07:00
Botanic
3e692705ea added folder placeholders 2013-10-26 02:04:54 -07:00
Botanic
7381de073e fixed bad merge 2013-10-26 00:57:50 -07:00
Botanic
057fe3e0f7 Merge 2013-10-26 00:50:56 -07:00
Botanic
b6de1eca23 Changed installer page to no_visible_elements
--HG--
branch : rc-botanic-webdev
2013-10-24 21:58:11 -07:00
Botanic
284884c573 added installer for nel_tool database
--HG--
branch : rc-botanic-webdev
2013-10-24 20:25:04 -07:00
Botanic
a3cbd69d3b fixed css
--HG--
branch : rc-botanic-webdev
2013-10-24 05:43:38 -07:00
Botanic
03a1dc39af made logo clickable
--HG--
branch : rc-botanic-webdev
2013-10-24 05:03:01 -07:00
Botanic
2d174cf15c fixed more warnings
--HG--
branch : rc-botanic-webdev
2013-10-24 04:43:42 -07:00
Botanic
b8fdefe10d fixed php warning
--HG--
branch : rc-botanic-webdev
2013-10-24 04:10:39 -07:00
Botanic
04619a39a9 made users a dropdown for adding users to group
--HG--
branch : rc-botanic-webdev
2013-10-24 02:21:43 -07:00
Botanic
632a6f2929 fixed missing </div>
--HG--
branch : rc-botanic-webdev
2013-10-24 01:25:05 -07:00
Botanic
91c4784752 Fixed Support Groups
--HG--
branch : rc-botanic-webdev
2013-10-24 01:12:09 -07:00
Botanic
81d1cf93fb added option for assigned and unassigned ie "both"
--HG--
branch : rc-botanic-webdev
2013-10-23 23:58:34 -07:00
Botanic
d1913cbfc5 fixed div in settings template
--HG--
branch : rc-botanic-webdev
2013-10-23 18:35:44 -07:00
Botanic
c4e79a8246 fixed some more static non-static warnings
--HG--
branch : rc-botanic-webdev
2013-10-23 18:26:59 -07:00
Botanic
6b266fd808 fixed missing index errors
--HG--
branch : rc-botanic-webdev
2013-10-23 18:07:09 -07:00
Botanic
8ca55f955e fixed groupid if there are no groups
--HG--
branch : rc-botanic-webdev
2013-10-23 17:12:47 -07:00
Botanic
677c8fa251 cleanup sync
--HG--
branch : rc-botanic-webdev
2013-10-23 17:08:27 -07:00
Botanic
3dbb08f1d1 fixed static call to non static
--HG--
branch : rc-botanic-webdev
2013-10-23 17:06:42 -07:00
Botanic
95c5b9e1a8 added fork on linux as well as implimented pid file to check for other running crons
--HG--
branch : rc-botanic-webdev
2013-10-23 15:26:36 -07:00
Botanic
72290313a4 Implimented lazy cron and fixed syncronize button.
--HG--
branch : rc-botanic-webdev
2013-10-23 15:06:41 -07:00
Botanic
08ee2b8abc added installing nel db
--HG--
branch : rc-botanic-webdev
2013-10-22 22:03:33 -07:00
Botanic
54d13d93d0 Fixed path bugs
--HG--
branch : rc-botanic-webdev
2013-10-21 23:57:27 -07:00
Botanic
16bd70c50a remove install.php from sql
--HG--
branch : rc-botanic-webdev
2013-10-21 23:31:58 -07:00
Botanic
fd012e9cda added installer
--HG--
branch : rc-botanic-webdev
2013-10-21 23:31:13 -07:00
Botanic
457f2f703f updated TOS url to http://www.gnu.org/licenses/agpl-3.0.html
--HG--
branch : rc-botanic-webdev
2013-10-21 23:14:26 -07:00
Botanic
7a7191e981 added installer for when database is missing
--HG--
branch : rc-botanic-webdev
2013-10-21 23:02:01 -07:00
Botanic
32c729f38e Moved Android app
--HG--
branch : rc-botanic-webdev
2013-10-21 20:05:16 -07:00
Matt Raykowski
0001719d99 Merged in DJanssens/quitta-ryzomcore (pull request #25)
Ryzom AMS - GSOC Project
2013-10-19 16:02:52 -05:00
Botanic
04221c3696 changed to tabs 2013-10-18 02:25:48 -07:00
Botanic
31ca25b00b connection failure message if mysql conneciton fails 2013-10-18 01:51:30 -07:00
kervala
c180c06d7f Removed: Backup files 2013-10-13 13:34:38 +02:00
kaetemi
af621187f1 Merge with default
--HG--
branch : multipass-stereo
2013-10-06 15:50:49 +02:00
kervala
30b0f25587 Fixed: server_share needs MySQL headers 2013-09-29 20:33:07 +02:00
kervala
652915412f Changed: Link to opengl library 2013-09-29 18:11:05 +02:00
kervala
de43ea8d86 Fixed: Some warnings 2013-09-29 16:26:24 +02:00
kervala
de42e4d7ff Fixed: Some warnings 2013-09-29 13:52:53 +02:00
kervala
0b29d3993d Changed: Don't check for D3D radio button under other OSes 2013-09-29 13:51:43 +02:00
kervala
f8179f68ad Changed: Minor change 2013-09-29 13:51:08 +02:00
kervala
f11f5c8b7a Changed: Disable D3D radio button for other OSes 2013-09-29 13:50:38 +02:00
kervala
339242d88e Changed: Virtual destructors 2013-09-29 13:49:53 +02:00
kervala
b638779240 Fixed: Compilation under Linux 2013-09-29 13:49:07 +02:00
kervala
28eb142f24 Changed: Minor changes 2013-09-29 13:47:30 +02:00
kervala
b5e7542602 Fixed: Wrong driver version in Ryzom Configurator
Fixed: Typo in "width"
2013-09-29 13:46:43 +02:00
kervala
b0b1c8a0b6 Changed: Added PCH for ryzom configurator qt 2013-09-29 13:44:04 +02:00
Cédric OCHS
349b8a8b55 Merged in nimetu/ryzomcore (pull request #28)
Fixed: restore correct resolution
2013-09-27 20:07:08 +02:00
kervala
43bbfe3da7 Fixed: Some warnings 2013-09-27 16:30:55 +02:00
Nimetu
5da36a54e4 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
276f664e50 Fixed: restore correct fullscreen resolution 2013-09-27 12:16:13 +03:00
kaetemi
3b4730c890 Fix warnings 2013-09-27 01:32:01 +02:00
kaetemi
3b1d4e3915 Fix warnings 2013-09-27 01:11:19 +02:00
kaetemi
85365fd7bb Fix line endings 2013-09-27 00:08:49 +02:00
Nimetu
4b86f979a8 Fixed: remember selected resolution in login screen (issue #36)
--HG--
branch : fix-issue-36
2013-09-26 21:34:55 +03:00
Cédric OCHS
f8f25e8579 Merged in nimetu/ryzomcore (pull request #26)
Fixed: map landmark bug (issue #15)
2013-09-25 08:52:30 +02:00
kervala
c8c296f484 Changed: Created NELID macro to fix warning "multi-character character constant" 2013-09-24 21:33:59 +02:00
Nimetu
75d784c656 Fixed: map landmark bug (issue #15) 2013-09-23 17:34:01 +03:00
Quitta
b190d7930d updated client_default.cfg and removed rhe anon login 2013-09-23 03:52:20 +02:00
Quitta
a484de5b3f Merge with quitta-gsoc-2013 2013-09-23 00:49:16 +02:00
Quitta
a8f9036b28 Added empty ssl_ca_cert.pem to fix missing cert error
--HG--
branch : quitta-gsoc-2013
2013-09-23 00:39:05 +02:00
kervala
82904232d2 Fixed: Warnings with GCC 2013-09-22 13:20:19 +02:00
kervala
61a5647bdd Changed: Typo 2013-09-22 13:18:28 +02:00
kervala
6695a9064e Changed: Created NELID macro to fix warning "multi-character character constant" 2013-09-22 13:10:57 +02:00
kervala
0ff9908e8e Changed: Don't include files from project in PCH 2013-09-22 11:01:17 +02:00
Quitta
a2cedf109d forgot to change one button, quick fix
--HG--
branch : quitta-gsoc-2013
2013-09-21 00:35:04 +02:00
Quitta
43e356cda1 changed button sizes and added the forgot password link to the client_cfg.cpp
--HG--
branch : quitta-gsoc-2013
2013-09-21 00:28:53 +02:00
Quitta
cf8251f25f forgot password added
--HG--
branch : quitta-gsoc-2013
2013-09-20 23:36:19 +02:00
Quitta
78adc25c8d Made it possible to redirect to a specific page after login in
--HG--
branch : quitta-gsoc-2013
2013-09-20 05:33:39 +02:00
Quitta
7d3bd1a4ba renamed the config to config.default.php
--HG--
branch : quitta-gsoc-2013
2013-09-20 03:11:04 +02:00
Quitta
cfa3651296 some extra information added + changed the default hardcoded register & support url in the client_cfg.cpp
--HG--
branch : quitta-gsoc-2013
2013-09-20 02:41:57 +02:00
Quitta
40bcc543e3 tried to fix error messages being shown
--HG--
branch : quitta-gsoc-2013
2013-09-17 05:26:09 +02:00
Quitta
3d69e377e0 it works, though this will also forward the client to the success page
--HG--
branch : quitta-gsoc-2013
2013-09-17 04:58:02 +02:00
Quitta
4aa905c07f bah, its late and I'm not working in c++...
--HG--
branch : quitta-gsoc-2013
2013-09-17 04:35:37 +02:00
Quitta
343c01d077 this should fix it :D!
--HG--
branch : quitta-gsoc-2013
2013-09-17 04:24:57 +02:00
Quitta
2747ed75f7 wasn't completely fixed yet, hopefuly it now is
--HG--
branch : quitta-gsoc-2013
2013-09-17 02:31:02 +02:00
Quitta
739defbd99 small fix
--HG--
branch : quitta-gsoc-2013
2013-09-17 01:59:40 +02:00
Quitta
cae26f525c updated the help page!
--HG--
branch : quitta-gsoc-2013
2013-09-15 20:11:34 +02:00
Quitta
3dd4901036 syncing small fix
--HG--
branch : quitta-gsoc-2013
2013-09-15 19:44:24 +02:00
Quitta
bfce96eb23 putted image files in the www folder too, because else it can't be accessed from outside!
--HG--
branch : quitta-gsoc-2013
2013-09-15 19:38:49 +02:00
Quitta
3c1d74045e added function that imports the users from the nel db into the ams/ticket_user
--HG--
branch : quitta-gsoc-2013
2013-09-15 19:15:17 +02:00
Quitta
a485382a47 updated the docs!
--HG--
branch : quitta-gsoc-2013
2013-09-15 18:27:07 +02:00
kaetemi
f6668b3f6f Cleanup vr config interface
--HG--
branch : multipass-stereo
2013-09-15 02:14:38 +02:00
kaetemi
6186da84b2 Add ingame configuration interface for virtual reality devices
--HG--
branch : multipass-stereo
2013-09-15 01:34:06 +02:00
kaetemi
6dfc8d0a00 Rename
--HG--
branch : multipass-stereo
2013-09-14 00:46:10 +02:00
Quitta
1b9f09bc52 Added more documentations, this time also the inc/func files are documented and changed the doxygen config file with the help of Botanic
--HG--
branch : quitta-gsoc-2013
2013-09-14 00:39:03 +02:00
kaetemi
d2bc32e598 Merge with default
--HG--
branch : multipass-stereo
2013-09-13 23:07:49 +02:00
kaetemi
cd9baf8f89 Cleanup
--HG--
branch : multipass-stereo
2013-09-13 23:02:35 +02:00
kaetemi
278e19743c Do not use old interface here
--HG--
branch : multipass-stereo
2013-09-13 17:17:11 +02:00
Quitta
580aa3c775 Added the doxygen generated pages + config file in ryzom/tools/server/ryzom_ams_docs
--HG--
branch : quitta-gsoc-2013
2013-09-13 00:27:49 +02:00
Quitta
f11559bd8a the lib is entirely documented, still webusers and func/inc folders to go :D
--HG--
branch : quitta-gsoc-2013
2013-09-12 19:28:56 +02:00
Quitta
03b48ea0d3 some more documented classes..
--HG--
branch : quitta-gsoc-2013
2013-09-12 06:13:28 +02:00
Quitta
9a6da85805 added extra documentation. Man, writing documentation for the ticket class was quite a job :D
--HG--
branch : quitta-gsoc-2013
2013-09-11 23:51:23 +02:00
Quitta
9cc28cfc4d Even more docs! writing documentation sucks..
--HG--
branch : quitta-gsoc-2013
2013-09-11 16:56:00 +02:00
Quitta
afb0a74980 added more documentation..
--HG--
branch : quitta-gsoc-2013
2013-09-11 01:38:53 +02:00
kaetemi
21a70b4211 Update d3d implementation and add some debugging code
--HG--
branch : multipass-stereo
2013-09-11 01:12:37 +02:00
Quitta
d055a15f29 added documentation for assigned, dblayer and forwarded class
--HG--
branch : quitta-gsoc-2013
2013-09-10 21:26:03 +02:00
kaetemi
0a9dfc6aef Update decal vp
--HG--
branch : multipass-stereo
2013-09-10 17:01:33 +02:00
Quitta
f7fc1afad9 Just retested the mailing functionality, which seems to still work proper
--HG--
branch : quitta-gsoc-2013
2013-09-10 04:42:36 +02:00
Quitta
eb3d992716 removed my testing pass out of the config file :D
--HG--
branch : quitta-gsoc-2013
2013-09-09 23:31:49 +02:00
Quitta
a0d8902d13 Added CreatePermissions + handling it while syncing + changed image path to refer to the image locations dir + other fixes
--HG--
branch : quitta-gsoc-2013
2013-09-09 23:30:45 +02:00
kaetemi
bb625c33bd Flag some TODO's
--HG--
branch : multipass-stereo
2013-09-09 20:55:23 +02:00
Quitta
8d8f53b2f2 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
--HG--
branch : quitta-gsoc-2013
2013-09-09 03:47:32 +02:00
Quitta
a7cce8b94e Soem fixes + also using the createPermissions() function of the module atm!
--HG--
branch : quitta-gsoc-2013
2013-09-08 22:49:39 +02:00
kervala
87ee7fa8d2 Changed: Moved lua, luabind and curl FIND_PACKAGE in root CMakeLists.txt 2013-09-08 12:52:00 +02:00
Quitta
59d417efb7 Huge update! ingame part should work!
--HG--
branch : quitta-gsoc-2013
2013-09-08 06:01:01 +02:00
kaetemi
348594e5fd Merge 2013-09-07 15:54:36 +02:00
kaetemi
68f20a3369 Use distSqTo instead of distTo 2013-09-07 15:53:17 +02:00
kaetemi
082ce825a5 Add distSqTo to CAIVector 2013-09-07 15:53:10 +02:00
kaetemi
9e1ca3d1d0 Comment if-check around commented unused client-side speed limiting code 2013-09-07 15:53:00 +02:00
kaetemi
e99bf91b20 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
d583b2cd8e Ingame version works now too more or less
--HG--
branch : quitta-gsoc-2013
2013-09-07 04:12:47 +02:00
kervala
89b945bb8c Changed: Minor changes 2013-09-06 15:00:35 +02:00
kervala
980b7120c8 Changed: Merged code from official client 2013-09-06 15:00:01 +02:00
kervala
3c37af1bbc Fixed: Define math.fmod as a function for Lua 5.0 2013-09-06 14:53:40 +02:00
kervala
a62b5068f7 Changed: Replace atoi by NLMISC::fromString 2013-09-06 14:45:48 +02:00
Quitta
ae9fcba077 show queue works and show ticket info, I think all outgame aspects are covered now!
--HG--
branch : quitta-gsoc-2013
2013-09-06 04:52:37 +02:00
Quitta
f16711c9fa added support group functionality to the drupal module
--HG--
branch : quitta-gsoc-2013
2013-09-05 21:33:11 +02:00
Quitta
46114b65b3 some fixes for the real version
--HG--
branch : quitta-gsoc-2013
2013-09-05 04:29:47 +02:00
Quitta
9362db15c2 userlist works, show reply works, also possible to change the permissions of the users (though relying on the libs permission system atm..)
--HG--
branch : quitta-gsoc-2013
2013-09-05 04:16:28 +02:00
Quitta
d86f3cf755 show ticket log works + fixed timestamp issue
--HG--
branch : quitta-gsoc-2013
2013-09-05 03:29:34 +02:00
Quitta
222da898f1 Creating tickets, browsing the profile, replying on tickets and forwarding them is possible!
--HG--
branch : quitta-gsoc-2013
2013-09-05 02:31:29 +02:00
Quitta
0ec8e76d8e helpers class updated!
--HG--
branch : quitta-gsoc-2013
2013-09-04 17:49:46 +02:00
Quitta
9101cd2f6e can display the dashboard html atm
--HG--
branch : quitta-gsoc-2013
2013-09-04 17:44:43 +02:00
Quitta
b94e0dee67 reworked the index.php page into the module's _ams_handler function, which will be the main function. Having some serialize/unserialize issues though..
--HG--
branch : quitta-gsoc-2013
2013-09-03 17:52:52 +02:00
Quitta
6ccc60660a added amsblock and a menu item for the ams page
--HG--
branch : quitta-gsoc-2013
2013-09-03 04:55:51 +02:00
Quitta
99fa5d938c added help hook, to make it viewable in the help menu, however still unsure if I have to make a page or block or a combination..
--HG--
branch : quitta-gsoc-2013
2013-09-02 23:52:42 +02:00
Quitta
0fa17cb47d auto login when calling the page from ingame (should work)...
--HG--
branch : quitta-gsoc-2013
2013-09-02 21:21:41 +02:00
Quitta
502cb9fadc taking away the functions checkUser, checkEmail, checkpassword out of the module, the webuser/user handles this!
--HG--
branch : quitta-gsoc-2013
2013-09-02 19:43:53 +02:00
Quitta
609d2cf252 added hook_user_insert, now the user gets also added to the shard + a ticket_user entry gets created that couples the drupal id to it
--HG--
branch : quitta-gsoc-2013
2013-09-02 18:32:10 +02:00
Quitta
4dd70fd8e7 reworked config file to work with drupal and added extra config fields to the configuration form in the module
--HG--
branch : quitta-gsoc-2013
2013-09-02 16:23:07 +02:00
Quitta
3be11e8b93 including the module problem
--HG--
branch : quitta-gsoc-2013
2013-09-02 04:42:56 +02:00
Quitta
4f2219eb7a started working on the module + small addition
--HG--
branch : quitta-gsoc-2013
2013-09-02 04:15:18 +02:00