Commit graph

3429 commits

Author SHA1 Message Date
Quitta
ca769bf24b login.tpl hided between my not yet pushed files! You evil login.tpl :D that might fix the auto login problem
--HG--
branch : quitta-gsoc-2013
2013-07-31 22:38:47 +02:00
Quitta
40883e8afc Merge
--HG--
branch : quitta-gsoc-2013
2013-07-31 22:29:09 +02:00
Quitta
4dba2a11cf change home button
--HG--
branch : quitta-gsoc-2013
2013-07-31 22:27:59 +02:00
DJanssens
2f8d97ae3b test
--HG--
branch : quitta-gsoc-2013
2013-07-31 13:03:12 -07:00
Quitta
eba12f770f Merge with default
--HG--
branch : quitta-gsoc-2013
2013-07-31 16:26:22 +02:00
Quitta
e8db641b47 Merge with default
--HG--
branch : quitta-gsoc-2013
2013-07-31 16:17:29 +02:00
Quitta
c42c667827 made the config file more general + seemed some simple <br>'s in the textarea solved it! thank you mr wireshark!
--HG--
branch : quitta-gsoc-2013
2013-07-31 16:09:39 +02:00
Quitta
b768d1afb6 create ticket almost done, sadly textarea isn't really helping because can't specify #rows
--HG--
branch : quitta-gsoc-2013
2013-07-31 03:31:50 +02:00
Quitta
2f4a965bdb settings finished
--HG--
branch : quitta-gsoc-2013
2013-07-31 02:09:21 +02:00
Quitta
d47aadf768 settings page is starting to look nice
--HG--
branch : quitta-gsoc-2013
2013-07-31 01:19:57 +02:00
Quitta
a5fad36d5a finally got some basic layout starting to look good!
--HG--
branch : quitta-gsoc-2013
2013-07-30 20:18:01 +02:00
Quitta
0f38c39152 working o the basic layout
--HG--
branch : quitta-gsoc-2013
2013-07-30 19:13:32 +02:00
Quitta
a2e69be7d7 trying to get basic layout done + removed the sidebar + added a scrollbar + the home button needs correct text.
--HG--
branch : quitta-gsoc-2013
2013-07-30 17:31:28 +02:00
Quitta
12baee2fcf fix for getting client working + possibly auto login for ingame part
--HG--
branch : quitta-gsoc-2013
2013-07-30 01:46:56 +02:00
kaetemi
1c3fbf0256 Improve performance of UsedTexture debugging info in OpenGL driver
--HG--
branch : kaetemi-optimize
2013-07-29 03:41:10 +02:00
kaetemi
64335ae0b8 NLGUI files dbgroup_combo_box.cpp and dbgroup_select_number.cpp were not linked 2013-07-28 21:39:54 +02:00
kaetemi
f5a8bd2785 Missed one 2013-07-28 18:22:35 +02:00
kaetemi
692dafacfb Fix a typo 2013-07-28 18:19:51 +02:00
kaetemi
343cc325b2 Merge 2013-07-28 18:04:13 +02:00
kaetemi
72fabe141e Fix another compile error 2013-07-28 18:02:43 +02:00
kaetemi
2670e34621 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
cf42b3473f Fix a compile error 2013-07-28 17:49:28 +02:00
kaetemi
0163a508c2 Merge 2013-07-28 09:17:58 +02:00
kaetemi
32082e854a Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:DIRECTION"")
--HG--
branch : kaetemi-optimize
2013-07-28 09:06:11 +02:00
kaetemi
16783449a7 Avoid redundant per-frame calls to getDbProp in outpost.xml and outpost.lua
--HG--
branch : kaetemi-optimize
2013-07-28 08:55:28 +02:00
kaetemi
70ea479714 Make _ShowReticleLeaf static
--HG--
branch : kaetemi-optimize
2013-07-28 08:35:40 +02:00
kaetemi
ed912ab3ae Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:CDB_INIT_IN_PROGRESS")
--HG--
branch : kaetemi-optimize
2013-07-28 08:22:53 +02:00
kaetemi
1fc4277cf4 Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:MK_MOVE")
--HG--
branch : kaetemi-optimize
2013-07-28 08:19:54 +02:00
kaetemi
cc2465199c Avoid redundant per-frame calls to getDbProp("UI:SAVE:USER_CHAR_FADE")
--HG--
branch : kaetemi-optimize
2013-07-28 08:16:02 +02:00
kaetemi
23ac008cf1 Avoid redundant per-frame calls to getDbProp("SERVER:WEATHER:VALUE")
--HG--
branch : kaetemi-optimize
2013-07-28 08:13:19 +02:00
kaetemi
171faa31fb Avoid redundant calls to getDbProp("UI:SAVE:INSCENE:...")
--HG--
branch : kaetemi-optimize
2013-07-28 07:55:16 +02:00
kaetemi
477e9e8ef1 Avoid redundant calls to getDbProp in CEntityCL
--HG--
branch : kaetemi-optimize
2013-07-28 06:45:43 +02:00
kaetemi
aeb9f4d945 Avoid redundant per-frame calls to getDbProp("UI:ENTITY:GUILD:#:ICON")
--HG--
branch : kaetemi-optimize
2013-07-28 05:48:59 +02:00
kaetemi
13fc6ffb58 Avoid per-frame 'set' action handler in map.xml when opening the respawn map
--HG--
branch : kaetemi-optimize
2013-07-28 05:21:05 +02:00
kaetemi
22710e12bd Avoid per-frame 'set' action handler in config.xml for blending day and night color
--HG--
branch : kaetemi-optimize
2013-07-28 05:21:00 +02:00
kaetemi
5a9537dfcc 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
--HG--
branch : kaetemi-optimize
2013-07-28 05:10:07 +02:00
kaetemi
19a8b48355 Avoid redundant per-frame calls to getDbProp("SERVER:USER:DEFAULT_WEIGHT_HANDS")
--HG--
branch : kaetemi-optimize
2013-07-28 05:10:06 +02:00
kaetemi
a75bd5d23a Avoid redundant per-frame calls to getDbProp in CNetManager
--HG--
branch : kaetemi-optimize
2013-07-28 05:10:06 +02:00
kaetemi
7bb8dec40c Parse action handler condition for interface link in advance
--HG--
branch : kaetemi-optimize
2013-07-28 03:02:07 +02:00
kaetemi
d5308215aa Avoid redundant per-frame calls to getDbProp in NLGUI::CWidgetManager
--HG--
branch : kaetemi-optimize
2013-07-28 00:48:34 +02:00
kaetemi
fb00acf329 Avoid redundant per-frame calls to getDbValue32(toString("SERVER:CHARACTER_INFO:CHARACTERISTICS%d:VALUE", i))
--HG--
branch : kaetemi-optimize
2013-07-28 00:29:32 +02:00
kaetemi
5f80a90a1c Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:FPS", false)
--HG--
branch : kaetemi-optimize
2013-07-28 00:29:32 +02:00
kaetemi
2a57f6c647 Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:TOTAL_MALUS_EQUIP", false)
--HG--
branch : kaetemi-optimize
2013-07-28 00:29:32 +02:00
kaetemi
0897092fe3 Avoid redundant per-frame calls to getDbProp("UI:SAVE:SHOW_RETICLE")
--HG--
branch : kaetemi-optimize
2013-07-28 00:29:25 +02:00
kaetemi
5ad6373f61 Build ligo outside the database
--HG--
branch : build_pipeline_py
2013-07-27 04:03:05 +02:00
kervala
8577277bfd Fixed: prtab function not compiling with VC++ (define DEBUG_CRYPT if you want to debug crypt() method) 2013-07-26 09:33:32 +02:00
Cédric OCHS
1a83892ec6 Merged in StudioEtrange/ryzomcore/StudioEtrange/fix-some-probleme-with-spaces-in-path-on-1374699208398 (pull request #19)
Fix some problems with space char in path on windows
2013-07-26 08:07:42 +02:00
kaetemi
f6ee2707ea Merge with default
--HG--
branch : multipass-stereo
2013-07-25 21:18:52 +02:00
kaetemi
55a00fd518 Don't do EOL changes for database.xml and msg.xml, causes checksum difference 2013-07-25 18:06:32 +02:00
kaetemi
78595ec0e6 Silently sneaking in a nicer splash image for ovqt 2013-07-25 02:39:07 +02:00
kaetemi
1e9771d054 Merge with default
--HG--
branch : multipass-stereo
2013-07-25 00:37:00 +02:00
StudioEtrange
0efa7c8aee PCHSupport.cmake edited online with Bitbucket
--HG--
branch : StudioEtrange/fix-some-probleme-with-spaces-in-path-on-1374699208398
2013-07-24 21:57:52 +00:00
kaetemi
d777110d68 Remove some world editor leveldesign data
--HG--
branch : kaetemi-cleanup
2013-07-24 23:36:41 +02:00
StudioEtrange
744267c63b Fix some probleme with spaces in path on windows
PCHSupport.cmake edited online with Bitbucket

--HG--
branch : StudioEtrange/fix-some-probleme-with-spaces-in-path-on-1374699208398
2013-07-24 20:53:33 +00:00
kaetemi
ae7abf27c5 Remove build gamedata workspace
--HG--
branch : kaetemi-cleanup
2013-07-24 22:49:01 +02:00
kaetemi
929692b204 Remove more game data
--HG--
branch : kaetemi-cleanup
2013-07-24 21:49:16 +02:00
StudioEtrange
f18dd1f351 Error passing wrong version number to msvc linker
ENV: WinSDK8 VS2012 Compilation in 64 Bits
ERROR: error when linking client

CAUSE: msvc link support only major and minor version number. Before VS2012 extra number (like revision number) were stripped. Now the link throw an error with VS2012

see https://bugs.php.net/bug.php?id=63537 see http://msdn.microsoft.com/fr-fr/library/h88b7dc8(v=vs.110).aspx

--HG--
branch : StudioEtrange/error-passing-wrong-version-number-to-ms-1374694351376
2013-07-24 19:32:41 +00:00
StudioEtrange
885a39ad7e nel.cmake edited online with Bitbucket
--HG--
branch : StudioEtrange/nelcmake-edited-online-with-bitbucket-1374694264640
2013-07-24 19:31:10 +00:00
StudioEtrange
cc30e3b8f8 ENV:
WinSDK8
VS2012
Compilation in 64 Bits

ERROR:
error when linking client

CAUSE:
msvc link support only major and minor version number.
Before VS2012 extra number (like revision number) were stripped. Now the link throw an error with VS2012

see https://bugs.php.net/bug.php?id=63537
see http://msdn.microsoft.com/fr-fr/library/h88b7dc8(v=vs.110).aspx

--HG--
branch : StudioEtrange/env-winsdk8-vs2012-compilation-in-64-bit-1374693753244
2013-07-24 19:22:38 +00:00
kaetemi
ddec3d8b19 Remove game data
--HG--
branch : kaetemi-cleanup
2013-07-24 20:58:43 +02:00
kaetemi
e435a07bb6 Fix bug #45 crash in zone lighter with large number of CPU cores 2013-07-24 20:51:43 +02:00
kaetemi
e9c274c135 Use tags for pacs prim export 2013-07-24 20:51:38 +02:00
kaetemi
179669116c EOL 2013-07-24 20:51:26 +02:00
kervala
aeddda3e19 Fixed: lua_open() doesn't exist with Lua 5.2 2013-07-24 18:47:50 +02:00
kervala
296b4384a8 Fixed: Compilation in 64 bits with Windows SDK 8.0 (patch provided by StudioEtrange) 2013-07-24 18:47:04 +02:00
Quitta
3d309fbfa5 Merge with default
--HG--
branch : quitta-gsoc-2013
2013-07-24 13:14:27 +02:00
Quitta
b12f630077 queue creator works also added a few extra default queues
--HG--
branch : quitta-gsoc-2013
2013-07-23 23:38:06 +02:00
Quitta
722795b5d2 queue selector written with javascript functionality
--HG--
branch : quitta-gsoc-2013
2013-07-23 21:50:39 +02:00
Quitta
0410b104c1 Added another row of info to the show_ticket where the user to whom the ticket is assigned to and also cleaned up the right side, so user can also assign & unassign while browsing a ticket :)
--HG--
branch : quitta-gsoc-2013
2013-07-23 03:16:19 +02:00
Quitta
7fba0cab1c when the ticket starter replies on a ticket the ticket status changes to waiting for support automatically!
--HG--
branch : quitta-gsoc-2013
2013-07-22 22:58:12 +02:00
Quitta
6887ee889e updated logging, when ticket is assigned/unassigned or forwarded, then it will be logged!
--HG--
branch : quitta-gsoc-2013
2013-07-22 20:33:34 +02:00
Quitta
63666aef9b showing in the queue to what support_group the ticket is sent to, also made the query bigger and changed the todo query as primary!
--HG--
branch : quitta-gsoc-2013
2013-07-22 18:22:21 +02:00
Quitta
d140af612e Forward works, though needs refinement! also is shown in ticket info bar
--HG--
branch : quitta-gsoc-2013
2013-07-22 14:51:42 +02:00
Quitta
3e5568e760 forgot to add tge class
--HG--
branch : quitta-gsoc-2013
2013-07-22 13:19:21 +02:00
Quitta
178d59caac class for forwarding + db update
--HG--
branch : quitta-gsoc-2013
2013-07-22 13:19:07 +02:00
Quitta
e9853f3262 Big Query that makes it possible to see the todo list, also had to fix the assign/unassign
--HG--
branch : quitta-gsoc-2013
2013-07-21 17:56:24 +02:00
Quitta
46f2ad2274 made the todo queue
--HG--
branch : quitta-gsoc-2013
2013-07-21 15:38:22 +02:00
Quitta
fdef0d55dc People can assign and unassign to a ticket
--HG--
branch : quitta-gsoc-2013
2013-07-21 03:49:31 +02:00
Quitta
8f38980a00 in the show queue, it also shows the assigned users name :)
--HG--
branch : quitta-gsoc-2013
2013-07-20 14:45:05 +02:00
Quitta
6d8a79da5a base class for assigned added
--HG--
branch : quitta-gsoc-2013
2013-07-20 13:19:14 +02:00
Quitta
f41c9ab65e forgot to push the time-format in config file update! :)
--HG--
branch : quitta-gsoc-2013
2013-07-20 01:04:20 +02:00
Quitta
9d90043a76 fixed error in time elapsed function and removed the queue structure, one queue class would suffice I guess
--HG--
branch : quitta-gsoc-2013
2013-07-19 23:36:34 +02:00
kaetemi
5831150471 Merge with default
--HG--
branch : multipass-stereo
2013-07-19 18:12:08 +02:00
kaetemi
347d4e0940 Some necessary ryzom tools did not build when client and server were unchecked 2013-07-19 18:11:31 +02:00
Quitta
f922b14e30 Outputted time is handled by using the Helpers::outputTime function, this makes changees to the time format easy.
Also made it possible for admins to edit roles directly in the userlist.

