Vincent Lejeune
b9d0088ff9
Parse more context in windows build.
2014-03-26 22:13:02 +01:00
Vincent Lejeune
14500d65ab
Reverse order of templates in glwrapp.hpp
2014-03-26 21:18:36 +01:00
Vincent Lejeune
f49dfbc51f
Fix flip particle shader.
2014-03-26 20:58:13 +01:00
Vincent Lejeune
0f451c8f9d
List files when shader link fails.
2014-03-26 20:49:58 +01:00
Vincent Lejeune
9f0620c122
Add a #define to switch between dof and non dof
2014-03-26 19:42:25 +01:00
vlj
8b652ababb
Merge object_pass*.vert
2014-03-26 19:04:46 +01:00
vlj
ae5c7b8c3d
Implement UI single color overload
2014-03-26 19:04:45 +01:00
Guillaume P
c04ee0f345
When a kart has crashed, make the impulsive force a little more realistic. (depending on the kart velocity).
2014-03-25 16:59:20 +01:00
vlj
71881ac64d
Add orientation to grass material
2014-03-25 16:49:03 +01:00
hiker
24dc70427f
Fixed compiler warnings.
2014-03-25 20:54:20 +11:00
Vincent Lejeune
9fef40318e
Fixes for grass instancied material.
2014-03-25 00:09:32 +01:00
Vincent Lejeune
72556fddc3
Don't use glDebugMessageCallbackARB if null
2014-03-24 21:47:24 +01:00
vlj
a866b3f416
Add Grass material support for instancing.
2014-03-24 16:40:40 +01:00
Marianne Gagnon
d798398478
Merge branch 'Instancing' of https://github.com/supertuxkart/stk-code into Instancing
2014-03-23 18:55:51 -04:00
Marianne Gagnon
bb28e26eff
Cleanup for instancing
2014-03-23 18:55:45 -04:00
vlj
3423cbf60b
Some fixes.
2014-03-23 20:05:51 +01:00
Vincent Lejeune
76cf04f548
Clean code to make it extendable later
2014-03-23 19:50:33 +01:00
Vincent Lejeune
5c8ef365a5
Merge instanced_object_pass vertex shaders.
2014-03-23 19:28:07 +01:00
Vincent Lejeune
5dd2d28134
Merge branch 'master' into Instancing
2014-03-23 19:20:23 +01:00
Marianne Gagnon
ae92b4007b
Add initial basic support for loading instancing nodes
2014-03-22 20:55:30 -04:00
vlj
73755a3431
clamp overload was ambiguous.
2014-03-23 01:09:14 +01:00
samuncle
f7f3cb1cbe
Add depth of field to the color_level shader. As vincent requested. Something cleaner need to be done
2014-03-23 00:59:06 +01:00
Marianne Gagnon
5750b860c9
Add missing icon
2014-03-22 19:49:48 -04:00
Marianne Gagnon
ce1cbd44da
Use new single-color overload in font where possible
2014-03-22 19:38:48 -04:00
vlj
a21d162d5a
Add an overload for draw2DImage with a single color
2014-03-23 00:29:47 +01:00
vlj
6fc2248d7a
GPUParticles: some factorisation
2014-03-23 00:19:57 +01:00
vlj
9752689d15
Do not render billboard outside of transparent pass
2014-03-22 23:18:07 +01:00
vlj
c0b2b23692
Factorise cubevbo/vao in shader.cpp
2014-03-22 23:09:33 +01:00
vlj
6538d16eb3
Fix a shader compile failure on nvidia.
2014-03-22 22:32:52 +01:00
vlj
fd82494ee8
Add file path when a compiler error arise.
2014-03-22 22:32:01 +01:00
Vincent Lejeune
2cbf8dafc7
SkyShader: attrib position is not always 0.
2014-03-22 20:05:56 +01:00
Vincent Lejeune
efa7316fc5
Definitively fix stencil bug thx to graphitemaster from irc
2014-03-22 19:19:59 +01:00
Vincent Lejeune
29749d5dbd
Merge commit 'f3e2da881a4d394c4ca902548e788f5b4c0bdd81'
...
* commit 'f3e2da881a4d394c4ca902548e788f5b4c0bdd81':
Do not build shadow shader without gs support.
Add a function to query supported glsl ver
Some drivers dont support const array
2014-03-22 18:54:51 +01:00
Vincent Lejeune
f3e2da881a
Do not build shadow shader without gs support.
2014-03-22 18:36:21 +01:00
Vincent Lejeune
ae3cf30070
Add a function to query supported glsl ver
2014-03-22 18:36:20 +01:00
Vincent Lejeune
aa39246404
Some drivers dont support const array
2014-03-22 18:36:19 +01:00
Unitraxx
c647fa5081
Merge pull request #1252 from mcsab/master
...
Reset-per-lap achievement support
2014-03-22 01:12:28 +01:00
Csaba Molnar
ca19a428b2
merge, comment fix, never-consistence fix
2014-03-22 01:02:52 +01:00
Vincent Lejeune
320558c205
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-03-22 00:52:53 +01:00
Csaba Molnar
3a5812dd6c
Merge branch 'master' of https://github.com/supertuxkart/stk-code
...
Conflicts:
data/achievements.xml
2014-03-22 00:52:33 +01:00
Vincent Lejeune
1f1e79477d
Add missing utils/log.hpp in glwrap.hpp
2014-03-22 00:24:00 +01:00
Marianne Gagnon
33b3880320
Add the author of the GP editor to the credits
2014-03-21 18:56:47 -04:00
Vincent Lejeune
340eaa9352
Factorize getLightFactor
2014-03-21 18:36:47 +01:00
Vincent Lejeune
01b88fde9d
Factorize DecodeNormal from misc shaders.
2014-03-21 18:17:21 +01:00
Vincent Lejeune
77e5f413c7
Factorize EncodeNormal from Pass1 shaders.
2014-03-21 18:10:54 +01:00
Vincent Lejeune
f0e96bb7f2
Use variadic function to load shader
2014-03-21 18:09:10 +01:00
Vincent Lejeune
9728226ee3
Forgot to dereference a value.
2014-03-21 15:58:21 +01:00
Marianne Gagnon
89e070c7f3
Revert dubious change from GP patch
2014-03-20 21:30:10 -04:00
Marianne Gagnon
2f2547420d
Apply Marc Coll's Grand Prix editor, thanks! There will be refinements to come for sure, but this is a very nice start
2014-03-20 21:13:05 -04:00
vlj
68935decaa
Reenable Debug Output on windows.
2014-03-21 01:44:14 +01:00