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

10175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
samuncle
7633db8c03 A majority of normal have been corrected to be SSAO friendly 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14764 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-23 23:48:25 +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
samuncle
d6a532151d Color correction is removed due to vlj's demand. Now we can test safely HDR 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14762 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-23 22:45:15 +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
352009b2ce RTT_COLOR uses float format. 
This allows for hdr, however there is no tone mapping at the moment.
color_level.frag can be currently used for such purpose, it gives a nice look
in harvest, although it is way too bright.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14757 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-23 17:00:42 +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
deveee
bc2eefe1dc Fixed displaying more than 2 karts in soccer setup screen 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14751 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-22 16:14:26 +00:00
samuncle
cc7b5d2229 Some normal are corrected 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14750 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-22 03:32:08 +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
samuncle
3423227e9e I have added a better grass texture 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14747 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-22 01:44:04 +00:00
samuncle
0f9081ef56 Increase the size of the grass 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14746 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-22 01:35:20 +00:00
samuncle
a66096f978 Add a grass texture for harvest 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14745 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-22 01:16:30 +00:00
samuncle
43d919ec6a Reduced the LOD distance of the kart. The player won't notice since he is focused on the race 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14744 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-22 00:08:17 +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
samuncle
52ebb9a300 Little value for the distance of animated kart. You won't notice the difference (expect that the christmas hat isn't displayed with the non animated version 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14742 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-21 14:36:40 +00:00
deveee
49be95b966 Some code cleanup in soccer world 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14741 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-20 21:11:22 +00:00
deveee
ae2a41f2d0 Fixed problem with karts which were assigned to wrong team in soccer mode. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14740 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-20 00:29:37 +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
c450c97472 Allowed the music directory to be external. Renamed 
getMusicFile to searchMusic and getTextureFile to
searchTexture. Removed m_root_dir from file_manager.
Added convenience function getTexture to irr_driver
which takes an asset type, so now less code is needed
to load textures (though that's proably not used
everywhere yet).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14736 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-18 22:29:08 +00:00
deveee
0337ae19e0 Some code cleanup in soccer setup screen 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14735 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-18 19:40:36 +00:00
deveee
b7a80dd686 Wait for animation before continue using mouse - soccer setup screen 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14734 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-18 12:15:53 +00:00
deveee
25d4bf488a Fixed start game with disabled shaders 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14733 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-18 10:09:03 +00:00
auria
6ec9bf1d0f apply egypt song tweaked mixing 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14732 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-18 00:00:16 +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
deveee
248551bcb6 Minor modification in previous commit - play sound only once 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14730 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-17 21:13:27 +00:00
deveee
8947227175 Allow to confirm players using mouse in soccer setup screen 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14729 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-17 21:01:20 +00:00
deveee
79e01c5c56 Hopefully fixed problem with tutorial which sometimes was starting in a loop 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14728 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-17 21:00:56 +00:00
samuncle
7147490b90 Add a light + color corretion (to make tests) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14727 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-17 01:06:27 +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
funto66
c225eb6d32 Remove now useless m4 scripts (we fully switched to CMake) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14725 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-16 23:10:15 +00:00
deveee
0188e90a65 Fixed crash when you start tutorial 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14724 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-16 21:37:20 +00:00
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