Commit Graph

50 Commits

Author SHA1 Message Date
auria
4afb71659f Modified music handling, fixing the music heard during GP lost/won
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5513 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-06-13 18:25:49 +00:00
hikerstk
0a59455a82 Removed LIMBO state, added new RESULT_DISPLAY_PHASE (but at this stage no
visible change to user).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5424 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-05-10 23:53:32 +00:00
auria
297f0cceb4 Renamed SoundManager into MusicManager, since this makes it much clearer what it does (it was just confusing to have SoundManager and SFXManager)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5228 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-21 17:24:02 +00:00
auria
9074febf54 Fixed missing music issues when aborting race / going back to main menu
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5220 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-20 19:11:48 +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
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
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
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
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
auria
957fc9281b A menu that uses animations can now choose not to throttle FPS to 35. This means credits and feature unlocked are now smoother
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4251 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-06 02:19:37 +00:00
hikerstk
e53d080286 Added support for changing the ambient color in certain areas of a track.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4026 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-16 05:32:17 +00:00
auria
5aa52c20ce Implemented viewing the help menu in-game
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4009 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-06 18:45:38 +00:00
auria
22f6c6e008 First (rough) version of an end-of-race dialog
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3974 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-01 18:11:26 +00:00
hikerstk
c1d69986b0 1) Profile mode now works, and is now completely implemented
in ProfileWorld only (no more m_profile in UserConfig)
2) Added some more virtual functions to the modes to simply
   code a bit.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3909 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-23 15:42:58 +00:00
hikerstk
63e16e3e8a Removed scene.?pp (which didn't do much anyway except for
handling the cameras, which can as easily be handled by
player karts instead).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3883 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-19 04:03:25 +00:00
auria
85266dfe10 Started mammoth cleanup of GUI code. Separated the generic GUI engine and the STK-specific bits (still work to do on this side)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3764 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-18 17:48:36 +00:00
hikerstk
88b4b3b041 1) Added calls to new render functions which are
called during the irrlicht rendering, so calls
   to directly print etc. to the screen are possible.
2) Time and ready/set/go of the race gui now work.
3) Code cleanup.
4) Removed compiler warnings.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3740 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-12 11:54:21 +00:00
hikerstk
e6fb0c9231 Removed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3677 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-06-29 03:38:48 +00:00
auria
555a6cb8e8 Implemented FPS display. Limited FPS in menus where it's really not necessary to push the graphics card hard
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3676 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-06-29 01:40:15 +00:00
auria
2f6b05bace started converting user config to XML. Implementation is not 100% complete yet; saving works, not lodading. Implementation is not the prettiest but designed for minimal maintenance.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3625 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-06-21 01:10:43 +00:00
hikerstk
ee90eca26e 1) Created new config subdir and moved the last remaining files into
appropriate subdirs (only main.cpp and main_loop.?pp are now directly
   in the src directory).
2) Cleaned up all #include directives, so that all files now use
   the right subdirectories.
