Commit Graph

6446 Commits

Author SHA1 Message Date
deveee
130f3f42a9 Don't explode shielded kart which is near other exploded kart.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14210 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-05 20:20:41 +00:00
deveee
535d3c87fb Fixed regression since r12673. Add-ons were sorting from "z" to "a" in default mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14209 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-05 19:15:14 +00:00
deveee
1d918f0bc4 Move default nitro emitter little higher
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14205 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-05 10:22:17 +00:00
deveee
3a73436d3e Nitro and skidding gfx improvements
- skidding effect shouldn't depend on height of the kart
 - workaround for karts which don't have nitro emitters

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14202 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-04 20:08:16 +00:00
deveee
77e7ff57ab Fixed #1005 - add sound when ball hits non-kart object
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14201 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-04 05:16:18 +00:00
deveee
d7d29dd2b8 Fixed #934. Wait before ready phase if sounds are disabled.
Jingle is actually sound rather than music. Before change it was disabled in preferences by both - music and sfx.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14199 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-03 13:49:56 +00:00
auria
fbf1e46e2f tweak fonts to make screens sort of fit at very low resolutions
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14178 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-02 00:56:17 +00:00
deveee
4673c41987 Still work on #886.
- fixed resume sound after that when speed was near to 0 (broken in previous commit)
- pause sound while explosion animation

Tested on bridges in hacienda and snowmountain.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14171 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-29 22:19:48 +00:00
deveee
b1c375528e Partially fixed #886.
There is still an issue when the kart doesn't move. Function isInRest doesn't work well in this case.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14170 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-28 21:53:47 +00:00
hikerstk
3e6b1872e4 Enabled searching in the doxygen documentation (thanks to nixt for
finding that).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14155 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-26 00:56:28 +00:00
magned
78632a8ecf Align Wiimote connect instruction with actual confirm button text, and added link to wiki with detailed instructions (yet to be written).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14154 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-24 22:44:37 +00:00
deveee
dbd36f47dd Little change in previous commit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14152 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-24 18:04:14 +00:00
deveee
ee61e8f52a Fixed displaying time in race gui and race result - soccer mode
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14151 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-24 17:57:13 +00:00
deveee
bc4006cefa Add BAD badges in soccer setup screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14150 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-24 16:54:18 +00:00
deveee
947f1876d2 Add OK badges and sounds
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14149 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-24 16:34:51 +00:00
deveee
2aab049540 Fixed compilation in gcc
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14148 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-24 16:34:31 +00:00
deveee
4edd9176dd Both teams should have at least one kart.
Still to do: user should be informed that he can't choose this team.
Not tested in more than 2 karts.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14146 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-24 11:57:50 +00:00
deveee
0db9da03e5 Restore rotating after player confirmation.
But rotation is done only once to avoid rotating kart in every fire press.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14145 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-24 07:03:07 +00:00
deveee
f7d41cf008 Remember last used number of goals value
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14141 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-23 18:17:32 +00:00
deveee
d5bddb20fa Assign fire key to select in soccer setup screen.
This is done in the same way as in kart selection.
Btw. nixt, update rain in final camera is necessary ;-p

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14140 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-23 14:09:25 +00:00
hikerstk
1b2c340875 Disable Easter egg mode in multiplayer for now (see #1047).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14139 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-23 07:20:57 +00:00
deveee
fc15d0fd7b Disable highscores in soccer mode. The same as in 3 strikes battle.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14134 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-22 20:36:58 +00:00
deveee
ec02f2990b Arrow position should depend on height of the kart rather than position of the hat.
Not every kart have/should have a hat (puffy?). A lot of add-on karts probably never will have
defined hat offset. Also hats position is now broken a little.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14128 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-22 08:44:42 +00:00
deveee
4c7fdb0ccb Goal text was drawing twice. Leave only global text in race gui.
Also add possibility to translate it. Previously was added only string from soccer_world.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14121 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-21 17:50:12 +00:00
auria
f426a2f31c Simplify bubblegum code, make it play a sound when exploding and leave a bubblegum pudddle on the ground
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14118 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-21 00:24:01 +00:00
deveee
1e6425a1cc Reset clock mode when game is restarted.
This solves problem with missing thunderbird.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14117 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-20 21:38:59 +00:00
deveee
42fd3a2343 Reset position of soccer ball when game is restarted
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14116 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-20 21:25:26 +00:00
deveee
6baf56ca8c Non-master players shouldn't quit the soccer setup screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14113 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-20 07:43:01 +00:00
auria
099bbd27a6 Following (insufficient :P) feedback, tweak nitro minimum usage a bit. More extensive feedback still welcome
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14111 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-20 00:34:29 +00:00
auria
838fa746a7 Add zoom-in effect on attachements. Required for bubble gum, but looks actually qutie good on others too
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14108 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-20 00:09:06 +00:00
auria
001da20f42 Fix audio master volume bug
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14107 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-19 23:46:51 +00:00
deveee
8eac1d5971 Fixed small bug in previous commit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14106 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-19 19:11:36 +00:00
deveee
8704ea70e0 Allow push buttons using keyboard/gamepad in soccer setup screen.
Also disable up and down arrow for non-master players.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14105 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-19 18:03:06 +00:00
deveee
d25c692cb4 Tabs into spaces
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13702 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-16 19:41:13 +00:00
deveee
c192a431fa Size and position of team icon in race gui is the same in different resolutions
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13701 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-16 19:37:24 +00:00
deveee
82590c791d In soccer mode the same end camera as in 3 strikes battle
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13699 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-16 17:37:07 +00:00
deveee
829656d1d7 Move getting team icons to avoid getting it in every refresh.
I'm not sure where it should be to keep order.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13698 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-16 10:15:29 +00:00
deveee
d4a224cd4e Place team icon in the same position as kart icon in soccer mode result race.
Visually now everything looks good for me :-P

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13695 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-15 20:09:21 +00:00
deveee
402799a460 Draw team icon in race result
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13691 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-15 13:34:23 +00:00
deveee
ecc27f9d03 First version of race result gui in soccer mode
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13682 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-14 19:20:08 +00:00
deveee
d0be1fc0a2 Convert tabs to spaces
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13681 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-14 19:19:40 +00:00
deveee
07a3c4f3d5 Minor changes in soccer mode
- scoring points correctly
 - goal text only on the center of screen, not everywhere
 - soccer mode enabled only in multiplayer
 - disable rotating after player confirmation - should look the same as in kart selection
 - restore master-player-only after back to race setup

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13680 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-14 12:08:22 +00:00
hikerstk
bf11fb4076 Updates VS 2010 project files.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13674 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-12 23:38:44 +00:00
deveee
c4f85ccbdb Tutorial cannot be played in reverse mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13661 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-11 13:08:54 +00:00
deveee
fa70318e11 Update rain also in debug and finish camera.
Now everything should work properly.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13660 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-11 07:52:24 +00:00
deveee
a38d0f57bf Update rain while explosion animation.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13655 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-09 20:37:24 +00:00
deveee
17a0b1848d Move updating rain below positionCamera(). It solves the problem with diseppearing rain - ticket #972
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13653 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-09 19:59:13 +00:00
deveee
8d89f84a04 Fixes #923 and hopefully doesn't break anything other.
Distance cannot be equal to 0.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13647 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-08 09:57:29 +00:00
hikerstk
af62f273d9 Fixed VS compilation (why, since we have cmake? Don't ask ... long story).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13638 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-06 13:57:15 +00:00
hikerstk
5efb8a0828 Fixed windows compilation.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13636 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-06 10:59:07 +00:00