samuncle
122567f0d3
Increase the max distance of the displacement effect
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14793 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-26 01:01:12 +00:00
vincentlj
c2b18a0a1c
Light: Export the correct value for specmap in grass/splatting shaders
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14789 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-25 20:48:27 +00:00
vincentlj
3a6e75b656
Light: Fix skybox bug with specmap and update grass/splatting shader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14788 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-25 20:40:14 +00:00
vincentlj
ec3fd4fa13
Light: Support for specularmap
...
The specular map is embedded in the alpha component of texture.
Alpha value of 1. means no specular, alpha of 0. means 100% specular.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14786 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-25 20:19:18 +00:00
vincentlj
c9b8734717
Plug-in energy parameter into pointlight shader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14779 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 23:07:42 +00:00
vincentlj
65b32757f3
Separate Diffuse and Specular components
...
This allows to bypass alpha test, and have colored specular lights.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14777 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 20:51:53 +00:00
vincentlj
5f23483bd9
Fix some shaders not building with mesa
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14775 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 02:47:33 +00:00
vincentlj
7f51c9737b
Test commit, to be reverted
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14770 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 01:59:35 +00:00
vincentlj
88ac0ba6cf
Attempt to mimic blender light behavior.
...
The attenuation assumes a power distributed on the whole sphere surface.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14769 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 01:44:40 +00:00
vincentlj
bd52770ceb
SSAO: Avoid sampling outside of RTT_NORMAL_AND_DEPTH textures.
...
It should remove artifact at the edge of the screen.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14767 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 00:37:58 +00:00
vincentlj
49131c68af
Rain: Fade instead of intersecting geometry
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14765 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 00:33:57 +00:00
vincentlj
f17f8b62cb
SSAO: Use the correct distance for range checking
...
It should remove halo around kart heads.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14763 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 23:25:14 +00:00
vincentlj
3fc63a9f27
SSAO:Ensure sampled point are inside the unit sphere.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14760 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 20:25:58 +00:00
vincentlj
a3cc62a985
SSAO: Use a costheta factor to ease transition
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14759 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 20:02:11 +00:00
vincentlj
a9db4c7c3f
Generate random value for SSAO sampling
...
It should improve SSAO at least with grass.
However this make the algorithm even more sensitive to bad normals.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14758 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 18:14:02 +00:00
vincentlj
34d83859cd
Add support for specular light
...
Note that specular light is applied unconditionnaly, thus every object will shine.
TODO : Specular map should be defined using texture or a material flag.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14756 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 17:00:34 +00:00
vincentlj
5db6705889
Move SSAO code into renderLight in order to use a lighter rtt (8 bits instead of 32)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14755 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 17:00:27 +00:00
vincentlj
45db87de8a
Merge normals and depth RTT into a single one
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14754 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 16:59:55 +00:00
vincentlj
07abdebbfa
Add range check for ssao + fix for nvidia
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14748 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-22 03:03:07 +00:00
auria
c6fd5cde1c
Apply patch by vlj to improve rendering, thanks a lot!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14739 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-20 00:11:57 +00:00
samuncle
73f9779324
Animated texture corrected. Thanks to vlj :)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14738 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-19 23:58:26 +00:00
auria
118705f19a
Apply patch by Vlj to put normals in eyespace coordinates and reenable normal mapping, thanks!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14737 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-19 00:13:17 +00:00
funto66
2c1853e54d
Remove some more useless autotools files
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14726 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-16 23:21:37 +00:00
samuncle
08f211129b
Now the sunlight doesn't kill point light. Thanks to Vlj for the correction
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14722 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-16 18:33:00 +00:00
auria
e9e3a8afff
remove seemingly useless if in shader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14711 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 23:46:40 +00:00
auria
1fb46ca162
Reduce intensity of glowing objects like giftboxes
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14702 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 01:16:40 +00:00
samuncle
14432a8689
Now the grass shader can be used with the new pipeline.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14695 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-10 01:58:22 +00:00
nixt
5113dc3337
SVN messed up data/shaders in my branch. 76 files in local copy, 21 on SF. Re-adding folder to branch.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14686 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 13:11:09 +00:00
auria
31c29c7a92
Fix visible line in front of kart in SSAO
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14675 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 00:39:07 +00:00
auria
db0a3d37a2
Undo samuncle's commit that added specular lights, but in a way that would only work on nvidia gpus
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14666 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-08 20:19:46 +00:00
samuncle
7f214d4458
Restore flip shader and put the color correction in a dedicated shader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14632 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 14:24:02 +00:00
samuncle
0a1431aed5
Corrected a bug on intel driver
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14604 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 23:46:12 +00:00
samuncle
9fdfb27a67
Add color correction
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14603 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 22:48:12 +00:00
samuncle
77db3a2a6e
A basic test (TODO, if this is accepted I should make a new shader for only this effect
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14601 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 21:52:07 +00:00
samuncle
063ea38cc6
A new bias (it works better with harvest
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14594 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 17:47:30 +00:00
auria
8cf0030a27
Apply patch to fix OSX compilation
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14591 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 16:51:08 +00:00
auria
5899a26aad
Merge cand's graphical improvements branch!! There are many known issues folks, so don't cry victory just now, this is just the beginning. Especially, shadows do not work correctly at this time
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14590 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-30 21:33:06 +00:00
samuncle
bc0724935e
Add copyright header to each shader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14395 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-06 23:17:18 +00:00
curaga
c96bd8d64e
Make gum_shield.frag compile
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13550 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 15:44:56 +00:00
samuncle
d58e16c338
A basic shader for the bubble gum shield effect
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13445 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-08 03:59:15 +00:00
curaga
57e692c61c
lightbeam: Remove unused uniform, add some spacing
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13381 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-29 14:41:13 +00:00
curaga
b4cd5e4ec9
Fix the lightbeam shader's inconsistent style
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13380 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-29 14:40:42 +00:00
samuncle
bb64fec5d0
A new shader to make beautifull lightbeams
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13073 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 02:32:11 +00:00
curaga
2d50b47f56
Shader space cleanup
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12881 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-18 14:35:29 +00:00
curaga
a45bf5092f
Make skinning.vert valid 1.10 code so the checker can run to completion
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12880 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-18 14:34:59 +00:00
curaga
75e1c8bc69
Add an offline syntax checker for shaders
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12815 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 19:21:12 +00:00
auria
b7680d7177
Fix small fog bug
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12769 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-16 00:49:51 +00:00
auria
0735e70f47
Remove Y changes from grass shader, that was intended
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12740 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-12 01:14:08 +00:00
auria
3b20637b48
Make grass speed and amplitude configurable
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12735 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-12 00:14:53 +00:00
auria
3eb6c034d0
Add grass shader for samuncle
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12730 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-11 23:09:03 +00:00
auria
734b9707bc
Fix motion blur on some picky GPUs
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12571 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-21 00:02:07 +00:00
auria
98d8ef74ac
Simplify shader, removing the need to make a fallback mesh
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12565 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-18 00:21:28 +00:00
hikerstk
5445cec7ba
Enabled motion blur shader in split screen multiplayer.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12552 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-14 21:04:48 +00:00
auria
4b9d02cc25
Allow combining lightmaps and normal maps
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11428 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-07-22 21:30:47 +00:00
auria
157081edf2
Add fog support to water shader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11184 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-04 01:33:13 +00:00
auria
5ae58258df
Add specular highlights to the trophy shader. Something is not 100% right since the highlights move around, nonetheless the effect is reaosnably good
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10860 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-16 02:44:02 +00:00
auria
c6a2cecc05
Add my own sphere mapping shader, since irrlicht's one is buggy when the model moves around. Bonus, mine uses pixel shading instead of vertex shading, which makes the shadows much smoother
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10859 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-16 02:25:52 +00:00
auria
71118f24cf
Add water shader for the overworld. Feedback ewlcome
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10743 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-29 16:39:30 +00:00
auria
1d12c3c9aa
Improve water shaders a bit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10741 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-29 03:11:48 +00:00
auria
f33cbb8dc0
Add WIP water shader. Not yet used because not satisfying
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10740 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-29 02:55:52 +00:00
auria
b57ea6a182
Slightly improve normal map shader. It's less physically realistic than before but IMO looks better
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10739 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-29 01:10:57 +00:00
auria
d6221dae92
Use new normal map shader for overworld columns. Remove 2-UV-layer normal map feature, irrlicht just doesn't support it
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10675 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-15 21:52:07 +00:00
auria
93a7099cf9
Minor tweaks to normal maps
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10672 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-15 20:33:18 +00:00
auria
df0232456d
Add new fixed normal map shader, thanks to Fabien Sanglard\! (Only for single-UV-mapping atm, i.e. applies to minigolf balls but not overworld columns)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10669 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-15 16:37:15 +00:00
auria
c29c91da21
Make bubble force fields fade in softly insetad of just popping up
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10638 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-10 23:40:14 +00:00
auria
f23f537620
Update overworld with 'force fields' to guard the entrance to challenges as discussed. I <3 my new shader\!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10491 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-26 16:46:29 +00:00
auria
733bc63dff
Add support for using a second UV layer for normal maps
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10486 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-22 23:05:13 +00:00
auria
fd49ecb3d6
Add support for vertex colors in splattig shader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10455 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-20 16:58:12 +00:00
auria
5c52a4e855
Attempt fix in splatting shader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10454 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-20 01:47:40 +00:00
auria
683b0e1903
Improve Lambert shading in splatting : actually use the sun direction
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10438 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-18 02:39:05 +00:00
auria
1ce4443ed8
Add lambert lighting to the splatting shader to make it look less flat
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10435 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-18 00:48:35 +00:00
auria
3e440fd88d
Improve how normal maps work on movimng objects
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10312 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-03 20:09:08 +00:00
auria
8799b3ca3b
Improve splatting
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10283 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-11-30 19:34:37 +00:00
auria
47d0e01f12
Add initial splatting support
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10282 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-11-30 16:56:04 +00:00
auria
35aa87674d
Add code to make normal maps work. Joerg: don't worry about this change being done near a release, we have no track atm using this feature, so this code will remain sleeping until, probably, 0.8
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10070 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-11-01 01:52:10 +00:00
hikerstk
d4317a0839
Updated autotools building, including distributing of the directories
...
tools; data/shaders; data/tutorials; and other missing files.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9772 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-06 06:09:27 +00:00
funto66
242549efae
Second attempt to fix the motion blur shader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9352 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-25 21:20:17 +00:00
funto66
ac836ee960
Attempt to fix compilation of the motion blur shader for Intel cards...
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9351 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-25 21:14:10 +00:00
funto66
1a0c45be42
Integrated the motion blur in game and adjusted the parameters
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9349 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-25 20:35:44 +00:00
funto66
1079391fd1
Started implementing post-processing
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9311 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-20 23:50:25 +00:00
funto66
d26b406780
Starting the merge with the swatter branch. Now it should be automatic with karts, but doesn't work with items (yet).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9275 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-15 23:38:40 +00:00