Commit Graph

11139 Commits

Author SHA1 Message Date
konstin
7cc83e1475 running whitespaces.py update 1 2014-03-29 11:33:43 +01:00
konstin
badf97dc77 whitespaces.py update 1 2014-03-29 11:32:50 +01:00
konstin
663fffdebb Revert "Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces"
This reverts commit 65e2dcf2f0.
2014-03-29 11:32:04 +01:00
konstin
65e2dcf2f0 Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces 2014-03-28 20:08:39 +01:00
konstin
233f9947ff Adding whitespaces.py, a small script for code clean 2014-03-28 20:08:02 +01:00
vlj
35c8a14938 Forgot to clean some VAOs. 2014-03-28 01:55:10 +01:00
Marianne Gagnon
348a20288f Apply patch by Marc Coll to have better progress reports during long GPs, thanks! 2014-03-26 20:14:29 -04:00
Vincent Lejeune
1740407e1e Use GS instancing to speed up shadow gen a little. 2014-03-26 22:27:11 +01:00
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
hiker
24dc70427f Fixed compiler warnings. 2014-03-25 20:54:20 +11:00
Vincent Lejeune
72556fddc3 Don't use glDebugMessageCallbackARB if null 2014-03-24 21:47:24 +01: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
vlj
a35b7d1e2d Do not reload Caustic/displace texture each frame 2014-03-21 01:43:45 +01:00
auriamg
dee2a0300e Merge pull request #1259 from cosmincav/master
Added achievement: unstoppable
2014-03-20 20:08:43 -04:00
vlj
f06ad3c785 Reenable transparent + fog material. 2014-03-20 18:25:44 +01:00