Commit Graph

2162 Commits

Author SHA1 Message Date
hiker
c322c507da Fix shader error (vlj, please check). 2014-07-22 13:28:12 +10:00
Marianne Gagnon
939e5d9fff Rework graphics settings popup to make it clear which options require the advanced pipeline 2014-07-21 19:48:17 -04:00
vlj
4e079b0e14 Fixes shader errors reported by Auria 2014-07-17 02:17:49 +02:00
vlj
23bc1f9344 Remove use of texture2d in rh.frag 2014-07-17 02:11:04 +02:00
vlj
40a7ab0780 Raise one of ssao tolerance value. 2014-07-17 00:12:54 +02:00
hiker
55df48d3e6 PLEASE UPDATE stk-assets! Moved data/models to stk-assets to help with
editor development.
2014-07-15 10:52:57 +10:00
vlj
9230cab9dd Add shadow for instanced grass. 2014-07-15 00:02:17 +02:00
vlj
ffe77e4aa4 Port instanced pass2 shaders to singleton 2014-07-14 23:41:47 +02:00
Vincent Lejeune
62bf54b8f3 Simplify displace handling
Should be faster now
2014-07-14 18:54:40 +02:00
Vincent Lejeune
f2acac7230 Inadverly inverted shadow and shadow_grass.vert 2014-07-13 21:37:12 +02:00
Vincent Lejeune
54b1ce39e4 Add Grass shadows.
For non instancing object.
2014-07-13 21:33:44 +02:00
Vincent Lejeune
7b9fc60f9c Factorise grass material 2014-07-13 18:56:17 +02:00
Vincent Lejeune
55a5185796 Avoid drawing negative color with splatting material. 2014-07-12 21:25:11 +02:00
Vincent Lejeune
d7139920ed Fix position reconstruction formula in ssao 2014-07-12 19:54:52 +02:00
vlj
822c8725dd Remove rimlight material 2014-07-10 01:02:52 +02:00
vlj
481a5bd0d0 Fix bubble shader with glsl < 330. 2014-07-09 17:49:47 +02:00
vlj
4c3db6ca59 Mix texture for displace. 2014-07-09 03:41:08 +02:00
Marianne Gagnon
ed97fca7b3 Ease debugging GPWin/GPLose/FeatureUnlocked scenes 2014-07-08 20:37:39 -04:00
Vincent Lejeune
ac55a70c83 Mimic previous motion blur behavior
Depending on zypper + mask on center.
2014-07-09 02:29:49 +02:00
Vincent Lejeune
aec31b28dd Merge remote-tracking branch 'origin/VAOGatherer' 2014-07-09 02:17:25 +02: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
vlj
6276cafba2 Use global VAO for rendering 2014-07-08 18:31:46 +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
Vincent Lejeune
d961a9a8bc Fix vertex color for object_pass2 2014-07-08 01:35:04 +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
be3882845c Merge branch 'properties' of https://github.com/solistice/stk-code into properties.
Fixed conflict.
Conflicts:
	src/guiengine/widgets/model_view_widget.cpp
2014-07-03 14:17:45 +10:00
vlj
fd5061057d Fix for instanced object with default material. 2014-07-02 22:37:51 +02:00
vlj
d5c91dcfe4 Remove Untextured material. 2014-07-02 22:37:51 +02:00
vlj
475d738d4b Merge remote-tracking branch 'origin/NewRTTMinimap' 2014-07-02 00:24:03 +02:00
Bart Cools
4a13eebc00 Merge branch 'master' into properties 2014-07-01 13:55:10 +02:00
Bart Cools
41a5b5275b properties group node is not really necessary 2014-07-01 13:32:26 +02:00
Bart Cools
0fa6df587f Removed redundant kart configuration 2014-07-01 12:25:02 +02:00
Bart Cools
1bbd294750 Forgot to add documentation to a single node 2014-07-01 10:43:00 +02:00
Bart Cools
a73462759b Moved the default kart-type to <general-kart-defaults> to better catch missing values in the kart-type nodes. Also moved the documentation again to properly fit the fields. 2014-07-01 10:37:00 +02:00
vlj
b861c3fb73 Use fixed attribute location for instanced objects. 2014-06-29 22:19:10 +02:00
vlj
bc7e2cd517 Some cleanups 2014-06-29 16:26:12 +02:00
Vincent Lejeune
8f59d8cac0 Add a weight for vignette. 2014-06-28 00:20:44 +02:00
Bart Cools
109f783fa4 Finally implemented the correct way to parse the data 2014-06-27 23:26:02 +02:00
vlj
bde17a28d5 Fix for GL 3.1 context 2014-06-27 20:58:52 +02:00
Marianne Gagnon
394fb9be9b Merge branch 'master' into NewRTTMinimap 2014-06-26 20:23:02 -04:00
Bart Cools
000fa2cf73 Fixed skill bars to return correct values. Also minor fix in kart properties 2014-06-26 13:43:53 +02:00
Bart Cools
c3e862f40c fix for different kart properties, now based on kart type set in kart.xml 2014-06-26 12:53:17 +02:00
Bart Cools
0fa746c805 Changes to stk_config to make 3 groups of karts, which will default to the medium, and can be set in the kart.xml 2014-06-26 12:09:22 +02:00
vlj
79838bffe3 Add 50% transparency to minimap. 2014-06-26 00:46:55 +02:00
vlj
a93b96d0b1 Use UBO matrixes in displace. 2014-06-25 01:22:03 +02:00
vlj
8e6fba3185 Some fixes 2014-06-24 23:57:29 +02:00
vlj
948c5e8aa2 Use explicit attribute location.
Should help implementing basevertex later, and simplify vao creation a
lot.
2014-06-24 23:17:41 +02:00
vlj
edc38c9933 Use object_pass.vert for transparent objects. 2014-06-24 22:20:01 +02:00
Arthur-D
d4bbb50e0a Fixed accidental and embarrassing error. 2014-06-23 13:28:06 +02:00