--HG--
branch : quitta-gsoc-2013
2013-07-19 16:30:58 +02:00
Quitta
19e26b93a9 Admins/Mods can post hidden replies!
--HG--
branch : quitta-gsoc-2013
2013-07-19 15:59:39 +02:00
kaetemi
662b75f87a Merge with default
--HG--
branch : multipass-stereo
2013-07-19 15:38:49 +02:00
kaetemi
02dc3c1cfe Fix a divide-by-zero crash in the 3ds Max plugins on really fast PCs 2013-07-19 15:37:25 +02:00
kaetemi
f280f4673f Merge with default
--HG--
branch : multipass-stereo
2013-07-19 14:10:07 +02:00
Quitta
72d3925b20 Changed DB so a reply has a Hidden field, to make it only show up for admins. Also made it only possible to add mods/admins to the support groups!
--HG--
branch : quitta-gsoc-2013
2013-07-19 11:56:39 +02:00
Quitta
895604e6ac Promoting a user to mod/admin or mod to admin, or demoting mod to user, admin to mod/user is now possible!
--HG--
branch : quitta-gsoc-2013
2013-07-19 03:05:12 +02:00
Quitta
532732a925 fixed some layoutwise stuff, like mods and admins will be shown the same way when replying on a ticket, because users won't be intrested in that anyway
--HG--
branch : quitta-gsoc-2013
2013-07-19 00:37:47 +02:00
Quitta
e170bff5bc made it possible or mod's to watch the support group lists, though not to edit them + fixed userlist
--HG--
branch : quitta-gsoc-2013
2013-07-19 00:12:29 +02:00
kaetemi
53e11d0d68 Merge with default
--HG--
branch : multipass-stereo
2013-07-18 23:05:25 +02:00
Quitta
a9cfd48df9 refactored to admin/mod + changed install file + added mod menu
--HG--
branch : quitta-gsoc-2013
2013-07-18 21:12:03 +02:00
kaetemi
8323f95e22 Fix issue #48, landscape quality issues caused by incorrect defaults 2013-07-18 18:22:28 +02:00
kaetemi
9f185ce38d Fix an error in 3ds Max with the material script 2013-07-18 18:15:53 +02:00
Quitta
32ac588a9b found the @#!$& bug, why on earth did I comment that in the past <,<
--HG--
branch : quitta-gsoc-2013
2013-07-18 15:52:03 +02:00
Quitta
b1836e7944 changed system to mod/admin permissions, though there's still a bug in show_ticket
--HG--
branch : quitta-gsoc-2013
2013-07-18 12:43:33 +02:00
Quitta
be65b89d86 Deletion of support_groups is possible, on delete cascade is pretty cool :D
--HG--
branch : quitta-gsoc-2013
2013-07-16 17:43:55 +02:00
Quitta
2410160c63 Delete a user out of a support_group is possible, have to look up how to do the deletion of a group while keeping referential integrity in mind!
--HG--
branch : quitta-gsoc-2013
2013-07-16 16:43:58 +02:00
Quitta
6e9f53b23d changed layout a bit, this seems better! :)
--HG--
branch : quitta-gsoc-2013
2013-07-16 05:47:31 +02:00
Quitta
465c9c531a It's now possible to add someone to a support group
--HG--
branch : quitta-gsoc-2013
2013-07-16 04:58:54 +02:00
Quitta
ac5c8378bc Show single group and there users almost done
--HG--
branch : quitta-gsoc-2013
2013-07-15 21:18:51 +02:00
Quitta
8d08ff0db0 support group class added + list of support groups added!
--HG--
branch : quitta-gsoc-2013
2013-07-15 17:29:19 +02:00
Quitta
c8607d29cd Updated database and sql model added support group and insupportgroup
--HG--
branch : quitta-gsoc-2013
2013-07-14 23:40:24 +02:00
Quitta
5a8f45f88c # ticket queues, though moving away from this approach
--HG--
branch : quitta-gsoc-2013
2013-07-14 22:33:09 +02:00
Quitta
b64d27a427 ticket queue base added
--HG--
branch : quitta-gsoc-2013
2013-07-14 16:38:36 +02:00
Quitta
16de8b0f3b small fix to make it run on my server
--HG--
branch : quitta-gsoc-2013
2013-07-14 03:05:13 +02:00
Quitta
6f43d4f003 Show single replies works, though the code for it is a bit ugly, have to refactor that though
--HG--
branch : quitta-gsoc-2013
2013-07-13 23:18:49 +02:00
Quitta
c1b7915219 show time elapsed as tooltip, which could be handy, started making the show_reply.tpl
--HG--
branch : quitta-gsoc-2013
2013-07-13 18:04:40 +02:00
Quitta
26faa286bf don't show the textarea for reply when ticket is closed.
--HG--
branch : quitta-gsoc-2013
2013-07-13 17:11:54 +02:00
Quitta
5d2e9dbf96 use language ini files to select correct log thing
--HG--
branch : quitta-gsoc-2013
2013-07-13 16:41:52 +02:00
Quitta
c7e58da11f Show the logs in show_ticket_log
--HG--
branch : quitta-gsoc-2013
2013-07-13 03:46:15 +02:00
Quitta
a8ee2f46f6 started working on the show_ticket_log and encapsulated the createReply of ticket_reply into a ticket class function
--HG--
branch : quitta-gsoc-2013
2013-07-12 20:10:17 +02:00
Quitta
aa26110823 added log system, added ticketupdateStatusandPriority(), using JSON for keeping action etc
--HG--
branch : quitta-gsoc-2013
2013-07-12 19:43:33 +02:00
Quitta
d1475a6eec Changed database all ID's to Unsigned, also added ticket_log table + started working on the class file
--HG--
branch : quitta-gsoc-2013
2013-07-12 14:06:06 +02:00
Quitta
bc238fba7a fixed upper info bar when showing ticket: which contains the initial time, the time passed since latest update, the status, the category and the priority.
DB got updated, ticket has an extra priority field now, to make it easier for admins to make a distinction between tickets! Also made it possible for admins to change the status/priority when replying.

