Commit graph

3333 commits

Author SHA1 Message Date
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
kervala
1560df430a Changed: Replace atoi by NLMISC::fromString 2013-09-06 14:45:48 +02:00
kervala
bfc65e70e7 Removed: DInput module because it's not used anymore 2013-09-06 14:44:03 +02:00
StudioEtrange
a4be8d565b Merged ryzom/ryzomcore into default 2013-09-06 14:14:51 +02:00
kervala
08cf590b30 Added: Toolchains for Android and iOS 2013-09-06 13:38:19 +02:00
kervala
b26bf1a265 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
8cd8dcee5e Changed: Use /X everytime with MSVC 2013-09-06 09:30:54 +02:00
kervala
9e042a5c67 Changed: Improved MFC module 2013-09-06 09:26:23 +02:00
kervala
b87aac1cc0 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
c87c99f6b2 Added: MSVC module to use later 2013-09-06 09:01:42 +02:00
kervala
5f4831f8b8 Changed: Use PLATFORM_LINKFLAGS in *_LINKER_FLAGS 2013-09-06 09:00:33 +02:00
kervala
3833a51003 Changed: Display a message when compiling with NMake and define NMAKE 2013-09-06 08:58:36 +02:00
kervala
30a8cc1fe3 Changed: Factorized AMD/amd 2013-09-06 08:58:02 +02:00
kervala
3c3e25d523 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
ff444f42fa Fixed: Don't use -fPIC and -fPIE together (this could occur in some cases) 2013-09-06 08:43:44 +02:00
Quitta
d267e60514 show queue works and show ticket info, I think all outgame aspects are covered now! 2013-09-06 04:52:37 +02:00
Quitta
4691242d4d added support group functionality to the drupal module 2013-09-05 21:33:11 +02:00
StudioEtrange
d951e1c452 ** 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
dd14548048 some fixes for the real version 2013-09-05 04:29:47 +02:00
Quitta
8f2dd7f2fd userlist works, show reply works, also possible to change the permissions of the users (though relying on the libs permission system atm..) 2013-09-05 04:16:28 +02:00
Quitta
8af7f02311 show ticket log works + fixed timestamp issue 2013-09-05 03:29:34 +02:00
Quitta
f795cf44d2 Creating tickets, browsing the profile, replying on tickets and forwarding them is possible! 2013-09-05 02:31:29 +02:00
Quitta
98e5964869 helpers class updated! 2013-09-04 17:49:46 +02:00
Quitta
fd368bb123 can display the dashboard html atm 2013-09-04 17:44:43 +02:00
Quitta
213000c5c8 reworked the index.php page into the module's _ams_handler function, which will be the main function. Having some serialize/unserialize issues though.. 2013-09-03 17:52:52 +02:00
Quitta
6f4fb697b5 added amsblock and a menu item for the ams page 2013-09-03 04:55:51 +02:00
Quitta
08d21336af 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.. 2013-09-02 23:52:42 +02:00
Quitta
2805577c81 auto login when calling the page from ingame (should work)... 2013-09-02 21:21:41 +02:00
Quitta
38fe1ee557 taking away the functions checkUser, checkEmail, checkpassword out of the module, the webuser/user handles this! 2013-09-02 19:43:53 +02:00
Quitta
e992a3aef0 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 2013-09-02 18:32:10 +02:00
Quitta
ebc2c1c144 reworked config file to work with drupal and added extra config fields to the configuration form in the module 2013-09-02 16:23:07 +02:00
Quitta
ef61212038 including the module problem 2013-09-02 04:42:56 +02:00
Quitta
1867c9d196 started working on the module + small addition 2013-09-02 04:15:18 +02:00
Quitta
362e395779 small bug fix 2013-09-01 18:15:41 +02:00
Quitta
01f6d6fabd ingame dashboard also fixed! 2013-08-29 22:19:37 +02:00
Quitta
a86f192c84 dashboard added that shows the newest ticket, the amount of tickets in your todo list and tickets waiting on YOUR response 2013-08-29 05:01:47 +02:00
Quitta
600b016e1d added images in the ingame part, added config properties & fixed time bug in queues page 2013-08-29 02:08:05 +02:00
Quitta
2f07d292e5 Fancified outgame show info page and made ingame info page 2013-08-28 22:24:47 +02:00
Thibaut Girka
a45299bfe5 Add support for LibVR 2013-08-28 08:08:22 +02:00
kaetemi
beb66b19b7 Merge with default 2013-09-07 16:25:45 +02:00
Quitta
a795c58256 ticket showing works outgame, but needs fancyfying :D 2013-08-28 05:31:06 +02:00
Quitta
fa86db3cc7 updated, stroing to the db seems to work! 2013-08-28 02:24:08 +02:00
Quitta
52f90e9261 ticket_info class done, however I think I better add a field to the Ticket DB, instead the way I do it now.. 2013-08-27 22:54:45 +02:00
Quitta
420bb064c6 ticket_info class almost done 2013-08-27 19:08:10 +02:00
Quitta
d6c8483029 Finaly got it to working again.. 2013-08-26 17:25:28 +02:00
kervala
d2a9cb90d0 Changed: Formatting 2013-08-26 12:34:04 +02:00
kervala
dd116afff3 Fixed: Crash when trying to display a missing texture 2013-08-26 12:33:26 +02:00
Quitta
dabf1da618 added language support however, something is broken :/ 2013-08-26 11:34:51 +02:00
Quitta
c6ce0a188a mailing refactored 2013-08-26 05:37:55 +02:00
Quitta
d147cc681c #mailing languages setup 2013-08-25 17:49:01 +02:00
Quitta
e9f3a560a8 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 2013-08-25 06:27:44 +02:00
Quitta
845719fd29 receive messages setting is added to the ingame layout 2013-08-25 01:22:24 +02:00
Quitta
bce43b641e Inagme layout for modifying group email stuff is fixed 2013-08-24 17:19:46 +02:00
Quitta
59ae5ce380 Fixed sgroup_liist ingame layout.. 2013-08-24 15:56:16 +02:00
Quitta
2cf3441ab8 put mail cron related debug info into a log file specified in config.php 2013-08-20 04:33:23 +02:00
Quitta
78aa1074af fixing a lot of mail bug problems 2013-08-20 02:08:12 +02:00
Quitta
72a0c8303c Added encryption by using the openSSL functionality to encrypt the email passwords in the db 2013-08-19 20:22:01 +02:00
Quitta
ba0e8e2d51 Users can specify if they want to receive or dont want to receive tickt updates! 2013-08-19 00:02:55 +02:00
Quitta
e0d9ff8628 fixed dirty error in queue's that didn't allow me to assing/unassign after creating a queue 2013-08-18 03:39:35 +02:00
Quitta
83d4a89e46 fixed some nasty errors + made it show the entire replied message 2013-08-18 02:49:58 +02:00
Quitta
2a7f13c8d8 response is being sent from the correct support group atm 2013-08-18 02:17:02 +02:00
Quitta
b765b0133d 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! 2013-08-17 19:07:00 +02:00
Quitta
993973441a creating new tickets over email works 2013-08-17 03:06:22 +02:00
Quitta
70fdf0dc74 Hanle multiple mailaccounts 2013-08-16 22:24:11 +02:00
Quitta
420454f7f3 sending mail with supportgroup ID is possible 2013-08-16 21:43:39 +02:00
Quitta
141f40835f Functionality to modify mailsettings of a support group. 2013-08-16 05:37:38 +02:00
Quitta
e169978d13 add email related stuff to support groups 2013-08-16 03:40:59 +02:00
Quitta
759ee63e9f ticket mail system basis works 2013-08-13 17:16:43 +02:00
Quitta
9ac1f5ffb4 ticket hanling function added 2013-08-12 23:56:58 +02:00
Quitta
188552a135 not sure if I should keep the task creation or not, will ask Botanic tomorrow 2013-08-12 05:14:00 +02:00
Quitta
7206e19c20 ready to do the imap part 2013-08-12 01:11:48 +02:00
Quitta
0d57ff53e8 basis seems to run in terminal, however mail() doesn't work yet 2013-08-11 03:55:07 +02:00
Quitta
74cfcdaac2 ready for testing the send mail functionality :) 2013-08-11 02:29:31 +02:00
Quitta
784fd5ecea updates to the mail_handler 2013-08-10 13:59:36 +02:00
Quitta
6b4deea068 added mail_handler class (from Botanic) still needs to be reworked + added show queue template 2013-08-10 01:46:21 +02:00
Quitta
7a051a8068 more elements per page! 2013-08-06 06:07:49 +02:00
Quitta
a2b83bb6c7 userlist ingame works + fixed a bug in demoting/promoting users with roles, which was looking at the wrong id 2013-08-06 04:31:01 +02:00
Quitta
2d863042e5 I think I'm done refactoring the queues 2013-08-06 01:00:17 +02:00
Quitta
c38605f74c refactor queue's part 1 2013-08-05 22:35:22 +02:00
Quitta
6faceea785 userlist works with pagination 2013-08-05 21:12:58 +02:00
Quitta
528f6d858a refactoring webusers.php 2013-08-05 17:31:36 +02:00
kervala
33115f61b2 Changed: Minor formatting 2013-08-05 10:34:38 +02:00
kervala
f9b70173ce Fixed: PCH with Qt 5 and CMake 2.8.11 2013-08-05 10:32:17 +02:00
kervala
e74913f589 Fixed: X64 not detected with CMake 2.8.11 2013-08-05 10:31:23 +02:00
kervala
a2f91ce484 Changed: Tabulations to spaces 2013-08-05 10:30:40 +02:00
Quitta
cee8bbc495 renamed libuserlist to syncing, which is more appropriate, also made pagination work! so Now I can start to use it ingame too! 2013-08-05 05:37:18 +02:00
Quitta
e5d5cfe0cc pagination seems to work! :) 2013-08-05 05:27:19 +02:00
Quitta
d1795c32f8 generic pagination with debugging for testing it atm 2013-08-05 04:37:20 +02:00
Quitta
7fea272d82 Pagination class added, not tested yet :D 2013-08-04 20:27:07 +02:00
kaetemi
d0a4f5ed75 Fix warning 2013-08-03 21:29:47 +02:00
Quitta
5ab79d3185 languages handling done 2013-08-03 18:59:21 +02:00
Quitta
dee33cda06 color scheme configuration with colors loaed from ingame_layout.ini 2013-08-03 05:00:39 +02:00
Quitta
2ab086183d fixed assigning/unassigning and sending empty messages 2013-08-03 04:00:41 +02:00
Quitta
0310bbd680 forgot to add the files 2013-08-02 19:44:28 +02:00
Quitta
1de3c2b40c log + reply ingame page 2013-08-02 19:43:43 +02:00
Quitta
47861c19d3 show ticket layout is done,though some unpleasant bugs turned up 2013-08-02 17:03:26 +02:00
Quitta
28847b88f1 show ticket save before going to bed 2013-08-02 05:27:00 +02:00
Quitta
461681ec33 Added the android app of Botanic :) 2013-08-02 04:47:33 +02:00
Quitta
99a50c00be basis for show ticket 2013-08-01 23:10:26 +02:00
kaetemi
9dc9acd68f Merge with default 2013-08-01 23:02:49 +02:00
kaetemi
bbe4ea4ba8 Add some basic prediction to CCDBNodeBranch::find 2013-08-01 22:47:46 +02:00
Quitta
3c2b2ef53d added db parameter to the syncing 2013-08-01 18:20:40 +02:00
kaetemi
1ed7e4fcff Force link 2013-08-01 10:11:11 +02:00
Quitta
e4d6228055 Added support group pages ingame layout + layout of the #menu's and managed to get a AMS-Home button in the top that would bring the page back to the dashboard! 2013-08-01 04:48:40 +02:00
Quitta
e4fcb7ec4f Merge 2013-08-01 00:14:31 +02:00
Quitta
dd16f2fc1e made home back redo 2013-08-01 00:10:47 +02:00
DJanssens
70a98da8a8 autologin works 2013-07-31 15:08:35 -07:00
Quitta
b3b39bd15f login.tpl hided between my not yet pushed files! You evil login.tpl :D that might fix the auto login problem 2013-07-31 22:38:47 +02:00
Quitta
471b4b2904 Merge 2013-07-31 22:29:09 +02:00
Quitta
b97824e0af change home button 2013-07-31 22:27:59 +02:00
DJanssens
af10295644 test 2013-07-31 13:03:12 -07:00
Quitta
63db620ca6 Merge with default 2013-07-31 16:26:22 +02:00
Quitta
e3625bc4e4 Merge with default 2013-07-31 16:17:29 +02:00
Quitta
3c85cd86b9 made the config file more general + seemed some simple <br>'s in the textarea solved it! thank you mr wireshark! 2013-07-31 16:09:39 +02:00
Quitta
efe5213887 create ticket almost done, sadly textarea isn't really helping because can't specify #rows 2013-07-31 03:31:50 +02:00
Quitta
49cb5fe731 settings finished 2013-07-31 02:09:21 +02:00
Quitta
93af1b2fde settings page is starting to look nice 2013-07-31 01:19:57 +02:00
Quitta
8368f37357 finally got some basic layout starting to look good! 2013-07-30 20:18:01 +02:00
Quitta
ba72925b86 working o the basic layout 2013-07-30 19:13:32 +02:00
Quitta
8903abf8d8 trying to get basic layout done + removed the sidebar + added a scrollbar + the home button needs correct text. 2013-07-30 17:31:28 +02:00
Quitta
0bf8c4d526 fix for getting client working + possibly auto login for ingame part 2013-07-30 01:46:56 +02:00
kaetemi
7bbf40ea19 Improve performance of UsedTexture debugging info in OpenGL driver 2013-07-29 03:41:10 +02:00
kaetemi
7046b6f364 NLGUI files dbgroup_combo_box.cpp and dbgroup_select_number.cpp were not linked 2013-07-28 21:39:54 +02:00
kaetemi
7a8db939ad Missed one 2013-07-28 18:22:35 +02:00
kaetemi
bff229da69 Fix a typo 2013-07-28 18:19:51 +02:00
kaetemi
19efd6fba8 Merge 2013-07-28 18:04:13 +02:00
kaetemi
880e9dc082 Fix another compile error 2013-07-28 18:02:43 +02:00
kaetemi
d9c15ede09 Can't include this here. A light header with all of these maximum constants might be handy 2013-07-28 17:59:05 +02:00
kaetemi
34553ca2db Fix a compile error 2013-07-28 17:49:28 +02:00
kaetemi
8bf0fbc60e Merge 2013-07-28 09:17:58 +02:00
kaetemi
7442168061 Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:DIRECTION"") 2013-07-28 09:06:11 +02:00
kaetemi
3115bcb1ff Avoid redundant per-frame calls to getDbProp in outpost.xml and outpost.lua 2013-07-28 08:55:28 +02:00
kaetemi
430bfd26c6 Make _ShowReticleLeaf static 2013-07-28 08:35:40 +02:00
kaetemi
527df2511b Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:CDB_INIT_IN_PROGRESS") 2013-07-28 08:22:53 +02:00
kaetemi
10e4eb4634 Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:MK_MOVE") 2013-07-28 08:19:54 +02:00
kaetemi
b32f8b5025 Avoid redundant per-frame calls to getDbProp("UI:SAVE:USER_CHAR_FADE") 2013-07-28 08:16:02 +02:00
kaetemi
30ea315002 Avoid redundant per-frame calls to getDbProp("SERVER:WEATHER:VALUE") 2013-07-28 08:13:19 +02:00
kaetemi
1674b81cce Avoid redundant calls to getDbProp("UI:SAVE:INSCENE:...") 2013-07-28 07:55:16 +02:00
kaetemi
37277019be Avoid redundant calls to getDbProp in CEntityCL 2013-07-28 06:45:43 +02:00
kaetemi
3fe1a17503 Avoid redundant per-frame calls to getDbProp("UI:ENTITY:GUILD:#:ICON") 2013-07-28 05:48:59 +02:00
kaetemi
292df29429 Avoid per-frame 'set' action handler in map.xml when opening the respawn map 2013-07-28 05:21:05 +02:00
kaetemi
bf0e0b1d56 Avoid per-frame 'set' action handler in config.xml for blending day and night color 2013-07-28 05:21:00 +02:00
kaetemi
b09e28e9e0 Avoid having to use 'set' action handler, which parses the value expression on every use, in interface links by implementing use of cdb nodes as targets 2013-07-28 05:10:07 +02:00