ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,998 Commits 9 Branches 28 Tags
933e27052d7ea3236af4aec67b1380830937963a
Commit Graph

189 Commits

Author SHA1 Message Date
curaga
9f8996727d Test commit, changing a comment 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12796 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-29 21:51:08 +00:00
auria
e74821e053 Still a bit more materials cleanup 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12761 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-14 23:46:52 +00:00
auria
568c96648f More material cleanup, move splatting where it belongs 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12759 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-14 23:04:48 +00:00
auria
9625eb58e3 Move sphere mapping in the GFX dropdown along other effects, no need for it to be a checkbox, especially since it can't be combined with others anyway 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12754 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-13 23:53:22 +00:00
auria
4d6e45ce00 Rework a bit material panel. For some reason, the flag that tells STK to produce a water splash upon collision was placed in a dropdown among a bunch of shaders... Left old settings in place for backwards compatibility for now, some day we can remove them 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12750 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-13 23:21:57 +00:00
hikerstk
6517830538 Fixed crash caused by new grass shaders (SHADER_COUNT was incorrect), 
changed array of pointer to a std::vector to track this kind of
problem earlier. Renamed Shader constants to have a common
prefix to make it easier to see that they are all related.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12741 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-12 12:15:45 +00:00
auria
9a17110f33 Introduce a bit of random in grass 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12739 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-12 01:02:07 +00:00
auria
f1fe3e3428 Fix speed being computer per instance in grass shader 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12738 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-12 00:59:05 +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
87f316fd03 Support combining splatting and lightmaps 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12567 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-03-18 01:08:35 +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
auria
7a81d37f69 Allow vertex colors to be used with lightmaps 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12564 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-03-17 23:06:37 +00:00
auria
051c3d43fe allow transparent water. not used yet 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12544 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-03-10 01:27:45 +00:00
hikerstk
e7f58450e1 Removed remaining hardcoded shader directories. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12537 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-03-01 05:42:38 +00:00
auria
27299e6cc6 Better detection of deprecated textures 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12320 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-01-01 19:46:53 +00:00
auria
baeaac3189 Display warning when a track uses a deprecated texture 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12319 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-01-01 19:01:39 +00:00
hikerstk
203ae69ce6 Added support in MaxSpeed for an additional engine force 
to work while a speed increase is active. This simplifies
existing code (for slipstream, nitro). Additional engine
force is also added for skidding, which should make 
skidding more worthwhile (since usually adjusting the
heading when stop skidding will use up the actual bonus
speed).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11450 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-07-29 23:46:16 +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
aa2f831ca0 Remove ugly shader hacks that are no more needed (and now even harmful) with latest irrlicht svn. You will need to update irrlicht 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11408 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-07-20 02:01:10 +00:00
wardje
4c3e6d864d Fix #373 + small bug introduced by r11160 
* Make sound work when driving back by taking absolute value of
   the speed.
 * r11160 made the sound not restart at all when coming to a halt and
   then speeding up again on materials (eg bridge in Coyote Canyon).
   Fix this by instead of stopping the sound, pausing it and allowing
   restarting only if the material sound was paused. Don't allow when
   stopped to take into account that music can be in stopped state
   when it's non-looping and it had been played once already.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11271 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-06-02 21:28:32 +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
b15d9356d8 Attempt to fix case where driving on water is possible 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11174 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-04-29 13:19:41 +00:00
auria
1b85ced4f9 Allow remembering Window position. Useful for multi-monitor setups. Only works for Windows at this time I'm afraid - although the code for Linux is mostly there 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11046 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-03-29 01:04:07 +00:00
hikerstk
ebbc1a71d8 Introduced an 'abstract kart' class, which is used to 
de-couple kart implementation and its interface. This
significantly reduces compile time when changing kart.hpp,
but is at this stage still work in progress.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10997 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-03-19 20:21:11 +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
6dcc313611 Make water speed customizable 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10791 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-02-02 16:37:30 +00:00
auria
e346b44ba1 Silence many of the annoying warnings that are printed when loading the overworld 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10757 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-01-30 00:54:13 +00:00
auria
691319efd3 Only use water shader when driver supports GLSL and shaders are enabled in preferences 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10744 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-01-29 16:40:35 +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
652e3180f0 Added needed code for shader 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10742 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-01-29 03:13:12 +00:00
hikerstk
f25cda4aa2 Update STK to compile with latest irrlicht (irrlicht r4047 
fixed a typo in a function name, so now you need r4047 or later
for STK to compiler!).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10710 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-01-24 03:24:09 +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
1b8c1d8088 Just increasing my commit count, nothing to see folks 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10639 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-01-10 23:41:08 +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
513b021a6c Add 'push back on collision' effect 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10623 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-01-09 02:30:49 +00:00
auria
3b0a88ae30 Update overworld : challenge orbs now contain the screenshot of the actual challenge they lead to 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10502 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-12-27 21:59:11 +00:00
auria
c45e9be77d Make level of anisotropic configurable, plus default to x8 (previously, was using maximum available which could use a lot more video memory with no need since above x8 the improvement is minor). Also remove some debug code that is no more used. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10499 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-12-27 19:49:03 +00:00
auria
41ab5979fa Support alpha-blended sphere mapping 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10496 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-12-26 21:17:36 +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
5c7d45576e Minor 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10490 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-12-26 01:46:57 +00:00
auria
9bb6dc84dd Minor overworld update, add switch to disable pixel shaders, fix custom settings to not be accessible in in-game menu 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10489 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-12-25 20:22:37 +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
5322baa0f4 Add a fallback for when splatting is not available in overworld 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10468 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-12-21 21:19:04 +00:00
auria
f398e8744b Refine detection of splatting support 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10464 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-12-21 20:32:20 +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
92eb0ebd2a Ran a small bash script to remove all of those annoying strings. The only thing they gave us were the need to rebuild after committing 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10363 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-12-06 18:43:36 +00:00