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

2261 commits

Author SHA1 Message Date
kaetemi
401d4bc791 Fix NeL Tools compile under MinGW 2014-06-18 21:05:39 +02:00
kaetemi
43be0fd2a5 Fix D3D driver compile under MinGW 2014-06-18 16:29:02 +02:00
kaetemi
75f7b9f931 Fix Snowballs service compile under MinGW 2014-06-18 12:52:03 +02:00
kaetemi
ee4a9ef334 Fix NeL Samples for MinGW 2014-06-18 12:40:53 +02:00
kaetemi
9838ef56de Fix Snowballs compile under MinGW 2014-06-18 02:05:54 +02:00
kaetemi
f4fd8bb669 Fix linking of OpenGL driver under MinGW 2014-06-18 01:21:05 +02:00
kaetemi
2f3f12e034 Fix linking of OpenAL driver under MinGW 2014-06-18 00:28:08 +02:00
kaetemi
5bd6c5e06b Fix compilation of NL3D under MinGW 2014-06-17 22:33:56 +02:00
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
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
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
kaetemi
0d67c420cd Set exec mode 2014-05-23 22:39:50 +02:00
kaetemi
4311da091f Add --admininstall parameter to c1_shard_patch 2014-05-23 17:25:52 +02:00
kaetemi
0a41e6b3c4 Fix Windows compilation of lightmap_optimizer 2014-05-23 01:57:19 +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
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
e84dd7b5f7 Changed: Replaced strlwr by toLower 2014-04-24 22:59:29 +02:00
kervala
24fa8df5ff Fusion avec default 
--HG--
branch : compatibility
 2014-04-24 19:16:42 +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
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
dfighter1985
4abf74d6e9 We can now drag elements, they will disappear and whatnot, but at least they can be dragged! 
--HG--
branch : gui-editor
 2014-04-21 19:30:33 +02:00
dfighter1985
e12d189d51 Refactored input event handling a bit. 
--HG--
branch : gui-editor
 2014-04-20 21:41:57 +02: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
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
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
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
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
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
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
2076a6b13d Changed: Typo 2014-03-22 16:23:28 +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
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
020bfb775e Disable build of dataset packed sheets in build pipeline 2014-02-20 20:15:18 +01:00
kaetemi
72fac9aaf1 Update default directories 2014-02-20 03:37:23 +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
76ce7523ff Additional streaming behaviour fix for XAudio2 driver 2014-02-17 00:20:29 +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
kaetemi
6426393210 Additional streaming behaviour fix for XAudio2 driver 
--HG--
branch : compatibility
 2014-02-17 00:20:29 +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
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
e569541faa Fix default directory 2014-02-14 02:03:22 +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
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
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
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
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
e728daa7cd Add CMAKE option and NVIDIA PerfHUD support 2014-02-07 19:49:40 -08: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
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
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
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
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
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
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
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
botanic
e995784886 Fixed typo issue 60 2014-01-28 11:41:26 -08: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
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
kaetemi
207d7323ce Fix Qt build on Windows 2014-01-21 12:50:23 +01:00
Nimetu
ea5a36b105 Remove tooltip debug message from logs 
--HG--
branch : misc-patches
 2014-01-04 00:20:05 +02:00
Nimetu
4c2531474a Fix typo (issue #70) 
--HG--
branch : misc-patches
 2014-01-03 19:51:50 +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
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
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
36a537a88e Changed: Replaced atof by fromString 2013-11-13 21:37:28 +01:00
kervala
b7082644f0 Changed: Updated OpenGL registry 2013-11-13 20:31:08 +01:00
Botanic
6dfafa7ae1 Merge 2013-11-02 16:35:26 -07: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
Botanic
7381de073e fixed bad merge 2013-10-26 00:57:50 -07:00
Botanic
057fe3e0f7 Merge 2013-10-26 00:50:56 -07:00
sfb
892ed1ed3d merge from default 
--HG--
branch : gsoc2011-worldeditorqt
 2013-10-23 12:08:09 -05:00
Matt Raykowski
0001719d99 Merged in DJanssens/quitta-ryzomcore (pull request #25) 
Ryzom AMS - GSOC Project
 2013-10-19 16:02:52 -05:00
kaetemi
563afd027c Fix #67 bad NELID in vertex program parser 2013-10-06 20:06:53 +02:00
kervala
eb3c58cce9 Fixed: Use multiarch library path under Linux 2013-09-30 09:11:35 +02:00
kervala
de43ea8d86 Fixed: Some warnings 2013-09-29 16:26:24 +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
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
kaetemi
3b4730c890 Fix warnings 2013-09-27 01:32:01 +02:00
kaetemi
85365fd7bb Fix line endings 2013-09-27 00:08:49 +02:00
kervala
c8c296f484 Changed: Created NELID macro to fix warning "multi-character character constant" 2013-09-24 21:33:59 +02:00
Quitta
a484de5b3f Merge with quitta-gsoc-2013 2013-09-23 00:49:16 +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
6695a9064e Changed: Created NELID macro to fix warning "multi-character character constant" 2013-09-22 13:10:57 +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
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
kaetemi
21a70b4211 Update d3d implementation and add some debugging code 
--HG--
branch : multipass-stereo
 2013-09-11 01:12:37 +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
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
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
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