konstin
4633d82c23
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-07-09 21:19:17 +02:00
vlj
1324fa7b36
Readd support for 2tcoord vtx in rsm.
2014-07-09 18:06:24 +02:00
vlj
114b3f8830
Remove unused methods
2014-07-09 18:02:25 +02:00
vlj
7a989901e8
Fix ssao viz on nvidia.
2014-07-09 18:00:16 +02:00
vlj
481a5bd0d0
Fix bubble shader with glsl < 330.
2014-07-09 17:49:47 +02:00
vlj
5ee410c139
Use a default texture for transparent if not provided.
2014-07-09 17:47:09 +02:00
hiker
60ac76a3e8
Merge pull request #1398 from konstin/fix1
...
check if reverse is available; fix #1396
2014-07-09 14:17:56 +10:00
Marianne Gagnon
8c74ab5e14
Forgot to hide debug item
2014-07-08 22:07:49 -04:00
vlj
2c251ffaa4
Fix slip stream effect.
2014-07-09 03:59:21 +02:00
vlj
4c3db6ca59
Mix texture for displace.
2014-07-09 03:41:08 +02:00
vlj
25b5134881
Hack not to add displacement node to scene manager
2014-07-09 03:20:31 +02:00
vlj
9922047dd1
Do not ask GL vendor/renderer in no graphic mode.
2014-07-09 02:57:36 +02:00
Marianne Gagnon
faed904061
try to fix linux compilation
2014-07-08 20:39:31 -04:00
Marianne Gagnon
ed97fca7b3
Ease debugging GPWin/GPLose/FeatureUnlocked scenes
2014-07-08 20:37:39 -04:00
Marianne Gagnon
173ee0d510
Merge branch 'VAOGatherer'
2014-07-08 20:34:55 -04:00
Marianne Gagnon
dd7c2b6b61
Pass proper isRace value to post-processing
2014-07-09 02:30:41 +02:00
Vincent Lejeune
ac55a70c83
Mimic previous motion blur behavior
...
Depending on zypper + mask on center.
2014-07-09 02:29:49 +02:00
Marianne Gagnon
32fec1f559
Pass proper isRace value to post-processing
2014-07-08 20:25:12 -04:00
Vincent Lejeune
aec31b28dd
Merge remote-tracking branch 'origin/VAOGatherer'
2014-07-09 02:17:25 +02:00
Marianne Gagnon
7a0afd9321
Fix crash when changing kart from overworld
2014-07-08 20:10:54 -04:00
samuncle
1ecaea18b2
Add a fade out to avoid bokeh on distant objects (stars, moon, planet, background mountain)
2014-07-09 01:21:31 +02:00
Vincent Lejeune
6d7178aff5
Fix for missing texture with non advanced pipeline
2014-07-09 00:26:28 +02:00
konstin
ce7da4b237
running whitespace.py
2014-07-08 20:59:34 +02:00
konstin
eb0120fb77
fix #1395
2014-07-08 18:37:02 +02:00
konstin
240f0ec6b7
remove m_random_gp
2014-07-08 18:34:54 +02:00
vlj
6276cafba2
Use global VAO for rendering
2014-07-08 18:31:46 +02:00
Vincent Lejeune
afd97345f7
Add a global VAO manager
2014-07-08 18:31:45 +02:00
Vincent Lejeune
0a7e1312b5
Support for glDrawElements{Instanced}?BaseVertex
2014-07-08 18:31:45 +02:00
Marianne Gagnon
f37afa88b8
Only assign tangents for mesh buffers that actually use normal maps
2014-07-08 18:31:44 +02:00
konstin
8cac64f39f
check if reverse is available; fix #1396
2014-07-08 16:47:56 +02:00
hiker
a65959da42
Replaced upright constraint with simpler code that keeps the kart
...
in mid air aligned to the gravity. This will also enable jumps in
section where the gravity is not in the default direction.
2014-07-08 16:52:09 +10:00
hiker
7ec2bae8e7
Minor style changes.
2014-07-08 14:41:59 +10:00
hiker
32707b8f88
Changed m_grand_prix of RaceManager to be an object (and not a pointer to
...
an object) anymore, which fixes a memory leak (and I also reverted my quick
fix from last night de7ceb0c2d
to fix a crash,
which now not necessary anymore.
2014-07-08 13:20:53 +10:00
Vincent Lejeune
887438a0d0
Reduce blur amount
2014-07-08 02:37:00 +02:00
Marianne Gagnon
e229effba0
Fix gnu and sara on kart selection screen
2014-07-07 19:43:49 -04:00
Vincent Lejeune
d961a9a8bc
Fix vertex color for object_pass2
2014-07-08 01:35:04 +02:00
vlj
7bf6d4db8b
Change location where srgb fbo is disabled.
2014-07-08 00:24:21 +02:00
Vincent Lejeune
23bebff5c2
Forgot to add shaders.cpp to last commit
2014-07-07 19:33:01 +02:00
Vincent Lejeune
746e910e46
Remove some Motion Blur unused vars
2014-07-07 19:25:41 +02:00
Vincent Lejeune
f23f7b05e5
Turn motion blur into camera space motion blur
2014-07-07 18:44:25 +02:00
hiker
de7ceb0c2d
Quick fix to avoid crash at end of race, full fix to follow later ;)
2014-07-07 23:31:43 +10:00
hiker
09a9863a72
Merge branch 'konstin-a'
2014-07-07 17:01:48 +10:00
hiker
5611f1544d
Fixed VS compilation.
2014-07-07 16:54:25 +10:00
hiker
cab0b2d833
Fixed compiler warning.
2014-07-07 16:53:42 +10:00
hiker
c222bbcb1c
Merge branch 'a' of https://github.com/konstin/stk-code into konstin-a
2014-07-07 16:15:34 +10:00
hiker
0ff48588d0
Merge pull request #1387 from leyyin/master
...
Fix embarrassing clang compilation mistake (thanks to solistice and cand).
2014-07-07 16:02:29 +10:00
Vincent Lejeune
d501125e9d
Remove some unused variables.
2014-07-06 21:06:27 +02:00
Marianne Gagnon
1f5dd2fff3
Improve moving objects in library behavior.
2014-07-04 20:42:06 -04:00
Marianne Gagnon
3f8bff33f3
Improve a bit more movable objects in library
2014-07-04 19:59:22 -04:00
Marianne Gagnon
41c47e59be
Slightly improve behavior of moving objects in library. A problem still remains
2014-07-04 19:50:46 -04:00