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
|
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 |
|