Commit graph

4992 commits

Author SHA1 Message Date
dfighter1985
4243639143 MODIFIED: Resolved build error with FINAL_VERSION set. 2013-02-18 01:26:56 +01:00
dfighter1985
b25d4b628f MODIFIED: Resolved some GCC build errors. 2013-02-17 14:30:05 +01:00
mattraykowski
f45f8eb3b2 merge gsoc2012-achievements, updates 2013-02-15 12:53:17 -06:00
SirCotare
7e358fe887 #1470 re-added api 2013-02-15 17:45:33 +01:00
SirCotare
08fbdfec17 merge from default 2013-02-15 16:29:59 +01:00
SirCotare
cf027d4004 merge from upstream 2013-02-15 16:29:35 +01:00
SirCotare
f8382e4b4f #1470 damn that merging... trying to remove malicious api 2013-02-15 16:28:00 +01:00
SirCotare
ba89dc7b94 #1470 removed old parser 2013-02-15 16:00:01 +01:00
SirCotare
6130d06541 #1470 added missing summary image 2013-02-15 15:19:34 +01:00
SirCotare
4dccc6d201 #1470 updated API & achievements tracker to latest live version 2013-02-15 15:04:02 +01:00
SirCotare
b284cbb79c #1470 database structure updated 2013-02-15 15:03:12 +01:00
SirCotare
ccf6788cd2 #1470 updated achievements app to latest live version 2013-02-15 14:51:41 +01:00
SirCotare
4f1fc4c3e6 #1470 updated admin tool to latest live version 2013-02-15 14:50:17 +01:00
mattraykowski
aa261f28a4 merging gui editor repo. 2013-02-14 09:53:06 -06:00
mattraykowski
104ac66fae removed line from a bad merge of the character achievement code, sorry 2013-02-14 07:47:40 -06:00
mattraykowski
ed7b06835d Added another path for x86_64 Ubuntu 12.10 for libwww 2013-02-14 07:46:42 -06:00
dfighter1985
dee1b19544 another merge from mainline 2013-02-14 13:56:05 +01:00
dfighter1985
62b5dc4199 Merging gsoc2012-gui-editor branch into default. 2013-02-14 13:54:40 +01:00
dfighter1985
33d84c99d7 CHANGED: Somehow lost this code part during development. 2013-02-14 12:13:32 +01:00
dfighter1985
543488b490 Merged mainline default branch changes. 2013-02-14 10:47:10 +01:00
kervala
2e7540370a Changed: Typo fixes and French comments translated to English (Thanks to DuDraig!) 2013-02-13 14:40:41 +01:00
kervala
ba089f8548 Changed: Typo fixes and French comments translated to English (Thanks to DuDraig!) 2013-02-12 22:48:37 +01:00
mattraykowski
1740fc306c merging 2013-02-12 12:53:19 -06:00
sfb
847f455a97 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
4f6cb3e329 Changed: Typo fixes (Thanks to DuDraig!) 2013-02-12 17:35:51 +01:00
mattraykowski
d285e4c6df merging 2013-02-12 10:28:20 -06:00
mattraykowski
04e11cd7fa merging character achievements branch into default. 2013-02-12 10:24:53 -06:00
mattraykowski
47098b3a63 merge from default 2013-02-12 10:24:22 -06:00
mattraykowski
34df7fbb9e merge changes in remote repo 2013-02-12 10:20:56 -06:00
mattraykowski
f7b0dd3a9e fixes #18 - adds the create script for the webig and app_test databases. 2013-02-12 10:09:48 -06:00
kervala
b368cae7a5 Changed: Typo fixes (Thanks to DuDraig!) 2013-02-12 17:07:38 +01:00
kervala
1bf4109e5b Changed: Typo fixes (Thanks to DuDraig!) 2013-02-11 22:34:24 +01:00
kervala
5794497a79 Changed: French comments translated to English 2013-02-11 22:24:48 +01:00
kervala
8409d5a371 Changed: Typo fixes (thanks to Vagrant!) 2013-02-09 10:05:32 +01:00
kervala
2b9dc61e3e Changed: Warnings with clang 2013-02-08 18:17:42 +01:00
kervala
dc28573170 Changed: Preliminary memory leaks detection under Windows 2013-02-08 13:29:17 +01:00
kervala
39668984c1 Changed: Typo fixes (thanks to Vagrant!) 2013-02-08 13:26:07 +01:00
kervala
98606fb5b5 Changed: Typo fixes (thanks to Vagrant!) 2013-02-08 13:17:44 +01:00
Botanic
be84d32306 Backed out changeset: 97505c669e04 2013-02-08 03:09:17 -08:00
Botanic
132a4d6934 Backed out changeset: e36d69e04aa1 2013-02-08 03:08:59 -08:00
Botanic
ab4b8922a6 Backed out changeset: 57d8f3733daf 2013-02-08 03:08:42 -08:00
Botanic
2067d66b15 Backed out changeset: c569b6062f5d 2013-02-08 03:08:24 -08:00
Botanic
cad71e1551 fixed load form and character_cl 2013-02-07 15:04:28 -08:00
Botanic
6f72f2fb3e fixed vertex_program_parse 2013-02-07 13:00:51 -08:00
Botanic
cd9f2aa238 Fixed warning: multi-character character constant [-Wmultichar] 2013-02-07 12:19:00 -08:00
Botanic
08176389af 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
2dd0bed9d9 Changed: Use OpenGL by default with an ATI card and without a warning dialog 2013-02-01 21:58:05 +01:00
mattraykowski
22e4fd9610 fixes issue #9 - deleted the 'highres' graphvars from config files. 2013-02-01 13:09:53 -06:00
mattraykowski
50e6c8c278 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
0743a9323c merge from default 2013-01-30 10:15:14 -06:00