Commit graph

489 commits

Author SHA1 Message Date
Botanic
4fdee0b373 Merge with quitta-gsoc-2013 2013-06-17 02:24:41 -07:00
Botanic
a12890a376 reverted to tour 2013-06-17 02:24:18 -07:00
Quitta
2a68b01d7d Tour seems to work here, not sure though 2013-06-17 11:03:31 +02:00
Quitta
6b14f646ca Merge with rc-botanic-webdev 2013-06-17 09:29:37 +02:00
Botanic
09bf26dbd1 working on help tips 2013-06-17 00:25:04 -07:00
Botanic
7c8664925f changed default skin to cerulean and constrained proportions in css 2013-06-16 23:28:58 -07:00
Botanic
0487fc0c53 changed index.php to correct file and created charisma index for backup 2013-06-16 23:13:38 -07:00
Botanic
9dd168220e cleaned up formatting and added custom.css 2013-06-16 22:57:09 -07:00
Botanic
31a6e62cf5 changed to default will override with custom.css 2013-06-16 22:46:50 -07:00
Botanic
a7320cc1ee updated the index pages with home register and login 2013-06-16 20:11:11 -07:00
Botanic
ffe60f1790 Merge with quitta-gsoc-2013 2013-06-16 00:59:10 -07:00
Quitta
89f187a04f Fixed layout for register.tpl and login.tpl, it now uses also layout.tpl but with a parameter 'no_visible_elements' => 'TRUE' 2013-06-16 01:40:13 +02:00
Botanic
2180be89d7 added .tpl.php and removed extra files 2013-06-15 15:20:16 -07:00
Botanic
40fefe1df2 Merge with quitta-gsoc-2013 2013-06-15 15:16:57 -07:00
Quitta
76096267f9 Basic template integration with css 2013-06-16 00:13:13 +02:00
Quitta
b13b72f629 Merge with rc-botanic-webdev 2013-06-15 16:14:50 +02:00
Botanic
36e39d599b fixed to proper path 2013-06-15 07:11:03 -07:00
Botanic
c2598c9673 changed to use .php not html 2013-06-15 07:08:38 -07:00
Botanic
c056507f25 added charisma 2013-06-15 07:01:11 -07:00
Quitta
f25442cbc9 Merge with rc-botanic-webdev 2013-06-13 23:43:58 +02:00
Botanic
621301aaf2 forgot global 2013-06-13 14:41:58 -07:00
Quitta
cbf5b8cbdc Merge with rc-botanic-webdev 2013-06-13 23:36:07 +02:00
Botanic
943266e341 auto create folders 2013-06-13 14:33:23 -07:00
Quitta
a2df5f36a5 Merge with rc-botanic-webdev 2013-06-10 13:20:42 +02:00
Botanic
765a26a90e latest changes to work on getting registration working 2013-06-10 04:17:55 -07:00
Botanic
ef8d9129c4 updated template for registration and setting up add_user functions 2013-06-07 04:05:28 -07:00
Botanic
47887e000c added base drupal module and removed old phtml file 2013-06-06 23:07:47 -07:00
Botanic
6340a3da36 cleaned up templates and got languages working 2013-06-06 22:59:11 -07:00
Botanic
99967baefd added in smarty, still need to finish making it load the correct template properly 2013-06-06 21:43:11 -07:00
Quitta
eecb35c42f Merge with default 2013-06-06 23:55:04 +02:00
Quitta
2f072fb60b Merge with rc-botanic-webdev 2013-06-06 23:54:41 +02:00
Quitta
932c23646e initial branch creation 2013-06-06 23:53:34 +02:00
Botanic
7a8d47922f updated files that were not merged 2013-06-06 03:38:24 -07:00
Botanic
c9811a9804 fixed thanks kervala 2013-06-06 01:28:12 -07:00
Botanic
94b3b07c85 added in-game template file 2013-06-05 23:39:33 -07:00
Botanic
9014f722c4 added base class file for sql as well as updated users to use class 2013-06-05 23:19:40 -07:00
Botanic
eda629c1ab changed to use class 2013-06-05 23:10:00 -07:00
Botanic
b6fe4f98b3 added old to hgignore 2013-06-05 23:08:57 -07:00
Botanic
e42f2f8ba0 initial work on ams_lib 2013-06-05 23:04:46 -07:00
Botanic
e5619e273b Backed out changeset: 97505c669e04 2013-02-08 03:09:17 -08:00
Botanic
3d2b747e6d Backed out changeset: e36d69e04aa1 2013-02-08 03:08:59 -08:00
Botanic
341e468d5b Backed out changeset: 57d8f3733daf 2013-02-08 03:08:42 -08:00
Botanic
bc638755e6 Backed out changeset: c569b6062f5d 2013-02-08 03:08:24 -08:00
Botanic
84701dfca3 fixed load form and character_cl 2013-02-07 15:04:28 -08:00
Botanic
326b07885f fixed vertex_program_parse 2013-02-07 13:00:51 -08:00
Botanic
2521f746d1 Fixed warning: multi-character character constant [-Wmultichar] 2013-02-07 12:19:00 -08:00
Botanic
ab608d2cfe 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
dnk-88
c72828b6dd Change: Fixed incorrect behavior scroll of 2d view in landscape editor qt 2012-12-15 00:41:29 +03:00
dnk-88
ebeae32287 Changed: Fixed crash land editor qt 2012-11-11 13:33:43 +03:00
dnk-88
283f4929b4 Changed: #1302 Polish code of property editor 2012-09-02 15:27:31 +03:00