Commit graph

3618 commits

Author SHA1 Message Date
Botanic
6dfafa7ae1 Merge 2013-11-02 16:35:26 -07:00
kervala
588d262dbf Fixed: MFC can't be found 2013-10-30 20:46:19 +01:00
sfb
59abfb8a1d Bad logging, content is unsigned const char*, fixed it to use %s and not cast.
--HG--
branch : gsoc2011-worldeditorqt
2013-10-28 12:58:08 -05:00
sfb
df7110d2d6 Bad merge resolution, fixed a couple source files which merged poorly.
--HG--
branch : gsoc2011-worldeditorqt
2013-10-28 11:24:31 -05:00
sfb
d86f150caa Bad merge resolution, fixed the build files that merged poorly.
--HG--
branch : gsoc2011-worldeditorqt
2013-10-28 11:24:02 -05: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
sfb
892ed1ed3d merge from default
--HG--
branch : gsoc2011-worldeditorqt
2013-10-23 12:08:09 -05: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
kervala
28b9fbe8bc Changed: Search for default installation paths under Windows 2013-10-21 17:50:21 +02: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
3f1ce6020a Merge with default
--HG--
branch : multipass-stereo
2013-10-06 20:09:25 +02:00
kaetemi
563afd027c Fix #67 bad NELID in vertex program parser 2013-10-06 20:06:53 +02:00
kaetemi
af621187f1 Merge with default
--HG--
branch : multipass-stereo
2013-10-06 15:50:49 +02:00
kervala
eb3c58cce9 Fixed: Use multiarch library path under Linux 2013-09-30 09:11:35 +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
67e0b796ce Changed: Search for OpenGL Qt 4 module 2013-09-29 13:52:21 +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
kervala
f2ee0e99d8 Changed: Detect Windows 8 and Windows Server 2012 2013-09-29 13:41:42 +02:00
kervala
c7899841d3 Fixed: Compilation under Linux 2013-09-28 10:18:35 +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
eebe74066e Changed: Include Lua headers directory for GUI Editor 2013-09-27 16:43:02 +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
kervala
bc8490adb7 Changed: Detect Express versions 2013-09-27 11:05:52 +02:00
kervala
2aba0ec52f 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
4fee35c5b3 Fixed: Windows SDK detection for some previous versions 2013-09-27 09:26:22 +02: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
kervala
65d9c70cd9 Fixed: LNK2011 when using external libraries 2013-09-26 22:50:13 +02:00
kervala
03201f979f Changed: Improved Windows SDK detection 2013-09-26 22:49:30 +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
bb7297f260 Fixed: Wrong variable used to compute array length 2013-09-22 13:23:03 +02:00
kervala
b7ddc2c0d2 Fixed: OpenGL ES driver compilation 2013-09-22 13:20:53 +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
c7deb1b0c4 Changed: FIX_PRECOMPILED_HEADER now useless 2013-09-22 11:05:13 +02:00
kervala
6dff896bba Changed: Link to CURL_LIBRARIES 2013-09-22 11:04:40 +02:00
kervala
0ff9908e8e Changed: Don't include files from project in PCH 2013-09-22 11:01:17 +02:00
kervala
3294955c60 Fixed: #55 ryzom_client crashes on start with unprotected error in call to Lua API 2013-09-22 10:47:12 +02:00
StudioEtrange
d81c9db04e FindMSVC fix 2013-09-21 14:14:29 +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
1a669307da Fix typo 2013-09-14 19:05:54 +02:00
kaetemi
ce9e0a397b Fix regression from stereo branch in wind tree 2013-09-14 18:58:23 +02:00
kaetemi
046e3c92da Fix compile error in vertex program 2013-09-14 17:53:47 +02:00
kaetemi
3c099397d8 Update supportVertexProgram calls 2013-09-14 16:43:36 +02:00
kaetemi
e99bc7ba69 Remove old interface 2013-09-14 16:45:00 +02:00
kaetemi
256f7ff06c Cleanup unused code 2013-09-14 16:23:11 +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
973215e1d0 Cleanup
--HG--
branch : multipass-stereo
2013-09-14 00:36:06 +02:00
kaetemi
96dc139ddd Merge with default
--HG--
branch : multipass-stereo
2013-09-13 23:24:13 +02:00
kaetemi
df123d6b89 Fix compile errors caused by missing includes 2013-09-13 23:23:19 +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
74cff50842 Use named indices with wind tree program
--HG--
branch : multipass-stereo
2013-09-13 22:20:52 +02:00
kaetemi
c766940e75 Use named indices for per pixel light vertex program
--HG--
branch : multipass-stereo
2013-09-13 21:47:42 +02:00
kaetemi
f9c9c1836a Use named uniform indices for lighted vertex program
--HG--
branch : multipass-stereo
2013-09-13 21:31:47 +02:00
kaetemi
61af565bf9 Updated wind tree program container
--HG--
branch : multipass-stereo
2013-09-13 20:45:06 +02:00
kaetemi
c353121771 Use lighted vertex program container for per pixel light program
--HG--
branch : multipass-stereo
2013-09-13 20:00:20 +02:00
kaetemi
a72f25e763 Add container for lighted vertex program
--HG--
branch : multipass-stereo
2013-09-13 19:03:05 +02:00
kaetemi
ab231ea700 Adjust order for meshvp
--HG--
branch : multipass-stereo
2013-09-13 18:25:52 +02:00
kaetemi
278e19743c Do not use old interface here
--HG--
branch : multipass-stereo
2013-09-13 17:17:11 +02:00
kaetemi
d5c2a0527d Modify calls in bloom effect
--HG--
branch : multipass-stereo
2013-09-13 17:11:42 +02:00
kaetemi
5e14dc4458 Update veget implementation
--HG--
branch : multipass-stereo
2013-09-13 17:09:05 +02:00
kaetemi
9d93ae51a3 Fixes for d3d
--HG--
branch : multipass-stereo
2013-09-13 17:08:56 +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
e8d77e23e0 Rename of a d3d specific class
--HG--
branch : multipass-stereo
2013-09-10 19:53:41 +02:00
kaetemi
c6139419ac Partial update of veget vp
--HG--
branch : multipass-stereo
2013-09-10 19:52:14 +02:00
kaetemi
0a9dfc6aef Update decal vp
--HG--
branch : multipass-stereo
2013-09-10 17:01:33 +02:00
kaetemi
5fbb220795 Update some test code
--HG--
branch : multipass-stereo
2013-09-10 16:42:51 +02:00
kaetemi
c53aa6958e Small adjustment to landscape vp parameter setting
--HG--
branch : multipass-stereo
2013-09-10 16:24:45 +02:00
kaetemi
88cbc2f82b Simplify
--HG--
branch : multipass-stereo
2013-09-10 15:59:31 +02:00
kaetemi
abafc9b1ef Adjust landscape vertex program to use new interface
--HG--
branch : multipass-stereo
2013-09-10 15:42:42 +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
kaetemi
5ad617efb6 Use new program interface for water vertex program
--HG--
branch : multipass-stereo
2013-09-10 02:07:16 +02:00
kaetemi
32809d646a Set driver parameters
--HG--
branch : multipass-stereo
2013-09-10 02:01:57 +02:00
kaetemi
64643e564b Some fixes
--HG--
branch : multipass-stereo
2013-09-10 01:29:53 +02:00
kaetemi
0429e67903 Use CSmartPtr for vertex program
--HG--
branch : multipass-stereo
2013-09-10 00:31:26 +02:00
kaetemi
8f4fe87b7b Set params from storage
--HG--
branch : multipass-stereo
2013-09-09 23:39:18 +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
484a946c60 Fix incorrectly removed line
--HG--
branch : multipass-stereo
2013-09-09 23:03:52 +02:00
kaetemi
b03895f5f3 Missed file in last commit
--HG--
branch : multipass-stereo
2013-09-09 23:01:43 +02:00
kaetemi
e3dead19e4 Replace temporary CMaterial code
--HG--
branch : multipass-stereo
2013-09-09 21:44:14 +02:00
kaetemi
e9444ce36a Implement param storage copy
--HG--
branch : multipass-stereo
2013-09-09 21:05:12 +02:00
kaetemi
bb625c33bd Flag some TODO's
--HG--
branch : multipass-stereo
2013-09-09 20:55:23 +02:00
kaetemi
87b24bc4ab Add glsl pixel program for stereo distortion
--HG--
branch : multipass-stereo
2013-09-09 20:49:59 +02:00
kaetemi
ac2e087fbf Cleanup abstract gpu program interface
--HG--
branch : multipass-stereo
2013-09-09 18:33:38 +02:00
kaetemi
0d743d7f37 Implement new driver interface in Direct3D driver
--HG--
branch : multipass-stereo
2013-09-09 16:36:29 +02:00
kaetemi
81876009d3 Implement new driver interface in OpenGL driver
--HG--
branch : multipass-stereo
2013-09-09 14:43:10 +02:00
kaetemi
d1b93ac3d6 Expand parameter interface
--HG--
branch : multipass-stereo
2013-09-09 12:18:20 +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
kaetemi
e84e08b0f6 Reduce function duplication
--HG--
branch : multipass-stereo
2013-09-09 02:03:40 +02:00
kaetemi
4d1b5d90c0 Builtin parameter set functions
--HG--
branch : multipass-stereo
2013-09-09 01:53:02 +02:00
kaetemi
afe6c16bf3 Separate count and size
--HG--
branch : multipass-stereo
2013-09-09 01:31:15 +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
kaetemi
05583d134a Cleanup driver interface
--HG--
branch : multipass-stereo
2013-09-08 21:57:27 +02:00
kervala
0b9092a547 Changed: lua, luabind, libwww and libxml2 already linked to previous libraries (NLMISC and NLGUI) 2013-09-08 12:57:34 +02:00
kervala
0ccec811d6 Changed: Updated Freetype libraries variable 2013-09-08 12:54:05 +02:00
kervala
11dd2bc101 Changed: Look for Debug versions of libwww libraries 2013-09-08 12:53:35 +02:00
kervala
87ee7fa8d2 Changed: Moved lua, luabind and curl FIND_PACKAGE in root CMakeLists.txt 2013-09-08 12:52:00 +02:00
kervala
17ebe78cf6 Changed: Look for Debug version of freetype and use it for Debug configuration 2013-09-08 10:26:23 +02:00
Quitta
59d417efb7 Huge update! ingame part should work!
--HG--
branch : quitta-gsoc-2013
2013-09-08 06:01:01 +02:00
kaetemi
235bfcfd94 Add additional set functions
--HG--
branch : multipass-stereo
2013-09-08 01:49:34 +02:00
kaetemi
f0af3326e6 Add gpu program params storage structure
--HG--
branch : multipass-stereo
2013-09-08 01:36:01 +02:00
kaetemi
ee0396bd6f Implement new gpu program interface in direct3d driver
--HG--
branch : multipass-stereo
2013-09-07 22:00:07 +02:00
kaetemi
0a3f3f1760 Merge with default
--HG--
branch : multipass-stereo
2013-09-07 21:36:08 +02:00
kaetemi
350b580085 Implement new gpu program interface in opengl driver
--HG--
branch : multipass-stereo
2013-09-07 21:30:40 +02:00
kaetemi
1fa02cae9e Make gpu programs use abstract gpu program class
--HG--
branch : multipass-stereo
2013-09-07 20:41:07 +02:00
StudioEtrange
3121a83730 Merged ryzom/ryzomcore into default 2013-09-07 20:16:17 +02:00
kaetemi
97c9c26690 Add abstract gpu program and source classes
--HG--
branch : multipass-stereo
2013-09-07 18:33:18 +02:00
kervala
9dccf31863 Removed: S3TC module because not used anymore 2013-09-07 17:01:06 +02:00
kaetemi
361b7eab74 Fix compile error 2013-09-07 16:05:28 +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
StudioEtrange
fec561914d Merged ryzom/ryzomcore into default 2013-09-07 01:39:45 +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
86dfd0350b Fixed: Integer 32 bits conversion to 64 bits pointer 2013-09-06 14:51:21 +02:00
kervala
d03c795dd8 Changed: Don't use NLMISC includes in NLMISC PCH 2013-09-06 14:50:19 +02:00
kervala
ca9597e11e Changed: Cleanlooks doesn't exist anymore in Qt 5, so use default style 2013-09-06 14:49:12 +02:00
kervala
37fa1fa1ec Fixed: Use 32 bits libraries from Windows SDK in 64 bits 2013-09-06 14:48:21 +02:00
kervala
a62b5068f7 Changed: Replace atoi by NLMISC::fromString 2013-09-06 14:45:48 +02:00
kervala
d196f05b7e Removed: DInput module because it's not used anymore 2013-09-06 14:44:03 +02:00
StudioEtrange
d2530f6894 Merged ryzom/ryzomcore into default 2013-09-06 14:14:51 +02:00
kervala
f2bc8f3c8c Added: Toolchains for Android and iOS 2013-09-06 13:38:19 +02:00
kervala
3988120c55 Changed: Allows to choose a specific Windows SDK version with WINSDK_VERSION
Changed: Look for all installed Windows SDKs
2013-09-06 13:35:43 +02:00
kervala
6ddf4786ff Changed: Use /X everytime with MSVC 2013-09-06 09:30:54 +02:00
kervala
3a7cee4aa7 Changed: Improved MFC module 2013-09-06 09:26:23 +02:00
kervala
4a4b9b5ab8 Changed: Detect hg binary under Mac OS X if /opt/local/bin is not in PATH 2013-09-06 09:02:48 +02:00
kervala
651065e4ed Added: MSVC module to use later 2013-09-06 09:01:42 +02:00
kervala
a71f08274e Changed: Use PLATFORM_LINKFLAGS in *_LINKER_FLAGS 2013-09-06 09:00:33 +02:00
kervala
969d9a057d Changed: Display a message when compiling with NMake and define NMAKE 2013-09-06 08:58:36 +02:00
kervala
a52df4c710 Changed: Factorized AMD/amd 2013-09-06 08:58:02 +02:00
kervala
26679e767e Changed: Allow to put a "revision" file in root directory if .hg directory is not present 2013-09-06 08:44:57 +02:00
kervala
3e4a567d6a Fixed: Don't use -fPIC and -fPIE together (this could occur in some cases) 2013-09-06 08:43:44 +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
StudioEtrange
f10b6613cf ** PCH Support for NMake with VS2012
NMAKE-VS2012 Error LNK2011
while NMAKE-VS2010 does not complain
we need to link the pch.obj file
see http://msdn.microsoft.com/en-us/library/3ay26wa2(v=vs.110).aspx

