Commit graph

3935 commits

Author SHA1 Message Date
Quitta
25d96701c4 Merge with rc-botanic-webdev
--HG--
branch : quitta-gsoc-2013
2013-06-17 16:03:24 +02:00
Botanic
7ef366d11d fix top menu
--HG--
branch : rc-botanic-webdev
2013-06-17 06:57:22 -07:00
Botanic
3066d30ff5 Merge with quitta-gsoc-2013
--HG--
branch : rc-botanic-webdev
2013-06-17 06:41:45 -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
Quitta
f8f786fd68 Merge with rc-botanic-webdev
--HG--
branch : quitta-gsoc-2013
2013-06-17 12:09:55 +02:00
Botanic
983ea23da6 fixed js issue
--HG--
branch : rc-botanic-webdev
2013-06-17 03:08:45 -07:00
Botanic
54d2153c4b Merge with quitta-gsoc-2013
--HG--
branch : rc-botanic-webdev
2013-06-17 02:24:41 -07:00
Botanic
038f881185 reverted to tour
--HG--
branch : rc-botanic-webdev
2013-06-17 02:24:18 -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
Quitta
35179cab0f Merge with rc-botanic-webdev
--HG--
branch : quitta-gsoc-2013
2013-06-17 09:29:37 +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
Quitta
693e2a25d1 Merge with rc-botanic-webdev
--HG--
branch : quitta-gsoc-2013
2013-06-15 16:14:50 +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
kaetemi
b37606ed06 Ignore .Sync* files 2013-06-15 15:52:18 +02:00
Quitta
a4501f42ff Merge with rc-botanic-webdev
--HG--
branch : quitta-gsoc-2013
2013-06-13 23:43:58 +02:00
Botanic
900ce13318 forgot global
--HG--
branch : rc-botanic-webdev
2013-06-13 14:41:58 -07:00
Quitta
b4d3a4adb6 Merge with rc-botanic-webdev
--HG--
branch : quitta-gsoc-2013
2013-06-13 23:36:07 +02: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
Quitta
b52aa0d2fd Merge with rc-botanic-webdev
--HG--
branch : quitta-gsoc-2013
2013-06-10 13:20:42 +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