dfighter1985
|
27fe95904a
|
Quelled some compiler compliants.
--HG--
branch : gsoc2014-dfighter
|
11 years ago |
dfighter1985
|
7f5973e462
|
tooltip parent is now changable using an enum.
--HG--
branch : gsoc2014-dfighter
|
11 years ago |
dfighter1985
|
842ca366de
|
Tooltip posrefs are now enums in the GUI Editor.
--HG--
branch : gsoc2014-dfighter
|
11 years ago |
dfighter1985
|
e182e25e07
|
text posref is now an enum too.
--HG--
branch : gsoc2014-dfighter
|
11 years ago |
dfighter1985
|
250cd6efc1
|
Posref can now be set as an enum, instead of a string in the property editor.
--HG--
branch : gsoc2014-dfighter
|
11 years ago |
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).
|
11 years ago |
kaetemi
|
5cb8a7700e
|
Exit with error
|
11 years ago |
kaetemi
|
cf3e779ae9
|
Fix compile
|
11 years ago |
kaetemi
|
07dd9eb85b
|
Compile fix
|
11 years ago |
kaetemi
|
43a061bebd
|
SSE2: Compile fix
--HG--
branch : sse2
|
11 years ago |
kaetemi
|
cec2970169
|
SSE2: Replace prefetch
--HG--
branch : sse2
|
11 years ago |
kaetemi
|
71a598db7e
|
SSE2: Remove dead code
--HG--
branch : sse2
|
11 years ago |
kaetemi
|
848932f93a
|
SSE2: Fix for MinGW
--HG--
branch : sse2
|
11 years ago |
kaetemi
|
ac3e69b8ab
|
Merge with default
--HG--
branch : sse2
|
11 years ago |
kaetemi
|
93e97c56cd
|
Implement occlusion queries for AMD/ATI in the OpenGL driver
|
11 years ago |
kaetemi
|
fd6a95e3a3
|
Backed out changeset: f665fcc42968 (except dru.cpp)
|
11 years ago |
kaetemi
|
b18203fc4e
|
Fix Ryzom server compile under MinGW
|
11 years ago |
kaetemi
|
7adf98e8a7
|
Fix NeL GUI compile under MinGW
|
11 years ago |
kaetemi
|
cffd68230c
|
Fix XA2 driver compile under MinGW
|
11 years ago |
kaetemi
|
43be0fd2a5
|
Fix D3D driver compile under MinGW
|
11 years ago |
kaetemi
|
75f7b9f931
|
Fix Snowballs service compile under MinGW
|
11 years ago |
kaetemi
|
9838ef56de
|
Fix Snowballs compile under MinGW
|
11 years ago |
kaetemi
|
f4fd8bb669
|
Fix linking of OpenGL driver under MinGW
|
11 years ago |
kaetemi
|
2f3f12e034
|
Fix linking of OpenAL driver under MinGW
|
11 years ago |
kaetemi
|
5bd6c5e06b
|
Fix compilation of NL3D under MinGW
|
11 years ago |
kaetemi
|
1df9bec563
|
Fix compilation of NLNET under MinGW
|
11 years ago |
kaetemi
|
3dd11fe157
|
Fix compilation of NLMISC under MinGW
|
11 years ago |
kaetemi
|
d3fb390cf3
|
SSE2: Align CMatrix
--HG--
branch : sse2
|
11 years ago |
kaetemi
|
556a41afee
|
SSE2: Implement alignment for arena allocator
--HG--
branch : sse2
|
11 years ago |
kaetemi
|
eee9ba0cae
|
SSE2: Add aligned allocators
--HG--
branch : sse2
|
11 years ago |
kaetemi
|
66126429c2
|
GL3: Temp bugfix
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
6a207ffd76
|
Backed out changeset: 97ebe9c61936
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
c9e8fb94c8
|
Backed out changeset: 8fd9b4f9a6b2
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
55aae0d138
|
Without sync but memory intensive, performance gain vs regular stream buffer only minimal
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
5bc87eeeed
|
Backed out changeset: 70793b42008e
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
afea49e83d
|
GL3: Manual syncing
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
42936097ce
|
GL3: Add experimental implementation for volatile buffers using pinned memory
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
aab353672c
|
GL3: Debug
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
50dea16ee7
|
GL3: Disable an assert
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
f860d46543
|
Merge with default
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
15dc492690
|
Set additional preferred memory
|
11 years ago |
kaetemi
|
0a9135a511
|
Add note
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
1896876b11
|
Merge with default
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
ad0bf64b18
|
Cleanup extension initialization
|
11 years ago |
kaetemi
|
b5b0ec45ca
|
Adjust a memory preference
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
85542abbfe
|
GL3: Report correct location
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
76cacae628
|
GL3: Add support for GL_AMD_pinned_memory
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
60851a863e
|
GL3: Cleanup
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
636b93a7b5
|
GL3: Cleanup
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
0543548272
|
GL3: Cleanup
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
984b899287
|
GL3: Set slowUnlockVertexBufferHard to false
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
f3766f9c40
|
GL3: Implement RAMPreferred
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
fef2365b5d
|
Merge with default
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
766cace955
|
Implement volatile vertex buffer for opengl driver, should provide considerable performance improvements for particle systems. Needs additional testing.
|
11 years ago |
kaetemi
|
f799bdb650
|
GL3: Optimize volatile vertex buffers
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
516a56acd8
|
GL3: Use GL_STREAM_DRAW for volatile buffers
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
b6ac857074
|
GL3: Refactor vertex buffers
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
46ac4541f9
|
GL3: Rename
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
9b48fb0c5a
|
Change default for 'setStaticMemoryToVRAM'
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
457f794584
|
Merge with default
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
db5c65fedf
|
Merge
|
11 years ago |
kaetemi
|
1a4a7bafab
|
Backed out changeset: 897087f1fa71, 7c3f1f0dc9d8, 61d11f94e3ea
|
11 years ago |
kervala
|
e84dd7b5f7
|
Changed: Replaced strlwr by toLower
|
11 years ago |
kervala
|
24fa8df5ff
|
Fusion avec default
--HG--
branch : compatibility
|
11 years ago |
kervala
|
3fff8fe467
|
Changed: Replaced strlwr by toLower
--HG--
branch : compatibility
|
11 years ago |
Nimetu
|
7cc1bf9f17
|
Fix compiling on linux with new OpenGL headers (issue #145)
--HG--
branch : Issue#145
|
11 years ago |
dfighter1985
|
4abf74d6e9
|
We can now drag elements, they will disappear and whatnot, but at least they can be dragged!
--HG--
branch : gui-editor
|
11 years ago |
dfighter1985
|
e12d189d51
|
Refactored input event handling a bit.
--HG--
branch : gui-editor
|
11 years ago |
dfighter1985
|
41f44b2aa6
|
Merge default.
--HG--
branch : gsoc2012-gui-editor
|
11 years ago |
kervala
|
ed1a84c99b
|
Changed: Updated OpenGL and OpenGL ES headers
--HG--
branch : compatibility
|
11 years ago |
kervala
|
831758beb1
|
Fixed: nglXSwapIntervalEXT return type should be void
--HG--
branch : compatibility
|
11 years ago |
kaetemi
|
a0796d23de
|
GL3: Don't use expensive dynamic_cast
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
96d4a17340
|
GL3: Render up to 31 lightmaps at once!
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
5d542ed91e
|
GL3: Increase number of usable samplers in program from 4 to 32
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
393d08532a
|
GL3: Alpha test bugfix
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
cda664c62a
|
GL3: Bugfix
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
181db9adb9
|
GL3: Initial lightmap shader implementation
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
9df1935f5e
|
GL3: Cleanup
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
a37d7a3127
|
GL3: Cleanup
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
9dbdcd1d4e
|
GL3: Cleanup
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
b372f203ec
|
GL3: Bugfix
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
cb3f3b72c5
|
GL3: Cleanup
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
07f663a68e
|
GL3: Cleanup
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
5a4dd538f1
|
GL3: Implement mapTextureStageToUV
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
09db5b352c
|
GL3: Bugfix
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
007d8877b8
|
GL3: Remove invalid calls
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
f347172bbe
|
GL3: Use compatibility instead of core, because core disables s3tc extension...
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
44102b2034
|
GL3: Use glClearBuffer
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
7e565518ec
|
GL3: Fix
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
07269aea3e
|
Backed out changeset: 455175ba6c2e
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
ec190696ad
|
GL3: Unlit material color
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
4913e7dc94
|
GL3: Primary and secondary color vertex attributes
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
4b4ac31a3d
|
Remove branch unrelated features (must backout this changeset after merging into parent feature branch)
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
267e7397c5
|
GL3: Support specular materials with missing textures
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
cfe1b2b8da
|
GL3: Don't call virtual getters for accessing internal data, please
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
6d946081e3
|
GL3: Fix typo
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
25cb297dcf
|
GL3: Fix for texture formats
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
d415ff508e
|
Backed out changeset: 96647f9b388a
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
725ec35188
|
GL3: Use core profile texture formats
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
d421f34c1a
|
GL3: Remove dead code
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
9cf5b3305c
|
GL3: Create 3.3 core profile context
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
11e871c8ab
|
GL3: Remove dead code
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
a17fc28955
|
GL3: Cleanup
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
f7d0b292f7
|
GL3: Cleanup
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
75d2bf91bf
|
GL3: Even more refactoring
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
17b3fa7b55
|
GL3: More refactoring
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
5002eea62a
|
GL3: Further refactor
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
a13d39e9f4
|
GL3: Begin refactoring pixel program
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
5ed5cd5ea8
|
Add interface for HMD with player death support
|
11 years ago |
kaetemi
|
270342a07d
|
GL3: Specular related
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
2aa36f413d
|
GL3: Prepare TexGen implementation
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
8532f79833
|
GL3: Remove dead code
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
62381dd219
|
GL3: Cleanup dead code
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
1a40e67fee
|
GL3: Remove dead code
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
11dc9110c2
|
GL3: Remove dead code
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
c0bb40b4a5
|
GL3: Fix tex coord (fixes landscape near rendering)
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
c270ec5a58
|
GL3: Remove dead code
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
12cb0ac306
|
GL3: Fix
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
78ec40afa7
|
GL3: Rewrite generateTexEnv
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
f62228592e
|
GL3: Cleanup samplers
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
7691e22a28
|
GL3: Fix ambient
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
75e650432f
|
GL3: Cleanup and fix lighting state bug in pp
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
d5d82ce900
|
GL3: Fix
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
443eb54128
|
GL3: Note
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
21eca5af5f
|
GL3: Optimize
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
424aa079a2
|
GL3: Cleanup
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
b25747b2ef
|
GL3: Optimize VP switching
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
5d80073c0f
|
GL3: Refactoring vertex program generation
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
7a960ed768
|
GL3: Cleanup user program state
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
3885389b3b
|
GL3: Remove GL_LIGHTING
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
641125963e
|
GL3: Replace glActiveTexture
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
7ae15eb2b8
|
GL3: Remove ARB_multitexture
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
89c83f86e5
|
GL3: Remove GL_EXT_blend_color and GL_EXT_secondary_color
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
4fe91132ce
|
GL3: Remove GL_ARB_multisample
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
5ad62b942a
|
GL3: Remove GL_MAX_TEXTURE_UNITS_ARB
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
9c1165dcf9
|
GL3: Remove GL_MAX_LIGHTS
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
8a60e5d4fa
|
GL3: Remove checkForPerPixelLightingSupport
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
313de47e53
|
GL3: Remove GL_ARB_texture_rectangle
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
0802330985
|
GL3: Remove GL_ARB_texture_cube_map
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
441d3a66f5
|
GL3: Remove GL_EXT_separate_specular_color
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
fce7aab22c
|
GL3: Remove GL_EXT_vertex_weighting
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
d7c5d30523
|
GL3: Remove GL_ARB_texture_non_power_of_two
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
79141e0a9c
|
GL3: Remove GL_ARB_texture_compression
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
3c1b39e103
|
GL3: Remove unused variable
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
3bba0fad6c
|
GL3: Remove GL_EXT_framebuffer_object
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
40a6972753
|
GL3: Remove GL_ATI_texture_env_combine3 and GL_ATIX_texture_env_route
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
118d6e0966
|
GL3: Remove GL_NV_occlusion_query
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
2139f39c43
|
GL3: Remove GL_EXT_texture_env_combine
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
b978ec5c8e
|
Cleanup extensions
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
b12c15ab5d
|
Follow existing code style
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
99f37eb90c
|
Cleanup style
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
be050f3927
|
Cleanup
--HG--
branch : opengl3
|
11 years ago |
kervala
|
8f6c32bd69
|
Backed out changeset: 3937923211ec
--HG--
branch : compatibility
|
11 years ago |
kaetemi
|
e01a42e21f
|
Fix shader compile
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
082504bc70
|
Workaround for shader bug
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
444d652435
|
More logging
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
41f77780d5
|
Functions texture2D and textureCube are deprecated
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
870df89bcd
|
Remove unnecessary assert
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
df1e27b82c
|
Fix shader compile on nv driver
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
d7a0816547
|
Merge with default
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
3738aa71ce
|
Fix EOL
--HG--
branch : opengl3
|
11 years ago |
kervala
|
c83afd649d
|
Changed: Replaced some Mac OS X warnings by TODO comments
--HG--
branch : compatibility
|
11 years ago |
kervala
|
81881a583f
|
Fixed: Switch not handled warnings
--HG--
branch : compatibility
|
11 years ago |
kervala
|
bfaf952f32
|
Fixed: Warnings with clang: wrong ! and == operators order
|
11 years ago |
kervala
|
8fa24eeb4e
|
Fixed: Warnings with clang: wrong ! and == operators order
--HG--
branch : compatibility
|
11 years ago |
kervala
|
a0801ebffe
|
Changed: Removed useless definitions
|
11 years ago |
kervala
|
7ab7952dbd
|
Changed: Removed useless definitions
--HG--
branch : compatibility
|
11 years ago |
kervala
|
def5243d06
|
Changed: Updated OpenGL headers
|
11 years ago |
kervala
|
ee87716aa0
|
Changed: Updated OpenGL headers
--HG--
branch : compatibility
|
11 years ago |
kervala
|
a77bddf265
|
Changed: Give priority to ARB extensions in tests
--HG--
branch : compatibility
|
11 years ago |
kervala
|
55a29115ba
|
Changed: Detect available video memory with OpenGL extensions
|
11 years ago |
kervala
|
d4fb36d1eb
|
Changed: Detect available video memory with OpenGL extensions
--HG--
branch : compatibility
|
11 years ago |
kervala
|
0aaad7051b
|
Changed: Use OpenGL ES functions prototypes from official headers
|
11 years ago |
kervala
|
3e30929867
|
Changed: Use OpenGL ES functions prototypes from official headers
--HG--
branch : compatibility
|
11 years ago |
kervala
|
c59f9d8a5e
|
Changed: Optimize OpenGL driver PCH
|
11 years ago |
kervala
|
406df1c59c
|
Changed: Optimize OpenGL driver PCH
--HG--
branch : compatibility
|
11 years ago |
kervala
|
927ff14998
|
Changed: Use OpenGL functions prototypes from official headers
Fixed: glDeleteObjectBufferATI replaced by glFreeObjectBufferATI since 2002
|
11 years ago |
kervala
|
713c07e1e6
|
Changed: Use OpenGL functions prototypes from official headers
Fixed: glDeleteObjectBufferATI replaced by glFreeObjectBufferATI since 2002
--HG--
branch : compatibility
|
11 years ago |
kervala
|
2076a6b13d
|
Changed: Typo
|
11 years ago |
kaetemi
|
de9724a821
|
Add color to console output
|
11 years ago |
dfighter1985
|
2ca40f10eb
|
Merging default.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
681a0bc8f3
|
Don't generate and cache shaders if they are set up from outside of the driver.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
43ad0189c6
|
Set up the shader programs in setupMaterial call.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
709c54e485
|
Fixed a GLSL syntax bug that I introduced into the shader generator in December. Specular material will now longer disappear.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
kaetemi
|
76ce7523ff
|
Additional streaming behaviour fix for XAudio2 driver
|
11 years ago |
kaetemi
|
49fa568123
|
Remove some debug
|
11 years ago |
kaetemi
|
d680b70308
|
Fix some streaming behaviour in XAudio2 driver
|
11 years ago |
kaetemi
|
6426393210
|
Additional streaming behaviour fix for XAudio2 driver
--HG--
branch : compatibility
|
11 years ago |
kaetemi
|
f703359eaa
|
Remove some debug
--HG--
branch : compatibility
|
11 years ago |
kaetemi
|
17b99ba796
|
Fix some streaming behaviour in XAudio2 driver
--HG--
branch : compatibility
|
11 years ago |
kervala
|
c26e4c7426
|
Changed: Typo
--HG--
branch : compatibility
|
11 years ago |
botanic
|
2e1b47e3f0
|
Backed out merge changeset: b2d97621fa3b
Backed out merge revision to its first parent (99840e8413f2)
|
11 years ago |
kervala
|
6b04b77bdd
|
Fixed: Reverted i18n change
--HG--
branch : compatibility
|
11 years ago |
kaetemi
|
ccf99f4f8e
|
Merge
|
11 years ago |
kaetemi
|
4f2a1b7db2
|
Fix the bug that caused the shape exporter to crash
|
11 years ago |
Matthew Lagoe
|
3f04907c31
|
Merged in botanic/ryzomcore-botanic-testing (pull request #21)
Make it so that bad text always throws a nlwarning
|
11 years ago |
botanic
|
e728daa7cd
|
Add CMAKE option and NVIDIA PerfHUD support
|
11 years ago |
kaetemi
|
40fe633dbe
|
Fix thread lockup in zone lighter
--HG--
branch : build_pipeline_py
|
11 years ago |
kaetemi
|
89a2a2ce99
|
Do not select stereo display debugger when HMD is set to Auto in Snowballs
|
11 years ago |
kaetemi
|
bcb2f48940
|
Remove georges4cvs feature
|
11 years ago |
botanic
|
e995784886
|
Fixed typo issue 60
|
11 years ago |
botanic
|
71b0f9ae92
|
Issue #60
does seem to work better when latency is high
|
11 years ago |
botanic
|
60495f79ac
|
Merge
|
11 years ago |
botanic
|
b6441edf2d
|
Fix for Issue #94
|
11 years ago |
kervala
|
a5a9532a13
|
Changed: Best fix for Freetype new layout (we only just need to include ft2build.h as done in font_generator.h)
|
11 years ago |
kervala
|
09e3471f1b
|
Fixed: Compilation with freetype
|
11 years ago |
Nimetu
|
ea5a36b105
|
Remove tooltip debug message from logs
--HG--
branch : misc-patches
|
11 years ago |
Nimetu
|
3cd6ecdb82
|
Add deadlock counter to prevent endless loop (issue #73)
--HG--
branch : misc-patches
|
11 years ago |
dfighter1985
|
3a84270a84
|
Textures with DSDT/DUDV format will now be uploaded as RG8. Ryzom will now not crash while entering world.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
fb38a7a0a7
|
Disable lights when the material isn't lighted.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
2a158e76e1
|
Lights should now be turned off even when enableLightInternal is called directly. This also fixes the dark background on the character selection screen.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
9c69e1bf84
|
Material colors ( ambient, diffuse, specular ) should now be used when there's no texture available.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
kervala
|
b96ad682f5
|
Fixed: Compilation under Mac OS X
|
11 years ago |
kervala
|
a45bbd96c5
|
Fixed: Warning with clang
|
11 years ago |
kervala
|
af1721a0a4
|
Changed: Don't need to change _PolygonSmooth if value is the same
|
11 years ago |
kervala
|
166607f644
|
Changed: Implement VSync under Mac OS X
|
11 years ago |
kervala
|
73196fe7fe
|
Changed: Replace strlwr by toLower
|
11 years ago |
kervala
|
b46c316940
|
Fixed: #77 crash when using lua:parseInterfaceFromString() (a big thanks to nimetu for the fix !)
|
11 years ago |
kervala
|
d8a6c9f966
|
Fixed: Warning with clang
|
11 years ago |
kervala
|
36a537a88e
|
Changed: Replaced atof by fromString
|
11 years ago |
kervala
|
b7082644f0
|
Changed: Updated OpenGL registry
|
11 years ago |
dfighter1985
|
a119d3e1a0
|
Use the view matrix instead of modelview to transform the light stuff.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
8f2e75415c
|
Set up the normalmatrix in the driver and feed it to the shaders, instead of calculating it in the shaders.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
9c0e1c2449
|
Tattos ( and other multitextured stuff ) will now show up again, even if there's only one texture coordinate set.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
7f7a3e159b
|
Reverse directional light direction as it is done in the old OpenGL driver. Also normalize normal.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
90dc025fd8
|
Fixed: Some uniforms names were wrong after the merge, which led to rendering issues.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
eb9b3e4f0f
|
Implemented light controls.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Botanic
|
6dfafa7ae1
|
Merge
|
11 years ago |
dfighter1985
|
1cc71457eb
|
Implemented a basic fog control widget.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
sfb
|
df7110d2d6
|
Bad merge resolution, fixed a couple source files which merged poorly.
--HG--
branch : gsoc2011-worldeditorqt
|
11 years ago |
Botanic
|
7381de073e
|
fixed bad merge
|
11 years ago |
Botanic
|
057fe3e0f7
|
Merge
|
11 years ago |
dfighter1985
|
ed885d3df6
|
Replaced ARB VertexAttribArray stuff with the core calls.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
d37b004372
|
Removed some more deprecated stuff.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
a9a9768872
|
Removed ARB fragment shader stuff.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
f768704cbf
|
Removed some ATI stuff.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
6947a58ba1
|
Removed fixed embm stuff.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
8276cb0140
|
We shouldn't set up a generated or newly compiled shader program if we already have one ( set up from outside the driver for example ).
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
82a7237e7d
|
Forgot to actually add the driver infos to the list, which caused the driver to hang on deletion.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
sfb
|
892ed1ed3d
|
merge from default
--HG--
branch : gsoc2011-worldeditorqt
|
11 years ago |
Matt Raykowski
|
0001719d99
|
Merged in DJanssens/quitta-ryzomcore (pull request #25)
Ryzom AMS - GSOC Project
|
11 years ago |
dfighter1985
|
982b99d8d0
|
Merged the GPU program stuff from mainline.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
563afd027c
|
Fix #67 bad NELID in vertex program parser
|
12 years ago |
dfighter1985
|
3b16f096cc
|
Merge with rename commit.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
32e814ecb6
|
Use separate shaders in the OpenGL3 driver.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kervala
|
eb3c58cce9
|
Fixed: Use multiarch library path under Linux
|
12 years ago |
kervala
|
de43ea8d86
|
Fixed: Some warnings
|
12 years ago |
kervala
|
f2ee0e99d8
|
Changed: Detect Windows 8 and Windows Server 2012
|
12 years ago |
kervala
|
43bbfe3da7
|
Fixed: Some warnings
|
12 years ago |
kaetemi
|
3b4730c890
|
Fix warnings
|
12 years ago |
dfighter1985
|
b70ce1eb09
|
Renamed OpenGL3 to opengl3
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
ace1b5386b
|
Check GL_ARB_separate_shader_objects extension on startup, and load related functions.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
cf6d2a88bc
|
Removed some now unused methods.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
afb56ea660
|
Moved the rendering methods into a new file.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
b0613e334c
|
Removed a now unused file.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
9d3e3a6a73
|
GL_VERTEX_PROGRAM_TWO_SIDED_ARB isn't used in the GL3 driver.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
7b5aaf7e0f
|
Some cleanup, most of the old OpenGL stuff should be gone.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
5326324b56
|
Some comments.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
69a4a9f9a5
|
Two sided rendering, while using dynmat.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
dbd5185de1
|
Only use the shader combo box for the user shaders.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
586c25f864
|
When clearing the dynmat, should clear all of them. Also fixes a crash.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
3949c210f6
|
OpenGL should be fed a clamped color value.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
b775237215
|
It's now possible to render using the user shaders and dynmat.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
Quitta
|
a484de5b3f
|
Merge with quitta-gsoc-2013
|
12 years ago |
kervala
|
bb7297f260
|
Fixed: Wrong variable used to compute array length
|
12 years ago |
kervala
|
b7ddc2c0d2
|
Fixed: OpenGL ES driver compilation
|
12 years ago |
kervala
|
82904232d2
|
Fixed: Warnings with GCC
|
12 years ago |
kervala
|
6695a9064e
|
Changed: Created NELID macro to fix warning "multi-character character constant"
|
12 years ago |
dfighter1985
|
8269ec7be5
|
Wrong direction, wrong lighting!
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
11fe86e552
|
Forgot to actually pass the direction in the previous commit...
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
72e7d09113
|
Don't calculate these more than once.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
69c41a31ae
|
These positions and directions were supposed to be in eye coords.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
0453f30582
|
Added lighting to the specular shader.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
f194704a28
|
Refactored directional lighting a little. No need to calculate things more than once.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
0ab68ef25f
|
Added point light support.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
9a647a893c
|
Specular shader should compile even when there's no fog added.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
c6bb6ec2a9
|
Renamed a bunch of shader related classes in NL3D to contain the word Usr, since they are user shader related.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
6c58856ed7
|
Shininess is now loaded from the material as a uniform instead of being hardcoded.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
4ba9d815d4
|
Colors are now set from the light setup, rather than being hardcoded.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
6f396aa8f7
|
Added the directional light(s) to the lightmap shader too.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
01ef7fd973
|
The specular calculation is probably faster this way.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
4ec92d2f06
|
Simplified the directional light shader generator functions.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
28c4b5b157
|
Added specular term to the directional lights.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
354d2b8c65
|
Added ambient term support for directional light.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
43817746ec
|
Renamed light[n]Col to light[n]ColDiff.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
0def5caf54
|
Added diffuse directional light support to the normal shader.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
3c99323ada
|
Apparently typos and redundantly setting uniforms can totally ruin rendering :D
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
5fbfe7b17f
|
Since now we have fog support, this doesn't need to be disabled anymore.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
1a669307da
|
Fix typo
|
12 years ago |
kaetemi
|
ce9e0a397b
|
Fix regression from stereo branch in wind tree
|
12 years ago |
kaetemi
|
046e3c92da
|
Fix compile error in vertex program
|
12 years ago |
kaetemi
|
3c099397d8
|
Update supportVertexProgram calls
|
12 years ago |
kaetemi
|
256f7ff06c
|
Cleanup unused code
|
12 years ago |
dfighter1985
|
8d57eac3d4
|
Some basic fog.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
6dfc8d0a00
|
Rename
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
973215e1d0
|
Cleanup
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
96dc139ddd
|
Merge with default
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
df123d6b89
|
Fix compile errors caused by missing includes
|
12 years ago |
kaetemi
|
d2bc32e598
|
Merge with default
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
cd9baf8f89
|
Cleanup
--HG--
branch : multipass-stereo
|
12 years ago |