hilnius
ea2b52a663
merging hilnius's branch
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13394 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-31 18:03:11 +00:00
unitraxx
8656a12d12
Undoing last commit which was not what I wanted after all.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13391 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-30 22:05:06 +00:00
unitraxx
75e286932f
An attempt to merge with hilnius' branch
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13390 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-30 21:39:27 +00:00
auria
8f77aac50a
Apply small patch by lennartack to fix leak in --no-graphic mode
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13264 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-17 22:37:45 +00:00
hilnius
ed6e4ebfb4
correcting the ai kart bug due to the former networking removal
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13088 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-05 12:01:29 +00:00
hilnius
613e97d0d6
breaking everything that was working. cannot even start a race now, need to rewrite the network manager and part of the race startup sequence
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13032 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-29 22:57:18 +00:00
curaga
b56bf4dc53
Remove trailing space, git doesn't like it
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12797 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-29 22:04:35 +00:00
hikerstk
e1033ca9f7
Started to restructure rendering loop - moved things out of rendering
...
loop, cleaned up code, ...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12531 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-28 01:05:27 +00:00
auria
04efc6a1cf
Undo not too funny April's fool joke committed by Minibjorn.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11064 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-01 14:48:26 +00:00
mbjornstk
e1b8b399df
Improve FPS feedback.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11055 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-03-31 22:27:11 +00:00
funto66
569308a730
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10539 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-01 21:19:13 +00:00
auria
92eb0ebd2a
Ran a small bash script to remove all of those annoying strings. The only thing they gave us were the need to rebuild after committing
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10363 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-06 18:43:36 +00:00
auria
78eac6b7ce
Add gloal profiler marker, will help get percentages
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9761 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-05 22:55:55 +00:00
hikerstk
6c43457f37
Ignore FPS limit set in the config file if no-graphics
...
is selected (this gives a HUGE speedup for non-graphics
run).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9411 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-03 00:41:28 +00:00
hikerstk
a62e0f86d3
1) Added new --no-graphics option for fast batch testing.
...
Renamed --profile=+-n options to --profile-laps=n
and --profile-time=n.
2) Fixed averaging in case of --profile-time.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9372 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-27 12:11:11 +00:00
funto66
d26b406780
Starting the merge with the swatter branch. Now it should be automatic with karts, but doesn't work with items (yet).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9275 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-15 23:38:40 +00:00
funto66
a8919a8252
Added experimental and buggy hardware skinning support + removed a useless loop in the material manager
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9253 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-14 00:59:00 +00:00
funto66
49ea3a9cf9
Improved the profiler: a bar is displayed to show the end of the analyzed frame, there are more markers, now the profiler can be frozen/unfrozen by clicking on it...
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9211 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-10 00:04:12 +00:00
funto66
de401bc234
Added a first (unfinished) version of a graphical profiler
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9207 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-09 19:13:17 +00:00
mbjornstk
015443f582
Set props as per SVN-CONFIG for .[ch]pp, AKA SVN props clean up day. :)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7493 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-01-21 01:54:38 +00:00
hikerstk
07c2a3b3b0
Removed debug output.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6863 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-12-05 22:24:01 +00:00
hikerstk
2c15bd265f
1) Made TrackObject use an ISceneNode instead of an IAnimatedMeshSceneNode,
...
allowing us to use the same base class for billboard.
2) Fixed billboard implementation: billboards are now properly removed,
and can also be IPO animated.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6861 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-12-05 20:55:09 +00:00
auria
c9c71dddd9
Hopefully fixed crash at exit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5962 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-11 16:54:45 +00:00
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