--HG--
branch : quitta-gsoc-2013
2013-07-11 20:31:34 +02:00
Quitta
24b08104f9 added admin function to change setting + changed color of admin bg when they reply + some other fixes
--HG--
branch : quitta-gsoc-2013
2013-07-11 02:39:52 +02:00
Quitta
b1473fad58 ticket reply show correct username, this was harder then expected
--HG--
branch : quitta-gsoc-2013
2013-07-10 22:40:01 +02:00
Quitta
0b72b5cd67 replying on a ticket is now possible though still have to fix the username being shown.
--HG--
branch : quitta-gsoc-2013
2013-07-10 20:46:26 +02:00
Quitta
4afb0b912e forward to show ticket after creating ticket, also build basis for replying on ticket!
--HG--
branch : quitta-gsoc-2013
2013-07-10 13:05:05 +02:00
Quitta
9003f4781a Refacoring of DBLayer seems to work now :)
--HG--
branch : quitta-gsoc-2013
2013-07-10 12:36:14 +02:00
Quitta
f98a4617f0 fixed some hidden error in the syncing
--HG--
branch : quitta-gsoc-2013
2013-07-10 10:28:39 +02:00
Quitta
5e053f3fc4 Also made tickets cickable in the profile page! now let the DBLayer refactoring begin!
--HG--
branch : quitta-gsoc-2013
2013-07-10 10:13:53 +02:00
Quitta
f2d8afaea4 small layout update, before trying to refactor the DBLayer, I want to make sure that I can revert to this point :D
--HG--
branch : quitta-gsoc-2013
2013-07-10 10:10:02 +02:00
Quitta
8981556796 fixed row formatting of the responses
--HG--
branch : quitta-gsoc-2013
2013-07-10 09:44:45 +02:00
Quitta
e4ffdeccc7 forgot to add the files <,<
--HG--
branch : quitta-gsoc-2013
2013-07-10 02:41:21 +02:00
Quitta
5c623e0bd3 Show_Ticket starts to work :)
--HG--
branch : quitta-gsoc-2013
2013-07-10 02:41:03 +02:00
Quitta
fca8eb1ced make_table_with_key_is_id function added to replace and use for like filling the category array, I guess it will be used in the future for a lot of different things
--HG--
branch : quitta-gsoc-2013
2013-07-09 16:34:43 +02:00
Quitta
ba69c5939e added gui_elements class
--HG--
branch : quitta-gsoc-2013
2013-07-09 16:03:52 +02:00
Quitta
9d3317eb0c Show the user his tickets in the user profile screen
--HG--
branch : quitta-gsoc-2013
2013-07-09 01:03:49 +02:00
Quitta
61aebf6b3b show user added, where admins can create a ticket from another user
--HG--
branch : quitta-gsoc-2013
2013-07-08 17:14:03 +02:00
Quitta
1e4daba4ae updated install, added create_Ticket function as wrapper!
--HG--
branch : quitta-gsoc-2013
2013-07-08 14:49:03 +02:00
Quitta
fa07e3cd16 added mennu item for createticket
--HG--
branch : quitta-gsoc-2013
2013-07-08 09:58:29 +02:00
Quitta
21d3bf363b create ticket works, also admins can create other people's tickets
--HG--
branch : quitta-gsoc-2013
2013-07-08 09:40:48 +02:00
Quitta
56fa0bf238 Creation of a ticket (not the content yet though) seems to work
--HG--
branch : quitta-gsoc-2013
2013-07-06 22:38:57 +02:00
kaetemi
d5329b1ac8 Fix bad includes in snowballs, re #43
--HG--
branch : multipass-stereo
2013-07-06 21:58:26 +02:00
Michael Witrant
293601e80e Fixed definition tests for optional LibOVR
--HG--
branch : multipass-stereo
2013-07-06 20:40:42 +02:00
Michael Witrant
a33a0e5c56 LibOVR is optional, and is disabled by default
--HG--
branch : multipass-stereo
2013-07-06 20:05:19 +02:00
Michael Witrant
0036b5c619 Added Win32 and Apple LibOVR build paths
--HG--
branch : multipass-stereo
2013-07-06 19:55:08 +02:00
Michael Witrant
fa4cbb00f7 Fixed Linux build failure because a temporary pointer was passed, ref #43
--HG--
branch : multipass-stereo
2013-07-06 19:34:28 +02:00
Michael Witrant
c60bd3e3f5 Added LibOVR finder and Linux support, ref #43
--HG--
branch : multipass-stereo
2013-07-06 19:33:07 +02:00
Quitta
a81b2dc9b3 woops forgot to add those in last update, also loading all categories from the db works now
--HG--
branch : quitta-gsoc-2013
2013-07-06 19:12:55 +02:00
Quitta
a3b284077c createticket template done + when registering: create ticket_user + when login make session object ticket_user
--HG--
branch : quitta-gsoc-2013
2013-07-06 18:27:25 +02:00
Quitta
ff96e6db5e Added ticket class | added ticket_user class| added ticket_category class. These aren't tested yet, so expect errors and changes! :D
--HG--
branch : quitta-gsoc-2013
2013-07-06 06:09:47 +02:00
Quitta
b163ab7960 Add some default categories
--HG--
branch : quitta-gsoc-2013
2013-07-05 23:00:19 +02:00
Quitta
c045617e98 Added database setup into install
--HG--
branch : quitta-gsoc-2013
2013-07-05 22:28:31 +02:00
kaetemi
d1051ce5c9 Handle head orientation in ryzom client, ref #43
--HG--
branch : multipass-stereo
2013-07-05 04:09:53 +02:00
Quitta
10cbc0b63b updated the sync and added some new db tabels in the install
--HG--
branch : quitta-gsoc-2013
2013-07-05 03:50:43 +02:00
kaetemi
eab2386ff6 Don't render to texture when in wireframe mode, re #43
--HG--
branch : multipass-stereo
2013-07-05 03:42:38 +02:00
kaetemi
248f07ad9e Put stereo render loop inside ryzom client main loop, see #43
--HG--
branch : multipass-stereo
2013-07-05 02:38:56 +02:00
kaetemi
b1aaf05bf6 Init/release VR interfaces in ryzom client, ref #43
--HG--
branch : multipass-stereo
2013-07-05 02:04:34 +02:00
Quitta
4ee0c06991 Added the DB scheme + png image as reference
--HG--
branch : quitta-gsoc-2013
2013-07-05 00:51:26 +02:00
kaetemi
ffe05eae62 Move some more updates out of the render code, see #43
--HG--
branch : multipass-stereo
2013-07-05 00:47:17 +02:00
Quitta
3184941710 Added functionality to update country + gender + added some xss security
--HG--
branch : quitta-gsoc-2013
2013-07-05 00:37:48 +02:00
kaetemi
263e506551 Some necessary changes to camera setting, re #43
--HG--
branch : multipass-stereo
2013-07-05 00:17:09 +02:00
kaetemi
5ac4a23bd3 Some more cleanup
--HG--
branch : multipass-stereo
2013-07-04 23:41:46 +02:00
kaetemi
93d856b394 Make oversize screenshots be perfectly seamless
--HG--
branch : multipass-stereo
2013-07-04 23:11:15 +02:00
kaetemi
bf8ad82e21 Pull weather updates out of scene render
--HG--
branch : multipass-stereo
2013-07-04 22:39:05 +02:00
kaetemi
5c568c6ea0 Correctly apply bloom on oversize screenshots
--HG--
branch : multipass-stereo
2013-07-04 22:26:31 +02:00
kaetemi
c87403ecb9 Refactor fulldetail override
--HG--
branch : multipass-stereo
2013-07-04 22:18:19 +02:00
Quitta
e187da3f6b Made country select code way more easy to handle by using smarty's foreach loop
--HG--
branch : quitta-gsoc-2013
2013-07-04 22:05:26 +02:00
kaetemi
25f5bccfe6 Merge with default
--HG--
branch : multipass-stereo
2013-07-04 21:12:34 +02:00
kaetemi
352ee42571 Distort 2D gui as well, ref #43
--HG--
branch : multipass-stereo
2013-07-04 21:12:11 +02:00
Jan Boon
46c4cc7aa4 Merged in botanic/rc-botanic-webdev (pull request #13)
warning and path fix's
2013-07-04 21:07:21 +02:00
kaetemi
6cfc75a1a2 Correctly synchronize some more animation in snowballs, re #43
--HG--
branch : multipass-stereo
2013-07-04 20:43:49 +02:00
Quitta
537916d828 making install dependent on config file for db name
--HG--
branch : quitta-gsoc-2013
2013-07-04 01:26:55 +02:00
kaetemi
dcd77495ca Fix particles being animated twice in stereo render, see #43
--HG--
branch : multipass-stereo
2013-07-04 00:42:06 +02:00
kaetemi
bf8bd64f0d Add stereo debugger for visually comparing rendered frames, ref #43
--HG--
branch : multipass-stereo
2013-07-04 00:09:10 +02:00
Quitta
93c1998a60 error template added, fixed some small bugs
--HG--
branch : quitta-gsoc-2013
2013-07-03 18:49:23 +02:00
kaetemi
e68e7161d8 Use width instead of height of screen for hmd fov, re #43
--HG--
branch : multipass-stereo
2013-07-03 06:04:37 +02:00
Quitta
0275e11e48 small update, changed the libuserlist so it only shows id and type of the elements in the query db, also only manual syncing is possible when shard db is back online!
--HG--
branch : quitta-gsoc-2013
2013-07-03 06:03:01 +02:00
Quitta
25f479f3d0 added a userlist to browse users and edit their settings as admin
--HG--
branch : quitta-gsoc-2013
2013-07-03 05:57:50 +02:00
kaetemi
1fe2b62eb1 Add minimal head model and world scale, ref #43
--HG--
branch : multipass-stereo
2013-07-03 05:21:32 +02:00
kaetemi
0dd8764e45 Make bloom work together with render target used for the rift shader, ref #43
--HG--
branch : multipass-stereo
2013-07-03 03:53:32 +02:00
kaetemi
52f4a37939 Remove unnecessary user render target code from bloom, see #43
--HG--
branch : multipass-stereo
2013-07-03 03:21:57 +02:00
kaetemi
8c86b05d5b Merge with default
--HG--
branch : multipass-stereo
2013-07-03 03:17:29 +02:00
Quitta
0b9ad19e35 Change info works, without whiping the other fiels now! :)
--HG--
branch : quitta-gsoc-2013
2013-07-03 03:05:01 +02:00
kaetemi
391fa6dcff Add arbfp1 and fp40 barrel fragment programs, see #43
--HG--
branch : multipass-stereo
2013-07-02 19:39:05 +02:00
kaetemi
73d3176f0c Test arbfp1, see #43
--HG--
branch : multipass-stereo
2013-07-02 18:48:29 +02:00
kaetemi
5bae110c2c Properly scale seconds per frame graph in snowballs
--HG--
branch : multipass-stereo
2013-07-02 18:43:28 +02:00
kaetemi
d13da7a398 Prefer NPOT texture over RECT texture
--HG--
branch : multipass-stereo
2013-07-02 18:43:15 +02:00
Quitta
1b8bf17c8b Checking filled in data for change_info has to be updated
--HG--
branch : quitta-gsoc-2013
2013-07-02 16:36:44 +02:00
Quitta
d3b12f74a4 change info page basics
--HG--
branch : quitta-gsoc-2013
2013-07-02 16:07:55 +02:00
Quitta
a1a052dd72 Change email seems to work, also for admin's :)
--HG--
branch : quitta-gsoc-2013
2013-07-02 04:42:12 +02:00
Quitta
2130875539 changepassword works
--HG--
branch : quitta-gsoc-2013
2013-07-02 03:36:49 +02:00
kaetemi
43f8adff79 Render left and right deformed view, re #43
--HG--
branch : multipass-stereo
2013-07-02 03:34:49 +02:00
kaetemi
ce92c13289 Test the barrel shader, see #43
--HG--
branch : multipass-stereo
2013-07-02 02:40:27 +02:00
kaetemi
d45813adfc Workaround in snowballs for fullscreen bug with opengl driver
--HG--
branch : multipass-stereo
2013-07-02 01:08:49 +02:00
kaetemi
c5c6f7c871 Render the scene to a target texture for the stereo rendering filter, ref #43
--HG--
branch : multipass-stereo
2013-07-02 00:55:13 +02:00
kaetemi
7766116494 Fix a render target issue, see #43
--HG--
branch : multipass-stereo
2013-07-02 00:53:45 +02:00
Quitta
75ff3e1ed4 change password is now usable for GM's too by using a GET['id'] param!
--HG--
branch : quitta-gsoc-2013
2013-07-01 23:29:16 +02:00
kaetemi
c5e1235cbb Create stereo render target, see #43
--HG--
branch : multipass-stereo
2013-07-01 23:23:54 +02:00
kaetemi
85109102b2 Add interface for stereo display render targets, ref #43
--HG--
branch : multipass-stereo
2013-07-01 21:23:47 +02:00
kaetemi
85977755de Allow turning off bloom in snowballs
--HG--
branch : multipass-stereo
2013-07-01 20:38:18 +02:00
kaetemi
fe91e2a751 Cleanup
--HG--
branch : multipass-stereo
2013-07-01 20:15:55 +02:00
kaetemi
fba17e4553 Allow linking debug and release with same mysql lib if no specific debug lib.
--HG--
branch : multipass-stereo
2013-07-01 18:45:43 +02:00
Quitta
23e9b57703 Settings page layout set!
--HG--
branch : quitta-gsoc-2013
2013-07-01 18:28:37 +02:00
Quitta
a769a985d9 template for changing the settings added, still needs quite some work
--HG--
branch : quitta-gsoc-2013
2013-06-30 05:53:31 +02:00
Quitta
40d6617216 added flags to inlog/logout etc, + added some base translations
--HG--
branch : quitta-gsoc-2013
2013-06-29 20:46:38 +02:00
Quitta
8ff40bb619 added initial admin/admin account when sql/install is executed, also added the admin's functionality: libuserlist
--HG--
branch : quitta-gsoc-2013
2013-06-29 19:05:54 +02:00
Quitta
4f82afa5d0 added libuserlist page, that shows entire list of users in the lib db, admins can remove entry of it and perform manual syncing. Still needs some work though
--HG--
branch : quitta-gsoc-2013
2013-06-29 06:46:10 +02:00
Quitta
a3b3dbd59c Changed the way index handles page requests, also made a folder func, for when a form is submitted and requires a function to be performed and inc for pages that want to perform php code but without a form
--HG--
branch : quitta-gsoc-2013
2013-06-29 05:23:38 +02:00
Quitta
4034c83382 webUsers derived from Users, with www dependent functionality to check if username already in use or email already in use
--HG--
branch : quitta-gsoc-2013
2013-06-29 05:02:54 +02:00
kaetemi
5f229667bc Create interface classes for stereo displays and head mounted displays, see #43
--HG--
branch : multipass-stereo
2013-06-28 23:19:32 +02:00
Quitta
76e46c9fc4 add language flags + js for activating them
--HG--
branch : quitta-gsoc-2013
2013-06-28 18:10:02 +02:00
Quitta
4755b7478f messing around and fixing throwing of exceptions in DBLayer
--HG--
branch : quitta-gsoc-2013
2013-06-28 06:18:23 +02:00
Quitta
3b58c56d5b Language stuff supports cookies now and in case a not specified language is given, then it uses the default
--HG--
branch : quitta-gsoc-2013
2013-06-27 20:50:32 +02:00
Quitta
fe70ca714b small test to check if ajax works on the pages, it still seems to work :)
--HG--
branch : quitta-gsoc-2013
2013-06-27 20:18:36 +02:00
Quitta
9a41affe9f dblayer + refactored the db parts
--HG--
branch : quitta-gsoc-2013
2013-06-27 18:06:09 +02:00
Quitta
afd473aaff Syncing basics, need refactoring though
--HG--
branch : quitta-gsoc-2013
2013-06-27 04:54:41 +02:00
kaetemi
bf16ccd320 Separate some camera related functions, ref #43
--HG--
branch : multipass-stereo
2013-06-27 04:11:09 +02:00
kaetemi
86eb05a6d0 Move some config stuff out of main_loop.cpp, see #43
--HG--
branch : multipass-stereo
2013-06-27 03:49:30 +02:00
kaetemi
24af75fc23 Remove some unused includes, re #43
--HG--
branch : multipass-stereo
2013-06-27 03:16:53 +02:00
kaetemi
3912bee50e Some more debug functions moved, see #43
--HG--
branch : multipass-stereo
2013-06-27 03:04:40 +02:00
kaetemi
7fa2a05195 Moved some temp code out of main_loop.cpp, ref #43
--HG--
branch : multipass-stereo
2013-06-27 02:43:51 +02:00
kaetemi
bcc048145c Take some debug render code out of main_loop.cpp, see #43
--HG--
branch : multipass-stereo
2013-06-27 02:13:48 +02:00
kaetemi
4d96c23c95 Separate some profiling code from main_loop.cpp, see #43
--HG--
branch : multipass-stereo
2013-06-27 01:43:04 +02:00
kaetemi
cb60e64355 Pull CPing out of main_loop.cpp, refs #43
--HG--
branch : multipass-stereo
2013-06-27 01:23:53 +02:00
kaetemi
6d28f88601 Return view as CQuat, see #43
--HG--
branch : multipass-stereo
2013-06-26 21:36:21 +02:00
kaetemi
1cc5848220 Create a clipping frustum, ref #43
--HG--
branch : multipass-stereo
2013-06-26 21:35:36 +02:00
kaetemi
e7842982a0 Allow multiple user cameras to be calculated separately, useful for sky etc, re #43
--HG--
branch : multipass-stereo
2013-06-26 20:57:37 +02:00
kaetemi
38be9b5997 Fix warning
--HG--
branch : multipass-stereo
2013-06-26 20:10:30 +02:00
kaetemi
202413ab52 Adjust 2D interface shift, re #43
--HG--
branch : multipass-stereo
2013-06-26 19:58:27 +02:00
Quitta
f9cdc45ed8 show name when logged in in main top bar
--HG--
branch : quitta-gsoc-2013
2013-06-26 17:43:29 +02:00
kaetemi
9255bd73de Move snowballs compass, see #43
--HG--
branch : multipass-stereo
2013-06-26 17:38:20 +02:00
kaetemi
4864ce7a5a Add eye distance in 2D interface shift, re #43
--HG--
branch : multipass-stereo
2013-06-26 17:24:23 +02:00
kaetemi
5423d4d025 Add 2D interface shifting calculations, see #43
--HG--
branch : multipass-stereo
2013-06-26 16:59:08 +02:00
Quitta
9e6597e937 Added logout, refined login and took it back out of the lib. Added timers to forward after 5 seconds after logout & register. Looks good imo
--HG--
branch : quitta-gsoc-2013
2013-06-26 16:35:33 +02:00
kaetemi
39197681fa Correctly adjust text to viewport, re #43
--HG--
branch : multipass-stereo
2013-06-26 16:08:48 +02:00
kaetemi
d1bf069708 Add some comments, see #43
--HG--
branch : multipass-stereo
2013-06-26 15:55:39 +02:00
kaetemi
91be2d64bd Cleanup and make bloom work with stereo rendering, re #43
--HG--
branch : multipass-stereo
2013-06-26 15:49:31 +02:00
kaetemi
32a187a199 Render from multiple cameras, see #43
--HG--
branch : multipass-stereo
2013-06-26 08:00:19 +02:00
kaetemi
a5c9592165 Read sensor data and set camera in snowballs, ref #43
--HG--
branch : multipass-stereo
2013-06-26 04:57:58 +02:00
Quitta
c59e3d0b47 feedback on registering early version, also added an installer.php in the previous revision, forgot to mention that
--HG--
branch : quitta-gsoc-2013
2013-06-26 04:03:16 +02:00
Quitta
5a163663cc Reworked register
--HG--
branch : quitta-gsoc-2013
2013-06-26 03:26:25 +02:00
kaetemi
a79b9f7e65 Add library name to device name, re #43
--HG--
branch : multipass-stereo
2013-06-26 02:55:15 +02:00
kaetemi
64821ab4de List stereo devices, see #43
--HG--
branch : multipass-stereo
2013-06-26 02:45:49 +02:00
kaetemi
c188dd3e17 Merge with default
--HG--
branch : multipass-stereo
2013-06-26 00:00:35 +02:00
kaetemi
f331757718 Fix Ryzom Client scripts for lua 5.2 2013-06-25 23:57:23 +02:00
Quitta
e72eac8888 Reworked index.php a little, though something is going wrong with my session variables
--HG--
branch : quitta-gsoc-2013
2013-06-25 21:33:49 +02:00
Quitta
8f2f0a3ad7 Loging in match searching seems to work :)
--HG--
branch : quitta-gsoc-2013
2013-06-25 20:57:10 +02:00
Quitta
761d7b2775 Register seems to work :) Next step permissions and login
--HG--
branch : quitta-gsoc-2013
2013-06-20 01:02:27 +02:00
kaetemi
8ded099fbb Added some notes
--HG--
branch : multipass-stereo
2013-06-20 00:25:52 +02:00
Quitta
4f822c37fe first attempt to get register up and running
--HG--
branch : quitta-gsoc-2013
2013-06-19 23:53:53 +02:00
kaetemi
78179ed809 Rename some functions to follow the same naming convention of others
--HG--
branch : multipass-stereo
2013-06-19 23:49:39 +02:00
kaetemi
ad5b60963f Cleanup
--HG--
branch : multipass-stereo
2013-06-19 23:34:40 +02:00
kaetemi
be33bbc70f Add support for fp40 with opengl
--HG--
branch : multipass-stereo
2013-06-19 22:41:03 +02:00
kaetemi
bc25be05ba Additional test, textures does not seem to work in ps_3_0
--HG--
branch : multipass-stereo
2013-06-19 21:31:29 +02:00
kaetemi
f278ac7638 Activate textures for postprocessing material under direct3d
--HG--
branch : multipass-stereo
2013-06-19 21:16:13 +02:00
Quitta
c22e1de52d small fixes of last night, still have to figure out a way to get the mkdir warning dissapear!
--HG--
branch : quitta-gsoc-2013
2013-06-19 21:05:12 +02:00
kaetemi
3e91b1a5cf Test texture with postprocessing material, seems to work with opengl
--HG--
branch : multipass-stereo
2013-06-19 20:47:23 +02:00
kaetemi
ea97602c5f Updated snowballs default config
--HG--
branch : multipass-stereo
2013-06-19 16:22:48 +02:00
kaetemi
9b0b1008ff Fix linux compile
--HG--
branch : multipass-stereo
2013-06-19 16:18:09 +02:00
Quitta
fb622a9eb7 register refactoring + small bug fixes that went unnoticed before
--HG--
branch : quitta-gsoc-2013
2013-06-19 06:50:08 +02:00
kaetemi
dfb110b387 Add function to check which pixel program profiles are available on a driver
--HG--
branch : multipass-stereo
2013-06-19 05:03:47 +02:00
kaetemi
9f1ddc9202 Add test for ps.1.1 pixel program in snowballs (it works too now)
--HG--
branch : multipass-stereo
2013-06-19 04:03:32 +02:00
kaetemi
c3af389ea6 Add test for ARBfp1.0 fragment program in snowballs (it works)
--HG--
branch : multipass-stereo
2013-06-19 02:59:32 +02:00
kaetemi
1c3fc17d91 Cleanup more unneeded code
--HG--
branch : multipass-stereo
2013-06-19 02:36:57 +02:00
kaetemi
4200483383 Removed unneeded parser related code from the opengl pixel program implementation
--HG--
branch : multipass-stereo
2013-06-19 02:33:19 +02:00
kaetemi
197c0687d9 Add direct3d diff for old nevrax pixel program code, marked a todo in the comments
--HG--
branch : multipass-stereo
2013-06-19 02:10:38 +02:00
kaetemi
f08de2dcdc Added diff to opengl driver for old nevrax pixel program code, marked todos in comments
--HG--
branch : multipass-stereo
2013-06-19 02:01:12 +02:00
kaetemi
983fab378c Add rest of the diff from the old nevrax code for pixel programs to NL3D
--HG--
branch : multipass-stereo
2013-06-19 01:38:23 +02:00
kaetemi
ef720f764f Removed some CEffect related bit that slipped in
--HG--
branch : multipass-stereo
2013-06-19 01:22:26 +02:00
kaetemi
3927378399 Add diff from old nevrax pixel program code to IDriver, CEffect related code not included
--HG--
branch : multipass-stereo
2013-06-19 01:20:51 +02:00
kaetemi
7be5858010 Simplify CPixelProgram
--HG--
branch : multipass-stereo
2013-06-19 01:19:45 +02:00
kaetemi
16d47d742f Add some files from old nevrax shader code for exposing pixel programs in the drivers
--HG--
branch : multipass-stereo
2013-06-19 01:14:30 +02:00
kaetemi
f63a275f2b Backed out changeset ea4b76b7213a, bad approach
--HG--
branch : multipass-stereo
2013-06-19 01:03:20 +02:00
Botanic
321edeff10 add_user example
--HG--
branch : rc-botanic-webdev
2013-06-18 10:48:54 -07:00
Quitta
61c9a3d9a6 show error message + tooltips while registering
--HG--
branch : quitta-gsoc-2013
2013-06-18 16:27:57 +02:00
Quitta
8ee559e662 Damn its early in the morning :D Oh well! Register works with a callback function. shows which fields are correctly filled in and which not yet. It runs quite smooth. Off to bed now!
--HG--
branch : quitta-gsoc-2013
2013-06-18 07:22:24 +02:00
Quitta
79e7b18bc8 Changed register form + tried getting messages passed
--HG--
branch : quitta-gsoc-2013
2013-06-17 21:42:33 +02:00
Quitta
1c4bb138e9 Select automatically if it should load with no_visible_elements on or off + minor updates
--HG--
branch : quitta-gsoc-2013
2013-06-17 16:29:20 +02:00
Botanic
7ef366d11d fix top menu
--HG--
branch : rc-botanic-webdev
2013-06-17 06:57:22 -07:00
Quitta
9806ea6ef0 Trying to intigrate the home template in the inheritance structure of smarty
--HG--
branch : quitta-gsoc-2013
2013-06-17 15:39:55 +02:00
Botanic
983ea23da6 fixed js issue
--HG--
branch : rc-botanic-webdev
2013-06-17 03:08:45 -07:00
Quitta
879f28e45f Tour seems to work here, not sure though
--HG--
branch : quitta-gsoc-2013
2013-06-17 11:03:31 +02:00
Botanic
b1c97cab76 working on help tips
--HG--
branch : rc-botanic-webdev
2013-06-17 00:25:04 -07:00
Botanic
46c1952de6 changed default skin to cerulean and constrained proportions in css
--HG--
branch : rc-botanic-webdev
2013-06-16 23:28:58 -07:00
Botanic
0b8c4968e9 changed index.php to correct file and created charisma index for backup
--HG--
branch : rc-botanic-webdev
2013-06-16 23:13:38 -07:00
Botanic
19f7b3ec9c cleaned up formatting and added custom.css
--HG--
branch : rc-botanic-webdev
2013-06-16 22:57:09 -07:00
Botanic
b596502982 changed to default will override with custom.css
--HG--
branch : rc-botanic-webdev
2013-06-16 22:46:50 -07:00
Botanic
08d3d766a2 updated the index pages with home register and login
--HG--
branch : rc-botanic-webdev
2013-06-16 20:11:11 -07:00
kaetemi
c7994bb11f Allow rendering with bloom to a user provided render target (untested) (#43)
--HG--
branch : multipass-stereo
2013-06-17 00:45:17 +02:00
kaetemi
4a7f58938d Allow stepping through the time delta in multiple passes in snowballs
--HG--
branch : multipass-stereo
2013-06-16 23:51:33 +02:00
kaetemi
c7a9edd495 Remove silly heap allocation of a null pointer
--HG--
branch : multipass-stereo
2013-06-16 23:49:45 +02:00
kaetemi
f17145cde6 Allow configuration of bloom settings from config files in snowballs
--HG--
branch : multipass-stereo
2013-06-16 23:48:40 +02:00
kaetemi
87c30bceea Add info structure for multipass camera rendering effects #43
--HG--
branch : multipass-stereo
2013-06-16 20:48:17 +02:00
Botanic
7f7c2cfb44 Merge with quitta-gsoc-2013
--HG--
branch : rc-botanic-webdev
2013-06-16 00:59:10 -07:00
kaetemi
3b9f934b82 Fixes to compile Ryzom Client with lua 5.2 2013-06-16 03:43:45 +02:00
kaetemi
8629f069ae Allow compiling with shared libxml2 on Windows 2013-06-16 03:19:02 +02:00
kaetemi
d139185b1e Compile NLGUI with lua 5.2 2013-06-16 02:33:04 +02:00
Quitta
9f6349843c Fixed layout for register.tpl and login.tpl, it now uses also layout.tpl but with a parameter 'no_visible_elements' => 'TRUE'
--HG--
branch : quitta-gsoc-2013
2013-06-16 01:40:13 +02:00
Botanic
af6dac032b added .tpl.php and removed extra files
--HG--
branch : rc-botanic-webdev
2013-06-15 15:20:16 -07:00
Botanic
1b7f8f8370 Merge with quitta-gsoc-2013
--HG--
branch : rc-botanic-webdev
2013-06-15 15:16:57 -07:00
Quitta
260315d1ef Basic template integration with css
--HG--
branch : quitta-gsoc-2013
2013-06-16 00:13:13 +02:00
Botanic
6973070230 fixed to proper path
--HG--
branch : rc-botanic-webdev
2013-06-15 07:11:03 -07:00
Botanic
d7db141324 changed to use .php not html
--HG--
branch : rc-botanic-webdev
2013-06-15 07:08:38 -07:00
Botanic
4438e87a8c added charisma
--HG--
branch : rc-botanic-webdev
2013-06-15 07:01:11 -07:00
Botanic
900ce13318 forgot global
--HG--
branch : rc-botanic-webdev
2013-06-13 14:41:58 -07:00
Botanic
102a4c3950 auto create folders
--HG--
branch : rc-botanic-webdev
2013-06-13 14:33:23 -07:00
kervala
30d56b7c24 Added: CMake project for shape2obj 2013-06-10 15:48:10 +02:00
Botanic
1f648910ed latest changes to work on getting registration working
--HG--
branch : rc-botanic-webdev
2013-06-10 04:17:55 -07:00
liria
487799cbf5 kervala's enhancements and fixes for the Windows compilation.
--HG--
branch : ig_elevaton_port_to_linux
2013-06-09 15:55:59 +02:00
liria
6b750cf042 FIXE: Linux/Windows compilation : revert the code of the 'void dir(...)' function for windows.
--HG--
branch : ig_elevaton_port_to_linux
2013-06-08 16:15:41 +02:00
liria
46d99e4a6d FIXE: Linux/Windows compilation : revert the code of the 'void dir(...)' function for windows with using conditional compilation.
--HG--
branch : ig_elevaton_port_to_linux
2013-06-08 15:38:04 +02:00
kervala
d77926c96e Fixed: EOL for client_config_qt 2013-06-08 14:56:58 +02:00
liria
99efdb2a23 FIXE: replace the WIN32 API for directories manipulation by the the POSIX API to compile with linux.
--HG--
branch : ig_elevaton_port_to_linux
2013-06-08 14:39:30 +02:00
Botanic
3e2278d692 updated template for registration and setting up add_user functions
--HG--
branch : rc-botanic-webdev
2013-06-07 04:05:28 -07:00
Botanic
40ba525e5a added base drupal module and removed old phtml file
--HG--
branch : rc-botanic-webdev
2013-06-06 23:07:47 -07:00
Botanic
524e338f68 cleaned up templates and got languages working
--HG--
branch : rc-botanic-webdev
2013-06-06 22:59:11 -07:00
Botanic
9ed3f20570 added in smarty, still need to finish making it load the correct template properly
--HG--
branch : rc-botanic-webdev
2013-06-06 21:43:11 -07:00
Botanic
e66c77470f updated files that were not merged
--HG--
branch : rc-botanic-webdev
2013-06-06 03:38:24 -07:00
Botanic
c5f75ec268 fixed thanks kervala 2013-06-06 01:28:12 -07:00
Botanic
ae9ffef35d fixed thanks kervala
--HG--
branch : rc-botanic-webdev
2013-06-06 01:28:12 -07:00
Botanic
0a3020e971 added in-game template file
--HG--
branch : rc-botanic-webdev
2013-06-05 23:39:33 -07:00
Botanic
4d3acc9cc0 added base class file for sql as well as updated users to use class
--HG--
branch : rc-botanic-webdev
2013-06-05 23:19:40 -07:00
Botanic
c66d9cf225 changed to use class
--HG--
branch : rc-botanic-webdev
2013-06-05 23:10:00 -07:00
Botanic
c256187ead initial work on ams_lib
--HG--
branch : rc-botanic-webdev
2013-06-05 23:04:46 -07:00
Botanic
b76fe233da why the hell make the faster values for "debug only" waiting it so 1990's
--HG--
branch : rc-botanic-webdev
2013-06-05 19:59:53 -07:00
Botanic
26c4b51d01 fixed warning
--HG--
branch : rc-botanic-webdev
2013-06-05 19:43:10 -07:00
Botanic
3439d1063b fixed warning
--HG--
branch : rc-botanic-webdev
2013-06-05 19:27:06 -07:00
Botanic
515a665339 no reason to make people change the logs path every time
--HG--
branch : rc-botanic-webdev
2013-06-05 19:19:09 -07:00
Botanic
e4b24f08da Fixed warnings and logout
--HG--
branch : rc-botanic-webdev
2013-06-05 19:14:53 -07:00
Botanic
1055925bac No reason to hardcode the path 2013-06-05 19:14:49 -07:00
Botanic
503f5d348e Fixed warnings and logout 2013-06-05 19:14:53 -07:00
Botanic
914c5ad303 no reason to make people change the logs path every time 2013-06-05 19:19:09 -07:00
Botanic
7e64c718c4 fixed warning 2013-06-05 19:27:06 -07:00
Botanic
0fc3b07a12 fixed warning 2013-06-05 19:43:10 -07:00
Botanic
a535002554 why the hell make the faster values for "debug only" waiting it so 1990's 2013-06-05 19:59:53 -07:00
Botanic
b1edfcc646 bad eol 2013-06-06 02:56:48 -07:00
Botanic
ea42101296 No reason to hardcode the path
--HG--
branch : rc-botanic-webdev
2013-06-05 19:14:49 -07:00
Botanic
395c194acc bad eol's
--HG--
branch : rc-botanic-webdev
2013-06-06 02:47:26 -07:00
dfighter1985
cfc78bd614 FIXED: GUI not showing up because of the interface user functions not getting registered, because of a file linking issue. 2013-06-05 03:29:34 +02:00
dfighter1985
301077c93d Merged default
--HG--
branch : client_config_qt
2013-05-04 21:56:21 +02:00
dfighter1985
d2a7c66e9f Use to .toUTF8() instead of .toStdString().
--HG--
branch : client_config_qt
2013-05-04 21:55:41 +02:00
dfighter1985
e950834079 Merged default
--HG--
branch : client_config_qt
2013-05-04 21:23:55 +02:00
Dzmitry Kamiahin
68fe576f01 Fixed self-comparsion in ps. 2013-05-04 01:57:53 +03:00
sfb
1bfba35cd0 merge 2013-05-02 14:38:49 -05:00
kaetemi
76a7df820b This should fix #41. It was creating the unknown for the new type and then returning a new sheet for the requested unknown 2013-05-02 21:37:15 +02:00
sfb
2bf56882f8 merge 2013-05-02 14:34:40 -05:00
sfb
8fe6eee93c fixed #40 with an explicit static_cast. 2013-05-02 14:31:10 -05:00
dfighter1985
bdfa7dbc37 Don't build GUI Editor when not building the GUI library. 2013-05-02 20:19:35 +02:00
kervala
2aea567fe2 Changed: Moved Ryzom detailed version in client 2013-04-29 14:46:53 +02:00
kervala
f68cda5cd2 Changed: Process EventCloseWindowId by client 2013-04-29 14:44:39 +02:00
kervala
0624da9c82 Changed: Added a new event EventCloseWindowId when system reports window should be closed 2013-04-29 11:15:14 +02:00
kervala
67c93a1238 Changed: Warning 2013-04-29 11:10:55 +02:00
kervala
d85e4f9ec7 Changed: EOL fixes 2013-04-29 10:46:02 +02:00
kervala
381eeaef8a Fixed: Virtual destructor warning 2013-04-29 10:41:34 +02:00
kervala
920cbf55ca Fixed: Assign instead of a comparison 2013-04-29 10:34:33 +02:00
kervala
b0e717728b Changed: French comments translated to English 2013-04-29 10:33:33 +02:00
kervala
9aff9ae939 Fixed: PCH compilation 2013-03-31 23:36:56 +02:00
kervala
d505b181f9 Changed: Define CMAKE_OSX_DEPLOYMENT_TARGET if not specified on command line 2013-03-28 16:42:16 +01:00
kervala
33c73f3f16 fixes #33 build failure/error using clang 2013-03-26 19:57:00 +01:00
kervala
0c2e2d3e8f fixes #32 build failure/error using clang 2013-03-26 13:56:16 +01:00
kervala
3aee7c3ac8 fixes a warning 2013-03-24 20:16:53 +01:00
kervala
ab454f3d92 fixes #31 Luabind can't be found
Added PCH support to NeL GUI
2013-03-24 20:16:23 +01:00
kervala
a5806126b4 Fixed: Compilation under Mac OS X (CMAKE_OSX_DEPLOYMENT_TARGET and CMAKE_OSX_SYSROOT must be set on CMake command-line if needed) 2013-03-24 19:59:19 +01:00
dfighter1985
526da8ddf8 MODIFIED: no more action handler spam. 2013-03-12 07:16:16 +01:00
dfighter1985
fb4875570e Merging dangling default branch. 2013-02-27 22:27:53 +01:00
mattraykowski
b90737e365 changes #6 - updated the NL_VERSION_MINOR version from 8 to 9. 2013-02-25 14:01:57 -06:00
dfighter1985
2bdceaecda Resolved some build errors occuring after previous commit. 2013-02-21 01:25:50 +01:00
dfighter1985
fe456d91b6 GUI Editor no longer depends on RTTI typename, instead it uses GetClassName() string provided by DECLARE_UI_CLASS(). 2013-02-20 22:05:09 +01:00
dfighter1985
ea8d82cfa6 MODIFIED: #20 Resolved build errors with stlport. 2013-02-19 19:29:48 +01:00
dfighter1985
d106260646 Merged in dfighter1985/ryzomcore (pull request #3)
GCC build error fixes for #20
2013-02-19 17:19:51 +01:00
dfighter1985
df7cf9704f Merged some changes. 2013-02-19 17:17:47 +01:00
dfighter1985
f7962597bd MODIFIED: #20 Resolved some GCC build in the GUI Editor. 2013-02-19 17:16:58 +01:00
mattraykowski
6e309fee7a changed #20 - moved the libwww package discovery and fixed include paths in library project. 2013-02-19 10:04:40 -06:00
dfighter1985
8d54b6f77d MODIFIED: Resolved build error with FINAL_VERSION set. 2013-02-18 01:26:56 +01:00
dfighter1985
ecbcdf388f MODIFIED: Resolved some GCC build errors. 2013-02-17 14:30:05 +01:00
SirCotare
44681d3663 #1470 re-added api
--HG--
branch : gsoc2012-achievements
2013-02-15 17:45:33 +01:00
SirCotare
3cf378c5e7 merge from default
--HG--
branch : gsoc2012-achievements
2013-02-15 16:29:59 +01:00
SirCotare
12db371ce0 merge from upstream
--HG--
branch : gsoc2012-achievements
2013-02-15 16:29:35 +01:00
SirCotare
b7d56fc85e #1470 damn that merging... trying to remove malicious api
--HG--
branch : gsoc2012-achievements
2013-02-15 16:28:00 +01:00
SirCotare
64aa976411 #1470 removed old parser
--HG--
branch : gsoc2012-achievements
2013-02-15 16:00:01 +01:00
SirCotare
1dbd080eda #1470 added missing summary image
--HG--
branch : gsoc2012-achievements
2013-02-15 15:19:34 +01:00
SirCotare
51cc279942 #1470 updated API & achievements tracker to latest live version
--HG--
branch : gsoc2012-achievements
2013-02-15 15:04:02 +01:00
SirCotare
2d73e89682 #1470 database structure updated
--HG--
branch : gsoc2012-achievements
2013-02-15 15:03:12 +01:00
SirCotare
6017025058 #1470 updated achievements app to latest live version
--HG--
branch : gsoc2012-achievements
2013-02-15 14:51:41 +01:00
SirCotare
598adb8489 #1470 updated admin tool to latest live version
--HG--
branch : gsoc2012-achievements
2013-02-15 14:50:17 +01:00
mattraykowski
e7e51f01e0 merging gui editor repo. 2013-02-14 09:53:06 -06:00
mattraykowski
0eeeaa401f removed line from a bad merge of the character achievement code, sorry 2013-02-14 07:47:40 -06:00
mattraykowski
3f97c5afbd Added another path for x86_64 Ubuntu 12.10 for libwww 2013-02-14 07:46:42 -06:00
dfighter1985
a920c7e261 another merge from mainline 2013-02-14 13:56:05 +01:00
dfighter1985
96a5f00dbf CHANGED: Somehow lost this code part during development.
--HG--
branch : gsoc2012-gui-editor
2013-02-14 12:13:32 +01:00
dfighter1985
fcb736c387 Merged mainline default branch changes.
--HG--
branch : gsoc2012-gui-editor
2013-02-14 10:47:10 +01:00
kervala
6eec6cb861 Changed: Typo fixes and French comments translated to English (Thanks to DuDraig!) 2013-02-13 14:40:41 +01:00
kervala
f5dec3c1ca Changed: Typo fixes and French comments translated to English (Thanks to DuDraig!) 2013-02-12 22:48:37 +01:00
mattraykowski
de3371cae9 merging 2013-02-12 12:53:19 -06:00
sfb
9343d45e22 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
kervala
4f8b62acb4 Changed: Typo fixes (Thanks to DuDraig!) 2013-02-12 17:35:51 +01:00
mattraykowski
cd2134e671 merging 2013-02-12 10:28:20 -06:00
mattraykowski
8ced186cfd merge from default
--HG--
branch : gsoc2012-achievements
2013-02-12 10:24:22 -06:00
mattraykowski
643fcadc27 merge changes in remote repo
--HG--
branch : gsoc2012-achievements
2013-02-12 10:20:56 -06:00
mattraykowski
c87d8a7fe0 fixes #18 - adds the create script for the webig and app_test databases. 2013-02-12 10:09:48 -06:00
kervala
e53d42ea0e Changed: Typo fixes (Thanks to DuDraig!) 2013-02-12 17:07:38 +01:00
kervala
fc0f58e99b Changed: Typo fixes (Thanks to DuDraig!) 2013-02-11 22:34:24 +01:00
kervala
671827225d Changed: French comments translated to English 2013-02-11 22:24:48 +01:00
kervala
6e498aefad Changed: Typo fixes (thanks to Vagrant!) 2013-02-09 10:05:32 +01:00
kervala
3416ec2824 Changed: Warnings with clang 2013-02-08 18:17:42 +01:00
kervala
1582ae9dbf Changed: Preliminary memory leaks detection under Windows 2013-02-08 13:29:17 +01:00
kervala
c71e6e82f1 Changed: Typo fixes (thanks to Vagrant!) 2013-02-08 13:26:07 +01:00
kervala
45c8b20f39 Changed: Typo fixes (thanks to Vagrant!) 2013-02-08 13:17:44 +01:00
Botanic
0b75988887 Backed out changeset: 97505c669e04 2013-02-08 03:09:17 -08:00
Botanic
eb7b45eba3 Backed out changeset: e36d69e04aa1 2013-02-08 03:08:59 -08:00
Botanic
74c6735274 Backed out changeset: 57d8f3733daf 2013-02-08 03:08:42 -08:00
Botanic
26c4cd3bc9 Backed out changeset: c569b6062f5d 2013-02-08 03:08:24 -08:00
Botanic
09851e732c fixed load form and character_cl 2013-02-07 15:04:28 -08:00
Botanic
12bb26459b fixed vertex_program_parse 2013-02-07 13:00:51 -08:00
Botanic
f57637baf6 Fixed warning: multi-character character constant [-Wmultichar] 2013-02-07 12:19:00 -08:00
Botanic
4f16007da6 Fixed warning "unix_event_emitter.cpp:569:8: warning: 'KeySym XKeycodeToKeysym(Display*, KeyCode, int)' is deprecated (declared at /usr/include/X11/Xlib.h:1695)" 2013-02-07 03:27:12 -08:00
kervala
be0cd80674 Changed: Use OpenGL by default with an ATI card and without a warning dialog 2013-02-01 21:58:05 +01:00
mattraykowski
f370f767ef fixes issue #9 - deleted the 'highres' graphvars from config files. 2013-02-01 13:09:53 -06:00
mattraykowski
6f64abe84a 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
af14e1e591 merge, fixed inconsistent newlines 2013-01-30 09:57:53 -06:00
mattraykowski
971c2ba4a3 Fixed: #5 Applied check to validate parent skeleton is valid, patch provided by Vinicius Arroya. 2013-01-30 09:54:55 -06:00
kervala
c53d1fb301 Changed: OpenGL headers not being found by PCH 2013-01-09 09:29:15 +01:00
dnk-88
d301e9ac67 Change: Optimized placement source files in object viewer qt 2013-01-06 16:25:28 +03:00
kervala
b275536528 Changed: Included "fe_types.h" 2012-12-28 15:42:31 +01:00
kervala
16dc8db7ca Changed: GCC warnings 2012-12-21 16:51:10 +01:00
kervala
e6036c3047 Changed: frontend_service PCH compilation 2012-12-21 16:47:34 +01:00
kervala
df5376cc2a Changed: ai_service PCH compilation 2012-12-21 14:39:38 +01:00
dnk-88
d62b9db23c Change: Fixed incorrect behavior scroll of 2d view in landscape editor qt
--HG--
branch : gsoc2011-worldeditorqt
2012-12-15 00:41:29 +03:00
SirCotare
cffdcc5339 #1470 bugfix
--HG--
branch : gsoc2012-achievements
2012-12-11 13:10:53 +01:00
kervala
5efeb5ba62 Fixed: Compilation with VC++ 2010 and 2012 2012-12-11 12:22:41 +01:00
kervala
c8172d233c Changed: PCH optimizations 2012-12-11 11:59:54 +01:00
SirCotare
9283736c91 #1470 This is a huge update. It contains all changes we made to the system on the
official ryzom servers. I removed non open source content though. So this version
is running on live servers and works!

--HG--
branch : gsoc2012-achievements
2012-12-10 15:07:13 +01:00
kaetemi
dcbdb76fc9 Changed: Better log text 2012-12-10 13:32:17 +01:00
kaetemi
0e973ec976 Fixed: typo 2012-12-10 13:30:14 +01:00
kaetemi
d29a9ee8d7 Changed: Alternative code for play function for streaming source 2012-12-10 13:28:39 +01:00
kaetemi
6502311563 Changed: Additional checks for streaming buffers in OpenAL 2012-12-10 13:09:41 +01:00
kervala
d53a4bca98 Fixed: PCH for client_sheets 2012-12-09 08:48:15 +01:00
kervala
41f4cf2979 Fixed: Include libxml2 header 2012-12-08 13:13:00 +01:00
kervala
b83b8563a6 Fixed: Compilation with GCC 2012-12-08 13:12:29 +01:00
kervala
f89fdf3c24 Fixed: PCH for Georges editor Qt 2012-12-08 13:12:15 +01:00
kervala
4a63d4556a Fixed: PCH for Object Viewer plugin 2012-12-08 13:11:17 +01:00
kervala
7f4ac72ef3 Changed: Minor typos 2012-12-08 12:07:23 +01:00
kervala
7136618a72 Changed: Preliminary memory leaks detection under Windows 2012-12-08 11:40:34 +01:00
kervala
b330b46ee3 Fixed: PCH finally working under Linux and Mac OS X (never worked before) 2012-12-08 11:34:39 +01:00
kervala
4daf3bd009 Changed: Compilation with PCH optimizations 2012-12-08 11:32:31 +01:00
kervala
439266544e Changed: Compilation with VC++ 2012 2012-12-08 11:28:46 +01:00
kervala
21b784cc84 Changed: Methods constification 2012-12-08 11:27:18 +01:00
kervala
80d16e39eb Changed: Add Qt headers in PCH for speed improvement 2012-12-08 11:25:21 +01:00
kervala
0cabe14089 Changed: Code simplification 2012-12-08 11:24:43 +01:00
kervala
d1dfe4eb62 Added: PCH for Georges Editor Plugin 2012-12-08 11:22:05 +01:00
kervala
d9e75b1e03 Changed: Compilation with GCC 2012-12-08 11:18:26 +01:00
kervala
ab838c00bf Fixed: revision target not being generated 2012-12-07 14:51:48 +01:00
kervala
af366070ea Changed: Simplification of OpenGL ES driver 2012-12-06 10:48:46 +01:00
kervala
f4b72eab54 Changed: Support for VC++ 2012
Changed: Improvements for iOS
Changed: Support for Android
2012-12-06 10:44:55 +01:00