dfighter1985
|
a810b29ec7
|
Merged default.
--HG--
branch : gsoc2014-dfighter
|
2014-08-19 00:33:03 +02:00 |
|
kaetemi
|
d4b7a3cf8a
|
Crashfix in case pacs_prim are exported into .ig
|
2014-08-17 16:48:51 +02:00 |
|
kervala
|
31e9934ba7
|
Changed #172 XML floating point serialization not using neutral culture
|
2014-08-17 16:05:51 +02:00 |
|
kervala
|
41f6e70dc9
|
Fixed #172 XML floating point serialization not using neutral culture
|
2014-08-17 15:39:30 +02:00 |
|
kaetemi
|
38abf2193f
|
Project client loading screens into 3D space for HMD
--HG--
branch : multipass-stereo
|
2014-08-07 18:49:05 +02:00 |
|
kaetemi
|
38a418503d
|
Non-functional direct to rift
--HG--
branch : multipass-stereo
|
2014-08-07 05:09:11 +02:00 |
|
kaetemi
|
aff0cab54e
|
GL: Fix switch from different resolution fullscreen to borderless display
--HG--
branch : multipass-stereo
|
2014-08-07 04:45:14 +02:00 |
|
kaetemi
|
e2bfb5d542
|
Clean handling of display mode switching in client
--HG--
branch : multipass-stereo
|
2014-08-07 04:36:51 +02:00 |
|
kaetemi
|
400f479fe1
|
GL: Handle borderless fullscreen to specified monitor internally
--HG--
branch : multipass-stereo
|
2014-08-07 04:18:17 +02:00 |
|
kaetemi
|
7c39f7d33b
|
Specify monitor when changing display mode
--HG--
branch : multipass-stereo
|
2014-08-07 01:04:58 +02:00 |
|
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
|
e8a245a133
|
OVR: Chroma factor
--HG--
branch : multipass-stereo
|
2014-08-05 20:14:58 +02:00 |
|
kaetemi
|
e61eb57fd9
|
OVR: Fix for debug devices
--HG--
branch : multipass-stereo
|
2014-08-05 04:03:27 +02:00 |
|
kaetemi
|
3fd358d69d
|
OVR: Convert texture coordinates and setup rendering material
--HG--
branch : multipass-stereo
|
2014-08-05 03:54:19 +02:00 |
|
kaetemi
|
102d3653d7
|
3D: Ensure correct fog handling for effects
--HG--
branch : multipass-stereo
|
2014-08-05 02:58:55 +02:00 |
|
kaetemi
|
6ad1d14617
|
OVR: Test distortion mesh
--HG--
branch : multipass-stereo
|
2014-08-05 02:55:26 +02:00 |
|
kaetemi
|
65578ce498
|
OVR: Test large render target
--HG--
branch : multipass-stereo
|
2014-08-05 02:25:14 +02:00 |
|
kaetemi
|
2fbf1cb06d
|
3D: Set matrix modes after changing render target in effect
--HG--
branch : multipass-stereo
|
2014-08-05 02:24:11 +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
|
96bd17ae63
|
3D: Fix texture coords for FXAA on D3D
--HG--
branch : multipass-stereo
|
2014-08-04 07:38:40 +02:00 |
|
kaetemi
|
d56047bde6
|
Remove debug
--HG--
branch : multipass-stereo
|
2014-08-04 06:19:03 +02:00 |
|
kaetemi
|
8a283ea518
|
3D: User higher quality FXAA version
--HG--
branch : multipass-stereo
|
2014-08-04 06:11:47 +02:00 |
|
kaetemi
|
ec4762f669
|
3D: Add FXAA
--HG--
branch : multipass-stereo
|
2014-08-04 04:44:27 +02:00 |
|
kaetemi
|
f59de199cf
|
Fix crash on AMD with legacy clouds
--HG--
branch : multipass-stereo
|
2014-08-04 01:05:53 +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 |
|
kaetemi
|
1c67d6ec0f
|
GL: Occlusion query bugfix
|
2014-08-03 22:15:12 +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 |
|
kaetemi
|
78ce8f4f25
|
GL: Share depth and stencil to get similar behaviour to D3D driver
--HG--
branch : multipass-stereo
|
2014-08-03 18:59:19 +02:00 |
|
kaetemi
|
503292065c
|
Simplify GUI projection settings
--HG--
branch : multipass-stereo
|
2014-08-03 00:56:26 +02:00 |
|
kaetemi
|
1965d46dce
|
Off-center GUI cylinder
--HG--
branch : multipass-stereo
|
2014-08-02 20:11:28 +02:00 |
|
kaetemi
|
f2dd6083fa
|
Cylindrical GUI
--HG--
branch : multipass-stereo
|
2014-08-02 19:50:26 +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
|
f32c3bf6b0
|
Temporary crashfix, ref #68
--HG--
branch : multipass-stereo
|
2014-08-01 15:23:13 +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
|
c70d8597b2
|
Merge with default
--HG--
branch : multipass-stereo
|
2014-08-01 11:50:40 +02:00 |
|
kaetemi
|
79c6f50054
|
Render target format (for alpha)
--HG--
branch : multipass-stereo
|
2014-07-31 18:25:50 +02:00 |
|
kaetemi
|
61f97fae40
|
Fix issue with render target in OpenGL when size not specified
--HG--
branch : multipass-stereo
|
2014-07-31 17:41:56 +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 |
|
kaetemi
|
c461502dc7
|
Crash workaround in IG loading, ref #171
|
2014-07-31 19:50:25 +02:00 |
|
kaetemi
|
6b0d468240
|
Remove a debug assert
|
2014-07-29 14:39:07 +02:00 |
|
dfighter1985
|
8373118c7e
|
Merged default.
--HG--
branch : gsoc2014-dfighter
|
2014-07-22 00:15:50 +02:00 |
|
kervala
|
4b39f9640d
|
Changed: Minor optimization and warning
|
2014-07-19 14:01:44 +02:00 |
|
kervala
|
0bb464411b
|
Changed: Replaced tests with .size() by .empty() because faster
|
2014-07-19 14:01:03 +02:00 |
|
kervala
|
c1ea3820d5
|
Fixed: Warning
|
2014-07-19 11:16:43 +02:00 |
|
Laszlo Kis-Adam
|
03af2ed463
|
Merged in dfighter1985/ryzomcore/dfighter-tools (pull request #94)
Just too lazy to push directly
--HG--
branch : develop
|
2014-10-15 19:48:23 +02:00 |
|
kaetemi
|
b010f224e4
|
Don't use I18N when the required ui prefix is not in the tooltip text (convention actually dictates uitt as tooltip prefix)
--HG--
branch : develop
|
2014-10-14 23:45:08 +02:00 |
|
kaetemi
|
07a57f81f8
|
Shadow should not be taken into account for font height, breaks vertical centering
--HG--
branch : develop
|
2014-10-14 23:45:08 +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
|
246d931bee
|
Formatting: Use tabs
|
2014-07-09 16:59:55 +02:00 |
|
KISHAN GRIMOUT
|
107646d95d
|
fix windows 64bit build in mem_displayer.cpp
|
2014-07-09 13:41:43 +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
|
27fe95904a
|
Quelled some compiler compliants.
--HG--
branch : gsoc2014-dfighter
|
2014-06-29 03:01:43 +02:00 |
|
dfighter1985
|
7f5973e462
|
tooltip parent is now changable using an enum.
--HG--
branch : gsoc2014-dfighter
|
2014-06-29 02:53:33 +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 |
|
dfighter1985
|
e182e25e07
|
text posref is now an enum too.
--HG--
branch : gsoc2014-dfighter
|
2014-06-27 00:07:44 +02:00 |
|
dfighter1985
|
250cd6efc1
|
Posref can now be set as an enum, instead of a string in the property editor.
--HG--
branch : gsoc2014-dfighter
|
2014-06-21 18:25:14 +02:00 |
|
kaetemi
|
353c74ff21
|
Don't enforce native fragment programs on modern hardware. Fixes water for the open source ATI/AMD driver, which reports fragment programs as not native (as they are translated to modern hardware).
|
2014-06-21 06:41:14 +02:00 |
|
kaetemi
|
5cb8a7700e
|
Exit with error
|
2014-06-21 05:46:20 +02:00 |
|
kaetemi
|
cf3e779ae9
|
Fix compile
|
2014-06-20 23:38:44 +02:00 |
|
kaetemi
|
07dd9eb85b
|
Compile fix
|
2014-06-20 17:53:38 +02:00 |
|
kaetemi
|
43a061bebd
|
SSE2: Compile fix
--HG--
branch : sse2
|
2014-06-20 03:08:51 +02:00 |
|
kaetemi
|
cec2970169
|
SSE2: Replace prefetch
--HG--
branch : sse2
|
2014-06-14 01:09:05 +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
|
93e97c56cd
|
Implement occlusion queries for AMD/ATI in the OpenGL driver
|
2014-06-19 21:49:33 +02:00 |
|
kaetemi
|
fd6a95e3a3
|
Backed out changeset: f665fcc42968 (except dru.cpp)
|
2014-06-19 20:22:12 +02:00 |
|
kaetemi
|
b18203fc4e
|
Fix Ryzom server compile under MinGW
|
2014-06-19 20:19:39 +02:00 |
|
kaetemi
|
7adf98e8a7
|
Fix NeL GUI compile under MinGW
|
2014-06-19 00:40:29 +02:00 |
|
kaetemi
|
cffd68230c
|
Fix XA2 driver compile under MinGW
|
2014-06-18 23:18:06 +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
|
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
|
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
|
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 |
|
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
|
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 |
|
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
|
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
|
de9724a821
|
Add color to console output
|
2014-03-13 18:34:26 +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 |
|
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 |
|
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
|
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 |
|
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 |
|
botanic
|
e728daa7cd
|
Add CMAKE option and NVIDIA PerfHUD support
|
2014-02-07 19:49:40 -08: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 |
|
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 |
|
kervala
|
09e3471f1b
|
Fixed: Compilation with freetype
|
2014-01-25 10:45:57 +01:00 |
|
Nimetu
|
ea5a36b105
|
Remove tooltip debug message from logs
--HG--
branch : misc-patches
|
2014-01-04 00:20:05 +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 |
|
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
|
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
|
df7110d2d6
|
Bad merge resolution, fixed a couple source files which merged poorly.
--HG--
branch : gsoc2011-worldeditorqt
|
2013-10-28 11:24:31 -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
|
43bbfe3da7
|
Fixed: Some warnings
|
2013-09-27 16:30:55 +02:00 |
|
kaetemi
|
3b4730c890
|
Fix warnings
|
2013-09-27 01:32:01 +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
|
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
|
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 |
|
kaetemi
|
e84e08b0f6
|
Reduce function duplication
--HG--
branch : multipass-stereo
|
2013-09-09 02:03:40 +02:00 |
|
kaetemi
|
afe6c16bf3
|
Separate count and size
--HG--
branch : multipass-stereo
|
2013-09-09 01:31:15 +02:00 |
|
kaetemi
|
05583d134a
|
Cleanup driver interface
--HG--
branch : multipass-stereo
|
2013-09-08 21:57:27 +02:00 |
|
kervala
|
0ccec811d6
|
Changed: Updated Freetype libraries variable
|
2013-09-08 12:54:05 +02:00 |
|
kervala
|
87ee7fa8d2
|
Changed: Moved lua, luabind and curl FIND_PACKAGE in root CMakeLists.txt
|
2013-09-08 12:52:00 +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
|
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 |
|
kaetemi
|
97c9c26690
|
Add abstract gpu program and source classes
--HG--
branch : multipass-stereo
|
2013-09-07 18:33:18 +02:00 |
|
kaetemi
|
361b7eab74
|
Fix compile error
|
2013-09-07 16:05:28 +02:00 |
|
kervala
|
89b945bb8c
|
Changed: Minor changes
|
2013-09-06 15:00:35 +02:00 |
|
kervala
|
d03c795dd8
|
Changed: Don't use NLMISC includes in NLMISC PCH
|
2013-09-06 14:50:19 +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 |
|
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 |
|
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 |
|
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 |
|
kaetemi
|
3bc5d88d78
|
Force link
|
2013-08-01 10:11:11 +02:00 |
|