aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-22 00:48:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4599 commits 14 branches 0 tags 258 MiB
Commit graph

4427 commits

Author SHA1 Message Date
kaetemi
1df9bec563 Fix compilation of NLNET under MinGW 2014-06-17 21:56:53 +02:00
kaetemi
3dd11fe157 Fix compilation of NLMISC under MinGW 2014-06-17 21:48:25 +02:00
kaetemi
f6ad306a57 SSE2: Add macro for force inline 
--HG--
branch : sse2
 2014-06-13 20:25:45 +02:00
kaetemi
d3fb390cf3 SSE2: Align CMatrix 
--HG--
branch : sse2
 2014-06-13 19:33:09 +02:00
kaetemi
556a41afee SSE2: Implement alignment for arena allocator 
--HG--
branch : sse2
 2014-06-13 19:26:22 +02:00
kaetemi
eee9ba0cae SSE2: Add aligned allocators 
--HG--
branch : sse2
 2014-06-13 19:12:31 +02:00
kaetemi
4ed37ac68e SSE2: Add CMake options 
--HG--
branch : sse2
 2014-06-13 19:00:24 +02:00
shubham_meena
59a6c6b8c3 deleting plugin from ams 
--HG--
branch : Gsoc14-ryzomAppImprovements
 2014-06-13 17:21:49 +05:30
shubham_meena
ad2ed4dfa4 Plugin installation first upload t{block name=content} 
--HG--
branch : Gsoc14-ryzomAppImprovements
 2014-06-13 16:40:27 +05:30
shubham_meena
a15462c863 plugin installer functionality 
--HG--
branch : Gsoc14-ryzomAppImprovements
 2014-06-11 15:57:07 +05:30
shubham_meena
c558b92bf5 plugin interaction files 
--HG--
branch : Gsoc14-ryzomAppImprovements
 2014-06-11 11:52:57 +05:30
