Commit Graph

10158 Commits

Author SHA1 Message Date
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
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