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

10137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
samuncle
ed3472efd3 Add lights to test the light prepass system 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14723 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-16 19:04:20 +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
deveee
5c58d07278 Avoid code duplication in debug.cpp file 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14721 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-13 10:34:58 +00:00
deveee
3ba8f1bd38 Add parachute to debug menu 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14720 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-13 09:06:54 +00:00
deveee
052b7eb07f Add powerups for all local players in debug mode. 
Often I need to check something in multiplayer mode - for example bubblegum shield.
Why F1, F2, F3 etc. was removed? ;-(

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14719 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-12 17:51:14 +00:00
hikerstk
55cd9dd09a Made 'min_speed' available for zipper only, re-exported spaceship track. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14716 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-12 05:37:15 +00:00
auria
c10ed78570 remove problematic code that crashes for some people only, will figure that out later 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14715 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-12 01:10:28 +00:00
samuncle
017b49daed Just a quick 'n' dirty fix to have an idea how new texture migh look in the new pipeline 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14714 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-12 01:04:22 +00:00
auria
ae337751de Remove cand's water-wave node for now and revert back to irrlicht's for the moment. The problem with cand's is that it ignores all our material flags, which is not acceptable 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14713 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-12 00:50:27 +00:00
auria
22d6dd56ea Undo change that would limit STK to 35 FPS 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14712 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-12 00:39:19 +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
hikerstk
bce4a075ba Added support for a texture specific minimum speed. This fixes issues with 
AI karts (esp. EndController) not being able to do long jumps. Added setting
for minimum speed to Enterprise track (EndController were not able to finish
the jump on the ramp).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14710 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-11 22:12:14 +00:00
samuncle
1a776381d5 Correction of the ssao vs fog bug (thanks to vlj). Minor tweaks for fps display and debug menu 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14709 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-11 22:11:32 +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
d18068f2f4 Remove forgotten debug log 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14701 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-11 01:03:59 +00:00
auria
afe826a814 Fix disabling lights on additive materials; fix disabling fog 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14700 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-11 01:02:20 +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
aa848f0afd small fixes to material 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14698 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-11 00:40:51 +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
08299c6e58 Minor correction to use correct blending 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14696 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-10 02:01:18 +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
samuncle
7e8159ccd6 Now the grass shader can be used with the new pipeline. Todo make a basic ubershader 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14694 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-10 01:57:20 +00:00
auria
95ffca1bf0 Remove alpha to coverage 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14693 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 23:38:53 +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
samuncle
f2df11e5a0 Now there the FPS display has a background so it's more readable 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14688 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 14:07:42 +00:00
nixt
ef792f3d01 Revert r14686: Accidentally applied to trunk. When did I get trunk privileges? 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14687 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 14:07:28 +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
deveee
375b1a1f06 Revert r14655. It is already fixed in r14660 and redeclaration breaks compilation. 
Tested on VC2010 - it compiles and runs.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14682 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 09:50:37 +00:00
hikerstk
3af325d672 Fixed VS 2012 compilation. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14681 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 03:15:50 +00:00
samuncle
fe2c682ed1 Use the color violet for displaying FPS. Everything related to debug/etc should be in violet 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14680 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 02:59:29 +00:00
samuncle
4c1dd1ada4 Minor tweak to change the background of the debug menu 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14679 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 02:28:11 +00:00
auria
aebd8d2996 Minor tweaks 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14678 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 02:15:54 +00:00
auria
0383a9ec55 more debug menu love 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14677 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 02:03:16 +00:00
auria
55018ee089 Extend funto's debug menu 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14676 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 01:51:03 +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
funto66
39046749d2 Add a debug menu + option to reload shaders (memory leak, yeah, but it's just for debugging) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14674 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 00:09:35 +00:00
auria
9a2b4cc3ab Further modularisation of rendering 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14672 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-08 21:27:56 +00:00
hikerstk
5cf8c7bf77 Languages are now sorted alphabetically. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14670 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-08 20:47:49 +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
auria
f96a647a9c Modularize the rendering a little (I am aware this results in a very small loss of performance, but given the large amount of virtual method calls we make every frame, should be pretty insignificant, and will make the rendering much easier to follow). Fix VS 2013 support issues. Improve material to reject mutually exclusive settings that result in render bugs. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14665 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-08 20:06:44 +00:00
auria
7bb321a108 fix vs2013 compilation 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14664 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-08 17:19:04 +00:00
auria
668e8dc719 Apply supermat patch to remove a couple leftover hit messages, thanks 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14663 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-08 17:10:20 +00:00
samuncle
1880cf9492 Palm trees are corrected #1120. It was caused by the flag of the Z-Buffer that was disabled 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14661 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-08 14:04:46 +00:00
funto66
a6d4d423da Fix compilation on VC2010 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14660 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-08 08:10:20 +00:00
samuncle
0f96fe219b Correction of the window bug #1120 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14657 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-08 02:51:38 +00:00
auria
85191ef9b1 Fix compilation on VS < 2013, tested and confirmed to work by nixt 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14655 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-08 02:39:38 +00:00
auria
c6681f05bc Fix crash when adding new device 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14652 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-07 17:02:22 +00:00
auria
b6002111b7 Add new music for minigolf 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14650 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-07 16:53:32 +00:00
auria
b8e42e3fe2 Apply patch tested by SuperMat to fix clang compilation 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14649 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-07 16:23:40 +00:00