ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,466 Commits 9 Branches 28 Tags 433 MiB
65c0c95490
Commit Graph

10466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hikerstk
c8d066ce37 Fixed compiler warnings. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15033 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 03:02:08 +00:00
vincentlj
468d5458bc Clean color_level shader providers. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15032 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 00:11:31 +00:00
vincentlj
164f1dda11 Use direct gl calls for color_levels. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15031 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 00:04:53 +00:00
vincentlj
6d57947c73 Remove some leftover comments. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15030 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 23:52:13 +00:00
vincentlj
1da42b81a6 Remove PPDisplace provider. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15029 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 23:47:34 +00:00
vincentlj
47d7f4fdd4 Use direct gl calls for ppdisplace. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15028 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 23:43:00 +00:00
vincentlj
98f58d257c Clean bloom shader provider. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15027 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 23:27:31 +00:00
vincentlj
f8e17ecffa Use direct gl calls for BloomBlend too. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15026 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 23:19:28 +00:00
hikerstk
a49d85fa3e Replaced pop_back, which is not available on all compilers (for 
std::string).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15025 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 22:43:45 +00:00
samuncle
1ca7413aed Add better lantern post 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15023 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 21:34:43 +00:00
vincentlj
9968ff1ccf Use custom opengl call for bloom fullscreen shader. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15022 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 21:07:14 +00:00
samuncle
2dea6ded0d Add another track to test the library 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15021 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 20:46:33 +00:00
samuncle
b278f7abd5 Second object to be added in the library :) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15020 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 20:43:06 +00:00
samuncle
7252df884a First generic texture to be used in a track 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15019 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 20:41:33 +00:00
auria
37851c7508 Add absolute position getter to trackobject 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15018 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 20:19:58 +00:00
vincentlj
c5edf82a6c GPUParticles: This should fix boxemitters. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15017 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 19:49:23 +00:00
auria
795ac13c95 Removed unused music 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15016 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 19:10:18 +00:00
vincentlj
e4dd3c9ed6 GPUParticle: Fix sudden amount of particle for boxemitter 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15015 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 18:40:04 +00:00
auria
a32f760d03 clarify music licenses 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15014 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 18:36:36 +00:00
auria
03618a5bc5 Apply slighly modified version of patch from ticket #1121 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15013 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 18:04:00 +00:00
vincentlj
55d085bf6d STKMesh: Now use separate shader for ref/noref object 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15012 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 17:40:39 +00:00
vincentlj
8e7e84c984 STKMesh: Use VAO for faster rendering 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15011 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 17:03:02 +00:00
vincentlj
1e84b57269 STKMesh: Some improvements 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15010 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 16:25:47 +00:00
vincentlj
61003eda91 STKMesh: Some refactorisation work 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15009 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 15:53:41 +00:00
vincentlj
fda86ed45c STKMesh: Rendering in minel is working (except transparent part) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15008 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 15:27:24 +00:00
vincentlj
f6b7fb3853 Fix what looks like type 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15007 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 14:34:34 +00:00
hikerstk
b136e16f7a Preparation to remove network_http (its work will be 
taken over by the reqeust manager).
Initialise news and addons manager in a separate thread
and not from the network_http thread anymore. Icons are
also downloaded now from the request manager instead
of the network_http.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15006 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 11:20:32 +00:00
samuncle
9804cbddeb Better lanterns 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15004 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 02:26:46 +00:00
samuncle
0058097123 Better lantern 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15003 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 02:26:08 +00:00
vincentlj
ebaec55f4d STKMesh: Rendering works...sortof 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15002 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 00:26:18 +00:00
vincentlj
b5a9932169 STKMesh: Forget to add byref modifier 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15001 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-11 23:26:58 +00:00
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
d255f4f049 STKMesh: Some more code to load vertex data, but rendering is still using old path 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14999 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-11 18:12:04 +00:00
vincentlj
2aea7a2624 STKMesh: Add some code that just mimic CMeshNode behavior 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14998 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-10 22:10:21 +00:00
vincentlj
c3a4f7d8ce Use a custom stk mesh 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14997 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-10 21:30:17 +00:00
vincentlj
9b1853ef21 GPUParticles: Remove the unused PointEmitter class. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14996 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-10 21:12:38 +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
0a50518fb9 Remove code loading snow shaders. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14991 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-10 00:59:15 +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
hikerstk
ba1e6465ef Fixed #1146 - removing directories didn't work (listFiles() returns absolute 
paths (now??)).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14988 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 23:07:01 +00:00
hikerstk
0566d785b1 Fix crash when re-trying to delete an addon (that was deleted 
previously, but had an error).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14987 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 23:03:00 +00:00
hikerstk
e2f636153b Fixed crash #1146 ('install' widgets is removed in case 
of an installed icon, so m_install was NULL).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14986 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 22:52:18 +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