Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity
2977 commits 14 branches 1 tag 255 MiB
Commit graph

2896 commits

Author SHA1 Message Date
kaetemi
430bfd26c6 Make _ShowReticleLeaf static 2013-07-28 08:35:40 +02:00
kaetemi
527df2511b Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:CDB_INIT_IN_PROGRESS") 2013-07-28 08:22:53 +02:00
kaetemi
10e4eb4634 Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:MK_MOVE") 2013-07-28 08:19:54 +02:00
kaetemi
b32f8b5025 Avoid redundant per-frame calls to getDbProp("UI:SAVE:USER_CHAR_FADE") 2013-07-28 08:16:02 +02:00
kaetemi
30ea315002 Avoid redundant per-frame calls to getDbProp("SERVER:WEATHER:VALUE") 2013-07-28 08:13:19 +02:00
kaetemi
1674b81cce Avoid redundant calls to getDbProp("UI:SAVE:INSCENE:...") 2013-07-28 07:55:16 +02:00
kaetemi
37277019be Avoid redundant calls to getDbProp in CEntityCL 2013-07-28 06:45:43 +02:00
kaetemi
3fe1a17503 Avoid redundant per-frame calls to getDbProp("UI:ENTITY:GUILD:#:ICON") 2013-07-28 05:48:59 +02:00
kaetemi
292df29429 Avoid per-frame 'set' action handler in map.xml when opening the respawn map 2013-07-28 05:21:05 +02:00
kaetemi
bf0e0b1d56 Avoid per-frame 'set' action handler in config.xml for blending day and night color 2013-07-28 05:21:00 +02:00
kaetemi
b09e28e9e0 Avoid having to use 'set' action handler, which parses the value expression on every use, in interface links by implementing use of cdb nodes as targets 2013-07-28 05:10:07 +02:00
kaetemi
22934d2b60 Avoid redundant per-frame calls to getDbProp("SERVER:USER:DEFAULT_WEIGHT_HANDS") 2013-07-28 05:10:06 +02:00
kaetemi
8bbb438674 Avoid redundant per-frame calls to getDbProp in CNetManager 2013-07-28 05:10:06 +02:00
kaetemi
70f83e1fb9 Parse action handler condition for interface link in advance 2013-07-28 03:02:07 +02:00
kaetemi
36c969252b Avoid redundant per-frame calls to getDbProp in NLGUI::CWidgetManager 2013-07-28 00:48:34 +02:00
kaetemi
1273830c0e Avoid redundant per-frame calls to getDbValue32(toString("SERVER:CHARACTER_INFO:CHARACTERISTICS%d:VALUE", i)) 2013-07-28 00:29:32 +02:00
kaetemi
c2b29881bb Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:FPS", false) 2013-07-28 00:29:32 +02:00
kaetemi
2cd88e5d9e Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:TOTAL_MALUS_EQUIP", false) 2013-07-28 00:29:32 +02:00
kaetemi
beff07c398 Avoid redundant per-frame calls to getDbProp("UI:SAVE:SHOW_RETICLE") 2013-07-28 00:29:25 +02:00
kervala
0cbc471341 Fixed: prtab function not compiling with VC++ (define DEBUG_CRYPT if you want to debug crypt() method) 2013-07-26 09:33:32 +02:00
Cédric OCHS
94c1ffe9f1 Merged in StudioEtrange/ryzomcore/StudioEtrange/fix-some-probleme-with-spaces-in-path-on-1374699208398 (pull request #19) 
Fix some problems with space char in path on windows
 2013-07-26 08:07:42 +02:00
kaetemi
bcba46f950 Merge with default 2013-07-25 21:18:52 +02:00
kaetemi
38c4b66cce Don't do EOL changes for database.xml and msg.xml, causes checksum difference 2013-07-25 18:06:32 +02:00
kaetemi
9587ccc6ba Silently sneaking in a nicer splash image for ovqt 2013-07-25 02:39:07 +02:00
kaetemi
fd285cc703 Merge with default 2013-07-25 00:37:00 +02:00
StudioEtrange
31ba0013a6 PCHSupport.cmake edited online with Bitbucket 2013-07-24 21:57:52 +00:00
StudioEtrange
7b3381b997 Fix some probleme with spaces in path on windows 
PCHSupport.cmake edited online with Bitbucket
 2013-07-24 20:53:33 +00:00
StudioEtrange
e7f468536a Error passing wrong version number to msvc linker 
ENV: WinSDK8 VS2012 Compilation in 64 Bits
ERROR: error when linking client

CAUSE: msvc link support only major and minor version number. Before VS2012 extra number (like revision number) were stripped. Now the link throw an error with VS2012

see https://bugs.php.net/bug.php?id=63537 see http://msdn.microsoft.com/fr-fr/library/h88b7dc8(v=vs.110).aspx
 2013-07-24 19:32:41 +00:00
StudioEtrange
8aa9192dbb nel.cmake edited online with Bitbucket 2013-07-24 19:31:10 +00:00
StudioEtrange
368750bafa ENV: 
WinSDK8
VS2012
Compilation in 64 Bits

ERROR:
error when linking client

CAUSE:
msvc link support only major and minor version number.
Before VS2012 extra number (like revision number) were stripped. Now the link throw an error with VS2012

see https://bugs.php.net/bug.php?id=63537
see http://msdn.microsoft.com/fr-fr/library/h88b7dc8(v=vs.110).aspx
 2013-07-24 19:22:38 +00:00
kaetemi
f83fdf5a2f Fix bug #45 crash in zone lighter with large number of CPU cores 2013-07-24 20:51:43 +02:00
kaetemi
da53f11c73 Use tags for pacs prim export 2013-07-24 20:51:38 +02:00
kaetemi
199ead5988 EOL 2013-07-24 20:51:26 +02:00
kervala
dfbf2998b0 Fixed: lua_open() doesn't exist with Lua 5.2 2013-07-24 18:47:50 +02:00
kervala
bd8a606341 Fixed: Compilation in 64 bits with Windows SDK 8.0 (patch provided by StudioEtrange) 2013-07-24 18:47:04 +02:00
kaetemi
dfd92eb40d Merge with default 2013-07-19 18:12:08 +02:00
kaetemi
32553f4d87 Some necessary ryzom tools did not build when client and server were unchecked 2013-07-19 18:11:31 +02:00
kaetemi
b1f953c2a1 Merge with default 2013-07-19 15:38:49 +02:00
kaetemi
b6c869f072 Fix a divide-by-zero crash in the 3ds Max plugins on really fast PCs 2013-07-19 15:37:25 +02:00
kaetemi
4a593aa273 Merge with default 2013-07-19 14:10:07 +02:00
kaetemi
62f0c1e20c Merge with default 2013-07-18 23:05:25 +02:00
kaetemi
19c9d04ef2 Fix issue #48, landscape quality issues caused by incorrect defaults 2013-07-18 18:22:28 +02:00
kaetemi
e822c2be0d Fix an error in 3ds Max with the material script 2013-07-18 18:15:53 +02:00
kaetemi
cb53258f8c Fix bad includes in snowballs, re #43 2013-07-06 21:58:26 +02:00
Michael Witrant
59dc1a6c16 Fixed definition tests for optional LibOVR 2013-07-06 20:40:42 +02:00
Michael Witrant
69c194f57f LibOVR is optional, and is disabled by default 2013-07-06 20:05:19 +02:00
Michael Witrant
ed8e0edfd0 Added Win32 and Apple LibOVR build paths 2013-07-06 19:55:08 +02:00
Michael Witrant
f393622573 Fixed Linux build failure because a temporary pointer was passed, ref #43 2013-07-06 19:34:28 +02:00
Michael Witrant
67ebf920ec Added LibOVR finder and Linux support, ref #43 2013-07-06 19:33:07 +02:00
kaetemi
a1ded7183a Handle head orientation in ryzom client, ref #43 2013-07-05 04:09:53 +02:00
kaetemi
cb9e5762db Don't render to texture when in wireframe mode, re #43 2013-07-05 03:42:38 +02:00
kaetemi
c3f6f5b8ff Put stereo render loop inside ryzom client main loop, see #43 2013-07-05 02:38:56 +02:00
kaetemi
541f75920b Init/release VR interfaces in ryzom client, ref #43 2013-07-05 02:04:34 +02:00
kaetemi
59edf6ea13 Move some more updates out of the render code, see #43 2013-07-05 00:47:17 +02:00
kaetemi
5e5cfba035 Some necessary changes to camera setting, re #43 2013-07-05 00:17:09 +02:00
kaetemi
32e3da752f Some more cleanup 2013-07-04 23:41:46 +02:00
kaetemi
78276ab782 Make oversize screenshots be perfectly seamless 2013-07-04 23:11:15 +02:00
kaetemi
86870d66fb Pull weather updates out of scene render 2013-07-04 22:39:05 +02:00
kaetemi
bfae91eb88 Correctly apply bloom on oversize screenshots 2013-07-04 22:26:31 +02:00
kaetemi
ee227aaf9c Refactor fulldetail override 2013-07-04 22:18:19 +02:00
kaetemi
362024aff3 Merge with default 2013-07-04 21:12:34 +02:00
kaetemi
6113b07673 Distort 2D gui as well, ref #43 2013-07-04 21:12:11 +02:00
Jan Boon
f10ee56560 Merged in botanic/rc-botanic-webdev (pull request #13) 
warning and path fix's
 2013-07-04 21:07:21 +02:00
kaetemi
4402fbe1c2 Correctly synchronize some more animation in snowballs, re #43 2013-07-04 20:43:49 +02:00
kaetemi
4b2ea661cc Fix particles being animated twice in stereo render, see #43 2013-07-04 00:42:06 +02:00
kaetemi
fd1d606154 Add stereo debugger for visually comparing rendered frames, ref #43 2013-07-04 00:09:10 +02:00
kaetemi
d57b7b39fe Use width instead of height of screen for hmd fov, re #43 2013-07-03 06:04:37 +02:00
kaetemi
a531535dfa Add minimal head model and world scale, ref #43 2013-07-03 05:21:32 +02:00
kaetemi
299b3ec401 Make bloom work together with render target used for the rift shader, ref #43 2013-07-03 03:53:32 +02:00
kaetemi
9516851bee Remove unnecessary user render target code from bloom, see #43 2013-07-03 03:21:57 +02:00
kaetemi
81c23af33b Merge with default 2013-07-03 03:17:29 +02:00
kaetemi
e3784571cd Add arbfp1 and fp40 barrel fragment programs, see #43 2013-07-02 19:39:05 +02:00
kaetemi
118340d821 Test arbfp1, see #43 2013-07-02 18:48:29 +02:00
kaetemi
c6a7432d86 Properly scale seconds per frame graph in snowballs 2013-07-02 18:43:28 +02:00
kaetemi
2315ae9c5a Prefer NPOT texture over RECT texture 2013-07-02 18:43:15 +02:00
kaetemi
a924479a5c Render left and right deformed view, re #43 2013-07-02 03:34:49 +02:00
kaetemi
6b8d43181d Test the barrel shader, see #43 2013-07-02 02:40:27 +02:00
kaetemi
76d7146a42 Workaround in snowballs for fullscreen bug with opengl driver 2013-07-02 01:08:49 +02:00
kaetemi
3a12aa5894 Render the scene to a target texture for the stereo rendering filter, ref #43 2013-07-02 00:55:13 +02:00
kaetemi
3b630492aa Fix a render target issue, see #43 2013-07-02 00:53:45 +02:00
kaetemi
ffc91631e7 Create stereo render target, see #43 2013-07-01 23:23:54 +02:00
kaetemi
f25a9da718 Add interface for stereo display render targets, ref #43 2013-07-01 21:23:47 +02:00
kaetemi
2b653d2904 Allow turning off bloom in snowballs 2013-07-01 20:38:18 +02:00
kaetemi
9960b9dfdb Cleanup 2013-07-01 20:15:55 +02:00
kaetemi
ebba0c1917 Allow linking debug and release with same mysql lib if no specific debug lib. 2013-07-01 18:45:43 +02:00
kaetemi
b04d278a27 Create interface classes for stereo displays and head mounted displays, see #43 2013-06-28 23:19:32 +02:00
kaetemi
3a4204e091 Separate some camera related functions, ref #43 2013-06-27 04:11:09 +02:00
kaetemi
f84f5807c1 Move some config stuff out of main_loop.cpp, see #43 2013-06-27 03:49:30 +02:00
kaetemi
1928c9c679 Remove some unused includes, re #43 2013-06-27 03:16:53 +02:00
kaetemi
1e461ec4f3 Some more debug functions moved, see #43 2013-06-27 03:04:40 +02:00
kaetemi
d919591093 Moved some temp code out of main_loop.cpp, ref #43 2013-06-27 02:43:51 +02:00
kaetemi
a046b1c494 Take some debug render code out of main_loop.cpp, see #43 2013-06-27 02:13:48 +02:00
kaetemi
825ebb3335 Separate some profiling code from main_loop.cpp, see #43 2013-06-27 01:43:04 +02:00
kaetemi
b9334e3722 Pull CPing out of main_loop.cpp, refs #43 2013-06-27 01:23:53 +02:00
kaetemi
9526910d4b Return view as CQuat, see #43 2013-06-26 21:36:21 +02:00
kaetemi
d404c1228c Create a clipping frustum, ref #43 2013-06-26 21:35:36 +02:00
kaetemi
2f4867ab78 Allow multiple user cameras to be calculated separately, useful for sky etc, re #43 2013-06-26 20:57:37 +02:00
kaetemi
4a579d0af2 Fix warning 2013-06-26 20:10:30 +02:00
kaetemi
eb196fd99a Adjust 2D interface shift, re #43 2013-06-26 19:58:27 +02:00
kaetemi
06e96929af Move snowballs compass, see #43 2013-06-26 17:38:20 +02:00
kaetemi
8230238b5f Add eye distance in 2D interface shift, re #43 2013-06-26 17:24:23 +02:00
kaetemi
1b8ddaa87b Add 2D interface shifting calculations, see #43 2013-06-26 16:59:08 +02:00
kaetemi
78ae99731d Correctly adjust text to viewport, re #43 2013-06-26 16:08:48 +02:00
kaetemi
cbd72f73ff Add some comments, see #43 2013-06-26 15:55:39 +02:00
kaetemi
7672ab2812 Cleanup and make bloom work with stereo rendering, re #43 2013-06-26 15:49:31 +02:00
kaetemi
e51d9e15d9 Render from multiple cameras, see #43 2013-06-26 08:00:19 +02:00
kaetemi
a7cf55c58e Read sensor data and set camera in snowballs, ref #43 2013-06-26 04:57:58 +02:00
kaetemi
dc813a060e Add library name to device name, re #43 2013-06-26 02:55:15 +02:00
kaetemi
b45bdb88e6 List stereo devices, see #43 2013-06-26 02:45:49 +02:00
kaetemi
f54cd30f42 Merge with default 2013-06-26 00:00:35 +02:00
kaetemi
3df3fb730b Fix Ryzom Client scripts for lua 5.2 2013-06-25 23:57:23 +02:00
kaetemi
982bf804de Added some notes 2013-06-20 00:25:52 +02:00
kaetemi
1f68025931 Rename some functions to follow the same naming convention of others 2013-06-19 23:49:39 +02:00
kaetemi
1ed0d46026 Cleanup 2013-06-19 23:34:40 +02:00
kaetemi
aa3462b7bc Add support for fp40 with opengl 2013-06-19 22:41:03 +02:00
kaetemi
c852e2ca94 Additional test, textures does not seem to work in ps_3_0 2013-06-19 21:31:29 +02:00
kaetemi
0d1e405d3e Activate textures for postprocessing material under direct3d 2013-06-19 21:16:13 +02:00
kaetemi
cfb9827b2c Test texture with postprocessing material, seems to work with opengl 2013-06-19 20:47:23 +02:00
kaetemi
1224d57037 Updated snowballs default config 2013-06-19 16:22:48 +02:00
kaetemi
4cc4a84578 Fix linux compile 2013-06-19 16:18:09 +02:00
kaetemi
3865e6e56f Add function to check which pixel program profiles are available on a driver 2013-06-19 05:03:47 +02:00
kaetemi
9c5fabf615 Add test for ps.1.1 pixel program in snowballs (it works too now) 2013-06-19 04:03:32 +02:00
kaetemi
f534bac6e1 Add test for ARBfp1.0 fragment program in snowballs (it works) 2013-06-19 02:59:32 +02:00
kaetemi
0c1bfe0f63 Cleanup more unneeded code 2013-06-19 02:36:57 +02:00
kaetemi
72035e936a Removed unneeded parser related code from the opengl pixel program implementation 2013-06-19 02:33:19 +02:00
kaetemi
7dcc86c717 Add direct3d diff for old nevrax pixel program code, marked a todo in the comments 2013-06-19 02:10:38 +02:00
kaetemi
acf8ec653c Added diff to opengl driver for old nevrax pixel program code, marked todos in comments 2013-06-19 02:01:12 +02:00
kaetemi
cb966505cc Add rest of the diff from the old nevrax code for pixel programs to NL3D 2013-06-19 01:38:23 +02:00
kaetemi
7da48d8866 Removed some CEffect related bit that slipped in 2013-06-19 01:22:26 +02:00
kaetemi
9f6b60a920 Add diff from old nevrax pixel program code to IDriver, CEffect related code not included 2013-06-19 01:20:51 +02:00
kaetemi
b5dfdbdd55 Simplify CPixelProgram 2013-06-19 01:19:45 +02:00
kaetemi
fd42d61af9 Add some files from old nevrax shader code for exposing pixel programs in the drivers 2013-06-19 01:14:30 +02:00
kaetemi
ad6cc747b9 Backed out changeset ea4b76b7213a, bad approach 2013-06-19 01:03:20 +02:00
kaetemi
23e3393d2e Allow rendering with bloom to a user provided render target (untested) (#43) 2013-06-17 00:45:17 +02:00
kaetemi
968e0579fe Allow stepping through the time delta in multiple passes in snowballs 2013-06-16 23:51:33 +02:00
kaetemi
09df2d8bef Remove silly heap allocation of a null pointer 2013-06-16 23:49:45 +02:00
kaetemi
f1f06da75f Allow configuration of bloom settings from config files in snowballs 2013-06-16 23:48:40 +02:00
kaetemi
abdeee4b81 Add info structure for multipass camera rendering effects #43 2013-06-16 20:48:17 +02:00
kaetemi
5fa4beab46 Fixes to compile Ryzom Client with lua 5.2 2013-06-16 03:43:45 +02:00
kaetemi
a06e106212 Allow compiling with shared libxml2 on Windows 2013-06-16 03:19:02 +02:00
kaetemi
7bb6775261 Compile NLGUI with lua 5.2 2013-06-16 02:33:04 +02:00
kervala
f8083efd87 Added: CMake project for shape2obj 2013-06-10 15:48:10 +02:00
kervala
8ce27a9a1b Fixed: EOL for client_config_qt 2013-06-08 14:56:58 +02:00
Botanic
1d34a0a467 fixed thanks kervala 2013-06-06 01:28:12 -07:00
Botanic
fe343431a2 No reason to hardcode the path 2013-06-05 19:14:49 -07:00
Botanic
eea5ceaa11 Fixed warnings and logout 2013-06-05 19:14:53 -07:00
Botanic
ba0561766f no reason to make people change the logs path every time 2013-06-05 19:19:09 -07:00
Botanic
69a12addb2 fixed warning 2013-06-05 19:27:06 -07:00
Botanic
f2b47b2efe fixed warning 2013-06-05 19:43:10 -07:00
Botanic
6ccf7df354 why the hell make the faster values for "debug only" waiting it so 1990's 2013-06-05 19:59:53 -07:00
Botanic
8eb1a7c88f bad eol 2013-06-06 02:56:48 -07:00
dfighter1985
a88a4ad992 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
3f5d46e8fd Merged default 2013-05-04 21:56:21 +02:00
dfighter1985
ab7d2c1a53 Use to .toUTF8() instead of .toStdString(). 2013-05-04 21:55:41 +02:00
dfighter1985
29793ee97b Merged default 2013-05-04 21:23:55 +02:00
Dzmitry Kamiahin
7ddd062666 Fixed self-comparsion in ps. 2013-05-04 01:57:53 +03:00
sfb
ff3cc0a05e merge 2013-05-02 14:38:49 -05:00
kaetemi
a50ffb5de5 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
70397fe3bd merge 2013-05-02 14:34:40 -05:00
sfb
76dea51b8f fixed #40 with an explicit static_cast. 2013-05-02 14:31:10 -05:00
dfighter1985
8dd4c1abfe Don't build GUI Editor when not building the GUI library. 2013-05-02 20:19:35 +02:00
kervala
8a68c5e54f Changed: Moved Ryzom detailed version in client 2013-04-29 14:46:53 +02:00
kervala
b35bc728d3 Changed: Process EventCloseWindowId by client 2013-04-29 14:44:39 +02:00
kervala
79cd42d7c6 Changed: Added a new event EventCloseWindowId when system reports window should be closed 2013-04-29 11:15:14 +02:00
kervala
b7906ed835 Changed: Warning 2013-04-29 11:10:55 +02:00
kervala
5a87603a8e Changed: EOL fixes 2013-04-29 10:46:02 +02:00
kervala
36f996a20b Fixed: Virtual destructor warning 2013-04-29 10:41:34 +02:00
kervala
3c97196d1b Fixed: Assign instead of a comparison 2013-04-29 10:34:33 +02:00
kervala
2186e92527 Changed: French comments translated to English 2013-04-29 10:33:33 +02:00
kervala
31335cc491 Fixed: PCH compilation 2013-03-31 23:36:56 +02:00
kervala
026198d0b0 Changed: Define CMAKE_OSX_DEPLOYMENT_TARGET if not specified on command line 2013-03-28 16:42:16 +01:00
kervala
3edb0e439c fixes #33 build failure/error using clang 2013-03-26 19:57:00 +01:00
kervala
02d6565234 fixes #32 build failure/error using clang 2013-03-26 13:56:16 +01:00
kervala
c8334e7131 fixes a warning 2013-03-24 20:16:53 +01:00
kervala
7de717f9e2 fixes #31 Luabind can't be found 
Added PCH support to NeL GUI
 2013-03-24 20:16:23 +01:00
kervala
5c307818fb 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
045502d5a3 MODIFIED: no more action handler spam. 2013-03-12 07:16:16 +01:00
dfighter1985
d38271a1a3 Merging dangling default branch. 2013-02-27 22:27:53 +01:00
mattraykowski
16bf350108 changes #6 - updated the NL_VERSION_MINOR version from 8 to 9. 2013-02-25 14:01:57 -06:00
dfighter1985
1210f92ffe Resolved some build errors occuring after previous commit. 2013-02-21 01:25:50 +01:00
dfighter1985
f55ab4e21e 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
668e34f996 MODIFIED: #20 Resolved build errors with stlport. 2013-02-19 19:29:48 +01:00
dfighter1985
6d43dd5a09 Merged in dfighter1985/ryzomcore (pull request #3) 
GCC build error fixes for #20
 2013-02-19 17:19:51 +01:00
dfighter1985
8532cc5274 Merged some changes. 2013-02-19 17:17:47 +01:00
dfighter1985
8a486224d7 MODIFIED: #20 Resolved some GCC build in the GUI Editor. 2013-02-19 17:16:58 +01:00
mattraykowski
9048c3bb21 changed #20 - moved the libwww package discovery and fixed include paths in library project. 2013-02-19 10:04:40 -06:00
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
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