Commit Graph

11601 Commits

Author SHA1 Message Date
samuncle
ba3cce6046 Limit the DoF influence 2014-04-24 02:44:34 +02:00
Marianne Gagnon
3f17545541 Use hasShadows flag from Track 2014-04-23 19:19:11 -04:00
Marianne Gagnon
2e53328847 Add debug sliders for vlj 2014-04-23 19:03:23 -04:00
vlj
b939d06be5 Properly add Depth of Field 2014-04-23 22:08:37 +02:00
vlj
22d993dfbe Merge branch 'tonemap'
Conflicts:
	data/shaders/tonemap.frag
2014-04-23 18:20:30 +02:00
vlj
f83eb399fd Revert "Revert "Fix a typo in tonemap.frag""
This reverts commit 812b2afcd8.
2014-04-23 18:19:46 +02:00
vlj
19d2f1f9ac Revert "Revert "Use a less intrusive delta value""
This reverts commit 230076ffcb.
2014-04-23 18:19:00 +02:00
vlj
77795c796f Revert "Revert "Enable tonemap.""
This reverts commit e57339841b.
2014-04-23 18:18:43 +02:00
vlj
fb56a4086f Fix normalmap roughness 2014-04-23 18:09:48 +02:00
Vincent Lejeune
1bb4926ba2 Reorder post processes effects. 2014-04-23 18:09:48 +02:00
Vincent Lejeune
eb0c948e41 Tweak exposure/whiepoint/saturation 2014-04-23 18:09:47 +02:00
hiker
7bab6fdb82 Removed swap file added accidentally. 2014-04-23 14:39:16 +10:00
Vincent Lejeune
96c8180dfc Remove color_in, it's been superseeded
Keep the shader because it will be partly used for dof.
2014-04-22 19:51:36 +02:00
Vincent Lejeune
da15aebcda SSAO: Clamp to 0. 2014-04-22 18:22:39 +02:00
Vincent Lejeune
6f16831d00 Revert "Some color are negative, clamp them in loglum"
This reverts commit 43df357cfb.
2014-04-22 18:18:18 +02:00
hiker
2e3adee1a2 Merge branch 'master' of https://github.com/whichrakesh/stk-code into whichrakesh-master
Fix counting of bananas only for current player. Fixed conflicts.
Conflicts:
	src/achievements/achievement_info.hpp
2014-04-22 17:20:40 +10:00
hiker
469ac9c433 Don't fire a cake if the target kart is invulnerable. Some cosmetic
changes to reduce line length, and added more comments.
2014-04-22 16:53:12 +10:00
hiker
ef341344e7 Merge branch 'skiddingAI' of https://github.com/gupascal/stk-code into gupascal-skiddingAI 2014-04-22 14:29:35 +10:00
hiker
886e7614e2 Fixed -help command line options (which was broken elsewhere before). 2014-04-22 14:24:32 +10:00
hiker
1bff514c27 Merge branch 'master' of https://github.com/leyyin/stk-code into leyyin-master 2014-04-22 14:14:49 +10:00
hiker
c8d679139f Improved documentation. 2014-04-22 14:13:27 +10:00
Vincent Lejeune
17ba0f515c Revert "Use some realist order of magnitude of light"
This reverts commit 2aa6676050.
2014-04-22 02:32:42 +02:00
Vincent Lejeune
b0e56ca2b0 Use some diffent value/equation for tonemap 2014-04-22 02:29:22 +02:00
Marianne Gagnon
5373390fac Load textures for ambient lights separately from skybox textures 2014-04-21 20:25:51 -04:00
Vincent Lejeune
e57339841b Revert "Enable tonemap."
This reverts commit a0e63dea46.
2014-04-22 00:44:58 +02:00
Vincent Lejeune
230076ffcb Revert "Use a less intrusive delta value"
This reverts commit d7e3976ef5.
2014-04-22 00:44:49 +02:00
Vincent Lejeune
812b2afcd8 Revert "Fix a typo in tonemap.frag"
This reverts commit b8d5719a82.
2014-04-22 00:44:39 +02:00
Vincent Lejeune
d4718df127 Revert "Use some realist order of magnitude of light"
This reverts commit 2aa6676050.
2014-04-22 00:44:08 +02:00
Vincent Lejeune
b8d5719a82 Fix a typo in tonemap.frag
Also tweak whitepoint and exposure. They should be manually set by track
somehow.
2014-04-21 22:37:26 +02:00
vlj
2aa6676050 Use some realist order of magnitude of light 2014-04-21 19:40:10 +02:00
vlj
d7e3976ef5 Use a less intrusive delta value 2014-04-21 19:39:39 +02:00
vlj
43df357cfb Some color are negative, clamp them in loglum
I have yet to investigate how the pipeline can produce negative values
somewhere.
2014-04-21 19:29:13 +02:00
vlj
a0e63dea46 Enable tonemap. 2014-04-21 02:33:12 +02:00
vlj
2e1b0ac9f4 Avoid negative value when Yxy->RGB 2014-04-21 02:19:09 +02:00
vlj
8947242de4 Add proper tonemap, although disabled.
It currently generates way too much HDR.
2014-04-21 01:52:44 +02:00
vlj
1d40851600 Fix light shaft 2014-04-21 00:52:18 +02:00
vlj
d0afcce32d Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-04-20 02:56:10 +02:00
vlj
878a639a84 Another ssao tweak. 2014-04-20 02:56:07 +02:00
Marianne Gagnon
f0b61c98d7 No longer create an obsolete irrlicht water node. To be replaced by a better water shader 2014-04-19 20:24:43 -04:00
Marianne Gagnon
8e579d4874 Add UBOs flag to graphics options 2014-04-19 20:23:49 -04:00
vlj
e8b36f2490 Fix for shadow acne in chocolate. 2014-04-20 02:20:09 +02:00
vlj
87248b46f3 Tweak shadows CSM split. 2014-04-20 02:01:29 +02:00
vlj
fde29887f0 Fix roughness in instanced mesh. 2014-04-20 01:24:38 +02:00
Marianne Gagnon
478e904d1c Remove debug logging 2014-04-19 19:15:38 -04:00
vlj
18b2b341e7 Dont stick to integer coordinate for CSM. 2014-04-20 00:24:37 +02:00
vlj
1291d0cc93 Increase shadow fidelity. 2014-04-20 00:21:30 +02:00
vlj
a457b9f423 Shadows: Clean shaders. 2014-04-20 00:04:49 +02:00
vlj
dd3e15b298 Debug: display cascade in shadow debug mode 2014-04-19 23:57:27 +02:00
vlj
5d3d44e400 Avoid an extra blit in bloom. 2014-04-19 23:29:42 +02:00
vlj
ce6397c5e7 Remove an leftover return. 2014-04-19 23:20:40 +02:00