Commit Graph

3535 Commits

Author SHA1 Message Date
auria
bbd2ecb4c4 Clarified one method by using a enum type instead of simply 'int'
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4756 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-17 23:35:25 +00:00
auria
d4095bf3be Make a default selection in the arena selection screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4755 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-17 23:32:43 +00:00
auria
4119544ed7 Fixed the code-side confusion of track description vs designer (track exporter needs to be adapted accordingly)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4754 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-17 22:19:47 +00:00
auria
263b94c706 Various fixes to get battle mode working again
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4753 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-17 16:48:12 +00:00
auria
85d077ff1d Don't let the fix for a Windows warning create warnings elsewhere
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4752 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-17 16:38:46 +00:00
hikerstk
7416a2c7b3 Fixed errors in scene.xml file: old/incorrect style 'type="lap"' was used instead
of kind="lap", and the reactivation line did not reset the lap counter checkline.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4751 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-17 12:00:23 +00:00
hikerstk
31e3806fd0 Refactor end of race handling so that more functions are done in a base class only
(esp. code that was previously duplicated in the battle mode and standard race).
There is now time for an end animation, even if the player should finish last
(in which case the previous end camera would not be shown). This mostly in 
preparation for end animations.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4750 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-17 11:59:51 +00:00
hikerstk
b52a2a7e9b Bugfix: if items were switched when a game is restarted, they would
remain switched.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4749 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-17 11:36:44 +00:00
hikerstk
895324adbb Fixed gcc compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4748 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-17 00:08:10 +00:00
hikerstk
8c319e87f9 Bugfix: initialisation of variable was missing, resulting in (randomly)
all items being switched at start of race.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4747 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-16 23:55:12 +00:00
hikerstk
afdd182810 Fixed incorrect paths (hardcoded instead of using appropriate
file_manager functions).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4746 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-16 23:52:04 +00:00
hikerstk
46ed8ff33e Removed unused functions.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4745 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-16 23:50:52 +00:00
auria
c04cebeed7 Make arenas screen work again as well as before (which is not so good, but at least the regression is gone...)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4744 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-16 20:12:23 +00:00
auria
297e6a731c Updated nl translation
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4743 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-16 01:33:03 +00:00
auria
f21830b056 Sorted sounds alphabetically in config file, made swapper sound have lowe rollback so it's heard from far
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4742 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-16 01:21:59 +00:00
auria
b9af327a29 Converted music files to XML
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4741 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-16 01:18:40 +00:00
auria
11b0f5b226 Removed unnecessary includes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4740 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-16 00:49:05 +00:00
auria
02a2d40fb1 Removed unnecessary include and unimplemented method
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4739 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-16 00:44:35 +00:00
auria
929482c802 Removed unnecessary includes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4738 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-16 00:40:32 +00:00
auria
e15c217c5f Converted GPs to XML
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4737 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-16 00:33:41 +00:00
auria
9f0e6a3d83 Removed another debug print that wasn't useful
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4736 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 23:33:15 +00:00
auria
ea4cd3263a Removed a couple debug prints that w ere not useful anymore
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4735 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 23:32:37 +00:00
auria
d2dfb64f9e Renamed font file to not contain spaces, since that seems to confuse autotools on some platforms
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4733 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 22:50:08 +00:00
mbjornstk
0d97bfe2c4 Add string include.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4732 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 22:32:53 +00:00
auria
100883034e Remove unecessary #include (sorry everyone, will cause a full rebuild)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4731 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 21:57:39 +00:00
auria
6c40c061f5 Minor corrections to SFX license
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4730 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 19:19:42 +00:00
auria
5b61a0b23d Deleted directory (SVN requires this to be done in a separate commit...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4729 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 19:18:54 +00:00
auria
93cc5209f7 Converted sound effects file to XML. Along the way, refactored the audio code to be more flexible. before, when a sound changed, you needed to edit the config file of STK, edit the enum in the header, edit the loader in the .cpp... was annoying. Now you only need to edit the config file.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4728 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 19:17:35 +00:00
auria
b167931b9c Minor code style cleanup
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4727 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 16:12:50 +00:00
hikerstk
b28011ede2 If a bubble gum is dropped while items are switched,
immediately switch this item.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4726 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 03:07:19 +00:00
mbjornstk
0827c95c35 Make gum swap with big nitro (instead of small).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4725 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 02:47:05 +00:00
hikerstk
dfa152cd3b Bugfix: if a bubble gum was dropped while items were switched, stk could crash.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4724 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 02:44:39 +00:00
auria
2f1c755596 Added sound effect to using the Swapper powerup
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4723 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 02:37:54 +00:00
auria
965381bc46 Hopefully fixed all holes in lighthouse
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4721 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 02:14:33 +00:00
auria
fcda7bb946 More hole-filling in lighthouse
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4719 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 01:53:58 +00:00
auria
65bd5490a6 Updated lighthouse : 1) less holes in mesh (still a couple to fix) 2) don't make the driveline go right into a rock
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4718 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 01:31:31 +00:00
hikerstk
1f0ea20045 Fixed makefile for linux build.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4717 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 01:22:23 +00:00
auria
8c9905d071 Updated Xcode project
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4716 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 01:03:32 +00:00
auria
ff0c445d58 Fixed warning
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4715 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 01:02:08 +00:00
hikerstk
da3de6d131 Big code refactoring: instead of having auto_kart, player_kart, the karts
now use a 'controller' object which is responsible for its steering, e.g.
a default_ai_controller, player_controller etc. This makes it easier to
switch a player kart to use a end-of-race computer controller to drive
the kart once the race is finished (though that's not implemented yet).
I expect some bugs with restarting race, and perhaps end of race
behaviour at this stage.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4714 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 00:54:28 +00:00
auria
7a2d4a2a0e Removed a FIXME that's not relevant anymore
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4713 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 00:47:59 +00:00
hikerstk
a42629d458 Bugfix: rounding errors could cause acos(x) with x>1, resulting in a crash.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4712 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-14 23:29:59 +00:00
auria
ba8507f80d Fixed the 'random track' icon appearing locked
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4711 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-14 22:52:35 +00:00
auria
9f37de3c5d Minor code style tweaks
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4710 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-14 21:25:07 +00:00
auria
fa81852562 Some work on GPs. @Joerg : when moving to the next race, the models of the first aren't removed
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4709 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-14 21:23:38 +00:00
auria
fcca86bc9c Texture updates for jungle
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4706 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-13 02:33:23 +00:00
auria
9122b67481 Fixed crash when starting a GP
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4705 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-13 02:03:59 +00:00
auria
903f29e734 Do not try showing the full 'locked' sentence under each locked GP
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4704 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-13 01:59:39 +00:00
auria
219cc77c1e Handle better locked GPs
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4703 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-13 01:53:16 +00:00
auria
6d4078d3c7 Fixed absolute vs relative paths for images, fixing lots of warnings printed on the terminal
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4702 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-13 01:44:07 +00:00