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 |
|
Botanic
|
7f7c2cfb44
|
Merge with quitta-gsoc-2013
--HG--
branch : rc-botanic-webdev
|
2013-06-16 00:59:10 -07: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 |
|
Botanic
|
1f648910ed
|
latest changes to work on getting registration working
--HG--
branch : rc-botanic-webdev
|
2013-06-10 04:17:55 -07: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
|
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
|
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 |
|