Commit Graph

9352 Commits

Author SHA1 Message Date
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
cc07c61bff Larger checkline in jungle track.
This solves ticket #1050.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14132 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-22 19:44:26 +00:00
magned
ac72296fd0 New screenshot for Old Mine.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14131 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-22 18:42:34 +00:00
magned
804be1fb5b Removed old Sara kart model.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14130 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-22 16:27:56 +00:00
deveee
148f08ab8f Correct hat offset for every kart.
There is still problem with konqi, elephant and puffy kart - probably hats are not displayed at all.
I can't change these offsets in blend files. There is no option to write it.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14129 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-22 15:56:30 +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
a39a3e0880 Move Christmas hat model to the center
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14125 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-21 20:53:47 +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
35518d6526 Update ingame documentation for new bubblegum. Update translation files, fixing invalid XML files
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14119 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-21 00:42:01 +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
71bca15228 Fixed ticket #947
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14114 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-20 19:43:58 +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
f5aaeeb14e Make bubblegum shield transparent. Still quite ugly but at least bearable
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14112 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-20 00:52:46 +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
ce1d886994 Add XFCE mouse kart
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14110 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-20 00:22:41 +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
auria
9301bb41d6 Fixed missing padding issue since skin was modified
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13697 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-16 00:16:28 +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
3ef3193a7e Move flying grass to the ground in tutorial
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13672 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-12 21:38:46 +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
25eded2f4d Revert "Disable rain for Lighthouse due to #972. This will only be a temporary issue and should go away once cand's stuff has been merged."
This reverts commit 4c6cf1fc6b9fd18db6bf29f929cfafe21de50d27.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13654 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-09 20:00: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
magned
e3a5c2a889 Disable rain for Lighthouse due to #972. This will only be a temporary issue and should go away once cand's stuff has been merged.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13649 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-09 15:02:50 +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