Commit Graph

1806 Commits

Author SHA1 Message Date
vincentlj
15dc149799 STKMesh: Rendering implemented although it's a big red shader
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15000 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-11 22:57:48 +00:00
vincentlj
80faf282dc GPUParticles: Fix glsl versions.
Only heightmap sim require version 140.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14995 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-10 17:42:43 +00:00
vincentlj
ba61e2cbe4 GPUParticles: Finish refactorisation.
Heightmap are enabled again for snow.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14994 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-10 17:40:25 +00:00
vincentlj
af81015fcd GPUParticles: Use different shaders to avoid unneeded uniforms.
Heightmap affector is temporarly disabled.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14993 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-10 17:26:57 +00:00
vincentlj
45067e59cf OGL32CTX: Revert to use gl_TextureMatrix[]
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14992 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-10 01:29:32 +00:00
vincentlj
90f701c42d OGL32CTX: Attempt to replace implicitly defined uniforms for objectpass
This breaks animated textures in xr591...

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14990 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-10 00:31:22 +00:00
vincentlj
857f675f35 OGL32CTX: Replace another series of implicit declared uniforms
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14989 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-10 00:30:56 +00:00
vincentlj
9a99c3dae6 OGL32CTX: Replace implicitly defined uniforms in displace
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14985 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 17:32:51 +00:00
vincentlj
75b492b871 OGL32CTX: Replace implicitly declared uniforms in bubble
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14984 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 17:32:38 +00:00
vincentlj
751d09d35f GPUParticles: Remove snow shader as we use another now.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14983 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 17:09:50 +00:00
vincentlj
986f3a6098 OGL32CTX: Remove implicitly defined uniforms in normalmap
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14982 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 17:08:23 +00:00
vincentlj
e6d774a3ac OGL32CTX: Remove implicitly defined uniforms in splatting
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14981 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 17:08:15 +00:00
vincentlj
9ba803140a OGL32CTX: Remove implicitly defined uniforms in grass
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14980 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 17:08:03 +00:00
vincentlj
9d7ab41c11 OGL32CTX: Replace ftransform by gl_ModelViewProjectionMatrix * gl_Vertex.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14979 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 16:09:27 +00:00
vincentlj
99fde5faa4 GPUParticles: Kill snow flake when it hit the ground according to the heightmap.
(Actually we move it outside of the player view)

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14977 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 01:49:06 +00:00
vincentlj
105761151d GPUParticles: Another snow tweak
Slightly more particles, constrained rotation direction, lower speed (vector and rotation)

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14976 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 01:32:17 +00:00
vincentlj
73ba827763 GPUParticles: Tweak snow parameters.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14975 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 01:16:46 +00:00
vincentlj
42c16b32cb OGL32CTX: Replace deprecated "varying" by in/out semantic and make them explicit.
gl_Texcoord[]/gl_Color should be explocitly passed as in/out.
Compilers can pack varyings if the architecture does benefit from it (for instance intel mesa driver) but on the other hand they usually don't change size of varying even if there is only a single component used.
So storing vec2 into vec4 may waste performances.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14974 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 00:17:28 +00:00
vincentlj
2ba340b6cb OGL32CTX: Add vertex shader where default one was assumed.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14973 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-08 23:11:10 +00:00
vincentlj
53e32a9848 GPUParticles: bump shaders version to 140 to enable texture buffer support.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14971 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-08 19:09:04 +00:00
vincentlj
28d02f9622 GPUParticles: Implement particle flip.
Snow quads suffers from folding, I have to investigate and/or ask hiker.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14969 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-08 18:34:57 +00:00
samuncle
ff7a3d01c4 Minor update on the skybox shader
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14966 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-08 08:48:46 +00:00
vincentlj
5b8ca4fcd7 GPUParticles: Implement HeightMapAffector equivalent.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14961 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-07 21:06:06 +00:00
auria
b1c8898b54 Bump track XML version number to 6
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14948 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-07 00:05:40 +00:00
vincentlj
51023ceb81 GPUParticles: Fix adjusted_initial_velocity computation.
Thank to Auria and hiker for their help.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14947 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-07 00:04:43 +00:00
vincentlj
88bb3a8da8 GPUParticles: Add support for increase factor
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14945 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 22:58:04 +00:00
vincentlj
7a95d46448 GPUParticles: Use smoothstep for fade out and remove direction modulation by size.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14944 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 22:35:54 +00:00
vincentlj
841aa05cc0 GPUParticles: Use gl_vertexID to improve particle emission rate handling.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14941 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 18:05:21 +00:00
auria
068eb8ece2 Add ozoneone's new snow song
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14938 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 02:55:37 +00:00
vincentlj
7778a71c0a OGL32CTX: Use correct type in coloredquad.frag
Spotted by arb debug output too.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14927 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 18:54:40 +00:00
vincentlj
aad565a9bf GPUParticles: Use size value so that it doesn't get optimized away
Spotted by arb debug output.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14926 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 18:44:52 +00:00
vincentlj
d28a869444 Fix skybox frag shader
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14920 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 00:08:11 +00:00
vincentlj
fa068d7810 OGL32CTX: Ask #version 130 for all our shaders
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14919 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 00:08:00 +00:00
vincentlj
57d5d658a0 OGL32CTX: Fixes sourcerect in draw2DImage replacement
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14918 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 23:28:59 +00:00
vincentlj
7bb1e671b2 OGL32CTX: Port draw2DRectangle too
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14916 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 22:10:56 +00:00
samuncle
bd69c8c0d7 Add the skybox shader for harvest. For the moment it's still an object in the transparent pass. The object should be in the skybox pass
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14909 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 20:43:18 +00:00
vincentlj
b28044e603 OGL32CTX: Implement a draw2DImage function using shaders.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14903 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 17:12:30 +00:00
vincentlj
96841f5731 GPUParticles: Avoid particle respawning at too old location.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14889 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 17:20:26 +00:00
vincentlj
be93478687 GPUParticles: Fix orientation of reemitted particles.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14875 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 19:13:57 +00:00
vincentlj
a38522da70 GPUParticle: Implement size parameter.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14862 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 01:11:44 +00:00
vincentlj
1d3a33bf8e GPUParticles: Use quad instead of POINT_SPRITE
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14861 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 20:39:00 +00:00
vincentlj
9fbd2b19b1 GPUParticle: Implements generic fade out and rework particles lifetime.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14852 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 17:25:10 +00:00
vincentlj
8670aa86dc GPUParticle: Fix some parameters not used correctly.
Some previous value (like dt) came from debug attempt.
This fixes the particles behind the wheels of the wagon in minel.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14848 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 00:58:42 +00:00
vincentlj
d4b9ccf499 GPUParticles: Particles don't follow their source.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14838 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-30 13:57:55 +00:00
vincentlj
871e2b998b GPUParticles: Implement softness and use maxangle spread
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14832 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 20:36:21 +00:00
vincentlj
636f6412ab GPUParticles: Use some parameters, and texture, to display particles.
Still not enabled.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14831 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 19:24:19 +00:00
vincentlj
a2d1a86bac Lights: Make possible for gpu drivers to unroll loop.
GPU doesn't like indirect addressing and thus it's better to have unrolled loop. This is only possible for loop with a static iteration count.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14830 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 18:37:45 +00:00
vincentlj
4c725ac8f4 GPUParticles: Got PointEmitter to draw something at last.
Still WIP, uses a #ifdef to disable it but I wanted to keep a working commit
somewhere in case I mess up somewhere.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14829 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 18:23:36 +00:00
vincentlj
6d0e6a67b2 PointLight:Fix shader arithmetic type mismatch reported by mesa
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14813 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 17:03:02 +00:00
vincentlj
9826af0747 Rain: Avoid making a draw call that won't be used and make some cleanup
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14811 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 16:37:24 +00:00
vincentlj
053170fc27 Rain: Use transform feedback to decouple simulation from rendering
It's the base for a future gpu based particle system

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14806 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 02:50:25 +00:00
samuncle
cb21815054 Improved the specularity by adding a little offset to the energy
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14805 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 02:41:58 +00:00
samuncle
32a61d770e Allow kart to use specular map
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14803 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 02:06:08 +00:00
vincentlj
30a030bd4c Light: Pseudo sort lights distance using bucket to evict them fast.
Lower max light level to 16 as it proves sufficient.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14801 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 00:34:41 +00:00
vincentlj
4d0b9236b2 Lights: improve bandwidth usage
It should improve performance a lot, but it handles at most 32 simultaneous lights on screen.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14800 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-26 22:55:15 +00:00
vincentlj
4f36e43b14 Fix unexported FragData
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14797 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-26 18:28:35 +00:00
vincentlj
5512a72d62 Lights: Remove hard edge and attenuate specular
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14796 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-26 18:00:54 +00:00
samuncle
067564c7cf A little change to make the SSAO better (IMHO) other opinions are welcome)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14795 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-26 02:55:10 +00:00
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
deveee
8b76971a54 Minor changes in soccer setup gui
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14752 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-22 17:44:09 +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
deveee
1a2d26b894 - Fixed crash when goal is scored after time limit
- Set time max value to 15 - playing one game 45 minutes doesn't have a sense
- Remember time value in user config
- Little beter look of soccer setup
- Set goal-limit mode as default

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14743 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-21 17:04:46 +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
hikerstk
73c498daf3 Start to support 'externa' data directories. Most directories
from data can now be moved out (except music). STK prints
an overview of which directory is taken from where. More 
cleanups and improvements will come.
Also moved skins into a separate directory under data (from
data/skins), since it's likely that skins will be part
of a binary package (i.e. changes to skins not really
related to code), while gui files will more likely stay
with the code.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14731 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-17 23:48:47 +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
auria
b09b879238 typo fix
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14699 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 01:01:24 +00:00
auria
b27a5363bd Fix objects that are unaffected by lights
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14697 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 00:37:07 +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
hikerstk
0076bec269 Converted glow color back fro floating point to integers (upon artists requests).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14691 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 20:02:43 +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
hikerstk
09dc33d07e Moved the glowing data from stk_config.xml to items.xml.
Unfortunately I can't test (since the shaders don't work for me).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14683 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 12:24:26 +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
b0ce591330 Better outline (glow) color for: banana, bubblegum, box and nitro
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14647 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-06 23:18:49 +00:00
deveee
ec13bcf802 Merge branch 'hilnius'
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14638 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-05 17:28:55 +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
hikerstk
d41bbbaa2f Merged uni's branch with trunk. No guarantee that everything works ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14620 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-03 23:02:06 +00:00
hikerstk
bc2432bb57 Merged with trunk, final part.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14608 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 04:43:14 +00:00
hikerstk
63d5961dd0 Merged with trunk, part 3.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14607 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 04:39:40 +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
auria
e5fbd5d1fb First reorganisation of graphics options. Remove old MSAA anti-aliasing, offer only new MLAA. Organise options in more logical groups, improve overall popup layout
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14596 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 19:05:44 +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
hikerstk
ac0b0eb7fb Fixed name of supertuxkart.appdata, added (untested) installation support for that file.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14585 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-28 06:20:36 +00:00
hikerstk
11a0cf4b16 Added 'appdata' file for linux installations (see http://people.freedesktop.org/~hughsient/appdata/
for details).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14584 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-28 06:14:43 +00:00
hikerstk
26744f16d1 Removed minimal race gui.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14583 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-28 06:06:45 +00:00
hikerstk
b1c6ca2865 Updated translations (based on 0.8.1).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14582 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-28 06:02:48 +00:00
hikerstk
7797e1cbc3 Updated Asian fonts.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14574 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-24 21:57:33 +00:00
samuncle
27a3009114 Add credit to the author of the trailer :)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14534 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-23 17:29:26 +00:00
auria
9e7e80eed3 Restore missing OSX files and adjust CMakeList
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14518 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-22 00:27:33 +00:00
deveee
195daa8794 Avoid to run Easter Egg mode as Grand Prix.
I added new files to avoid a mess.
Proposed for 0.8.1

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14504 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-20 18:29:10 +00:00
auria
1c78060772 Fix another non-pot icon
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14489 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-20 00:11:56 +00:00
auria
f8feba2337 new icon by totoplus
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14483 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-19 23:48:30 +00:00
yasin-ghannam
6de5854ef8 Fix Soccer Setup Screen Check box placement.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14473 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-18 02:15:05 +00:00
yasin-ghannam
287ff4c8ee Added time limited-match instead of only goal-limited ones.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14472 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-18 01:58:10 +00:00
hikerstk
4057787955 Updated Asian fonts, see r14461 on 0.8.1.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14462 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-17 10:42:51 +00:00
auria
c3c2de2ce7 Remove very incomplete translations
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14453 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 23:12:22 +00:00
auria
e7091b5e83 update translations
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14452 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 23:08:46 +00:00
hikerstk
4b50173f33 Updated credits.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14440 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 00:27:33 +00:00
deveee
49b5b52621 Revert my last change in .pot file. It is already not needed.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14420 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-13 19:32:53 +00:00
deveee
8cfb3d5d9c Very quick workaround for ticket #1081. Just inform a player that grand prix will be continued. Ideally player should choose if he want to start new GP or continue previously saved.
String "Continue Grand Prix" was translated in previous versions of STK and launchpad should remember it (I hope).

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14418 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-13 08:48:09 +00:00
hikerstk
0dd2c2110d Updated translation (removed some incorrect strings, added
missing strings for video settings).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14413 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-12 00:44:34 +00:00
hikerstk
e98d15ef8b Added easter egg related license info.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14411 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-12 00:16:38 +00:00
auria
289f4b5f7b Restore big digit font XML, which got corrupted somehow??
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14402 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-09 20:57:59 +00:00
hikerstk
86118b92ae Updated and compressed the donation section.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14397 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-08 04:00:11 +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
samuncle
5c5155cce5 Minor credits update with the author of the wallpaper/poster
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14391 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-06 00:07:54 +00:00
samuncle
545f861c05 Minor credits update
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14387 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-05 00:33:56 +00:00
auria
30604e2500 small tweaks, as noted by samuncle the 'art direction' title does not make sense for me to have anymore, that's him now ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14385 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-04 23:12:33 +00:00
funto66
a153eb8c2c Fix some errors in CREDTS (thanks supermat)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14366 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-02 08:02:12 +00:00
funto66
550302488e New XML syntax for the speed-weighted objects: now we can have several speed-weighted objects with different parameter values in a single kart.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14361 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-02 00:20:48 +00:00
auria
7f854b4729 minor tweaks to credits
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14359 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-01 00:42:24 +00:00
funto66
734fef45a9 Added speed-weighted texture animations, as requested by samuncle.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14358 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-31 23:46:36 +00:00
unitraxx
1074bf720e Changed typo in my name.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14357 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-31 22:45:50 +00:00
magned
8dd928ba4d Misc small corrections and additions.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14356 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-31 22:40:45 +00:00
hikerstk
bb329d845a Updated and restructured credits.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14355 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-31 22:05:55 +00:00
deveee
6b9f69d2b2 Fixed typo.
I'm not sure if full update .pot file is needed.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14348 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-30 08:24:51 +00:00
hikerstk
8eaea2b1ba Fixed typo in string, updated pot file.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14347 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-30 02:59:43 +00:00
auria
42cf2c292a Update egg hunt name/description and update .pot file with all latest strings
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14345 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-29 23:59:04 +00:00
hikerstk
c187351efe Added fraang's Easter Egg models. Feedback welcome - egg
or bunny ;)


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14341 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-29 06:22:03 +00:00
hikerstk
07ac18dbe2 Added description for soccer and easter egg mode (I hope to replace
the bunny with easter eggs, so I mentioned eggs there ;)  ).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14339 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-29 01:46:33 +00:00
hikerstk
3d4664bd89 Repository recovery 9: former r14324
Made speed-weighted animations slower. That was part of r14324, but appears
to have been done accidentally. Auria, can you please confirm that you did
this on purpose?


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14321 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 10:08:53 +00:00
hikerstk
71c66d2eff Repository recovery 8: former r14328
Now that the nitro meter no longer features visible marks, adjust back the max nitro amount to what it was before, and restore back the old less easy nitro challenge on XR591


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14320 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 10:03:16 +00:00
hikerstk
d81c138e17 Repository recovery 5: former r14322
Give nolok his pecial green bubblegum shield. Just like regular bubblegum, the visuals will eventually need to be redone


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14317 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 09:53:46 +00:00
hikerstk
71709729b4 Repository recovery 4: former r14321
As suggested by deveee, allow bubblegums in battle mode now that they have defensive abilities.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14316 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 09:49:22 +00:00