Commit Graph

7098 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
samuncle
627004a536 Add glow support for banana and bubblegum
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14648 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-06 23:19:43 +00:00
hikerstk
723c4683ce Fixed STK hanging on exit (at least in one case ;) ).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14645 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-06 13:13:16 +00:00
hikerstk
f7cf407208 Deallocated http manager earlier (in case that it is using a command
which needs any of the objects that have been deleted while cleaning up).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14644 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-06 13:12:45 +00:00
hikerstk
94abdc5b05 Improved work around for graphics cards that do not allow stencil for FBOs
(like Intel hd3000). If a FBO with stencil can not be allocated, disable
stencil, and switch off pixel shaders.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14643 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-06 12:05:21 +00:00
hikerstk
ee2cea0aca Removed abbreviated language names from language selection widget.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14642 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-06 11:57:14 +00:00
hikerstk
86b1b67c61 Fixed windows compilation (missing lib), and some compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14641 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-06 03:54:31 +00:00
hikerstk
b074dc5f09 Moved all VS specific math code (i.e. for round(), isnan) into vs.hpp
and used it everywhere (I hope).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14640 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-06 03:49:55 +00:00
deveee
33525285d7 Fixed compilation problem
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14639 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-05 17:30:44 +00:00
deveee
ec13bcf802 Merge branch 'hilnius'
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14638 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-05 17:28:55 +00:00
deveee
33e09e8f59 Solved conflicts before merge hilnius branch
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14637 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-05 17:28:04 +00:00
deveee
bc46c305f3 Solved conflicts before merge hilnius branch
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14636 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-05 17:27:23 +00:00
samuncle
5b5fd87a8b Add two per track parameter for color correction
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14633 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 16:33:14 +00:00
samuncle
6b0962f876 Add the callback for the color correction shader
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14631 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 14:21:27 +00:00
auria
85bfec00a0 Correct VS compilation (VS 2013 is 18, not 17)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14629 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 01:54:54 +00:00
hikerstk
8032fdb3b0 Converted line endings consistently to unix.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14628 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 01:46:55 +00:00
auria
a358c4d8ee Change risky cast into dynamic_cast, fixing crash
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14627 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 01:38:29 +00:00
hikerstk
46bb243955 Added constant 'stencil' to make it easier to disable stencils for people
with cards that don't support it (like apparently hd3000).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14626 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 00:46:34 +00:00
auria
68820bb325 VS 2013 fixes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14625 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 00:36:44 +00:00
hikerstk
7c2e48e2c6 Fixed VS compilation (MAX_PRIORITY is a #define somewhere), and while
it can probably be disabled, it's just annoying to search the reason for
a rather incomprehensible error message all over again.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14622 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-03 23:54:11 +00:00
hikerstk
697a7cf111 Oops - forgot files in previous commit.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14621 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-03 23:11:29 +00:00
hikerstk
d41bbbaa2f Merged uni's branch with trunk. No guarantee that everything works ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14620 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-03 23:02:06 +00:00
funto66
3b6aab44b5 Fix compilation with Visual Studio 2010
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14619 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-03 22:38:49 +00:00
auria
faa7fd7ca5 fix typo that broke SSAO
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14611 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 23:22:03 +00:00
hikerstk
bced8cdb9f Merged with trunk, part 1 (due to previous failures I am splitting this
patch).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14605 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 04:27:55 +00:00
hikerstk
ad0fd41d52 Fixed compiler warnings on VS.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14602 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 22:16:43 +00:00
auria
eaef91fc4b Fix multiple crashes when new pipeline is turned off
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14598 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 19:42:14 +00:00
auria
f383440d7f More post-graphics-merge tweaks
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14597 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 19:18:14 +00:00
auria
e5fbd5d1fb First reorganisation of graphics options. Remove old MSAA anti-aliasing, offer only new MLAA. Organise options in more logical groups, improve overall popup layout
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14596 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 19:05:44 +00:00
auria
d1b8bc6073 Apply modified version of patch to remove remaining hit messages
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14593 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 17:23:48 +00:00
auria
8cf0030a27 Apply patch to fix OSX compilation
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14591 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 16:51:08 +00:00
auria
5899a26aad Merge cand's graphical improvements branch!! There are many known issues folks, so don't cry victory just now, this is just the beginning. Especially, shadows do not work correctly at this time
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14590 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-30 21:33:06 +00:00
funto66
3a659d45dd Add basic crash reporting functionality on Windows
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14586 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-29 22:33:11 +00:00
hikerstk
26744f16d1 Removed minimal race gui.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14583 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-28 06:06:45 +00:00
hikerstk
05607e862e Goodbye hit messages (note: I had to rebuild from scratch
to avoid some strange crashes).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14581 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-27 21:43:34 +00:00
hikerstk
87cc616a6c Fixed orientation of final 4 wheels that are added to an arena
in battle mode (plus some minor code cleanup).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14578 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-25 11:27:59 +00:00
hikerstk
50c451ac35 Bugfix: forgot to set the actual type.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14577 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-25 09:26:29 +00:00
hikerstk
c136bc2bd0 Fixed #1109 by adding a proper constructor to the Settings class
(which will make sure all fields are initialised).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14576 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-25 06:01:16 +00:00
hikerstk
a1eaada6da Changed default settings for wiimote.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14563 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-24 10:05:49 +00:00
hikerstk
af605462b2 Enabled wiimote-debug output in release builds, changed debug
output to show the now used and derived value.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14555 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-23 22:55:35 +00:00
hikerstk
ea9b7fe05c Removed 'for Windows' from the name.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14516 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-21 22:59:16 +00:00
hikerstk
24f13806b0 Disabled hardcoded setting of difficulty to hard when using profile
(difficulty can be set with --mode, this way every difficulty can be tested).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14514 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-21 10:21:49 +00:00
hikerstk
a97430c882 'Better' fix for incorrect time in easter egg mode - thanks to
Devee for diagnosing the problem!


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14512 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-21 01:50:46 +00:00
auria
5ab8b2b563 Fix crash on empty ribbons, required for what's coming next
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14506 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-21 00:14:57 +00:00
hikerstk
5a7fb84267 Fixed incorrect overloaded getTexture function (char * where handled
as bool, not std::string), avoided more crashes on missing textures,
adde better warnings.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14505 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-20 22:37:12 +00:00
deveee
195daa8794 Avoid to run Easter Egg mode as Grand Prix.
I added new files to avoid a mess.
Proposed for 0.8.1

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14504 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-20 18:29:10 +00:00
deveee
8ea98eae71 Display time in race result of Easter Egg mode properly.
It was broken since Easter Egg starts as linear world. My proposition is to include it to 0.8.1 branch.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14494 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-20 14:43:17 +00:00
hikerstk
e6660d7c74 Improved warning messages: most warnings about textures not
found will now be prefixed with a line indicating what kart
or track it comes from. Fixed crash in referee when a texture
did not exist. Irrlicht's warnings about missing textures
while loading a mesh will be prefixed by a line about which
kart/track is missing as well.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14491 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-20 10:56:42 +00:00
hikerstk
a17db8d168 1) Fixed #1103 (installer does not remove shortcuts) by running installer as
admin which apparently is default in win7), and then setting SetSHellVarContext All
   to tell the installer that the shortcuts are in AllUser.
