Commit Graph

276 Commits

Author SHA1 Message Date
mbjornstk
5fe41e5625 Run expand -t4 to convert tabs to spaces. No other whitespace fixes, but
there are still trailing spaces and lines with 5 spaces as indent (fix them
as the files are changed for other reasons). src/guiengine/CGUIFont.* and
src/bullet/ not processed to allow cleaner updates from upstream.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4320 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-18 00:36:35 +00:00
auria
e20f805e61 In multiplayer mode, players other than the game master should not be able to select stuff in race setup menus
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4265 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-06 19:22:57 +00:00
auria
a5edabee75 Fixed input mode not properly reset when exiting race
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4253 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-06 16:06:39 +00:00
auria
584417910d Cleanup, mostly in race ending
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4232 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-01 19:49:11 +00:00
hikerstk
ed9bd38402 Some redesign of split screen to enable proper handling of
ambient light changes.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4229 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-11-29 13:04:57 +00:00
hikerstk
86743991ae Updated project file, removed VS compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3985 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-02 02:08:24 +00:00
auria
c3f0f7ab82 Massive conversion from std::string to stringw for all strings that need to be translated. Currently, translation is broken (strings i try to transalte appear as junk) -- since irrlicht GUI widgets all use wchar_t, using std::string in UTF-8 just didn't make it
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3963 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-30 18:21:59 +00:00
auria
870c470eab Highscores are now displayed in the track screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3951 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-29 18:12:31 +00:00
hikerstk
96dc2a8fe2 Cleaned up StringUtils: used 'better' names (e.g. getPath()
instead of path()), and used our convention of using capitalization
for words (and not _). Started adding support for additional track
directories, but that's not working yet.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3912 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-24 05:56:53 +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
6318008c87 Restructured modes to be easier to inerhit from:
- cleanly split into constructor and init()
  phase
- added new isRaceFinished() function
Some minor code cleanup.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3900 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-21 13:05:52 +00:00
hikerstk
ef175e94d4 1) Added alpha version of profile-mode (which replaces if-statements
in world).
2) Moved camera management into race gui, so that the number of split screens
   used can be adjusted (and not only indirect via number of player) - this
   allows e.g. debug modes where you can see 4 AI karts at the same time,
   for profile mode, ...
3) Code cleanup.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3899 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-21 00:32:24 +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
rforder
47cfe64301 More cleanup. Replaced StateManager::addActivePlayer(PlayerProfile *) with StateManager::createActivePlayer(PlayerProfile *, InputDevice *) . This will ensure that in the future no active players will accidentally be added without an associated device and also removes some redundant code.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3860 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-14 17:36:47 +00:00
rforder
7db3295936 Moved various function calls involved in the initialization of the kart selection screen from different places in the code into the "init"
section of the kart selection call back.  This will prevent some problems that were occuring when returning to the kart select screen 
from the track select screen (and it just makes more sense to find them there).  Renamed playerPressedRescue and firePressedOnNewDevice 
to playerQuit and playerJoin respectively, to more accurately describe the behavior of the functions.  Removed the now superfluous 
setPlayer0Device function.



git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3853 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-13 17:38:01 +00:00
hikerstk
2b5a273b95 Renamed RaceManager::getKartName to getKartIdent, since this is was the function actually does :)
(prevents us printing the id instead of the name somewhere).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3846 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-13 04:53:51 +00:00
hikerstk
209d679a56 'Prepared' bugfix (for once we have a in-race menu):
if a player presses esc. after finishing a race in a 
GP, but before the race is finished, rerunRace() will
reset the scores and times to the previous values - 
but in case of karts who haven't finished the race 
that was undefined.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3840 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-12 02:55:53 +00:00
auria
432b1598c3 Fixed AI kart count widgets to provide correct in game
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3794 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-02 19:08:11 +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
auria
fbc3119dbc Continued cleaning up references to Player & ActivePlayer and docs
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3762 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-18 15:32:54 +00:00
auria
2c0a322b61 Started cleaning up references to Player to use ActivePlayer where relevant
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3761 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-18 15:21:16 +00:00
auria
c5afb804c3 Patch by StephenIRC to fix input when starting with -N
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3707 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-08 00:46:47 +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
25b9d9643c Replaced all remaining HEADER_.*_H with HEADER_.*_HPP .
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3585 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-06-03 02:17: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