dfighter1985
|
0f7e1c022a
|
Merge default
--HG--
branch : gsoc2014-dfighter
|
2014-08-07 00:03:09 +02:00 |
|
kaetemi
|
4e33e5cf2f
|
Process some scene traversals only once when rendering in stereo
--HG--
branch : multipass-stereo
|
2014-08-06 14:36:09 +02:00 |
|
kaetemi
|
3fd358d69d
|
OVR: Convert texture coordinates and setup rendering material
--HG--
branch : multipass-stereo
|
2014-08-05 03:54:19 +02:00 |
|
dfighter1985
|
d21aa2b678
|
Tile loading more or less works. TODO: investigate why displacement map lookup causes crashes.
--HG--
branch : gsoc2014-dfighter
|
2014-08-05 02:58:31 +02:00 |
|
kaetemi
|
6ad1d14617
|
OVR: Test distortion mesh
--HG--
branch : multipass-stereo
|
2014-08-05 02:55:26 +02:00 |
|
kaetemi
|
339c8b8dfa
|
3D: Render target matrix context fix
--HG--
branch : multipass-stereo
|
2014-08-05 02:21:30 +02:00 |
|
kaetemi
|
33235bdf6c
|
OVR: Testing
--HG--
branch : multipass-stereo
|
2014-08-05 01:49:45 +02:00 |
|
kaetemi
|
2e6893fd48
|
OVR: Translate camera
--HG--
branch : multipass-stereo
|
2014-08-05 00:51:53 +02:00 |
|
kaetemi
|
9b79a44f8a
|
OVR: Get orientation
--HG--
branch : multipass-stereo
|
2014-08-05 00:46:04 +02:00 |
|
kaetemi
|
262c1f84a9
|
OVR: Generate distortion mesh
--HG--
branch : multipass-stereo
|
2014-08-05 00:20:21 +02:00 |
|
kaetemi
|
99ea2c685c
|
OVR: Read device descriptions
--HG--
branch : multipass-stereo
|
2014-08-04 20:32:31 +02:00 |
|
kaetemi
|
f2274d2378
|
OVR: Iterate devices
--HG--
branch : multipass-stereo
|
2014-08-04 19:19:15 +02:00 |
|
kaetemi
|
b9e10fca72
|
Cleanup
--HG--
branch : multipass-stereo
|
2014-08-04 18:31:31 +02:00 |
|
kaetemi
|
0488b706b2
|
Add placeholders for LibOVR 0.4.0 support
--HG--
branch : multipass-stereo
|
2014-08-04 18:30:25 +02:00 |
|
kaetemi
|
ec4762f669
|
3D: Add FXAA
--HG--
branch : multipass-stereo
|
2014-08-04 04:44:27 +02:00 |
|
kaetemi
|
d98f1ede47
|
Move default render target handling to CDriverUser
--HG--
branch : multipass-stereo
|
2014-08-04 00:57:43 +02:00 |
|
kaetemi
|
e88dedf00c
|
Adjust render target handling for effects
--HG--
branch : multipass-stereo
|
2014-08-03 22:15:44 +02:00 |
|
kaetemi
|
6c3bcc2439
|
Merge with default
--HG--
branch : multipass-stereo
|
2014-08-03 22:15:39 +02:00 |
|
dfighter1985
|
30bae94ac3
|
Started to rework tile checks, tile banks loading / saving. A tilebank will now be in the tilemodel, and it will work from there. Also moved some constants into an independent file.
--HG--
branch : gsoc2014-dfighter
|
2014-08-03 21:33:13 +02:00 |
|
kaetemi
|
6a21d0503c
|
3D: Cleanup bloom effect
--HG--
branch : multipass-stereo
|
2014-08-03 21:09:55 +02:00 |
|
kaetemi
|
8af686f7ef
|
3D: Cleanup bloom effect
--HG--
branch : multipass-stereo
|
2014-08-03 20:35:05 +02:00 |
|
kervala
|
7aedffce9a
|
Changed: #172 XML floating point serialization not using neutral culture (for VC++ 2005 and up)
|
2014-08-02 11:18:24 +02:00 |
|
kaetemi
|
c11706feb8
|
Project GUI into space
--HG--
branch : multipass-stereo
|
2014-08-01 15:44:12 +02:00 |
|
kaetemi
|
caefb04928
|
Restore camera and scene viewport after disabling VR
--HG--
branch : multipass-stereo
|
2014-08-01 13:20:55 +02:00 |
|
kaetemi
|
79c6f50054
|
Render target format (for alpha)
--HG--
branch : multipass-stereo
|
2014-07-31 18:25:50 +02:00 |
|
kaetemi
|
22d03c5f79
|
Mode2D selection
--HG--
branch : multipass-stereo
|
2014-07-31 03:53:38 +02:00 |
|
kaetemi
|
dac5b2d274
|
Merge with game-device
--HG--
branch : multipass-stereo
|
2014-07-31 02:07:20 +02:00 |
|
kaetemi
|
b1e2b60381
|
Add render target manager, issue #47
--HG--
branch : multipass-stereo
|
2014-07-31 00:46:00 +02:00 |
|
dfighter1985
|
431178321f
|
TileBank loading.
--HG--
branch : gsoc2014-dfighter
|
2014-07-30 10:54:08 +02:00 |
|
dfighter1985
|
8373118c7e
|
Merged default.
--HG--
branch : gsoc2014-dfighter
|
2014-07-22 00:15:50 +02:00 |
|
KISHAN GRIMOUT
|
b9dc8ace7e
|
fix windows 64-bit crash in client due to VS 64-bit compiler bug, fix #164
|
2014-07-16 13:47:08 +02:00 |
|
kaetemi
|
176c3d8a4a
|
Add callback template class
--HG--
branch : develop
|
2014-07-12 18:19:25 +02:00 |
|
kaetemi
|
7487ea4135
|
Higher quality outline, visual difference is relevant only for black
--HG--
branch : develop
|
2014-10-16 02:00:45 +02:00 |
|
dfighter1985
|
f91846c970
|
Fix parent pos and size parsing.
--HG--
branch : dfighter-tools
|
2014-10-15 19:46:43 +02:00 |
|
dfighter1985
|
c5cd6990fe
|
When creating a new GUI set the base color to white.
--HG--
branch : dfighter-tools
|
2014-10-13 17:47:42 +02:00 |
|
dfighter1985
|
2dd6278771
|
Size parent is now queried directly from the widget.
--HG--
branch : dfighter-tools
|
2014-10-13 15:26:47 +02:00 |
|
dfighter1985
|
b3dd26e01c
|
Parent positions should now be saved right again.
--HG--
branch : dfighter-tools
|
2014-10-12 23:05:22 +02:00 |
|
dfighter1985
|
ded18b266c
|
Implemented new action.
--HG--
branch : dfighter-tools
|
2014-10-11 21:43:28 +02:00 |
|
dfighter1985
|
e5d2e9293d
|
Moved CRootGroup out of CInterfaceParser.
--HG--
branch : dfighter-tools
|
2014-10-11 19:30:30 +02:00 |
|
dfighter1985
|
7e16e95c35
|
CInterfaceParser in editor mode should look for files in the working directory first.
--HG--
branch : dfighter-tools
|
2014-10-11 16:26:38 +02:00 |
|
kaetemi
|
496f7f268c
|
Trash DirectInput
--HG--
branch : game-device
|
2014-07-12 17:17:24 +02:00 |
|
dfighter1985
|
012ad96806
|
Texture chooser now supports atlas textures as well.
--HG--
branch : gsoc2014-dfighter
|
2014-07-09 21:07:12 +02:00 |
|
kaetemi
|
e729a9d035
|
Fix #162: Center ingame mouse cursor after login
|
2014-07-09 12:31:22 +02:00 |
|
kaetemi
|
f281622d47
|
Trash DirectInput
--HG--
branch : game-device
|
2014-07-08 22:21:11 +02:00 |
|
dfighter1985
|
fe58435bb5
|
CPath can now return the file list with a path filter.
--HG--
branch : gsoc2014-dfighter
|
2014-07-06 23:21:25 +02:00 |
|
dfighter1985
|
085c1b41b9
|
Added facilities for viewing the loaded actions.
--HG--
branch : gsoc2014-dfighter
|
2014-07-02 22:27:04 +02:00 |
|
dfighter1985
|
842ca366de
|
Tooltip posrefs are now enums in the GUI Editor.
--HG--
branch : gsoc2014-dfighter
|
2014-06-29 01:44:06 +02:00 |
|
kaetemi
|
655c22e839
|
Fix compile
|
2014-06-20 23:24:54 +02:00 |
|
kaetemi
|
43a061bebd
|
SSE2: Compile fix
--HG--
branch : sse2
|
2014-06-20 03:08:51 +02:00 |
|
kaetemi
|
6734852fa3
|
SSE2: Ensure correct allocator is used
--HG--
branch : sse2
|
2014-06-14 00:38:35 +02:00 |
|
kaetemi
|
71a598db7e
|
SSE2: Remove dead code
--HG--
branch : sse2
|
2014-06-13 22:21:07 +02:00 |
|
kaetemi
|
848932f93a
|
SSE2: Fix for MinGW
--HG--
branch : sse2
|
2014-06-19 00:05:43 +02:00 |
|
kaetemi
|
ac3e69b8ab
|
Merge with default
--HG--
branch : sse2
|
2014-06-20 03:01:32 +02:00 |
|
kaetemi
|
b18203fc4e
|
Fix Ryzom server compile under MinGW
|
2014-06-19 20:19: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
|
f4fd8bb669
|
Fix linking of OpenGL driver under MinGW
|
2014-06-18 01:21:05 +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
|
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 |
|
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 |
|
kaetemi
|
5ed5cd5ea8
|
Add interface for HMD with player death support
|
2014-04-01 13:14:44 +02:00 |
|
kervala
|
62eb6347e5
|
Changed: Aligned methods names
|
2014-03-27 16:34:55 +01:00 |
|
kaetemi
|
40fe633dbe
|
Fix thread lockup in zone lighter
--HG--
branch : build_pipeline_py
|
2014-02-07 02:01:23 +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
|
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 |
|
Nimetu
|
4c2531474a
|
Fix typo (issue #70)
--HG--
branch : misc-patches
|
2014-01-03 19:51:50 +02:00 |
|
kervala
|
b219623129
|
Fixed: Verbose warning
|
2013-11-13 22:23:57 +01:00 |
|
kervala
|
dda2215ed8
|
Fixed: Wrong algorithm
|
2013-11-13 21:46:42 +01:00 |
|
kervala
|
6695a9064e
|
Changed: Created NELID macro to fix warning "multi-character character constant"
|
2013-09-22 13:10:57 +02:00 |
|
kaetemi
|
ce9e0a397b
|
Fix regression from stereo branch in wind tree
|
2013-09-14 18:58:23 +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
|
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
|
5e14dc4458
|
Update veget implementation
--HG--
branch : multipass-stereo
|
2013-09-13 17:09:05 +02:00 |
|
kaetemi
|
c6139419ac
|
Partial update of veget vp
--HG--
branch : multipass-stereo
|
2013-09-10 19:52:14 +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
|
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
|
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 |
|