2) Moved images out of supertuxkart directory (otherwise the images will be installed
   with STK), added missing image.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14480 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-19 09:55:50 +00:00
hikerstk
4b057e320b Removed old and outdated build support for VS and XCode.
CMake must be used now.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14479 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-19 01:12:46 +00:00
auria
685589a19c Silence warnings that could occur when sound is disabled
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14476 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-19 01:09:19 +00:00
auria
fc37766a6f fix harmless spinner warning
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14474 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-19 01:02:36 +00:00
yasin-ghannam
287ff4c8ee Added time limited-match instead of only goal-limited ones.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14472 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-18 01:58:10 +00:00
hikerstk
096c883552 Added new installer (which includes some commented out sections
which can be used to customise text), and new logo.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14471 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-17 23:58:42 +00:00
deveee
75a339b099 Force speed of a kart to be equal to 0 while rescue/explosion animation.
It solves problem with speed-weighted objects. Perhaps also others, for example some sounds depend on speed.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14458 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-16 19:43:42 +00:00
deveee
a6952261e2 Stop sounds on close Grand Prix win screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14456 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-16 18:32:11 +00:00
hikerstk
8247f73604 Replaced tabs with spaces.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14448 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 12:52:39 +00:00
hikerstk
c5b8732087 Probably biggest commit (in terms of number of files) ever -
updated the (c) line of all files to -2013, added missing (c), 
changed format in some cases so that it will be easier in
the future to change them by script. No actualy code change.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14447 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 11:43:21 +00:00
hikerstk
5d7650c418 Reverted r14410 - the proper finding of textures when loading models
is implemented, and has worked properly in the last years. This patch
will unlikely fix the issue Funto had (incorrect texture for one kart),
but might have unwanted side effects which are hard to evaluate so short
before a release.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14442 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 00:40:53 +00:00
hikerstk
cce43a6555 Avoid calling guiengine::render if STK is about to be aborted. While
it didn't cause any problems so far, it feels wrong ;)


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14438 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 00:05:35 +00:00
hikerstk
a7315d163b Fixed minor memory leak.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14437 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-14 23:56:37 +00:00
hikerstk
8d98f6939c Fixed minor memory leaks (the track.cpp caused warnings to be
printed by our leack checker).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14436 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-14 23:48:19 +00:00
hikerstk
77d0740b36 Fixed crash on linux (stdout was closed, but leak check would try
to print some output).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14434 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-14 22:20:48 +00:00
deveee
ac2981584e Avoid crash when object doesn't have texture
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14430 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-14 19:53:10 +00:00
deveee
ea2b34c52e Avoid bounce karts from edges in soccer field.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14428 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-14 19:03:35 +00:00
hikerstk
59f2e7ff75 Some code simplification for nitro emitters.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14427 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-14 10:49:02 +00:00
hikerstk
b4832697c2 Added push back to soccer ball, which can be used to push the ball
away from the edge of the soccer field (so prevents the ball from
getting stuck there).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14423 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-13 22:24:53 +00:00
deveee
91d41e37b3 Remove saved GP when it was not continued.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14421 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-13 19:45:33 +00:00
deveee
2127284e94 Now player can choose if he want to start new GP or continue previously saved.
Also change string to "Continue" to avoid problems with translations.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14419 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-13 19:32:11 +00:00
deveee
8cfb3d5d9c Very quick workaround for ticket #1081. Just inform a player that grand prix will be continued. Ideally player should choose if he want to start new GP or continue previously saved.
String "Continue Grand Prix" was translated in previous versions of STK and launchpad should remember it (I hope).

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14418 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-13 08:48:09 +00:00
hikerstk
0438928933 Fixed fullscreen issues (resulting in rtt not working) on intel
graphics card. Strange thing: everybody should have been running
stk in 16 bit colour mode since r12825, and no one noticed??
Now we properly request and set 32 bit mode, and all is working
fine on intel.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14417 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-13 03:33:39 +00:00
hikerstk
caeb87d9a7 Added file missing in previous commit.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14415 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-12 09:35:51 +00:00
hikerstk
a5fd91959c Removed some dead code, added documentation.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14414 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-12 06:12:06 +00:00
hikerstk
e1d3009053 Reduced xmas hat period to end 5th of January.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14412 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-12 00:39:22 +00:00
funto66
53297355f0 Set the B3D_TEXTURE_PATH Irrlicht Scene Manager attribute upon B3D file loading. Hope that this fixes the rare bug where I got Beastie's kart.png texture applied instead of Beagle's kart.png texture.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14410 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-11 23:13:47 +00:00
hikerstk
48ac2fdebf Fixed position of wheels (karts are not flying anymore),
and skid marks (which is mostly a result of wheels actually
touching the ground now).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14409 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-11 21:07:16 +00:00
deveee
e1bc4ef8fe Fixed #1089.
Stop goal sound when the game is terminated or restarted.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14405 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-10 09:53:36 +00:00
auria
79e1dc6efd Reset input at the end of easter egg hunt mode
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14399 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-08 22:12:05 +00:00
deveee
41bc19fa99 Add workaround for tickets #1084 and #1085.
Currently there is no non-linear track where eggs could be hidden. Start track as linear solves problem with position after rescue.
Also add win animation when all eggs are collected.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14398 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-08 21:42:49 +00:00
hikerstk
376d60b8c6 Some refactoring of xmas code. Command line options:
--xmas=1 enables xmas hats anytime, --xmas=2 disables
it completely, and (default) --xmas=0 (default) switches
Xmas mode on between 17. of December and 9th of January.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14396 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-07 11:34:13 +00:00
hikerstk
15c26079f1 Raise karts somewhat when they are leaning (otherwise the
karts will be partially inside of the track). Some dead code
removal.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14394 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-06 06:22:51 +00:00
hikerstk
e024b73553 Avoid potential division by zero (which might cause crashes).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14393 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-06 06:21:32 +00:00
hikerstk
d7319b766f Added new command line option "--camera-wheel-debug" which positions the
camera at wheel level (to better check if wheels are positioned at the right
height).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14392 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-06 06:08:31 +00:00
hikerstk
04d0859f9d Somehwat improved kart and wheel location, so that skid marks appear
'more' under the wheels. At this stage kart will partially go 'into'
the track when turning though :(  WIP, just to get some feedback, 
this patch need to cleaned up!


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14390 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-06 00:03:10 +00:00
auria
b4c698760a Fix "Guest" being untranslated despite appearing in the po file
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14389 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-05 23:21:32 +00:00
auria
55b3077e63 Mark a few missing strings as translatable
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14388 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-05 22:59:33 +00:00
hikerstk
c0783283e0 Fixed VS compilation (without WIN32_LEAN_AND_MEAN
VS defines MAX_PRIORITY as a macro).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14384 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-04 09:58:24 +00:00
hikerstk
0be530faf0 Fixed compiler warnings (and removed some tabs).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14383 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-04 09:56:33 +00:00
auria
96f7be1598 New method WorldWithRank::updateTrack(dt); was used by LinearWorld, but adding it to Overworld was forgotten, causing track objects to not work properly
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14379 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-03 02:28:23 +00:00
auria
bba033b0cc Disable reverse mode in egg hunt, many eggs that are hidden during normal play are very visible in reverse gameplay ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14372 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-02 19:41:31 +00:00
deveee
c58889b088 Revert "Display parachute for a short while when a kart was shielded. Player should be informed that parachute is the reason of removed shield."
This reverts commit 2b7e3d693ebbf67fe586090214d0279ad4bf08d2.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14369 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-02 11:07:05 +00:00
deveee
852512ec0a Display parachute for a short while when a kart was shielded. Player should be informed that parachute is the reason of removed shield.
Solution was suggested in comment to #1038 and is certainly not perfect, but I don't have better idea.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14367 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-02 09:38:59 +00:00
funto66
550302488e New XML syntax for the speed-weighted objects: now we can have several speed-weighted objects with different parameter values in a single kart.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14361 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-02 00:20:48 +00:00
funto66
734fef45a9 Added speed-weighted texture animations, as requested by samuncle.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14358 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-31 23:46:36 +00:00
auria
077615f309 Disable z buffer writes on shadows, can only help. Does not fix skidlines being behind wheels, however
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14354 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-30 23:15:57 +00:00
hikerstk
44f49b19b7 Removed debug option to always show skid marks.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14353 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-30 22:54:46 +00:00
hikerstk
90ca7db0c2 Made skidlines appear to where the graphical wheels are (still not
100% correct).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14352 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-30 22:09:48 +00:00
deveee
4c88999317 Release skidding key when kart was stopped, on rescue animation etc.
Also avoid reset skidding in every frame when speed is equal to 0.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14351 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-30 18:57:24 +00:00
deveee
6b9f69d2b2 Fixed typo.
I'm not sure if full update .pot file is needed.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14348 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-30 08:24:51 +00:00
hikerstk
c58b005ba4 Rotate Easter eggs.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14346 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-30 01:07:08 +00:00
auria
42cf2c292a Update egg hunt name/description and update .pot file with all latest strings
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14345 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-29 23:59:04 +00:00
auria
43e9d17eeb Apply safe part of supermat's patch to let STK build on clang on OSX. The part about long GLuint remains to be seen, not too sure what to do about it
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14344 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-29 23:14:51 +00:00
deveee
658b67d4ad Check if a track really has easter egg mode.
Eggs, but more colorful ;)

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14342 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-29 07:38:34 +00:00
auria
6139f6ef77 Improve what happens when you lose FTL. Should now be pretty clear
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14338 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-29 01:20:59 +00:00
auria
0c5eb2b115 Somewhat improve what happens when you lose Follow-The-Leader. Also make it more obvious to players they are in FTL mode, we got some reports of players confused in the FTL challenge
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14337 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-29 00:58:57 +00:00
hikerstk
206cc802e6 Modified instructions for connecting wiimote on windows, added
'OK/cancel' type to MessageDialog (instead of 'Yes/Cancel').


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14333 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 23:10:45 +00:00
hikerstk
3fae9270c2 Avoid concatenating translated strings, and moved comment so that
translators can see where the string is used. 


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14332 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 22:07:01 +00:00
hikerstk
9dc4c7a7e9 Removed tab.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14331 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 22:04:43 +00:00
hikerstk
86ffab7c8c Fixed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14330 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 21:40:19 +00:00
hikerstk
28cea5f3e6 Fixed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14328 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 11:20:54 +00:00
hikerstk
d81c138e17 Repository recovery 5: former r14322
Give nolok his pecial green bubblegum shield. Just like regular bubblegum, the visuals will eventually need to be redone


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14317 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 09:53:46 +00:00
hikerstk
46b19e2e8b Repository recovery 3: former r14320
Ignore all events received during the loading screen. Namely, this means that clicking on the STK window to focus it while it's loading will no longer open story mode.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14315 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 09:47:03 +00:00
hikerstk
02e93b1e52 Repository recovery 2: former r14317
Remove some unecessary logging.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14314 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 09:45:25 +00:00
deveee
345f55d6f0 Fixed bug with removing shield without a reason
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14312 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-27 10:07:09 +00:00
deveee
5824a2e942 Avoid scaling attachment which isn't bubblegum shield
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14311 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-26 13:07:34 +00:00
deveee
6dd109dab0 Smooth rotating when skidding was stopped.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14310 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-26 09:33:41 +00:00
auria
c04396e1c1 Scale bubble gum shield when karts are too large; loosely based uponpatch by deveee
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14309 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-25 22:57:46 +00:00
funto66
ee54d158c2 Speed-weighted objects: negative values for speed-factor and strength-factor lead to the speed and/or the strength of the animation not being affected
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14307 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-25 13:34:18 +00:00
funto66
01f029dad2 Oops - min() which should have been a max()...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14306 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-25 13:07:39 +00:00
hikerstk
00018ebe68 1) Replaced m_wiimote_max with m_wiimote_raw_maw (default
needs to be changed from 90 to 25 for r14301 to work
   properly).
2) Some code cleanup (removed global constant).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14305 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-25 05:25:33 +00:00
hikerstk
b51f500f8f Fixed wiimote steering (steering was dependend on
roll, i.e. tilting the wiimote forward would affect
steering), #990.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14301 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-24 20:55:33 +00:00
hikerstk
effc7049a2 Avoid infinite recursion when a track with looped shortcuts
is loaded.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14300 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-24 06:04:22 +00:00
auria
35d3807904 Add missing includes for some recent compilers
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14299 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-24 00:29:05 +00:00
deveee
b357de50c2 Stop finish sound while exit from race result gui
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14288 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-22 19:05:03 +00:00
funto66
831d27efbc Added "speed-weighted objects" functionality (so that we can have animations whose strength and speed grows with the kart's speed).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14286 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-22 13:44:08 +00:00
hikerstk
401f5caac2 Fixed compiler warnings (forcing int to be true or false or so).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14282 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-21 04:32:05 +00:00