Commit Graph

2252 Commits

Author SHA1 Message Date
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
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
auria
6b450f8e5a Updated Xcode project
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4669 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-08 15:43:30 +00:00
hikerstk
9a68e6e130 1) Renamed clock.?pp (which stored the class TimedRace) to
world_status.?pp (storing the class WorldStatus).
2) Fixed end of race in case that player kart is last
   (race would never end till esc is pressed).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4668 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-08 12:59:03 +00:00
hikerstk
9b577d89c8 Fix crash when exiting stk.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4665 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-07 22:52:25 +00:00
hikerstk
0465313495 Fixed race finish time estimation at end of race for AI karts.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4664 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-07 21:58:16 +00:00
hikerstk
fde579bee8 Added comments, minor cosmetic changes.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4663 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-07 21:57:10 +00:00
mbjornstk
6f2a459096 Add bubblegum to cheats (F5) and make real gum become small nitro on swap.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4662 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-07 21:14:08 +00:00
auria
a5119510d1 Updated Xcode project
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4661 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-07 16:16:12 +00:00
hikerstk
0f74ba0285 Bugfix: pitch and roll of items were not set, resulting esp. in
bananas not lying on the ground if the ground is non-horizontal.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4659 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-07 11:49:28 +00:00
hikerstk
5eaee4de39 Collected items do not appear from below now, but grow
(i.e. being scaled from 0 to 1). This allows it easily
to have items floating in mid air.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4658 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-07 10:35:45 +00:00
hikerstk
566e12d129 1) Removed bubblegum as a separate object, instead bubblegums are now
created as normal items. 
2) Now bubblebum can be used in swapping as well, so all nitro become
   bubblegums, and all bubblegums become items.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4657 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-07 08:49:36 +00:00
hikerstk
3116f475cd Instead of switching light off whenever a new mesh is set, change the light
settings once in the original 'master mesh'.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4656 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-07 03:59:03 +00:00
hikerstk
4aa664e124 Removed unused function.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4655 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-07 03:57:35 +00:00
hikerstk
4f39bd84db Improved the bugfix - so perhaps it works now all the time.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4654 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-07 03:40:33 +00:00
hikerstk
86f9741b73 Bugfix: placed bubble gum would lose smooth shading.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4653 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-07 03:33:45 +00:00
hikerstk
93e15df841 1) Replaced all .projectile files with one powerup.xml file,
replaced items.item with items.xml. Cleaned up item_manager
   and removed support for different item styles (since it
   didn't work anyway)
2) If a swapper item is used while items are swapped, they will
   now un-swap.
3) Moved all models and textures from data/items to data/models.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4648 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-07 02:05:21 +00:00
hikerstk
8be9c3397a Added first version of switch collectable.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4635 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-04 22:53:24 +00:00
hikerstk
192fc34572 Removed compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4634 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-04 22:37:33 +00:00
hikerstk
c2f3841de4 Removed compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4633 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-04 22:35:43 +00:00
hikerstk
76991060a7 1) Updated project files for new source files.
2) Removed irr* build targets, made debug/release be the appropriate
   targets (using irrlicht).
3) Removed STK_* environment variables, instead all dependencies are
   expected in the dependencies directory.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4632 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-04 22:35:18 +00:00
auria
9f57a7988a Fixed path issues in Xcode project
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4631 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-04 19:04:36 +00:00
auria
5d2d0973f2 Added back support for detecting bogus resolutions when switching, and revert to the previous working one when user can't click confirmation button
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4628 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-04 00:45:24 +00:00
auria
af02da1267 Eclude from resolution choices resolutions that are too small (and that STK's GUI does not support)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4627 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-03 21:56:45 +00:00
auria
f1c9b285fa Fixed resolution switching closing STK. Includes a totally ugly workaround a irrlicht behaviour I don't understand
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4626 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-03 21:47:36 +00:00
auria
a0588268f7 Fixed crash when Trying to moving up to the spinner name after confirming kart selection
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4625 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-03 01:57:12 +00:00
auria
411dffeea2 Fixed issues with active players and input (were not resetted properly)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4624 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-03 01:52:42 +00:00
auria
cf87636737 Improved feature unlocked a bit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4623 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-03 01:46:42 +00:00
auria
e8a5c1b3c5 Improved feature unlocked a bit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4622 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-03 01:43:18 +00:00
hikerstk
fcf956afbb Bugfix: the last searched setting from a materials.xml file would
take effect, not the first one (e.g. the shared one instead of
a track/kart - specific one).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4617 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-02 12:01:24 +00:00
auria
5bfebb1425 Fixed bug that allowed players that had backed from the kart selection screen to use their device to make selections later on
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4615 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-02 01:08:47 +00:00
auria
8dbb31caf9 Removed very silly copde i accidentally committed in previous revision
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4614 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-02 00:34:11 +00:00
auria
b6b47c37b6 Select player identity by default for players > 0, so they can choose their identity
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4613 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-02 00:32:42 +00:00