Commit Graph

158 Commits

Author SHA1 Message Date
auria
8623a4a49a Fixed incorrect code (and warning)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3792 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-02 18:04:16 +00:00
hikerstk
89b2eea124 Added first version of track mini map to race gui.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3784 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-30 02:40:30 +00:00
hikerstk
368604f379 Added speedometer.
NOTE: to use the speedometer, a patched version of irrlicht is needed. The replacement
files are included here, we hope that the necessary functions will be included in the
next irrlicht release (STK will still compile without a patched irrlicht version,
but not display the speedometer).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3781 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-27 11:56:09 +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
hikerstk
5f4b474e77 Fixed some memory leaks, code cleanup, started adding
mini map creation.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3755 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-16 12:09:15 +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
auria
a44b531525 Replaced usage of some confusing IDs with more explicit pointers
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3736 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-12 00:18:37 +00:00
hikerstk
8c1bba8abb Added initial support for checklines (though atm they don't do anything yet).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3703 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-06 13:35:33 +00:00
hikerstk
6cefc34b31 More work on animations (still work in progress)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3680 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-06-30 12:51:38 +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
auria
f4a76bc2ae removed 95% remaining dependencies on plib
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3479 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-05-11 01:28:18 +00:00
hikerstk
30de5e36f8 Removed callback manager, callbacks are not needed the way they were
with plib, and the track is now updating its animated textures and
physical objects.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3337 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-04-01 00:55:20 +00:00
hikerstk
4ccd7662ef 1) Added support for animated textures.
2) Removed static_ssg source files.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3335 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-31 23:45:20 +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
8a60edf241 Moved file manager to io subdir, made irrlicht compilation default,
started removing #ifdefs HAVE_IRRLICHT.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3239 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-12 03:49:31 +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
d49f009213 Removed the camera jump which happens on some tracks (e.g. snow
mountain) at the start of a race.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@3088 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-02-01 22:54:00 +00:00
hikerstk
4b907c643a Fixed bug 2547586 (keys lock after pause): keys pressed when the
in-game menu is called would still considered to be pressed
when the game is continued.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@3085 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-01-31 04:51:50 +00:00
hikerstk
012f503d60 Added more flexible functions to simulate s(n)printf,
removed more snprintf.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@3058 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-01-28 04:43:18 +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
6f34674b4c 1) Moved more files around.
2) Replaced many (though not all yet) snprintf with ostringstream
   (getting rid of the maximum length of messages).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@3034 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-01-23 05:23:22 +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
340fc18548 1) Applied Jonan's patch to fix the layout for many files.
2) Moved STK specific extensions to bullet out of
   bullet src tree.
3) Started to move more files into separate subdirs.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@3027 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-01-22 12:02:40 +00:00
hikerstk
2287757c6e Made STK more robust in case that the name of a track requested on the
command line does not exist. It now aborts with a useful error message
in this case.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2934 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-01-15 23:05:50 +00:00
hikerstk
9b622e59c7 Fixed --profile behaviour.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2587 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-12-09 05:05:48 +00:00
hikerstk
66859e11e9 1) Very first version of improved AI: it does use skidding,
and braking behaviour is improved.
2) The track angle was switched from degrees to rad.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2577 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-12-08 01:29:02 +00:00
hikerstk
c14ca10f81 1) Bubble gums do not disappear when hit, instead they are disabled
for 0.5 seconds (enough time for the kart that hit it to drive
   away). This also fixes the bug that re-appearing bubble gums
   were not properly pitch/roll aligned anymore.
2) Bugfix: If a bubble gum was used in a race, a crash happened
   when exiting STK (during cleanup).
3) Bugfix: When restarting a race, bubble gums from the old race
   are now removed.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2446 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-11-11 22:21:25 +00:00
auria
576d1c3265 fixed bonus boxes appearing in time trial mode
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2422 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-11-08 02:07:54 +00:00
hikerstk
ab506f462a Moved kart-related files into separate subdirectory.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2416 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-11-07 04:34:01 +00:00
hikerstk
c553ec77ee 1) Separated the wheel from the kart models. This is necessary
for irrlicht, simplifies the handling of the karts.
2) Current suspension is now used to display the wheels of karts.
   This currently only works for tuxkart, all other models still 
   need to be modified (and these models will not display any
   steering atm).
3) Refactored kart model handling: all plib specific kart model
   handling is now encapsulated in karts/kart_model.?pp
4) Moved some files into new subdirs.



git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2413 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-11-07 01:05:52 +00:00
auria
c595c74f7a renamed 'collectible' to 'powerup'
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2400 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-30 02:02:56 +00:00
auria
c834005143 removed most 'herring' names
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2392 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-29 15:55:54 +00:00
auria
42e0af65b7 started renaming herring to item
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2389 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-29 01:45:29 +00:00
auria
39bdf4f0b0 moved all item-related files into a new /items repository
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2385 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-28 01:46:35 +00:00
hikerstk
f2f09deff8 Removed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2372 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-24 04:39:52 +00:00
auria
6ac6eb9623 fixed bugs with battle mode
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2363 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-22 16:05:08 +00:00
scifly
ec272cf9ec Bugfix: Players can no longer set highscores of 0.00 if they do not
finish a race.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2361 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-21 16:04:54 +00:00
auria
ed2f52bee6 First iteration of battle mode! It's playable, and the rack selection works. Warning, if you select AI players it won't work. Lives are shown but don't decrease with hits yet.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2339 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-14 20:20:54 +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
43d092c26c better encapsulation of on-screen messages so they are independant of what mode is in use, and are also independant of the type of clock used (for instance there's a few ones that in FTL counted backwards). switched to alternate timers independant of the game mode's timer + more cleanup on previous commit (clock merge)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2326 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-04 18:50:45 +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
auria
0765e643cf fixed shortcut detection
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2312 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-30 01:54:09 +00:00
auria
04c106843a better fix for karts-position wrong when restarting a race
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2311 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-29 15:43:58 +00:00
auria
88d5b15747 fixed mistake in previous commit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2310 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-29 15:27:09 +00:00
auria
3728343cfa workaround attempt for crash seen only by conso, but that i can't reproduce, so he can test
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2309 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-29 15:23:54 +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
faa1ba9161 minor cleanup
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2305 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-27 20:49:11 +00:00
auria
019eaca2cf Mammoth patch to try and encapsulate sector and lap code better in modes. Still work in progress so expect suboptimal implementations and breakage. Known to be broken at this stage : opponents' times at the end of a lap, rescue button and rescuing in general, shortcut detection
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2303 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-27 19:43:57 +00:00
auria
3477a7f7e2 made section handling and lap counting a little more modular (nothing definitive, just an incremental step)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2302 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-25 00:31:21 +00:00
auria
e1df51b631 made faster music a choice of the base class. various 'for' loop optimisations. replaced incorrect 'int' with 'bool'
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2299 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-24 00:43:45 +00:00
auria
03ae2ce6d4 made use of highscores optional (for instance battle mode may not ahve high scores so we need a way to turn them off)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2298 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-24 00:13:31 +00:00
auria
0e5106bfb9 started highscores refactor, also fixing them (they had been broken during the world refactor)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2296 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-23 01:16:50 +00:00
auria
0ece64bc05 split major and minor modes, started some more encapsulationa round that
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2292 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-22 00:55:27 +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