Commit Graph

3156 Commits

Author SHA1 Message Date
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
auria
512326776e GP info screen now shows cycling screenshots of its tracks
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4701 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-13 01:20:52 +00:00
auria
a43196a8b4 Started populating GP info dialog
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4700 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-13 01:01:52 +00:00
auria
cc4e1357ba Started implementing GP info dialog
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4699 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-13 00:36:46 +00:00
auria
a2f03f2a0b Minor: some code style cleanup
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4698 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-13 00:16:34 +00:00
auria
a50bf44ea3 Minor: some code style cleanup
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4697 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-13 00:09:58 +00:00
auria
e426db317d Minor: some code style cleanup
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4696 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-13 00:07:13 +00:00
auria
84027f317b Fixed GPs aspect ratio
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4695 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-12 23:26:05 +00:00
auria
410226503d Fixed warnings
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4694 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-12 23:24:07 +00:00
auria
32d631ff00 use cycling images for GPs
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4693 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-12 22:20:58 +00:00
auria
77c29ca276 Max number of rows in a ribbon grid is no more hardcoded, can now be specified ion XML.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4692 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-12 17:45:10 +00:00
hikerstk
ca9bf74cba Added some debug output to find reason for assert.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4690 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-12 02:28:52 +00:00
auria
10116f628b Give some eye candy to the GP list in the tracks selection screen + clean code along the way
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4689 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-12 02:21:07 +00:00
auria
f29de6a89e Initial work towards STK adding GPs to the selection screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4688 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-12 01:48:47 +00:00
mbjornstk
5649c3affd Make printf a bit easier to grep and console output more obvious.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4687 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-11 20:55:33 +00:00
auria
787a2839dd Fixed several FIXMEs in GUI code
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4686 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-11 20:53:45 +00:00
auria
1f2311cf6f Fixed a FIXME, removed useless code
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4685 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-11 20:16:30 +00:00
auria
fc45605bf4 Improved comments a bit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4684 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-11 20:16:16 +00:00
auria
6c9239dc28 Fixed typos in GUI engine doc
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4683 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-11 19:59:45 +00:00
hikerstk
328373289a 1) Moved access to world object from race_manager to static functions in
world.
2) Removed more dujplicated/unnecessary functions from race_manager
   (getPlayerKart, getTrack).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4682 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-11 07:11:52 +00:00
hikerstk
b9ffb6fa13 Removed g++ compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4681 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-10 23:55:19 +00:00
hikerstk
4a96f98182 Removed player- and network-kart lists from world, so now
there is only one list used to access all karts in world.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4680 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-10 22:59:17 +00:00
auria
b9051bd402 Committed kart-spot-colors on minimap, by Kory
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4679 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-10 22:01:46 +00:00
hikerstk
47a1a1dfa2 Removed m_local_player_karts vector from world.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4678 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-10 12:47:18 +00:00
hikerstk
ab567bc53c Removed test code.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4677 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-10 12:01:37 +00:00
hikerstk
c6bf95a64c Started to remove the various kart lists in various objects.
1) Removed getKart from RaceManager.
2) Renamged RaceManager::getNumKarts() to getNumberOfKarts.
   This function should only be called when the world
   does not exist (or is not yet initialised). 	In all
   other cases world::getNumKarts() should be called.
3) Improved several 'const' functions.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4676 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-10 11:40:33 +00:00
auria
f78001c7b2 Misc nitpicking
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4675 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-10 02:11:56 +00:00
hikerstk
4e36fc1f78 Moved WorldStatus enums into WorldStatus class.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4673 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-09 09:24:45 +00:00
hikerstk
96ba05ff2f Stop bubble gum from rotation (which was yet another accidental debug
commit).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4672 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-08 22:55:03 +00:00
hikerstk
9952e74095 Fixed item rotation (got broken by accidentally committing a
work-in-progress version of the file).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4671 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-08 22:46:15 +00:00