shubham_meena
2f023e0bdc Database CREATE TABLE IF NOT EXISTS . ( 
--HG--
branch : Gsoc14-ryzomAppImprovements
 2014-06-10 12:11:34 +05:30
dfighter1985
fe7c3e4edf Rename log menu item. 
--HG--
branch : gsoc2014-dfighter
 2014-06-09 18:01:14 +02:00
dfighter1985
92cb5eea3a Updated qrc location. 
--HG--
branch : gsoc2014-dfighter
 2014-06-09 17:58:07 +02:00
dfighter1985
a86605f8d8 Move the log trigger menu item into it's own menu, and remove the menu when unloading the plugin. 
--HG--
branch : gsoc2014-dfighter
 2014-06-09 17:55:45 +02:00
dfighter1985
d4ee31ed63 Destroy context when unloading plugins. 
--HG--
branch : gsoc2014-dfighter
 2014-06-09 17:40:06 +02:00
dfighter1985
f060adbed7 Plugin loading, with issues.. 
--HG--
branch : gsoc2014-dfighter
 2014-06-09 01:14:13 +02:00
dfighter1985
c45b6a17f4 Don't crash when removing the plugin of the first tab. 
--HG--
branch : gsoc2014-dfighter
 2014-06-08 21:56:31 +02:00
dfighter1985
0096ad1204 Remove Object Viewer menus when unloading the plugin. 
--HG--
branch : gsoc2014-dfighter
 2014-06-08 19:39:58 +02:00
dfighter1985
9ad71881dc Line endings... 
--HG--
branch : gsoc2014-dfighter
 2014-06-08 19:28:19 +02:00
dfighter1985
b9bbe802d4 Remove display sheet id action when unloading the plugin. 
--HG--
branch : gsoc2014-dfighter
 2014-06-08 19:27:03 +02:00
dfighter1985
3fc289e7fa Remove sheet builder action when unloading the plugin. 
--HG--
branch : gsoc2014-dfighter
 2014-06-08 18:56:40 +02:00
dfighter1985
828f31a2a4 Remove translation manager menu when unloading the plugin. 
--HG--
branch : gsoc2014-dfighter
 2014-06-08 18:45:13 +02:00
dfighter1985
fb4dc15fe7 Remove GUI Editor menu when unloading the plugin. 
--HG--
branch : gsoc2014-dfighter
 2014-06-08 18:30:09 +02:00
dfighter1985
d7536332a6 Implemented plugin unload. 
--HG--
branch : gsoc2014-dfighter
 2014-06-08 18:17:24 +02:00
dfighter1985
eb41278369 GUI for plugin loading / unloading in the plugin dialog. 
--HG--
branch : gsoc2014-dfighter
 2014-06-07 21:07:46 +02:00
dfighter1985
732b24b985 Updated qrc location. 
--HG--
branch : gsoc2014-dfighter
 2014-06-07 20:04:15 +02:00
dfighter1985
c2a951fd6c Progressbar should look nicer on the splash screen now. 
--HG--
branch : gsoc2014-dfighter
 2014-06-07 18:10:43 +02:00
dfighter1985
f0a312a6e5 Progress bar will now actually show progress. 
--HG--
branch : gsoc2014-dfighter
 2014-06-07 17:23:06 +02:00
dfighter1985
f177a49a9e Instead of drawing the progressbar on the splash image, draw it below it. Also move the status text closer to the progress bar. 
--HG--
branch : gsoc2014-dfighter
 2014-06-07 16:56:10 +02:00
dfighter1985
2ce11cc2f9 Line endings... 
--HG--
branch : gsoc2014-dfighter
 2014-06-07 16:41:39 +02:00
kaetemi
15dc492690 Set additional preferred memory 2014-06-05 15:51:25 +02:00
kaetemi
ad0bf64b18 Cleanup extension initialization 2014-06-05 15:03:09 +02:00
dfighter1985
91463f9fa2 The splash screen will now inform the user about what's happening. 
--HG--
branch : gsoc2014-dfighter
 2014-06-05 01:57:13 +02:00
dfighter1985
cfa12b6d81 Somehow I always forget the banners... 
--HG--
branch : gsoc2014-dfighter
 2014-06-04 22:30:32 +02:00
dfighter1985
c15eebaadf First iteration of the new splash screen. 
--HG--
branch : gsoc2014-dfighter
 2014-06-04 22:09:11 +02:00
kaetemi
766cace955 Implement volatile vertex buffer for opengl driver, should provide considerable performance improvements for particle systems. Needs additional testing. 2014-06-04 18:59:54 +02:00
shubham_meena
bf47b07fe0 changes indentation and extra spaces 
--HG--
branch : Gsoc14-ryzomAppImprovements
 2014-06-01 19:52:54 +00:00
shubham_meena
c4ff97cefd template for plugins in AMS 
--HG--
branch : Gsoc14-ryzomAppImprovements
 2014-06-02 01:05:37 +05:30
shubham_meena
8a28b3583a restructuring of AMS database functions to work with CRUD 
--HG--
branch : Gsoc14-ryzomAppImprovements
 2014-05-28 03:48:44 +05:30
shubham_meena
a92f32c1c4 few more changes to the CRUD layer in ams 
--HG--
branch : Gsoc14-ryzomAppImprovements
 2014-05-27 14:19:37 +05:30
dfighter1985
1d23a092c1 rename. 
--HG--
branch : gsoc2014-dfighter
 2014-05-26 21:07:39 +02:00
dfighter1985
883c0d4462 Settings dialog on first startup. 
--HG--
branch : gsoc2014-dfighter
 2014-05-26 21:04:05 +02:00
dfighter1985
1306853697 More renames. 
--HG--
branch : gsoc2014-dfighter
 2014-05-25 22:45:34 +02:00
shubham_meena
23c0a8bc24 CRUD layer for AMS 
--HG--
branch : Gsoc14-ryzomAppImprovements
 2014-05-25 15:03:20 +05:30
kaetemi
0d67c420cd Set exec mode 2014-05-23 22:39:50 +02:00
kaetemi
1f786418a7 Crash safely with an error when sphrase is missing on client 2014-05-23 19:13:36 +02:00
kaetemi
47e5e587ad Use vector instead of map to store sbrick sheets, it's faster 2014-05-23 19:13:08 +02:00
kaetemi
4311da091f Add --admininstall parameter to c1_shard_patch 2014-05-23 17:25:52 +02:00
dfighter1985
4adbb6dbd9 Moved plugin menu items to their own sub-menu into the menubar. 
--HG--
branch : gsoc2014-dfighter
 2014-05-23 02:26:31 +02:00
kaetemi
0a41e6b3c4 Fix Windows compilation of lightmap_optimizer 2014-05-23 01:57:19 +02:00
dfighter1985
79348c8e93 More renames. 
--HG--
branch : gsoc2014-dfighter
 2014-05-22 15:56:38 +02:00
dfighter1985
ef7a39641f Rename. 
--HG--
branch : gsoc2014-dfighter
 2014-05-22 15:06:40 +02:00
dfighter1985
eeb4e48d38 Renames. 
--HG--
branch : gsoc2014-dfighter
 2014-05-19 02:08:03 +02:00
dfighter1985
0974142bcc Renamed the plugin XML files. 
--HG--
branch : gsoc2014-dfighter
 2014-05-19 01:45:19 +02:00
dfighter1985
3440c7081b Renamed ovqt and ovqt plugin binaries. 
--HG--
branch : gsoc2014-dfighter
 2014-05-18 21:47:31 +02:00
liria
94b30c76fa Merged default into lightmap_optimizer_port_to_linux 
--HG--
branch : lightmap_optimizer_port_to_linux
 2014-05-15 16:36:59 +02:00
dfighter1985
12890373a4 Merged default 
--HG--
branch : gsoc2014-dfighter
 2014-05-14 18:01:15 +02:00
kervala
46e5c39e74 Changed: Replaced some spaces by tabulations 2014-05-13 09:29:45 +02:00
botanic
b57755b9ee Fix for bug from de6f606 2014-05-10 09:15:00 -07:00
kervala
d7c9608d83 Fixed: Compilation error 2014-05-09 19:18:56 +02:00
dfighter1985
e6569049e9 Same as before... 
--HG--
branch : gsoc2014-dfighter
 2014-05-07 00:53:07 +02:00
dfighter1985
3c72598645 Readding core plugin that was missing because of a hgignore entry. 
--HG--
branch : gsoc2014-dfighter
 2014-05-07 00:50:57 +02:00
dfighter1985
91f859bc8a Moved ovqt to /code/studio 
--HG--
branch : gsoc2014-dfighter
 2014-05-06 01:30:28 +02:00
kaetemi
db5c65fedf Merge 2014-04-30 12:57:54 +02:00
kaetemi
1a4a7bafab Backed out changeset: 897087f1fa71, 7c3f1f0dc9d8, 61d11f94e3ea 2014-04-30 12:54:20 +02:00
kaetemi
798d207d0d Fix EOL 2014-04-30 12:53:06 +02:00
kervala
060347f2b9 Changed: Small typo 2014-04-30 09:18:31 +02:00
kervala
50324ccd55 Fixed #151: White box on character selection screen (a big thanks to nimetu for the patch!) 2014-04-29 10:31:02 +02:00
kervala
8972ecf1b3 Fixed: tmpFlagRemovedPatchCategories not needed anymore because RemovedPatchCategories defined in login_patch.cpp 2014-04-26 22:51:03 +02:00
sfb
c666176278 Modified the CTestConfig to point at the new CI server. 2014-04-25 14:00:46 -05:00
kervala
01bc4eeb92 Changed: Minor changes 2014-04-25 11:58:35 +02:00
kervala
e84dd7b5f7 Changed: Replaced strlwr by toLower 2014-04-24 22:59:29 +02:00
kervala
31859175ba Backed out changeset: 79980ce60498 2014-04-24 19:31:53 +02:00
kervala
24fa8df5ff Fusion avec default 
--HG--
branch : compatibility
 2014-04-24 19:16:42 +02:00
Cédric OCHS
bcc22bb11c Merged in nimetu/ryzomcore/Issue#130 (pull request #65) 
Properly restore saved camera distance from config file (issue #130)
 2014-04-24 19:14:01 +02:00
kervala
3fff8fe467 Changed: Replaced strlwr by toLower 
--HG--
branch : compatibility
 2014-04-24 18:11:16 +02:00
Nimetu
7cc1bf9f17 Fix compiling on linux with new OpenGL headers (issue #145) 
--HG--
branch : Issue#145
 2014-04-23 23:23:23 +03:00
Nimetu
02cb532401 Properly restore saved camera distance from config file (issue #130) 
--HG--
branch : Issue#130
 2014-04-23 23:20:13 +03:00
dfighter1985
4f39a58e31 Tile Editor crash fixes. 
--HG--
branch : gsoc2014-dfighter
 2014-04-23 02:10:14 +02:00
dfighter1985
fd5d961ba7 Build fixes. 
--HG--
branch : gsoc2014-dfighter
 2014-04-23 00:49:17 +02:00
dfighter1985
f882abca07 Merged Georges Editor branch. 
--HG--
branch : gsoc2014-dfighter
 2014-04-22 21:12:26 +02:00
dfighter1985
4d3a472262 Merged default. 
--HG--
branch : branch-tile-edit-ovqt-plugin
 2014-04-22 21:10:19 +02:00
dfighter1985
f3b94d38d5 Merged default. 
--HG--
branch : branch-features-geqt-plugin
 2014-04-22 21:02:34 +02:00
Matthew Lagoe
c7650f041a Merged in shubham_meena/ryzomcore/issue#119 (pull request #63) 
removed wrong panel from settings page
 2014-04-21 03:31:14 -07:00
botanic
db2f0435cd missing = 2014-04-21 03:03:39 -07:00
botanic
bac99a8815 fix for missing include 2014-04-21 03:00:19 -07:00
botanic
18f72e3781 php is_writable is not reliable 2014-04-21 02:39:29 -07:00
dfighter1985
41f44b2aa6 Merge default. 
--HG--
branch : gsoc2012-gui-editor
 2014-04-19 21:53:29 +02:00
kervala
ed1a84c99b Changed: Updated OpenGL and OpenGL ES headers 
--HG--
branch : compatibility
 2014-04-17 10:44:03 +02:00
kervala
831758beb1 Fixed: nglXSwapIntervalEXT return type should be void 
--HG--
branch : compatibility
 2014-04-17 10:16:30 +02:00
kervala
5a88951837 Changed: Find DirectX libraries in alternative folders 
--HG--
branch : compatibility
 2014-04-11 17:56:26 +02:00
liria
d89e6c9c2c Merged default into lightmap_optimizer_port_to_linux 
--HG--
branch : lightmap_optimizer_port_to_linux
 2014-04-11 16:47:50 +02:00
shubham_meena
1970dd0ff4 remove wrong panel from settings page 
--HG--
branch : issue#119
 2014-04-11 13:25:12 +05:30
botanic
4891ce5dc4 fix paths 2014-04-07 08:03:55 -07:00
botanic
fd4fce0d6a missing . 2014-04-07 06:39:41 -07:00
botanic
5fe1dd709f display erors on installer 2014-04-07 06:35:15 -07:00
botanic
fff4682d92 missed it on all of them 2014-04-07 06:29:44 -07:00
botanic
cd9deab467 Merge 2014-04-07 06:27:49 -07:00
botanic
08b1602e5a missed a ../ 2014-04-07 06:27:15 -07:00
Matthew Lagoe
0a631f5f9f Merged in shubham_meena/ryzomcore/issue#120 (pull request #60) 
changed hardcoded location of ams_lib with location defined in configuration
 2014-04-06 22:31:39 -07:00
Matthew Lagoe
3f54b93b30 Merged in shubham_meena/ryzomcore/Issue#123 (pull request #59) 
Changed log-in from username to both username and email
 2014-04-06 22:29:55 -07:00
liria
12f63f3a6e Typo correction 
--HG--
branch : lightmap_optimizer_port_to_linux
 2014-04-05 13:49:14 +00:00
liria
30036d000c Merged default into lightmap_optimizer_port_to_linux 
--HG--
branch : lightmap_optimizer_port_to_linux
 2014-04-05 15:40:17 +02:00
kaetemi
e494200c21 Bugfix: Kill users who attempt to escape the game 2014-04-01 13:54:39 +02:00
kaetemi
562dae3c3f Add command to eternally trap players ingame 2014-04-01 13:52:36 +02:00
kaetemi
5ed5cd5ea8 Add interface for HMD with player death support 2014-04-01 13:14:44 +02:00
kervala
8f6c32bd69 Backed out changeset: 3937923211ec 
--HG--
branch : compatibility
 2014-03-29 12:45:22 +01:00
Jan Boon
2eacddc47c Merged in shubham_meena/ryzomcore/Issue#121 (pull request #58) 
Added tile of web in translations
 2014-03-28 20:02:14 +01:00
Jan Boon
6765d4f091 Merged in shubham_meena/ryzomcore/issue#127 (pull request #56) 
collation changed to utf8_unicode_ci
 2014-03-28 20:01:46 +01:00
kaetemi
283f52a03f Merge 2014-03-28 19:50:21 +01:00
kervala
c83afd649d Changed: Replaced some Mac OS X warnings by TODO comments 
--HG--
branch : compatibility
 2014-03-27 16:36:00 +01:00
kervala
62eb6347e5 Changed: Aligned methods names 2014-03-27 16:34:55 +01:00
kervala
8968124553 Changed: Aligned methods names 
--HG--
branch : compatibility
 2014-03-27 16:34:55 +01:00
kervala
81881a583f Fixed: Switch not handled warnings 
--HG--
branch : compatibility
 2014-03-27 15:53:19 +01:00
kervala
9f0daa9a1e Fixed: Wrong header guard warning 2014-03-27 15:51:20 +01:00
kervala
2e6ac0ad84 Fixed: Wrong header guard warning 
--HG--
branch : compatibility
 2014-03-27 15:51:20 +01:00
kervala
bfaf952f32 Fixed: Warnings with clang: wrong ! and == operators order 2014-03-27 15:50:58 +01:00
kervala
8fa24eeb4e Fixed: Warnings with clang: wrong ! and == operators order 
--HG--
branch : compatibility
 2014-03-27 15:50:58 +01:00
kervala
b8ad53adf3 Fixed: Typo detected by clang 2014-03-27 13:40:22 +01:00
kervala
79529b1581 Fixed: Typo detected by clang 
--HG--
branch : compatibility
 2014-03-27 13:40:22 +01:00
kervala
a0801ebffe Changed: Removed useless definitions 2014-03-27 13:39:46 +01:00
kervala
7ab7952dbd Changed: Removed useless definitions 
--HG--
branch : compatibility
 2014-03-27 13:39:46 +01:00
kervala
def5243d06 Changed: Updated OpenGL headers 2014-03-27 13:39:16 +01:00
kervala
ee87716aa0 Changed: Updated OpenGL headers 
--HG--
branch : compatibility
 2014-03-27 13:39:16 +01:00
kervala
a8c35f9229 Fixed: Used code being removed by -Wl,-x on Mac OS X 2014-03-27 13:03:38 +01:00
kervala
f62b19eb71 Fixed: Used code being removed by -Wl,-x on Mac OS X 
--HG--
branch : compatibility
 2014-03-27 13:03:38 +01:00
shubham_meena
685987149d changed hardcoded location of ams_lib with location difined in configuration 
--HG--
branch : issue#120
 2014-03-27 16:50:26 +05:30
kervala
a77bddf265 Changed: Give priority to ARB extensions in tests 
--HG--
branch : compatibility
 2014-03-26 14:36:00 +01:00
kervala
55a29115ba Changed: Detect available video memory with OpenGL extensions 2014-03-26 14:34:07 +01:00
kervala
d4fb36d1eb Changed: Detect available video memory with OpenGL extensions 
--HG--
branch : compatibility
 2014-03-26 14:34:07 +01:00
kervala
0aaad7051b Changed: Use OpenGL ES functions prototypes from official headers 2014-03-26 14:32:00 +01:00
kervala
3e30929867 Changed: Use OpenGL ES functions prototypes from official headers 
--HG--
branch : compatibility
 2014-03-26 14:32:00 +01:00
kervala
c59f9d8a5e Changed: Optimize OpenGL driver PCH 2014-03-26 14:31:32 +01:00
kervala
406df1c59c Changed: Optimize OpenGL driver PCH 
--HG--
branch : compatibility
 2014-03-26 14:31:32 +01:00
kervala
927ff14998 Changed: Use OpenGL functions prototypes from official headers 
Fixed: glDeleteObjectBufferATI replaced by glFreeObjectBufferATI since 2002
 2014-03-26 14:14:36 +01:00
kervala
713c07e1e6 Changed: Use OpenGL functions prototypes from official headers 
Fixed: glDeleteObjectBufferATI replaced by glFreeObjectBufferATI since 2002

--HG--
branch : compatibility
 2014-03-26 14:14:36 +01:00
kervala
e2797c2567 Changed: Include PCH 2014-03-26 13:14:14 +01:00
kervala
b83c69bf89 Changed: Include PCH 
--HG--
branch : compatibility
 2014-03-26 13:14:14 +01:00
kervala
e9b8ee0fec Fixed: Improve compilation speed including revision.h in a smaller .cpp file 2014-03-26 13:13:17 +01:00
kervala
868470c19f Fixed: Improve compilation speed including revision.h in a smaller .cpp file 
--HG--
branch : compatibility
 2014-03-26 13:13:17 +01:00
shubham_meena
420a615321 login.php edited online with Bitbucket: to provide access through both username and email 
--HG--
branch : Issue#123
 2014-03-25 06:35:21 +00:00
shubham_meena
26c8e7ad15 changed login through email / username 
--HG--
branch : Issue#123
 2014-03-25 06:29:17 +00:00
botanic
6c345bf6b7 Merge 2014-03-24 10:45:54 -07:00
botanic
99b122c84c fix my typo's 2014-03-24 10:45:42 -07:00
shubham_meena
af2cf14273 changed login from username to both username and email 
--HG--
branch : Issue#123
 2014-03-24 17:07:53 +05:30
kervala
16d0f49b45 Changed: Minor changes 2014-03-23 20:36:46 +01:00
kervala
3045bdac62 Changed: Removed pwd command 2014-03-23 20:36:05 +01:00
kervala
3f2b2757d1 Fixed: Removed chmod because useless 2014-03-23 20:34:28 +01:00
kervala
d40db9f2af Fixed: Wrong parameters passed to bash script 2014-03-23 20:32:44 +01:00
kervala
4c159a04dd Changed: Use BuildName only on Unix 2014-03-23 20:31:59 +01:00
kervala
697e72751e Changed: Use fullpath in batch file 2014-03-23 20:27:09 +01:00
kervala
41ac5d56d8 Changed: Create .sh file under Unix 2014-03-23 20:26:29 +01:00
kervala
350c6ec5d7 Changed: Renamed RZ_PATCH to RZ_USE_PATCH 2014-03-23 20:25:48 +01:00
shubham_meena
5bef18032e added web title in translations 
--HG--
branch : Issue#121
 2014-03-23 18:48:39 +05:30
shubham_meena
7217a99c59 added title of web in translations 
--HG--
branch : Issue#121
 2014-03-23 17:56:42 +05:30
shubham_meena
bfb2b0c595 libsetup.php edited online with Bitbucket 
--HG--
branch : issue#127
 2014-03-23 10:45:30 +00:00
shubham_meena
f6f0f42d1f colation changed to utf8_unicode_ci 
--HG--
branch : issue#127
 2014-03-23 15:16:20 +05:30
kervala
7932937df9 Changed: Don't patch "main_exedll" and "main_cfg" categories under Unix 2014-03-22 19:36:53 +01:00
kervala
aa9c18481d Changed: Use "BuildName" from client_default.cfg to determinate last supported patch version by current client under Unix 2014-03-22 19:36:13 +01:00
kervala
98f33cfa87 Changed: Use RZ_USE_SEVENZIP instead of NL_USE_SEVENZIP 2014-03-22 18:20:30 +01:00
kervala
2076a6b13d Changed: Typo 2014-03-22 16:23:28 +01:00
kervala
6c4d33c2a6 Changed: Improvements in patch system 2014-03-22 16:23:17 +01:00
kaetemi
2f19b88539 Fix crash in 0_setup.py on Linux 2014-03-15 09:12:40 +01:00
kaetemi
de9724a821 Add color to console output 2014-03-13 18:34:26 +01:00
kaetemi
b3cf16f263 Separate output directories from input directories 2014-03-12 19:19:52 +01:00
botanic
9661711c66 dont chmod just check permissions 2014-03-10 12:56:47 -07:00
kaetemi
c5f3c5d9d0 Compile fix 2014-03-02 21:43:24 +01:00
kaetemi
5a97a3aef0 Fix config 2014-03-02 01:37:20 +01:00
kaetemi
98fdfb672c Cleanup config 2014-03-02 01:27:09 +01:00
kaetemi
2b5373e436 Fix duplicate config data 2014-03-02 01:13:48 +01:00
Cédric OCHS
c5e40670d9 Merged in StudioEtrange/ryzomcore/cmake-fixes (pull request #55) 
Cmake fix - FindWindowsSDK
 2014-02-28 10:19:37 +01:00
botanic
d5d65ae56e fixed cretion of users 2014-02-25 19:38:10 -08:00
kaetemi
dd97d5d41b Remove duplicate cfg data 2014-02-21 20:39:24 +01:00
StudioEtrange
994c47dc92 fix find windows.h for winsdk8 
--HG--
branch : cmake-fixes
 2014-02-21 17:35:15 +01:00
StudioEtrange
646b8fc9ae Fix bug cannot find right include folder for winsdk8 
--HG--
branch : cmake-fixes
 2014-02-21 16:40:04 +01:00
Jan Boon
fc835cbe6c Merged in StudioEtrange/ryzomcore/ovqt-fixes (pull request #54) 
OVQT Plugins - CMake Install fixes
 2014-02-21 04:53:06 +01:00
kaetemi
1764cfd708 Fix #138 Pointer truncation in AI Script VM 2014-02-21 03:17:54 +01:00
kaetemi
91d453dd63 Make packed sheets behaviour consistent accross services 2014-02-20 21:53:11 +01:00
kaetemi
020bfb775e Disable build of dataset packed sheets in build pipeline 2014-02-20 20:15:18 +01:00
kaetemi
86f86c6170 Add additional executable permissions 2014-02-20 19:42:56 +01:00
kaetemi
72fac9aaf1 Update default directories 2014-02-20 03:37:23 +01:00
kaetemi
151e86bc9d Add example configuration for patchman 2014-02-20 03:35:36 +01:00
kaetemi
d08c53aaf7 Remove unnecessary cfg 2014-02-20 03:13:30 +01:00
kaetemi
934f5c3f0b Add script for creating a new shard patch 2014-02-20 03:09:31 +01:00
kaetemi
27da0870b2 Rename scripts 2014-02-20 01:31:09 +01:00
kaetemi
e8770db674 Nicer batch scripts for pipeline 2014-02-20 01:06:29 +01:00
kaetemi
b52230832e Add build process script for shard sheets 2014-02-19 23:51:55 +01:00
kaetemi
2289285c14 Add AIS sheets to shard sheets packer tool 2014-02-19 00:40:04 +01:00
kaetemi
2555e93771 Add sheets packer tool for CTimeDateSeasonManager 2014-02-19 00:07:22 +01:00
kaetemi
30030220c1 Add EGS sheets to shard sheets packer tool 2014-02-18 23:50:55 +01:00
kaetemi
f65a48cc4b Rename CSheets in GPM to CGpmSheets 2014-02-18 22:43:06 +01:00
kaetemi
32eafb179d Add sheets packer tool for shard GPMS and CContinentContainer 2014-02-18 22:37:21 +01:00
kaetemi
accafc4192 Add sheets packer tool for shard MS and IOS 2014-02-18 22:19:56 +01:00
kaetemi
a6a72fd622 Fix #134 Exit crash after failed response from character selection 2014-02-17 13:57:26 +01:00
kaetemi
5c17bb1f8e Make IG load waiting loop more agreeable 2014-02-17 01:54:12 +01:00
kaetemi
76ce7523ff Additional streaming behaviour fix for XAudio2 driver 2014-02-17 00:20:29 +01:00
kaetemi
5ec390b0d6 Fix #132 You can no longer walk through rezzed players 2014-02-16 23:09:19 +01:00
kaetemi
49fa568123 Remove some debug 2014-02-16 20:44:58 +01:00
kaetemi
d680b70308 Fix some streaming behaviour in XAudio2 driver 2014-02-16 20:36:58 +01:00
StudioEtrange
0b8db2399c CMAKE TARGET : SHARED and MODULE 
About Shared Library (shared) and Module Library (module) type of cmake target
INSTALL command has different behaviour for ARCHIVE LIBRARY RUNTIME depending on the platform
 2014-02-16 19:43:44 +01:00
botanic
e741f31a64 Merge 2014-02-15 19:56:43 -08:00
botanic
a96f651742 force deleting of file so it works even after server crash 2014-02-15 19:52:08 -08:00
kaetemi
be311fb0f8 Fix for excessive inlining of npc chat serialization, issue #97 
--HG--
branch : compatibility
 2014-02-14 18:36:15 +01:00
kervala
8adf6df76a Changed: Minor changes 
--HG--
branch : compatibility
 2014-03-23 20:36:46 +01:00
kervala
a62393a9ed Changed: Removed pwd command 
--HG--
branch : compatibility
 2014-03-23 20:36:05 +01:00
kervala
f4233222e5 Fixed: Removed chmod because useless 
--HG--
branch : compatibility
 2014-03-23 20:34:28 +01:00
kervala
c9651b257d Fixed: Wrong parameters passed to bash script 
--HG--
branch : compatibility
 2014-03-23 20:32:44 +01:00
kervala
39eb83eb87 Changed: Use BuildName only on Unix 
--HG--
branch : compatibility
 2014-03-23 20:31:59 +01:00
kervala
058aa23813 Changed: Use official settings for client.cfg 
--HG--
branch : compatibility
 2014-03-23 20:27:55 +01:00
kervala
edf3f49afd Changed: Use fullpath in batch file 
--HG--
branch : compatibility
 2014-03-23 20:27:09 +01:00
kervala
dfb187126a Changed: Create .sh file under Unix 
--HG--
branch : compatibility
 2014-03-23 20:26:29 +01:00
kervala
91a3e128cc Changed: Renamed RZ_PATCH to RZ_USE_PATCH 
--HG--
branch : compatibility
 2014-03-23 20:25:48 +01:00
kervala
769a5ca2ee Changed: Don't patch "main_exedll" and "main_cfg" categories under Unix 
--HG--
branch : compatibility
 2014-03-22 19:36:53 +01:00
kervala
2c396827d5 Changed: Use "BuildName" from client_default.cfg to determinate last supported patch version by current client under Unix 
--HG--
branch : compatibility
 2014-03-22 19:36:13 +01:00
kervala
607f39561d Changed: Use RZ_USE_SEVENZIP instead of NL_USE_SEVENZIP 
--HG--
branch : compatibility
 2014-03-22 18:20:30 +01:00
kaetemi
cd1107adf5 Fix #134 Exit crash after failed response from character selection 
--HG--
branch : compatibility
 2014-02-17 13:57:26 +01:00
kaetemi
d2d87d2644 Make IG load waiting loop more agreeable 
--HG--
branch : compatibility
 2014-02-17 01:54:12 +01:00
kaetemi
6426393210 Additional streaming behaviour fix for XAudio2 driver 
--HG--
branch : compatibility
 2014-02-17 00:20:29 +01:00
kaetemi
4d3d7a000a Fix #132 You can no longer walk through rezzed players 
--HG--
branch : compatibility
 2014-02-16 23:09:19 +01:00
kaetemi
f703359eaa Remove some debug 
--HG--
branch : compatibility
 2014-02-16 20:44:58 +01:00
kaetemi
17b99ba796 Fix some streaming behaviour in XAudio2 driver 
--HG--
branch : compatibility
 2014-02-16 20:36:58 +01:00
kervala
c26e4c7426 Changed: Typo 
--HG--
branch : compatibility
 2014-03-22 16:23:28 +01:00
kervala
20ce763f35 Changed: Improvements in patch system 
--HG--
branch : compatibility
 2014-03-22 16:23:17 +01:00
kaetemi
cb6661b10d Fix for excessive inlining of npc chat serialization, issue #97 2014-02-14 18:36:15 +01:00
kaetemi
1bafddccf6 Fixup paths (could we use the search paths for this?) 2014-02-14 04:52:11 +01:00
kaetemi
62cf064982 Cleanup data_shard 2014-02-14 03:30:15 +01:00
kaetemi
5c4175a54d Only copy if needed 2014-02-14 02:46:07 +01:00
kaetemi
74363fdb33 Merge 2014-02-14 02:38:53 +01:00
kaetemi
f0688ad8c6 Get path for datasets from config like other services 2014-02-14 02:37:41 +01:00
kaetemi
e569541faa Fix default directory 2014-02-14 02:03:22 +01:00
kaetemi
106cd007f9 Move mirror sheets back in 2014-02-14 01:58:56 +01:00
kaetemi
497232b470 Extend shard data script to gather executables and configurations 2014-02-14 01:21:05 +01:00
kaetemi
3267b89362 Add directories for patchman to gamedata setup 2014-02-14 01:01:02 +01:00
kaetemi
9939219ebf Extend shard data script 2014-02-13 22:02:25 +01:00
botanic
2e1b47e3f0 Backed out merge changeset: b2d97621fa3b 
Backed out merge revision to its first parent (99840e8413f2)
 2014-02-13 12:12:28 -08:00
kervala
6b04b77bdd Fixed: Reverted i18n change 
--HG--
branch : compatibility
 2014-02-13 14:17:32 +01:00
kervala
ab7836187d Fixed: Reverted OpenGLES support change 
--HG--
branch : compatibility
 2014-02-13 14:15:34 +01:00
kaetemi
f4dda130a6 Clean translation diffs from OLDVALUE comments before merge, issue #116, patch provided by Łukasz K 2014-02-12 16:35:07 +01:00
kaetemi
4df290147b Fix make_merge_wk for uxt 2014-02-10 16:38:04 +01:00
kaetemi
b1c485fde0 Cleanup 2014-02-09 22:35:01 +01:00
kaetemi
451a82e59e Cleanup 2014-02-09 22:21:30 +01:00
kaetemi
ccf99f4f8e Merge 2014-02-09 22:15:33 +01:00
kaetemi
4f2a1b7db2 Fix the bug that caused the shape exporter to crash 2014-02-09 22:12:44 +01:00
kaetemi
90c9028170 Cleanup 2014-02-09 21:53:49 +01:00
kaetemi
ada9e8da5d Fix export of NeL Flare 2014-02-09 17:26:26 +01:00
botanic
b3cca9bd73 add_user code for AMS 2014-02-08 20:15:38 -08:00
botanic
96770ba2db auto create ring user permissions 2014-02-08 19:26:11 -08:00
botanic
37c3aa49fa Set permissions in the ams installer 2014-02-08 19:00:21 -08:00
botanic
ea6bec1f91 Backed out changeset: 7d3eaa1bada0 
--HG--
branch : compatibility
 2014-02-08 18:59:38 -08:00
botanic
c99bfa03d4 Set permissions in the ams installer 
--HG--
branch : compatibility
 2014-02-08 18:57:03 -08:00
Matthew Lagoe
0db3345130 Merged in nimetu/ryzomcore/shard-script-fixes-for-dash (pull request #47) 
Change shard scripts to work with dash shell (issue #99)
 2014-02-08 18:34:11 -08:00
Matthew Lagoe
3f04907c31 Merged in botanic/ryzomcore-botanic-testing (pull request #21) 
Make it so that bad text always throws a nlwarning
 2014-02-08 18:33:27 -08:00
kaetemi
bd206db383 Remove pacs.packed_prims when done 2014-02-09 02:42:45 +01:00
kaetemi
9d5c9019b5 Move visual slot tab to separate directory 2014-02-09 02:40:14 +01:00
kaetemi
06e8090669 Skip some files in ig build when possible 2014-02-09 00:46:03 +01:00
kaetemi
13e3849c89 Fix typo 2014-02-08 23:57:39 +01:00
kaetemi
6ac551cf60 Implement skip for rbank process 2014-02-08 23:43:42 +01:00
kaetemi
f085e226c6 Implement skip for ig elevation 2014-02-08 22:54:25 +01:00
kaetemi
bd335d80c4 Implement skip for zone dependency process 2014-02-08 22:23:24 +01:00
kaetemi
3d2c60aac6 Get properties search paths from python variable 2014-02-08 22:07:33 +01:00
kaetemi
af65ca5c62 Fix lightmap optimize skip 2014-02-08 21:09:35 +01:00
kaetemi
38e353b5c6 Implement skip for coarse mesh build process 2014-02-08 21:02:24 +01:00
kaetemi
a0f86ebd39 Implement skip for shape lightmap optimize build process 2014-02-08 20:02:57 +01:00
kaetemi
01a115899b Implement skip for interface build process 2014-02-08 19:44:52 +01:00
kaetemi
3f492d8b20 Add script to automatically merge translation wk files 2014-02-08 17:36:17 +01:00
kaetemi
6371fc324d Add script to make and merge all translation diffs 2014-02-08 17:10:34 +01:00
kaetemi
6b19d30de0 Add short translation procedure readme 2014-02-08 17:01:13 +01:00
kaetemi
ac474c79b9 Compile fix 2014-02-08 16:29:15 +01:00
kaetemi
8dac3b82f3 Merge 2014-02-08 16:26:01 +01:00
kaetemi
74984f768a Improve leveldesign_dev.bat 2014-02-08 16:24:56 +01:00
botanic
275542fa01 Added 7z library to all versions needed for in-game patcher 2014-02-07 20:12:15 -08:00
botanic
666ab7ebec Added linux patcher! 2014-02-07 20:10:07 -08:00
botanic
e728daa7cd Add CMAKE option and NVIDIA PerfHUD support 2014-02-07 19:49:40 -08:00
botanic
7518c066b3 Change frontend to use shard.ryzomcore.org by default 2014-02-07 19:32:10 -08:00
botanic
edd9381a3c General ui fix's 2014-02-07 19:29:36 -08:00
kaetemi
afece9a65e Merge with default 
--HG--
branch : multipass-stereo
 2014-02-08 02:58:22 +01:00
kaetemi
972d26ddde Adjust default paths 2014-02-08 01:34:16 +01:00
kaetemi
b785192a5e Add clause translation tool scripts 2014-02-08 01:03:01 +01:00
kaetemi
762a3b2655 Add translation tool scripts 2014-02-08 00:23:42 +01:00
kaetemi
62a4bec18c Add translation directory to pipeline setup 2014-02-08 00:03:56 +01:00
kaetemi
25ee7f2595 Fix crash in translation_tools 2014-02-07 23:01:36 +01:00
kaetemi
7d05793cc9 Remove temporary file 2014-02-07 20:31:21 +01:00
kaetemi
50f0ebbb41 Copy refs in client install 2014-02-07 19:35:55 +01:00
kaetemi
ef03dcd294 Add refs to patch xml 2014-02-07 18:30:55 +01:00
kaetemi
9c9811f1b3 Reorder pipeline scripts 2014-02-07 18:10:09 +01:00
kaetemi
7736c5757c Add world edit data install directory to pipeline setup 2014-02-07 18:04:23 +01:00
kaetemi
774cd59d8f Update default paths for world editor 2014-02-07 17:47:43 +01:00
kaetemi
f3b6ab7052 Typo 2014-02-07 17:23:34 +01:00
kaetemi
0d0907aa08 Add build shadow skin to shape process 2014-02-07 17:16:40 +01:00
kaetemi
991bf1244f Add some useful data to gamedev interfaces (temporary) 2014-02-07 15:53:35 +01:00
kaetemi
3fa19d91a5 Generate correct client.cfg data path for dev client 2014-02-07 15:26:15 +01:00
kaetemi
2619033972 Replace shard install script 2014-02-07 14:53:47 +01:00
kaetemi
680dfbd738 Remove duplicate tool 
--HG--
branch : build_pipeline_py
 2014-02-07 02:17:42 +01:00
kaetemi
40fe633dbe Fix thread lockup in zone lighter 
--HG--
branch : build_pipeline_py
 2014-02-07 02:01:23 +01:00
kaetemi
5144770d9d Backed out changeset: de1de16eef3b 
--HG--
branch : build_pipeline_py
 2014-02-07 01:49:39 +01:00
kaetemi
7219073bdc Include world editor files directory in prim export 
--HG--
branch : build_pipeline_py
 2014-02-07 01:49:16 +01:00
kaetemi
1a0ee41780 Improve debug message 
--HG--
branch : build_pipeline_py
 2014-02-07 01:49:01 +01:00
kaetemi
31d5b54e74 Let prim checker only open files with ig extension 
--HG--
branch : build_pipeline_py
 2014-02-07 01:01:36 +01:00
kaetemi
240576ab9c Add primitives directory to rbank lookup (needed file_index.cfg - is this the correct primitives dir?) 
--HG--
branch : build_pipeline_py
 2014-02-07 01:01:19 +01:00
kaetemi
f5c30593c8 Merge with default 
--HG--
branch : build_pipeline_py
 2014-02-07 00:11:12 +01:00
kaetemi
2c4ca0d915 Include world editor files in rbank process, part of what caused water not to build 
--HG--
branch : build_pipeline_py
 2014-02-06 23:58:18 +01:00
kaetemi
32ca8d61fe Add more paths to the build gamedata configuration 
--HG--
branch : build_pipeline_py
 2014-02-06 23:49:54 +01:00
kaetemi
b53926014d Remove weather configuration from data common 
--HG--
branch : build_pipeline_py
 2014-02-06 23:39:05 +01:00
kaetemi
439ba0713e Build pacs prim list txt outside repository 
--HG--
branch : build_pipeline_py
 2014-02-06 22:10:56 +01:00
kaetemi
dfb2815bcd Add separate target directory for shard data 
--HG--
branch : build_pipeline_py
 2014-02-06 21:44:14 +01:00
kaetemi
6f7e5e7c72 Update default paths 
--HG--
branch : build_pipeline_py
 2014-02-06 20:31:43 +01:00
kaetemi
11c9f6a91b Merge with default 
--HG--
branch : build_pipeline_py
 2014-02-06 20:16:18 +01:00
kaetemi
48d2c22639 Merge with default 
--HG--
branch : kaetemi-cleanup
 2014-02-06 19:54:15 +01:00
Matthew Lagoe
b63e2a7a8e Merged in nimetu/ryzomcore/shard-admin-tool-mysqli-class (pull request #49) 
mysqli class for shard admin tool
 2014-02-05 13:14:50 -08:00
Matthew Lagoe
d3912094cf Merged in nimetu/ryzomcore/php-mysqli-refactor-fixed (pull request #48) 
Replace deprecated mysql functions with mysqli in login and ring scripts
 2014-02-05 13:05:14 -08:00
botanic
231a6b2e64 remove sleep on ams install 2014-02-05 13:04:18 -08:00
kaetemi
89a2a2ce99 Do not select stereo display debugger when HMD is set to Auto in Snowballs 2014-02-04 20:52:15 +01:00
kaetemi
8de55c4cc5 Fix georges sound plugin compilation 2014-02-04 19:21:13 +01:00
kaetemi
ca31e78f7c Remove georges4cvs feature 2014-02-03 01:25:02 +01:00
kaetemi
bcb2f48940 Remove georges4cvs feature 2014-02-03 00:16:35 +01:00
Jan Boon
9062bea4a8 Merged ryzom/ryzomcore into default 2014-02-02 00:52:25 +01:00
kaetemi
2256b2ce15 Properly handle NeL dependencies for Ryzom tools when disabling NeL libraries 2014-02-02 00:47:33 +01:00
kervala
3980513e12 Fixed: Compilation with freetype under Linux 2014-02-01 13:59:47 +01:00
kervala
0c31ab50bf Changed: CMAKE_OSX_DEPLOYMENT_TARGET is useless because CMake set it automatically based on MACOSX_DEPLOYMENT_TARGET 2014-01-30 16:26:16 +01:00
kervala
c9a9839ce6 Fixed: Compilation under Mac OS X 10.9 (new libc++ tr1 namespace is std not std::tr1) 2014-01-30 16:14:25 +01:00
kervala
1c50b1f943 Fixed: Compilation under Mac OS X 10.9 2014-01-30 14:43:51 +01:00
Nimetu
cd4ba6e579 Removed debug output 
--HG--
branch : shard-admin-tool-mysqli-class
 2014-01-29 14:11:08 +02:00
Nimetu
db00b5002d Add mysqli database class to shard admin tool 
--HG--
branch : shard-admin-tool-mysqli-class
 2014-01-29 14:06:48 +02:00
kervala
19cc4571d3 Fixed: Don't set CMAKE_OSX_DEPLOYMENT_TARGET anymore by default, only use that if you need 2014-01-29 13:06:22 +01:00
botanic
e995784886 Fixed typo issue 60 2014-01-28 11:41:26 -08:00
Nimetu
e3c3d6a4b7 Replace deprecated mysql functions with mysqli in login and ring scripts 
--HG--
branch : php-mysqli-refactor-fixed
 2014-01-28 00:47:13 +02:00
Nimetu
6f1dc626bd Change shard scripts to work with dash shell (issue #99) 
Fix 'Press ENTER key' functionality

--HG--
branch : shard-script-fixes-for-dash
 2014-01-27 23:15:31 +02:00
botanic
71b0f9ae92 Issue #60 
does seem to work better when latency is high
 2014-01-26 03:20:00 -08:00
botanic
60495f79ac Merge 2014-01-26 02:58:42 -08:00
botanic
b6441edf2d Fix for Issue #94 2014-01-26 02:57:59 -08:00
kervala
a5a9532a13 Changed: Best fix for Freetype new layout (we only just need to include ft2build.h as done in font_generator.h) 2014-01-26 11:03:33 +01:00
botanic
5317c9f080 Backed out php-mysqli-refactor, broke logins 2014-01-26 01:31:47 -08:00
liria
16dbe48ed5 use NEL CFile function for file test 
--HG--
branch : lightmap_optimizer_port_to_linux
 2014-01-25 17:09:07 +01:00
liria
a6d9521ae6 Merged default into lightmap_optimizer_port_to_linux 
--HG--
branch : lightmap_optimizer_port_to_linux
 2014-01-25 13:52:12 +01:00
liria
54c53255b1 make the programm compile on linux plateform 
--HG--
branch : lightmap_optimizer_port_to_linux
 2014-01-25 11:50:14 +01:00
kervala
09e3471f1b Fixed: Compilation with freetype 2014-01-25 10:45:57 +01:00
kervala
43c48ad36a Changed: Enable ig_elevation everywhere (patch by Liria) 2014-01-23 13:08:11 +01:00
liria
41a475b8f3 Merged default into ig_elevaton_port_to_linux 
--HG--
branch : ig_elevaton_port_to_linux
 2014-01-23 00:49:56 +01:00
liria
ac48221c8b CMakeLists.txt edited online with Bitbucket - remove merge conflict with default branche 
--HG--
branch : ig_elevaton_port_to_linux
 2014-01-22 23:49:11 +00:00
kervala
ee8edac294 Fixed: #96 cmake and freetype detection on Linux Debian SID 2014-01-22 10:24:35 +01:00
kaetemi
207d7323ce Fix Qt build on Windows 2014-01-21 12:50:23 +01:00
Nimetu
11e5515c5c Replace deprecated mysql functions with mysqli in login and ring scripts 
--HG--
branch : php-mysqli-refactor
 2014-01-10 14:00:09 +02:00
Nimetu
ea5a36b105 Remove tooltip debug message from logs 
--HG--
branch : misc-patches
 2014-01-04 00:20:05 +02:00
Nimetu
5b09380bff Hide over the limit landmarks instead deleting them 
--HG--
branch : misc-patches
 2014-01-03 22:43:00 +02:00
Nimetu
4c2531474a Fix typo (issue #70) 
--HG--
branch : misc-patches
 2014-01-03 19:51:50 +02:00
Nimetu
0bad9f2f5e Fix inventory items draggable state (issue #78) 
--HG--
branch : misc-patches
 2014-01-03 20:31:14 +02:00
Nimetu
3cd6ecdb82 Add deadlock counter to prevent endless loop (issue #73) 
--HG--
branch : misc-patches
 2014-01-03 19:11:49 +02:00
botanic
935ea04c58 dont force null driver, doesnt work on all cards and disable maximising max while running pipeline 2013-12-30 10:03:49 -08:00
botanic
db3a789ab4 un kaetemi'd the pipeline 2013-12-30 08:59:59 -08:00
botanic
2c0d64e8ff added single bat file to run whole pipeline 2013-12-29 23:25:09 -08:00
botanic
15452f47d3 fixed permissions 2013-12-18 11:45:10 -08:00
botanic
92f8e4ffa8 changed client_default to use shard 2013-12-17 06:54:27 -08:00
botanic
c275d0f7d8 ams needs some urls editable without recompiling 2013-12-17 05:10:28 -08:00
botanic
32cfdada54 fixed permissions on default admin account 2013-12-17 04:59:53 -08:00
botanic
52d4d3c0f5 added the install for ring_open 2013-12-17 00:07:09 -08:00
botanic
0a48856319 a positive and a negative is supposted to be NEGATIVE stupid php 2013-12-16 23:38:24 -08:00
botanic
31de51af19 updated words file 2013-12-16 23:19:29 -08:00
botanic
8aa71de2bc helps if i use the right file... 2013-12-16 23:14:24 -08:00
botanic
8cbc6f01ec forgot a few ; 2013-12-16 23:11:30 -08:00
botanic
4e4d925e54 fixed some permissions issues, setup system so that it has a is_installed file to determin if it should install or not 2013-12-16 22:59:06 -08:00
botanic
09e5cfc5ef Merge 2013-12-14 19:36:36 -08:00
botanic
fe3a7c0e1c fix for new install 2013-12-14 19:34:07 -08:00
kervala
291c961776 Changed: #71 Crash when entering rooms (patch provided by Tierry Anthony, thanks!) 2013-12-14 09:18:51 +01:00
kervala
19f7bc931e Fixed: Warning "LNK4224: /INCREMENTAL:YES is no longer supported" 2013-11-22 11:27:30 +01:00
kervala
6196077160 Changed: #85 Compilation with STLport + EOL 2013-11-22 11:25:53 +01:00
kervala
986edb216f Fixed: #85 Compilation with STLport 2013-11-22 11:25:12 +01:00
kervala
c718ff693a Fixed: Assign instead of comparison 2013-11-22 11:20:07 +01:00
"picomancer ext:(%22)
12f646afef README: Update URL for build instructions, fix typo 2013-11-13 17:25:12 -05:00
kervala
ae5becbb0b Fixed: Warning with clang 2013-11-13 22:53:26 +01:00
kervala
98c862136a Changed: Manual -isysroot and -mmacosx-version-min useless because already set by CMake 2013-11-13 22:52:48 +01:00
kervala
b219623129 Fixed: Verbose warning 2013-11-13 22:23:57 +01:00
kervala
b96ad682f5 Fixed: Compilation under Mac OS X 2013-11-13 22:23:24 +01:00
kervala
a45bbd96c5 Fixed: Warning with clang 2013-11-13 22:23:02 +01:00
kervala
af1721a0a4 Changed: Don't need to change _PolygonSmooth if value is the same 2013-11-13 21:55:14 +01:00
kervala
166607f644 Changed: Implement VSync under Mac OS X 2013-11-13 21:54:45 +01:00
kervala
73196fe7fe Changed: Replace strlwr by toLower 2013-11-13 21:53:21 +01:00
kervala
b46c316940 Fixed: #77 crash when using lua:parseInterfaceFromString() (a big thanks to nimetu for the fix !) 2013-11-13 21:52:21 +01:00
kervala
dda2215ed8 Fixed: Wrong algorithm 2013-11-13 21:46:42 +01:00
kervala
6b3b85962a Changed: EOL 2013-11-13 21:45:06 +01:00
kervala
d8a6c9f966 Fixed: Warning with clang 2013-11-13 21:40:41 +01:00
kervala
8099217145 Changed: Replaced math.mod by math.fmod in Ring lua files 2013-11-13 21:38:23 +01:00
kervala
36a537a88e Changed: Replaced atof by fromString 2013-11-13 21:37:28 +01:00
kervala
0ce9bca0ac Changed: Replaced strlwr by toLower 2013-11-13 21:33:29 +01:00
kervala
b7082644f0 Changed: Updated OpenGL registry 2013-11-13 20:31:08 +01:00
botanic
be87039624 added reload link to if config permissions are wack 2013-11-11 13:23:33 -08:00
botanic
80e168886a properly write the hostname for permissions creation 2013-11-11 13:17:19 -08:00
botanic
036dac452f changed it to error on bad permissions copying config.php 2013-11-11 10:54:09 -08:00
Botanic
6dfafa7ae1 Merge 2013-11-02 16:35:26 -07:00
kervala
588d262dbf Fixed: MFC can't be found 2013-10-30 20:46:19 +01:00
sfb
59abfb8a1d Bad logging, content is unsigned const char*, fixed it to use %s and not cast. 
--HG--
branch : gsoc2011-worldeditorqt
 2013-10-28 12:58:08 -05:00
sfb
df7110d2d6 Bad merge resolution, fixed a couple source files which merged poorly. 
--HG--
branch : gsoc2011-worldeditorqt
 2013-10-28 11:24:31 -05:00
sfb
d86f150caa Bad merge resolution, fixed the build files that merged poorly. 
--HG--
branch : gsoc2011-worldeditorqt
 2013-10-28 11:24:02 -05:00
Matthew Lagoe
61f021f635 Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #43) 
added rrd_graphs directory
 2013-10-26 20:59:38 -07:00
Botanic
9e67d9ea09 added rrd_graphs directory 
--HG--
branch : rc-botanic-webdev
 2013-10-26 20:57:16 -07:00
Botanic
4c5832204f config.default.php 2013-10-26 03:19:59 -07:00
Botanic
3e692705ea added folder placeholders 2013-10-26 02:04:54 -07:00
Botanic
7381de073e fixed bad merge 2013-10-26 00:57:50 -07:00
Botanic
057fe3e0f7 Merge 2013-10-26 00:50:56 -07:00
Botanic
b6de1eca23 Changed installer page to no_visible_elements 
--HG--
branch : rc-botanic-webdev
 2013-10-24 21:58:11 -07:00
Botanic
284884c573 added installer for nel_tool database 
--HG--
branch : rc-botanic-webdev
 2013-10-24 20:25:04 -07:00
Botanic
a3cbd69d3b fixed css 
--HG--
branch : rc-botanic-webdev
 2013-10-24 05:43:38 -07:00
Botanic
03a1dc39af made logo clickable 
--HG--
branch : rc-botanic-webdev
 2013-10-24 05:03:01 -07:00
Botanic
2d174cf15c fixed more warnings 
--HG--
branch : rc-botanic-webdev
 2013-10-24 04:43:42 -07:00
Botanic
b8fdefe10d fixed php warning 
--HG--
branch : rc-botanic-webdev
 2013-10-24 04:10:39 -07:00
Botanic
04619a39a9 made users a dropdown for adding users to group 
--HG--
branch : rc-botanic-webdev
 2013-10-24 02:21:43 -07:00
Botanic
632a6f2929 fixed missing </div> 
--HG--
branch : rc-botanic-webdev
 2013-10-24 01:25:05 -07:00
Botanic
91c4784752 Fixed Support Groups 
--HG--
branch : rc-botanic-webdev
 2013-10-24 01:12:09 -07:00
Botanic
81d1cf93fb added option for assigned and unassigned ie "both" 
--HG--
branch : rc-botanic-webdev
 2013-10-23 23:58:34 -07:00
Botanic
d1913cbfc5 fixed div in settings template 
--HG--
branch : rc-botanic-webdev
 2013-10-23 18:35:44 -07:00
Botanic
c4e79a8246 fixed some more static non-static warnings 
--HG--
branch : rc-botanic-webdev
 2013-10-23 18:26:59 -07:00
Botanic
6b266fd808 fixed missing index errors 
--HG--
branch : rc-botanic-webdev
 2013-10-23 18:07:09 -07:00
Botanic
8ca55f955e fixed groupid if there are no groups 
--HG--
branch : rc-botanic-webdev
 2013-10-23 17:12:47 -07:00
Botanic
677c8fa251 cleanup sync 
--HG--
branch : rc-botanic-webdev
 2013-10-23 17:08:27 -07:00
Botanic
3dbb08f1d1 fixed static call to non static 
--HG--
branch : rc-botanic-webdev
 2013-10-23 17:06:42 -07:00
Botanic
95c5b9e1a8 added fork on linux as well as implimented pid file to check for other running crons 
--HG--
branch : rc-botanic-webdev
 2013-10-23 15:26:36 -07:00
Botanic
72290313a4 Implimented lazy cron and fixed syncronize button. 
--HG--
branch : rc-botanic-webdev
 2013-10-23 15:06:41 -07:00
sfb
892ed1ed3d merge from default 
--HG--
branch : gsoc2011-worldeditorqt
 2013-10-23 12:08:09 -05:00
Botanic
08ee2b8abc added installing nel db 
--HG--
branch : rc-botanic-webdev
 2013-10-22 22:03:33 -07:00
Botanic
54d13d93d0 Fixed path bugs 
--HG--
branch : rc-botanic-webdev
 2013-10-21 23:57:27 -07:00
Botanic
16bd70c50a remove install.php from sql 
--HG--
branch : rc-botanic-webdev
 2013-10-21 23:31:58 -07:00
Botanic
fd012e9cda added installer 
--HG--
branch : rc-botanic-webdev
 2013-10-21 23:31:13 -07:00
Botanic
457f2f703f updated TOS url to http://www.gnu.org/licenses/agpl-3.0.html 
--HG--
branch : rc-botanic-webdev
 2013-10-21 23:14:26 -07:00
Botanic
7a7191e981 added installer for when database is missing 
--HG--
branch : rc-botanic-webdev
 2013-10-21 23:02:01 -07:00
Botanic
32c729f38e Moved Android app 
--HG--
branch : rc-botanic-webdev
 2013-10-21 20:05:16 -07:00
kervala
28b9fbe8bc Changed: Search for default installation paths under Windows 2013-10-21 17:50:21 +02:00
Matt Raykowski
0001719d99 Merged in DJanssens/quitta-ryzomcore (pull request #25) 
Ryzom AMS - GSOC Project
 2013-10-19 16:02:52 -05:00
Botanic
04221c3696 changed to tabs 2013-10-18 02:25:48 -07:00
Botanic
31ca25b00b connection failure message if mysql conneciton fails 2013-10-18 01:51:30 -07:00
kervala
c180c06d7f Removed: Backup files 2013-10-13 13:34:38 +02:00
kaetemi
3f1ce6020a Merge with default 
--HG--
branch : multipass-stereo
 2013-10-06 20:09:25 +02:00
kaetemi
563afd027c Fix #67 bad NELID in vertex program parser 2013-10-06 20:06:53 +02:00
kaetemi
af621187f1 Merge with default 
--HG--
branch : multipass-stereo
 2013-10-06 15:50:49 +02:00
kervala
eb3c58cce9 Fixed: Use multiarch library path under Linux 2013-09-30 09:11:35 +02:00
kervala
30b0f25587 Fixed: server_share needs MySQL headers 2013-09-29 20:33:07 +02:00
kervala
652915412f Changed: Link to opengl library 2013-09-29 18:11:05 +02:00
kervala
de43ea8d86 Fixed: Some warnings 2013-09-29 16:26:24 +02:00
kervala
de42e4d7ff Fixed: Some warnings 2013-09-29 13:52:53 +02:00
kervala
67e0b796ce Changed: Search for OpenGL Qt 4 module 2013-09-29 13:52:21 +02:00
kervala
0b29d3993d Changed: Don't check for D3D radio button under other OSes 2013-09-29 13:51:43 +02:00
kervala
f8179f68ad Changed: Minor change 2013-09-29 13:51:08 +02:00
kervala
f11f5c8b7a Changed: Disable D3D radio button for other OSes 2013-09-29 13:50:38 +02:00
kervala
339242d88e Changed: Virtual destructors 2013-09-29 13:49:53 +02:00
kervala
b638779240 Fixed: Compilation under Linux 2013-09-29 13:49:07 +02:00
kervala
28eb142f24 Changed: Minor changes 2013-09-29 13:47:30 +02:00
kervala
b5e7542602 Fixed: Wrong driver version in Ryzom Configurator 
Fixed: Typo in "width"
 2013-09-29 13:46:43 +02:00
kervala
b0b1c8a0b6 Changed: Added PCH for ryzom configurator qt 2013-09-29 13:44:04 +02:00
kervala
f2ee0e99d8 Changed: Detect Windows 8 and Windows Server 2012 2013-09-29 13:41:42 +02:00
kervala
c7899841d3 Fixed: Compilation under Linux 2013-09-28 10:18:35 +02:00
Cédric OCHS
349b8a8b55 Merged in nimetu/ryzomcore (pull request #28) 
Fixed: restore correct resolution
 2013-09-27 20:07:08 +02:00
kervala
eebe74066e Changed: Include Lua headers directory for GUI Editor 2013-09-27 16:43:02 +02:00
kervala
43bbfe3da7 Fixed: Some warnings 2013-09-27 16:30:55 +02:00
Nimetu
5da36a54e4 Fixed: Do not save client.cfg when exiting from char selection screen or correct window size is lost 2013-09-27 12:58:34 +03:00
Nimetu
276f664e50 Fixed: restore correct fullscreen resolution 2013-09-27 12:16:13 +03:00
kervala
bc8490adb7 Changed: Detect Express versions 2013-09-27 11:05:52 +02:00
kervala
2aba0ec52f Changed: Don't use anymore the current SDK in registry (very unreliable) 
Changed: Use the Windows SDK installed with VC++ or the most recent compatible one
 2013-09-27 10:52:44 +02:00
kervala
4fee35c5b3 Fixed: Windows SDK detection for some previous versions 2013-09-27 09:26:22 +02:00
kaetemi
3b4730c890 Fix warnings 2013-09-27 01:32:01 +02:00
kaetemi
3b1d4e3915 Fix warnings 2013-09-27 01:11:19 +02:00
kaetemi
85365fd7bb Fix line endings 2013-09-27 00:08:49 +02:00
kervala
65d9c70cd9 Fixed: LNK2011 when using external libraries 2013-09-26 22:50:13 +02:00
kervala
03201f979f Changed: Improved Windows SDK detection 2013-09-26 22:49:30 +02:00
Nimetu
4b86f979a8 Fixed: remember selected resolution in login screen (issue #36) 
--HG--
branch : fix-issue-36
 2013-09-26 21:34:55 +03:00
Cédric OCHS
f8f25e8579 Merged in nimetu/ryzomcore (pull request #26) 
Fixed: map landmark bug (issue #15)
 2013-09-25 08:52:30 +02:00
kervala
c8c296f484 Changed: Created NELID macro to fix warning "multi-character character constant" 2013-09-24 21:33:59 +02:00
Nimetu
75d784c656 Fixed: map landmark bug (issue #15) 2013-09-23 17:34:01 +03:00
Quitta
b190d7930d updated client_default.cfg and removed rhe anon login 2013-09-23 03:52:20 +02:00
Quitta
a484de5b3f Merge with quitta-gsoc-2013 2013-09-23 00:49:16 +02:00
Quitta
a8f9036b28 Added empty ssl_ca_cert.pem to fix missing cert error 
--HG--
branch : quitta-gsoc-2013
 2013-09-23 00:39:05 +02:00
kervala
bb7297f260 Fixed: Wrong variable used to compute array length 2013-09-22 13:23:03 +02:00
kervala
b7ddc2c0d2 Fixed: OpenGL ES driver compilation 2013-09-22 13:20:53 +02:00
kervala
82904232d2 Fixed: Warnings with GCC 2013-09-22 13:20:19 +02:00
kervala
61a5647bdd Changed: Typo 2013-09-22 13:18:28 +02:00
kervala
6695a9064e Changed: Created NELID macro to fix warning "multi-character character constant" 2013-09-22 13:10:57 +02:00
kervala
c7deb1b0c4 Changed: FIX_PRECOMPILED_HEADER now useless 2013-09-22 11:05:13 +02:00
kervala
6dff896bba Changed: Link to CURL_LIBRARIES 2013-09-22 11:04:40 +02:00
kervala
0ff9908e8e Changed: Don't include files from project in PCH 2013-09-22 11:01:17 +02:00
kervala
3294955c60 Fixed: #55 ryzom_client crashes on start with unprotected error in call to Lua API 2013-09-22 10:47:12 +02:00
StudioEtrange
d81c9db04e FindMSVC fix 2013-09-21 14:14:29 +02:00
Quitta
a2cedf109d forgot to change one button, quick fix 
--HG--
branch : quitta-gsoc-2013
 2013-09-21 00:35:04 +02:00
Quitta
43e356cda1 changed button sizes and added the forgot password link to the client_cfg.cpp 
--HG--
branch : quitta-gsoc-2013
 2013-09-21 00:28:53 +02:00
Quitta
cf8251f25f forgot password added 
--HG--
branch : quitta-gsoc-2013
 2013-09-20 23:36:19 +02:00
Quitta
78adc25c8d Made it possible to redirect to a specific page after login in 
--HG--
branch : quitta-gsoc-2013
 2013-09-20 05:33:39 +02:00
Quitta
7d3bd1a4ba renamed the config to config.default.php 
--HG--
branch : quitta-gsoc-2013
 2013-09-20 03:11:04 +02:00
Quitta
cfa3651296 some extra information added + changed the default hardcoded register & support url in the client_cfg.cpp 
--HG--
branch : quitta-gsoc-2013
 2013-09-20 02:41:57 +02:00
Quitta
40bcc543e3 tried to fix error messages being shown 
--HG--
branch : quitta-gsoc-2013
 2013-09-17 05:26:09 +02:00
Quitta
3d69e377e0 it works, though this will also forward the client to the success page 
--HG--
branch : quitta-gsoc-2013
 2013-09-17 04:58:02 +02:00
Quitta
4aa905c07f bah, its late and I'm not working in c++... 
--HG--
branch : quitta-gsoc-2013
 2013-09-17 04:35:37 +02:00
Quitta
343c01d077 this should fix it :D! 
--HG--
branch : quitta-gsoc-2013
 2013-09-17 04:24:57 +02:00
Quitta
2747ed75f7 wasn't completely fixed yet, hopefuly it now is 
--HG--
branch : quitta-gsoc-2013
 2013-09-17 02:31:02 +02:00
Quitta
739defbd99 small fix 
--HG--
branch : quitta-gsoc-2013
 2013-09-17 01:59:40 +02:00
Quitta
cae26f525c updated the help page! 
--HG--
branch : quitta-gsoc-2013
 2013-09-15 20:11:34 +02:00
Quitta
3dd4901036 syncing small fix 
--HG--
branch : quitta-gsoc-2013
 2013-09-15 19:44:24 +02:00
Quitta
bfce96eb23 putted image files in the www folder too, because else it can't be accessed from outside! 
--HG--
branch : quitta-gsoc-2013
 2013-09-15 19:38:49 +02:00
Quitta
3c1d74045e added function that imports the users from the nel db into the ams/ticket_user 
--HG--
branch : quitta-gsoc-2013
 2013-09-15 19:15:17 +02:00
Quitta
a485382a47 updated the docs! 
--HG--
branch : quitta-gsoc-2013
 2013-09-15 18:27:07 +02:00
kaetemi
f6668b3f6f Cleanup vr config interface 
--HG--
branch : multipass-stereo
 2013-09-15 02:14:38 +02:00
kaetemi
6186da84b2 Add ingame configuration interface for virtual reality devices 
--HG--
branch : multipass-stereo
 2013-09-15 01:34:06 +02:00
kaetemi
1a669307da Fix typo 2013-09-14 19:05:54 +02:00
kaetemi
ce9e0a397b Fix regression from stereo branch in wind tree 2013-09-14 18:58:23 +02:00
kaetemi
046e3c92da Fix compile error in vertex program 2013-09-14 17:53:47 +02:00
kaetemi
3c099397d8 Update supportVertexProgram calls 2013-09-14 16:43:36 +02:00
kaetemi
e99bc7ba69 Remove old interface 2013-09-14 16:45:00 +02:00
kaetemi
256f7ff06c Cleanup unused code 2013-09-14 16:23:11 +02:00
kaetemi
6dfc8d0a00 Rename 
--HG--
branch : multipass-stereo
 2013-09-14 00:46:10 +02:00
Quitta
1b9f09bc52 Added more documentations, this time also the inc/func files are documented and changed the doxygen config file with the help of Botanic 
--HG--
branch : quitta-gsoc-2013
 2013-09-14 00:39:03 +02:00
kaetemi
973215e1d0 Cleanup 
--HG--
branch : multipass-stereo
 2013-09-14 00:36:06 +02:00
kaetemi
96dc139ddd Merge with default 
--HG--
branch : multipass-stereo
 2013-09-13 23:24:13 +02:00
kaetemi
df123d6b89 Fix compile errors caused by missing includes 2013-09-13 23:23:19 +02:00
kaetemi
d2bc32e598 Merge with default 
--HG--
branch : multipass-stereo
 2013-09-13 23:07:49 +02:00
kaetemi
cd9baf8f89 Cleanup 
--HG--
branch : multipass-stereo
 2013-09-13 23:02:35 +02:00
kaetemi
74cff50842 Use named indices with wind tree program 
--HG--
branch : multipass-stereo
 2013-09-13 22:20:52 +02:00
kaetemi
c766940e75 Use named indices for per pixel light vertex program 
--HG--
branch : multipass-stereo
 2013-09-13 21:47:42 +02:00
kaetemi
f9c9c1836a Use named uniform indices for lighted vertex program 
--HG--
branch : multipass-stereo
 2013-09-13 21:31:47 +02:00
kaetemi
61af565bf9 Updated wind tree program container 
--HG--
branch : multipass-stereo
 2013-09-13 20:45:06 +02:00
kaetemi
c353121771 Use lighted vertex program container for per pixel light program 
--HG--
branch : multipass-stereo
 2013-09-13 20:00:20 +02:00
kaetemi
a72f25e763 Add container for lighted vertex program 
--HG--
branch : multipass-stereo
 2013-09-13 19:03:05 +02:00
kaetemi
ab231ea700 Adjust order for meshvp 
--HG--
branch : multipass-stereo
 2013-09-13 18:25:52 +02:00
kaetemi
278e19743c Do not use old interface here 
--HG--
branch : multipass-stereo
 2013-09-13 17:17:11 +02:00
kaetemi
d5c2a0527d Modify calls in bloom effect 
--HG--
branch : multipass-stereo
 2013-09-13 17:11:42 +02:00
kaetemi
5e14dc4458 Update veget implementation 
--HG--
branch : multipass-stereo
 2013-09-13 17:09:05 +02:00
kaetemi
9d93ae51a3 Fixes for d3d 
--HG--
branch : multipass-stereo
 2013-09-13 17:08:56 +02:00
Quitta
580aa3c775 Added the doxygen generated pages + config file in ryzom/tools/server/ryzom_ams_docs 
--HG--
branch : quitta-gsoc-2013
 2013-09-13 00:27:49 +02:00
Quitta
f11559bd8a the lib is entirely documented, still webusers and func/inc folders to go :D 
--HG--
branch : quitta-gsoc-2013
 2013-09-12 19:28:56 +02:00
Quitta
03b48ea0d3 some more documented classes.. 
--HG--
branch : quitta-gsoc-2013
 2013-09-12 06:13:28 +02:00
Quitta
9a6da85805 added extra documentation. Man, writing documentation for the ticket class was quite a job :D 
--HG--
branch : quitta-gsoc-2013
 2013-09-11 23:51:23 +02:00
Quitta
9cc28cfc4d Even more docs! writing documentation sucks.. 
--HG--
branch : quitta-gsoc-2013
 2013-09-11 16:56:00 +02:00
Quitta
afb0a74980 added more documentation.. 
--HG--
branch : quitta-gsoc-2013
 2013-09-11 01:38:53 +02:00
kaetemi
21a70b4211 Update d3d implementation and add some debugging code 
--HG--
branch : multipass-stereo
 2013-09-11 01:12:37 +02:00
Quitta
d055a15f29 added documentation for assigned, dblayer and forwarded class 
--HG--
branch : quitta-gsoc-2013
 2013-09-10 21:26:03 +02:00
kaetemi
e8d77e23e0 Rename of a d3d specific class 
--HG--
branch : multipass-stereo
 2013-09-10 19:53:41 +02:00
kaetemi
c6139419ac Partial update of veget vp 
--HG--
branch : multipass-stereo
 2013-09-10 19:52:14 +02:00
kaetemi
0a9dfc6aef Update decal vp 
--HG--
branch : multipass-stereo
 2013-09-10 17:01:33 +02:00
kaetemi
5fbb220795 Update some test code 
--HG--
branch : multipass-stereo
 2013-09-10 16:42:51 +02:00
kaetemi
c53aa6958e Small adjustment to landscape vp parameter setting 
--HG--
branch : multipass-stereo
 2013-09-10 16:24:45 +02:00
kaetemi
88cbc2f82b Simplify 
--HG--
branch : multipass-stereo
 2013-09-10 15:59:31 +02:00
kaetemi
abafc9b1ef Adjust landscape vertex program to use new interface 
--HG--
branch : multipass-stereo
 2013-09-10 15:42:42 +02:00
Quitta
f7fc1afad9 Just retested the mailing functionality, which seems to still work proper 
--HG--
branch : quitta-gsoc-2013
 2013-09-10 04:42:36 +02:00
kaetemi
5ad617efb6 Use new program interface for water vertex program 
--HG--
branch : multipass-stereo
 2013-09-10 02:07:16 +02:00
kaetemi
32809d646a Set driver parameters 
--HG--
branch : multipass-stereo
 2013-09-10 02:01:57 +02:00
kaetemi
64643e564b Some fixes 
--HG--
branch : multipass-stereo
 2013-09-10 01:29:53 +02:00
kaetemi
0429e67903 Use CSmartPtr for vertex program 
--HG--
branch : multipass-stereo
 2013-09-10 00:31:26 +02:00
kaetemi
8f4fe87b7b Set params from storage 
--HG--
branch : multipass-stereo
 2013-09-09 23:39:18 +02:00
Quitta
eb3d992716 removed my testing pass out of the config file :D 
--HG--
branch : quitta-gsoc-2013
 2013-09-09 23:31:49 +02:00
Quitta
a0d8902d13 Added CreatePermissions + handling it while syncing + changed image path to refer to the image locations dir + other fixes 
--HG--
branch : quitta-gsoc-2013
 2013-09-09 23:30:45 +02:00
kaetemi
484a946c60 Fix incorrectly removed line 
--HG--
branch : multipass-stereo
 2013-09-09 23:03:52 +02:00
kaetemi
b03895f5f3 Missed file in last commit 
--HG--
branch : multipass-stereo
 2013-09-09 23:01:43 +02:00
kaetemi
e3dead19e4 Replace temporary CMaterial code 
--HG--
branch : multipass-stereo
 2013-09-09 21:44:14 +02:00
kaetemi
e9444ce36a Implement param storage copy 
--HG--
branch : multipass-stereo
 2013-09-09 21:05:12 +02:00
kaetemi
bb625c33bd Flag some TODO's 
--HG--
branch : multipass-stereo
 2013-09-09 20:55:23 +02:00
kaetemi
87b24bc4ab Add glsl pixel program for stereo distortion 
--HG--
branch : multipass-stereo
 2013-09-09 20:49:59 +02:00
kaetemi
ac2e087fbf Cleanup abstract gpu program interface 
--HG--
branch : multipass-stereo
 2013-09-09 18:33:38 +02:00
kaetemi
0d743d7f37 Implement new driver interface in Direct3D driver 
--HG--
branch : multipass-stereo
 2013-09-09 16:36:29 +02:00
kaetemi
81876009d3 Implement new driver interface in OpenGL driver 
--HG--
branch : multipass-stereo
 2013-09-09 14:43:10 +02:00
kaetemi
d1b93ac3d6 Expand parameter interface 
--HG--
branch : multipass-stereo
 2013-09-09 12:18:20 +02:00
Quitta
8d8f53b2f2 Biggest push ever! :D Kinda made it possible to only need a few files in the inc/func of the drupal module, all others can be copied of the www version 
--HG--
branch : quitta-gsoc-2013
 2013-09-09 03:47:32 +02:00
kaetemi
e84e08b0f6 Reduce function duplication 
--HG--
branch : multipass-stereo
 2013-09-09 02:03:40 +02:00
kaetemi
4d1b5d90c0 Builtin parameter set functions 
--HG--
branch : multipass-stereo
 2013-09-09 01:53:02 +02:00
kaetemi
afe6c16bf3 Separate count and size 
--HG--
branch : multipass-stereo
 2013-09-09 01:31:15 +02:00
Quitta
a7cce8b94e Soem fixes + also using the createPermissions() function of the module atm! 
--HG--
branch : quitta-gsoc-2013
 2013-09-08 22:49:39 +02:00
kaetemi
05583d134a Cleanup driver interface 
--HG--
branch : multipass-stereo
 2013-09-08 21:57:27 +02:00
kervala
0b9092a547 Changed: lua, luabind, libwww and libxml2 already linked to previous libraries (NLMISC and NLGUI) 2013-09-08 12:57:34 +02:00
kervala
0ccec811d6 Changed: Updated Freetype libraries variable 2013-09-08 12:54:05 +02:00
kervala
11dd2bc101 Changed: Look for Debug versions of libwww libraries 2013-09-08 12:53:35 +02:00
kervala
87ee7fa8d2 Changed: Moved lua, luabind and curl FIND_PACKAGE in root CMakeLists.txt 2013-09-08 12:52:00 +02:00
kervala
17ebe78cf6 Changed: Look for Debug version of freetype and use it for Debug configuration 2013-09-08 10:26:23 +02:00
Quitta
59d417efb7 Huge update! ingame part should work! 
--HG--
branch : quitta-gsoc-2013
 2013-09-08 06:01:01 +02:00
kaetemi
235bfcfd94 Add additional set functions 
--HG--
branch : multipass-stereo
 2013-09-08 01:49:34 +02:00
kaetemi
f0af3326e6 Add gpu program params storage structure 
--HG--
branch : multipass-stereo
 2013-09-08 01:36:01 +02:00
kaetemi
ee0396bd6f Implement new gpu program interface in direct3d driver 
--HG--
branch : multipass-stereo
 2013-09-07 22:00:07 +02:00
kaetemi
0a3f3f1760 Merge with default 
--HG--
branch : multipass-stereo
 2013-09-07 21:36:08 +02:00
kaetemi
350b580085 Implement new gpu program interface in opengl driver 
--HG--
branch : multipass-stereo
 2013-09-07 21:30:40 +02:00
kaetemi
1fa02cae9e Make gpu programs use abstract gpu program class 
--HG--
branch : multipass-stereo
 2013-09-07 20:41:07 +02:00
StudioEtrange
3121a83730 Merged ryzom/ryzomcore into default 2013-09-07 20:16:17 +02:00
kaetemi
97c9c26690 Add abstract gpu program and source classes 
--HG--
branch : multipass-stereo
 2013-09-07 18:33:18 +02:00
kervala
9dccf31863 Removed: S3TC module because not used anymore 2013-09-07 17:01:06 +02:00
kaetemi
361b7eab74 Fix compile error 2013-09-07 16:05:28 +02:00
kaetemi
348594e5fd Merge 2013-09-07 15:54:36 +02:00
kaetemi
68f20a3369 Use distSqTo instead of distTo 2013-09-07 15:53:17 +02:00
kaetemi
082ce825a5 Add distSqTo to CAIVector 2013-09-07 15:53:10 +02:00
kaetemi
9e1ca3d1d0 Comment if-check around commented unused client-side speed limiting code 2013-09-07 15:53:00 +02:00
kaetemi
e99bf91b20 Move r2 plot item security off the AIS to the EGS and remove hardcoded sheet ids 2013-09-07 15:51:30 +02:00
Quitta
d583b2cd8e Ingame version works now too more or less 
--HG--
branch : quitta-gsoc-2013
 2013-09-07 04:12:47 +02:00
StudioEtrange
fec561914d Merged ryzom/ryzomcore into default 2013-09-07 01:39:45 +02:00
kervala
89b945bb8c Changed: Minor changes 2013-09-06 15:00:35 +02:00
kervala
980b7120c8 Changed: Merged code from official client 2013-09-06 15:00:01 +02:00
kervala
3c37af1bbc Fixed: Define math.fmod as a function for Lua 5.0 2013-09-06 14:53:40 +02:00
kervala
86dfd0350b Fixed: Integer 32 bits conversion to 64 bits pointer 2013-09-06 14:51:21 +02:00
kervala
d03c795dd8 Changed: Don't use NLMISC includes in NLMISC PCH 2013-09-06 14:50:19 +02:00
kervala
ca9597e11e Changed: Cleanlooks doesn't exist anymore in Qt 5, so use default style 2013-09-06 14:49:12 +02:00
kervala
37fa1fa1ec Fixed: Use 32 bits libraries from Windows SDK in 64 bits 2013-09-06 14:48:21 +02:00
kervala
a62b5068f7 Changed: Replace atoi by NLMISC::fromString 2013-09-06 14:45:48 +02:00
kervala
d196f05b7e Removed: DInput module because it's not used anymore 2013-09-06 14:44:03 +02:00
StudioEtrange
d2530f6894 Merged ryzom/ryzomcore into default 2013-09-06 14:14:51 +02:00
kervala
f2bc8f3c8c Added: Toolchains for Android and iOS 2013-09-06 13:38:19 +02:00
kervala
3988120c55 Changed: Allows to choose a specific Windows SDK version with WINSDK_VERSION 
Changed: Look for all installed Windows SDKs
 2013-09-06 13:35:43 +02:00
kervala
6ddf4786ff Changed: Use /X everytime with MSVC 2013-09-06 09:30:54 +02:00
kervala
3a7cee4aa7 Changed: Improved MFC module 2013-09-06 09:26:23 +02:00
kervala
4a4b9b5ab8 Changed: Detect hg binary under Mac OS X if /opt/local/bin is not in PATH 2013-09-06 09:02:48 +02:00
kervala
651065e4ed Added: MSVC module to use later 2013-09-06 09:01:42 +02:00
kervala
a71f08274e Changed: Use PLATFORM_LINKFLAGS in *_LINKER_FLAGS 2013-09-06 09:00:33 +02:00
kervala
969d9a057d Changed: Display a message when compiling with NMake and define NMAKE 2013-09-06 08:58:36 +02:00
kervala
a52df4c710 Changed: Factorized AMD/amd 2013-09-06 08:58:02 +02:00
kervala
26679e767e Changed: Allow to put a "revision" file in root directory if .hg directory is not present 2013-09-06 08:44:57 +02:00
kervala
3e4a567d6a Fixed: Don't use -fPIC and -fPIE together (this could occur in some cases) 2013-09-06 08:43:44 +02:00
Quitta
ae9fcba077 show queue works and show ticket info, I think all outgame aspects are covered now! 
--HG--
branch : quitta-gsoc-2013
 2013-09-06 04:52:37 +02:00
Quitta
f16711c9fa added support group functionality to the drupal module 
--HG--
branch : quitta-gsoc-2013
 2013-09-05 21:33:11 +02:00
StudioEtrange
f10b6613cf ** PCH Support for NMake with VS2012 
NMAKE-VS2012 Error LNK2011
while NMAKE-VS2010 does not complain
we need to link the pch.obj file
see http://msdn.microsoft.com/en-us/library/3ay26wa2(v=vs.110).aspx

** PCH Support for Ninja
Ninja need to add property
        OBJECT_DEPENDS for using PCH
        OBJECT_OUTPUTS for create PCH
see http://public.kitware.com/pipermail/cmake-developers/2012-March/003653.html
 2013-09-05 17:18:01 +02:00
Quitta
46114b65b3 some fixes for the real version 
--HG--
branch : quitta-gsoc-2013
 2013-09-05 04:29:47 +02:00
Quitta
9362db15c2 userlist works, show reply works, also possible to change the permissions of the users (though relying on the libs permission system atm..) 
--HG--
branch : quitta-gsoc-2013
 2013-09-05 04:16:28 +02:00
Quitta
d86f3cf755 show ticket log works + fixed timestamp issue 
--HG--
branch : quitta-gsoc-2013
 2013-09-05 03:29:34 +02:00
Quitta
222da898f1 Creating tickets, browsing the profile, replying on tickets and forwarding them is possible! 
--HG--
branch : quitta-gsoc-2013
 2013-09-05 02:31:29 +02:00
Quitta
0ec8e76d8e helpers class updated! 
--HG--
branch : quitta-gsoc-2013
 2013-09-04 17:49:46 +02:00
Quitta
9101cd2f6e can display the dashboard html atm 
--HG--
branch : quitta-gsoc-2013
 2013-09-04 17:44:43 +02:00
Quitta
b94e0dee67 reworked the index.php page into the module's _ams_handler function, which will be the main function. Having some serialize/unserialize issues though.. 
--HG--
branch : quitta-gsoc-2013
 2013-09-03 17:52:52 +02:00
Quitta
6ccc60660a added amsblock and a menu item for the ams page 
--HG--
branch : quitta-gsoc-2013
 2013-09-03 04:55:51 +02:00
Quitta
99fa5d938c added help hook, to make it viewable in the help menu, however still unsure if I have to make a page or block or a combination.. 
--HG--
branch : quitta-gsoc-2013
 2013-09-02 23:52:42 +02:00
Quitta
0fa17cb47d auto login when calling the page from ingame (should work)... 
--HG--
branch : quitta-gsoc-2013
 2013-09-02 21:21:41 +02:00
Quitta
502cb9fadc taking away the functions checkUser, checkEmail, checkpassword out of the module, the webuser/user handles this! 
--HG--
branch : quitta-gsoc-2013
 2013-09-02 19:43:53 +02:00
Quitta
609d2cf252 added hook_user_insert, now the user gets also added to the shard + a ticket_user entry gets created that couples the drupal id to it 
--HG--
branch : quitta-gsoc-2013
 2013-09-02 18:32:10 +02:00
Quitta
4dd70fd8e7 reworked config file to work with drupal and added extra config fields to the configuration form in the module 
--HG--
branch : quitta-gsoc-2013
 2013-09-02 16:23:07 +02:00
Quitta
3be11e8b93 including the module problem 
--HG--
branch : quitta-gsoc-2013
 2013-09-02 04:42:56 +02:00
Quitta
4f2219eb7a started working on the module + small addition 
--HG--
branch : quitta-gsoc-2013
 2013-09-02 04:15:18 +02:00
Quitta
29b5876162 small bug fix 
--HG--
branch : quitta-gsoc-2013
 2013-09-01 18:15:41 +02:00
Quitta
3dc513e868 ingame dashboard also fixed! 
--HG--
branch : quitta-gsoc-2013
 2013-08-29 22:19:37 +02:00
Quitta
af6c57ff52 dashboard added that shows the newest ticket, the amount of tickets in your todo list and tickets waiting on YOUR response 
--HG--
branch : quitta-gsoc-2013
 2013-08-29 05:01:47 +02:00
Quitta
9647d6ec8f added images in the ingame part, added config properties & fixed time bug in queues page 
--HG--
branch : quitta-gsoc-2013
 2013-08-29 02:08:05 +02:00
Quitta
a19e833772 Fancified outgame show info page and made ingame info page 
--HG--
branch : quitta-gsoc-2013
 2013-08-28 22:24:47 +02:00
Thibaut Girka
ea8a845ab9 Add support for LibVR 
--HG--
branch : multipass-stereo
 2013-08-28 08:08:22 +02:00
kaetemi
7782576dfc Merge with default 
--HG--
branch : multipass-stereo
 2013-09-07 16:25:45 +02:00
Quitta
75b645264d ticket showing works outgame, but needs fancyfying :D 
--HG--
branch : quitta-gsoc-2013
 2013-08-28 05:31:06 +02:00
Quitta
3790739f49 updated, stroing to the db seems to work! 
--HG--
branch : quitta-gsoc-2013
 2013-08-28 02:24:08 +02:00
Quitta
2af50cb421 ticket_info class done, however I think I better add a field to the Ticket DB, instead the way I do it now.. 
--HG--
branch : quitta-gsoc-2013
 2013-08-27 22:54:45 +02:00
Quitta
54d71fd26d ticket_info class almost done 
--HG--
branch : quitta-gsoc-2013
 2013-08-27 19:08:10 +02:00
Quitta
bdbbb393cd Finaly got it to working again.. 
--HG--
branch : quitta-gsoc-2013
 2013-08-26 17:25:28 +02:00
kervala
6d10e3189c Changed: Formatting 2013-08-26 12:34:04 +02:00
kervala
881912fa34 Fixed: Crash when trying to display a missing texture 2013-08-26 12:33:26 +02:00
Quitta
b1926fbec3 added language support however, something is broken :/ 
--HG--
branch : quitta-gsoc-2013
 2013-08-26 11:34:51 +02:00
Quitta
1a81a7810f mailing refactored 
--HG--
branch : quitta-gsoc-2013
 2013-08-26 05:37:55 +02:00
Quitta
508545248a #mailing languages setup 
--HG--
branch : quitta-gsoc-2013
 2013-08-25 17:49:01 +02:00
Quitta
70732ffd42 rewrote language handling + language is now stored in the db and the value is based on the users language flag clicked (or default) or the ingame language 
--HG--
branch : quitta-gsoc-2013
 2013-08-25 06:27:44 +02:00
Quitta
0e0ce112bb receive messages setting is added to the ingame layout 
--HG--
branch : quitta-gsoc-2013
 2013-08-25 01:22:24 +02:00
Quitta
df4d97fa98 Inagme layout for modifying group email stuff is fixed 
--HG--
branch : quitta-gsoc-2013
 2013-08-24 17:19:46 +02:00
Quitta
7f8c0f8380 Fixed sgroup_liist ingame layout.. 
--HG--
branch : quitta-gsoc-2013
 2013-08-24 15:56:16 +02:00
Quitta
3bebfe4492 put mail cron related debug info into a log file specified in config.php 
--HG--
branch : quitta-gsoc-2013
 2013-08-20 04:33:23 +02:00
Quitta
ebce7ae90c fixing a lot of mail bug problems 
--HG--
branch : quitta-gsoc-2013
 2013-08-20 02:08:12 +02:00
Quitta
d1c1740741 Added encryption by using the openSSL functionality to encrypt the email passwords in the db 
--HG--
branch : quitta-gsoc-2013
 2013-08-19 20:22:01 +02:00
Quitta
5174764f2d Users can specify if they want to receive or dont want to receive tickt updates! 
--HG--
branch : quitta-gsoc-2013
 2013-08-19 00:02:55 +02:00
Quitta
f0f08fc374 fixed dirty error in queue's that didn't allow me to assing/unassign after creating a queue 
--HG--
branch : quitta-gsoc-2013
 2013-08-18 03:39:35 +02:00
Quitta
f8d19762fe fixed some nasty errors + made it show the entire replied message 
--HG--
branch : quitta-gsoc-2013
 2013-08-18 02:49:58 +02:00
Quitta
ba2c506120 response is being sent from the correct support group atm 
--HG--
branch : quitta-gsoc-2013
 2013-08-18 02:17:02 +02:00
Quitta
69192712a0 made 3 options for incomming mail: reply on ticket, new ticket and nothing related to that. When it's nothing related to that the mail will stay in the mailbox untill it get's manually read and deleted! 
--HG--
branch : quitta-gsoc-2013
 2013-08-17 19:07:00 +02:00
Quitta
483045c613 creating new tickets over email works 
--HG--
branch : quitta-gsoc-2013
 2013-08-17 03:06:22 +02:00
Quitta
2a02f35ae8 Hanle multiple mailaccounts 
--HG--
branch : quitta-gsoc-2013
 2013-08-16 22:24:11 +02:00
Quitta
8262febe32 sending mail with supportgroup ID is possible 
--HG--
branch : quitta-gsoc-2013
 2013-08-16 21:43:39 +02:00
Quitta
fb7254c018 Functionality to modify mailsettings of a support group. 
--HG--
branch : quitta-gsoc-2013
 2013-08-16 05:37:38 +02:00
Quitta
80ee498951 add email related stuff to support groups 
--HG--
branch : quitta-gsoc-2013
 2013-08-16 03:40:59 +02:00
Quitta
370653b11c ticket mail system basis works 
--HG--
branch : quitta-gsoc-2013
 2013-08-13 17:16:43 +02:00
Quitta
328351a4c5 ticket hanling function added 
--HG--
branch : quitta-gsoc-2013
 2013-08-12 23:56:58 +02:00
Quitta
987d5943c3 not sure if I should keep the task creation or not, will ask Botanic tomorrow 
--HG--
branch : quitta-gsoc-2013
 2013-08-12 05:14:00 +02:00
Quitta
4478ad115d ready to do the imap part 
--HG--
branch : quitta-gsoc-2013
 2013-08-12 01:11:48 +02:00
Quitta
e058a475f9 basis seems to run in terminal, however mail() doesn't work yet 
--HG--
branch : quitta-gsoc-2013
 2013-08-11 03:55:07 +02:00
Quitta
8ee02d9380 ready for testing the send mail functionality :) 
--HG--
branch : quitta-gsoc-2013
 2013-08-11 02:29:31 +02:00
Quitta
68a230f4ef updates to the mail_handler 
--HG--
branch : quitta-gsoc-2013
 2013-08-10 13:59:36 +02:00
Quitta
b05f34ac13 added mail_handler class (from Botanic) still needs to be reworked + added show queue template 
--HG--
branch : quitta-gsoc-2013
 2013-08-10 01:46:21 +02:00
Quitta
34a800542f more elements per page! 
--HG--
branch : quitta-gsoc-2013
 2013-08-06 06:07:49 +02:00
Quitta
9318776e85 userlist ingame works + fixed a bug in demoting/promoting users with roles, which was looking at the wrong id 
--HG--
branch : quitta-gsoc-2013
 2013-08-06 04:31:01 +02:00
Quitta
1d68d8a781 I think I'm done refactoring the queues 
--HG--
branch : quitta-gsoc-2013
 2013-08-06 01:00:17 +02:00
Quitta
ef05fdda7c refactor queue's part 1 
--HG--
branch : quitta-gsoc-2013
 2013-08-05 22:35:22 +02:00
Quitta
91e758c1ee userlist works with pagination 
--HG--
branch : quitta-gsoc-2013
 2013-08-05 21:12:58 +02:00
Quitta
99ad1504e3 refactoring webusers.php 
--HG--
branch : quitta-gsoc-2013
 2013-08-05 17:31:36 +02:00
kervala
f680e3943d Changed: Minor formatting 2013-08-05 10:34:38 +02:00
kervala
a41ba055a5 Fixed: PCH with Qt 5 and CMake 2.8.11 2013-08-05 10:32:17 +02:00
kervala
c792c423db Fixed: X64 not detected with CMake 2.8.11 2013-08-05 10:31:23 +02:00
kervala
2c7f848c83 Changed: Tabulations to spaces 2013-08-05 10:30:40 +02:00
Quitta
5b4c13f8d3 renamed libuserlist to syncing, which is more appropriate, also made pagination work! so Now I can start to use it ingame too! 
--HG--
branch : quitta-gsoc-2013
 2013-08-05 05:37:18 +02:00
Quitta
7e4a24bac8 pagination seems to work! :) 
--HG--
branch : quitta-gsoc-2013
 2013-08-05 05:27:19 +02:00
Quitta
845da81ad4 generic pagination with debugging for testing it atm 
--HG--
branch : quitta-gsoc-2013
 2013-08-05 04:37:20 +02:00
Quitta
9a2ff7c7d0 Pagination class added, not tested yet :D 
--HG--
branch : quitta-gsoc-2013
 2013-08-04 20:27:07 +02:00
Botanic
d0d69d7c77 Make it so that bad text always throws a nlwarning 2013-08-04 01:43:54 -07:00
kaetemi
71cdf88b81 Fix warning 
--HG--
branch : multipass-stereo
 2013-08-03 21:29:47 +02:00
Quitta
bc62611305 languages handling done 
--HG--
branch : quitta-gsoc-2013
 2013-08-03 18:59:21 +02:00
Quitta
f5ef22914f color scheme configuration with colors loaed from ingame_layout.ini 
--HG--
branch : quitta-gsoc-2013
 2013-08-03 05:00:39 +02:00
Quitta
8e7bbb2e62 fixed assigning/unassigning and sending empty messages 
--HG--
branch : quitta-gsoc-2013
 2013-08-03 04:00:41 +02:00
Quitta
9fd7c9f205 forgot to add the files 
--HG--
branch : quitta-gsoc-2013
 2013-08-02 19:44:28 +02:00
Quitta
7ee2ce596f log + reply ingame page 
--HG--
branch : quitta-gsoc-2013
 2013-08-02 19:43:43 +02:00
Quitta
785684f923 show ticket layout is done,though some unpleasant bugs turned up 
--HG--
branch : quitta-gsoc-2013
 2013-08-02 17:03:26 +02:00
Quitta
5aa33f49fb show ticket save before going to bed 
--HG--
branch : quitta-gsoc-2013
 2013-08-02 05:27:00 +02:00
Quitta
e9c9ed13e4 Added the android app of Botanic :) 
--HG--
branch : quitta-gsoc-2013
 2013-08-02 04:47:33 +02:00
Quitta
125a3b1f56 basis for show ticket 
--HG--
branch : quitta-gsoc-2013
 2013-08-01 23:10:26 +02:00
kaetemi
96b2df8405 Merge with default 
--HG--
branch : multipass-stereo
 2013-08-01 23:02:49 +02:00
kaetemi
53bebec880 Add some basic prediction to CCDBNodeBranch::find 
--HG--
branch : kaetemi-optimize
 2013-08-01 22:47:46 +02:00
Quitta
2d1a07c787 added db parameter to the syncing 
--HG--
branch : quitta-gsoc-2013
 2013-08-01 18:20:40 +02:00
kaetemi
3bc5d88d78 Force link 2013-08-01 10:11:11 +02:00
Quitta
1c6cdfd7a7 Added support group pages ingame layout + layout of the #menu's and managed to get a AMS-Home button in the top that would bring the page back to the dashboard! 
--HG--
branch : quitta-gsoc-2013
 2013-08-01 04:48:40 +02:00
Quitta
489e1b7f16 Merge 
--HG--
branch : quitta-gsoc-2013
 2013-08-01 00:14:31 +02:00
Quitta
c8fa00c9ca made home back redo 
--HG--
branch : quitta-gsoc-2013
 2013-08-01 00:10:47 +02:00
DJanssens
c6040d2853 autologin works 
--HG--
branch : quitta-gsoc-2013
 2013-07-31 15:08:35 -07:00
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