** PCH Support for Ninja
Ninja need to add property
        OBJECT_DEPENDS for using PCH
        OBJECT_OUTPUTS for create PCH
see http://public.kitware.com/pipermail/cmake-developers/2012-March/003653.html
2013-09-05 17:18:01 +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
Quitta
29b5876162 small bug fix
--HG--
branch : quitta-gsoc-2013
2013-09-01 18:15:41 +02:00
Quitta
3dc513e868 ingame dashboard also fixed!
--HG--
branch : quitta-gsoc-2013
2013-08-29 22:19:37 +02:00
Quitta
af6c57ff52 dashboard added that shows the newest ticket, the amount of tickets in your todo list and tickets waiting on YOUR response
--HG--
branch : quitta-gsoc-2013
2013-08-29 05:01:47 +02:00
Quitta
9647d6ec8f added images in the ingame part, added config properties & fixed time bug in queues page
--HG--
branch : quitta-gsoc-2013
2013-08-29 02:08:05 +02:00
Quitta
a19e833772 Fancified outgame show info page and made ingame info page
--HG--
branch : quitta-gsoc-2013
2013-08-28 22:24:47 +02:00
Thibaut Girka
ea8a845ab9 Add support for LibVR
--HG--
branch : multipass-stereo
2013-08-28 08:08:22 +02:00
kaetemi
7782576dfc Merge with default
--HG--
branch : multipass-stereo
2013-09-07 16:25:45 +02:00
Quitta
75b645264d ticket showing works outgame, but needs fancyfying :D
--HG--
branch : quitta-gsoc-2013
2013-08-28 05:31:06 +02:00
Quitta
3790739f49 updated, stroing to the db seems to work!
--HG--
branch : quitta-gsoc-2013
2013-08-28 02:24:08 +02:00
Quitta
2af50cb421 ticket_info class done, however I think I better add a field to the Ticket DB, instead the way I do it now..
--HG--
branch : quitta-gsoc-2013
2013-08-27 22:54:45 +02:00
Quitta
54d71fd26d ticket_info class almost done
--HG--
branch : quitta-gsoc-2013
2013-08-27 19:08:10 +02:00
Quitta
bdbbb393cd Finaly got it to working again..
--HG--
branch : quitta-gsoc-2013
2013-08-26 17:25:28 +02:00
kervala
6d10e3189c Changed: Formatting 2013-08-26 12:34:04 +02:00
kervala
881912fa34 Fixed: Crash when trying to display a missing texture 2013-08-26 12:33:26 +02:00
Quitta
b1926fbec3 added language support however, something is broken :/
--HG--
branch : quitta-gsoc-2013
2013-08-26 11:34:51 +02:00
Quitta
1a81a7810f mailing refactored
--HG--
branch : quitta-gsoc-2013
2013-08-26 05:37:55 +02:00
Quitta
508545248a #mailing languages setup
--HG--
branch : quitta-gsoc-2013
2013-08-25 17:49:01 +02:00
Quitta
70732ffd42 rewrote language handling + language is now stored in the db and the value is based on the users language flag clicked (or default) or the ingame language
--HG--
branch : quitta-gsoc-2013
2013-08-25 06:27:44 +02:00
Quitta
0e0ce112bb receive messages setting is added to the ingame layout
--HG--
branch : quitta-gsoc-2013
2013-08-25 01:22:24 +02:00
Quitta
df4d97fa98 Inagme layout for modifying group email stuff is fixed
--HG--
branch : quitta-gsoc-2013
2013-08-24 17:19:46 +02:00
Quitta
7f8c0f8380 Fixed sgroup_liist ingame layout..
--HG--
branch : quitta-gsoc-2013
2013-08-24 15:56:16 +02:00
Quitta
3bebfe4492 put mail cron related debug info into a log file specified in config.php
--HG--
branch : quitta-gsoc-2013
2013-08-20 04:33:23 +02:00
Quitta
ebce7ae90c fixing a lot of mail bug problems
--HG--
branch : quitta-gsoc-2013
2013-08-20 02:08:12 +02:00
Quitta
d1c1740741 Added encryption by using the openSSL functionality to encrypt the email passwords in the db
--HG--
branch : quitta-gsoc-2013
2013-08-19 20:22:01 +02:00
Quitta
5174764f2d Users can specify if they want to receive or dont want to receive tickt updates!
--HG--
branch : quitta-gsoc-2013
2013-08-19 00:02:55 +02:00
Quitta
f0f08fc374 fixed dirty error in queue's that didn't allow me to assing/unassign after creating a queue
--HG--
branch : quitta-gsoc-2013
2013-08-18 03:39:35 +02:00
Quitta
f8d19762fe fixed some nasty errors + made it show the entire replied message
--HG--
branch : quitta-gsoc-2013
2013-08-18 02:49:58 +02:00
Quitta
ba2c506120 response is being sent from the correct support group atm
--HG--
branch : quitta-gsoc-2013
2013-08-18 02:17:02 +02:00
Quitta
69192712a0 made 3 options for incomming mail: reply on ticket, new ticket and nothing related to that. When it's nothing related to that the mail will stay in the mailbox untill it get's manually read and deleted!
--HG--
branch : quitta-gsoc-2013
2013-08-17 19:07:00 +02:00
Quitta
483045c613 creating new tickets over email works
--HG--
branch : quitta-gsoc-2013
2013-08-17 03:06:22 +02:00
Quitta
2a02f35ae8 Hanle multiple mailaccounts
--HG--
branch : quitta-gsoc-2013
2013-08-16 22:24:11 +02:00
Quitta
8262febe32 sending mail with supportgroup ID is possible
--HG--
branch : quitta-gsoc-2013
2013-08-16 21:43:39 +02:00
Quitta
fb7254c018 Functionality to modify mailsettings of a support group.
--HG--
branch : quitta-gsoc-2013
2013-08-16 05:37:38 +02:00
Quitta
80ee498951 add email related stuff to support groups
--HG--
branch : quitta-gsoc-2013
2013-08-16 03:40:59 +02:00
Quitta
370653b11c ticket mail system basis works
--HG--
branch : quitta-gsoc-2013
2013-08-13 17:16:43 +02:00
Quitta
328351a4c5 ticket hanling function added
--HG--
branch : quitta-gsoc-2013
2013-08-12 23:56:58 +02:00
Quitta
987d5943c3 not sure if I should keep the task creation or not, will ask Botanic tomorrow
--HG--
branch : quitta-gsoc-2013
2013-08-12 05:14:00 +02:00
Quitta
4478ad115d ready to do the imap part
--HG--
branch : quitta-gsoc-2013
2013-08-12 01:11:48 +02:00
Quitta
e058a475f9 basis seems to run in terminal, however mail() doesn't work yet
--HG--
branch : quitta-gsoc-2013
2013-08-11 03:55:07 +02:00
Quitta
8ee02d9380 ready for testing the send mail functionality :)
--HG--
branch : quitta-gsoc-2013
2013-08-11 02:29:31 +02:00
Quitta
68a230f4ef updates to the mail_handler
--HG--
branch : quitta-gsoc-2013
2013-08-10 13:59:36 +02:00
Quitta
b05f34ac13 added mail_handler class (from Botanic) still needs to be reworked + added show queue template
--HG--
branch : quitta-gsoc-2013
2013-08-10 01:46:21 +02:00
Quitta
34a800542f more elements per page!
--HG--
branch : quitta-gsoc-2013
2013-08-06 06:07:49 +02:00
Quitta
9318776e85 userlist ingame works + fixed a bug in demoting/promoting users with roles, which was looking at the wrong id
--HG--
branch : quitta-gsoc-2013
2013-08-06 04:31:01 +02:00
Quitta
1d68d8a781 I think I'm done refactoring the queues
--HG--
branch : quitta-gsoc-2013
2013-08-06 01:00:17 +02:00
Quitta
ef05fdda7c refactor queue's part 1
--HG--
branch : quitta-gsoc-2013
2013-08-05 22:35:22 +02:00
Quitta
91e758c1ee userlist works with pagination
--HG--
branch : quitta-gsoc-2013
2013-08-05 21:12:58 +02:00
Quitta
99ad1504e3 refactoring webusers.php
--HG--
branch : quitta-gsoc-2013
2013-08-05 17:31:36 +02:00
kervala
f680e3943d Changed: Minor formatting 2013-08-05 10:34:38 +02:00
kervala
a41ba055a5 Fixed: PCH with Qt 5 and CMake 2.8.11 2013-08-05 10:32:17 +02:00
kervala
c792c423db Fixed: X64 not detected with CMake 2.8.11 2013-08-05 10:31:23 +02:00
kervala
2c7f848c83 Changed: Tabulations to spaces 2013-08-05 10:30:40 +02:00
Quitta
5b4c13f8d3 renamed libuserlist to syncing, which is more appropriate, also made pagination work! so Now I can start to use it ingame too!
--HG--
branch : quitta-gsoc-2013
2013-08-05 05:37:18 +02:00
Quitta
7e4a24bac8 pagination seems to work! :)
--HG--
branch : quitta-gsoc-2013
2013-08-05 05:27:19 +02:00
Quitta
845da81ad4 generic pagination with debugging for testing it atm
--HG--
branch : quitta-gsoc-2013
2013-08-05 04:37:20 +02:00
Quitta
9a2ff7c7d0 Pagination class added, not tested yet :D
--HG--
branch : quitta-gsoc-2013
2013-08-04 20:27:07 +02:00
Botanic
d0d69d7c77 Make it so that bad text always throws a nlwarning 2013-08-04 01:43:54 -07:00
kaetemi
71cdf88b81 Fix warning
--HG--
branch : multipass-stereo
2013-08-03 21:29:47 +02:00
Quitta
bc62611305 languages handling done
--HG--
branch : quitta-gsoc-2013
2013-08-03 18:59:21 +02:00
Quitta
f5ef22914f color scheme configuration with colors loaed from ingame_layout.ini
--HG--
branch : quitta-gsoc-2013
2013-08-03 05:00:39 +02:00
Quitta
8e7bbb2e62 fixed assigning/unassigning and sending empty messages
--HG--
branch : quitta-gsoc-2013
2013-08-03 04:00:41 +02:00
Quitta
9fd7c9f205 forgot to add the files
--HG--
branch : quitta-gsoc-2013
2013-08-02 19:44:28 +02:00
Quitta
7ee2ce596f log + reply ingame page
--HG--
branch : quitta-gsoc-2013
2013-08-02 19:43:43 +02:00
Quitta
785684f923 show ticket layout is done,though some unpleasant bugs turned up
--HG--
branch : quitta-gsoc-2013
2013-08-02 17:03:26 +02:00
Quitta
5aa33f49fb show ticket save before going to bed
--HG--
branch : quitta-gsoc-2013
2013-08-02 05:27:00 +02:00