3) Some minor code cleanup.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3606 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-06-11 10:00:43 +00:00
hikerstk
96805cfc71 Moved race related files into new subdir 'race'.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3581 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-06-03 01:36:48 +00:00
hikerstk
075c9dbb86 Moved more files into appropriate subdirs, update build
system for VS (verified) and autoconf (not verified).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3574 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-06-02 12:37:29 +00:00
auria
99e6752200 totally removed SDL dependency. wav sounds have been converted to OGG, since we already have an OGG reader in - why require an additionnal dep like SDL, that does input, graphics, etc. when we only need audio and already have an audio reader in? Original .wav files (lossless) will be added tomedia repository (second part)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3449 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-05-03 00:50:09 +00:00
hikerstk
fd82138d8f Added support for bullet debug view (still somewhat buggy, karts are
not shown correctly atm).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3442 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-04-29 14:48:18 +00:00
auria
6ed09ea3c5 bringing gamepad back in (won't work in game but will be detected, watch terminal)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3422 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-04-25 18:25:08 +00:00
auria
87a274fc77 started removing SDL from STK. Gamepad input broken, maybe keyboard a bit too. Default bindings changed because some keys on mac are ignored by irrlicht (known bug, fixed in enxt version IIRC)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3421 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-04-25 17:55:39 +00:00
auria
57ce9a3879 fixed warning
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3385 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-04-12 18:22:54 +00:00
mbjornstk
43ce2014cc Only check FPS while gaming, so menus do not make maxFPS useless.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3362 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-04-05 00:28:50 +00:00
auria
f66430574c attempt at timing so gamepad events don't happen too often in menu
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3355 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-04-04 23:47:38 +00:00
mbjornstk
4eadddd8ab Small logic changes to the FPS reporting, only update if FPS>1. Still disabled,
but at least nobody would say there is a bug like min FPS being 999.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3330 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-31 18:04:04 +00:00
mbjornstk
3f4e171872 Hacky FPS reporting (look for lastFPS to see the code involved). It is off by
default, with #if 0, but this way anybody can enable it. When we get "on game"
text, speed, etc it must be moved to the right place (and better code, the
chain of "->" is pretty ugly).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3323 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-30 18:09:33 +00:00
auria
b160406dd4 started reconstructing input...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3292 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-23 16:06:48 +00:00
auria
e7905e0811 started input module by splitting sdldrv in more logical parts
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3290 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-23 14:55:23 +00:00
auria
f5ced788ac Game menu now shows up :) Input is not yet handled, so not yet usable. Some dummy placeholder datafiles included for the sake of having something testable
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3261 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-15 01:34:21 +00:00
auria
4acc6fc7c8 first introduction of new GUI code. It does *not* work, consider this a backup (and the removal of the old UI)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3256 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-13 13:50:24 +00:00
hikerstk
62bc9990ca Irrlicht only: Added preliminary support for reading materials.xml files
(though the information is not used atm).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@3203 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-02-27 00:15:09 +00:00
hikerstk
0267f7630c Irrlicht only:
1) Added better support for reading XML files.
2) Fixed keyboard handling (for some keys only
   key releases were recognised).
3) #ifdef-ed out more plib parts that would cause a 
   crash with irrlicht.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@3164 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-02-17 02:57:28 +00:00
hikerstk
3b7bfd5367 Update to irrlicht only, non-irrlicht part should be unchanged.
- Tracks and kart models are now loaded and converted into
  bullet physics. 
- A simple camera is implemented, so a loaded track can be
  displayed (note: the current SVN version does not contain
  a track converted for irrlicht yet)
- Otherwise the irrlicht version is not working, i.e. no
  menus atm, ...


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@3115 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-02-10 05:30:59 +00:00
hikerstk
067d3daf79 1) Renamed scene to stk_scene (since scene is a namespace in irrlicht).
Note that with irrlicht the scene objects is most likely going to
   be replaced anyway.
2) Removed more snprintf.
3) Removed unused modes from VS project file, added new mode for irrlicht.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@3055 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-01-28 00:38:28 +00:00
hikerstk
6ce3803165 Moved more files into subdirs.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@3029 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-01-22 22:27:13 +00:00
hikerstk
d1eea398a1 Added support (incl. gui) to change the menu background
pictures.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2888 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-01-12 12:29:31 +00:00
auria
e44ac903d3 added support for by-menu bg pictures
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2882 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-01-12 00:49:25 +00:00
hikerstk
167107fcbc 1) Cleaned up implementation of history function.
2) Improved history file format to collect control information (like 
   steering etc) to allow replaying based on the physics (and not only
   replaying recorded kart positions).
3) Added some constants (time till finish, time for music credits) to
   the stk_config.dat file.
4) Made name of the menu background picture configureable in 
   stk_config.dat file.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2328 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-06 13:40:11 +00:00
auria
0c945d61d3 Made World derive from 'Clock' (now 'TimedRace') simplifying a lot of things, especially the race end process
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2323 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-04 17:32:40 +00:00
hikerstk
1809dd1da1 Synchronised race results menu, single races in LAN
mode can now be restarted (GP and FTL modes are still 
to be done).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2307 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-29 02:29:33 +00:00
auria
cc61f53ff8 more cleanup, replaced World global variable with singleton-like implementation, removed lots of includes to world.hpp
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2291 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-21 16:07:56 +00:00
auria
67c514f1ed first iteration of new game mode code. most things seem okay, maybe high scores/rankings should be double-checked, also the end-of-race screen seems a bit messed up
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2287 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-20 23:45:22 +00:00
hikerstk
c0eae662f2 1) Applied Stehen's patch to give each kart separate sound effects objects,
and add engine sounds.
2) Added sfx manager so that the buffers for the sfx are shared between
   all sfx objects.
3) Moved all audio related files into audio subdirectory.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2275 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-18 03:24:19 +00:00
hikerstk
803f188895 1) Renamed game_manager to main_loop.
2) Cleaned up some include files.
3) Fixed compilation of optimised version on VS.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2271 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-15 04:34:46 +00:00