Commit Graph

144 Commits

Author SHA1 Message Date
hikerstk
d34a697d5d Cosmetical change only.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4782 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-21 00:43:36 +00:00
hikerstk
9a767dcdbe Added support of far camera to stk, updated final camera handling of track exporter.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4775 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-20 01:42:32 +00:00
auria
4119544ed7 Fixed the code-side confusion of track description vs designer (track exporter needs to be adapted accordingly)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4754 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-17 22:19:47 +00:00
auria
929482c802 Removed unnecessary includes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4738 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-16 00:40:32 +00:00
hikerstk
da3de6d131 Big code refactoring: instead of having auto_kart, player_kart, the karts
now use a 'controller' object which is responsible for its steering, e.g.
a default_ai_controller, player_controller etc. This makes it easier to
switch a player kart to use a end-of-race computer controller to drive
the kart once the race is finished (though that's not implemented yet).
I expect some bugs with restarting race, and perhaps end of race
behaviour at this stage.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4714 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 00:54:28 +00:00
auria
6d4078d3c7 Fixed absolute vs relative paths for images, fixing lots of warnings printed on the terminal
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4702 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-13 01:44:07 +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
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
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
auria
4abd5310f7 Improved handling of empty 'squares' in scrolling ribbon grids
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4609 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-01 22:03:16 +00:00
hikerstk
17b20de61e Items will now (as a default) be dropped to the ground.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4598 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-01 11:34:19 +00:00
hikerstk
384469b950 Replaced octree with normal mesh, which is actually faster.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4558 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-29 02:50:26 +00:00
hikerstk
0fa80bd594 Fixed mirrored display of minimap if track has a driveline with maximum z < 0.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4545 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-27 12:28:35 +00:00
hikerstk
cf0e69b48f Removed #include of kart and player_kart from world.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4424 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-10 23:12:29 +00:00
hikerstk
81bb0ac8dc Fixed memory leaks due to missing destructor.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4405 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-07 01:14:46 +00:00
hikerstk
dcec9bafcf Added support for irrlicht 1.7.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4400 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-05 03:38:35 +00:00
auria
9859e0c4ad Fixed Hikerian mistake
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4374 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-30 19:40:59 +00:00
hikerstk
637aab7cf7 First version of improved track object support - not fully functional yet, but
should allow for movable and static track objects. Also fixes problems with
incorrect radius for spheres.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4362 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-30 00:08:20 +00:00
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
hikerstk
5a938b4bf9 Removed more tabs.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4319 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-17 23:45:42 +00:00
hikerstk
0ddcb9dc2c File missing in previous commit.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4309 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-17 00:24:38 +00:00
hikerstk
d4c537c7e8 1) Added support for ignoring materials
2) Replaced tabs with spaces.
3) Removed unnecessary function parameter for loadTrackInfo.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4308 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-17 00:22:29 +00:00
hikerstk
de0e948c9a Simplified camera code somewhat, added support for final-camera, and made reverse
faster.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4306 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-16 21:37:33 +00:00
hikerstk
b65fbd8a23 Removed tabs.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4301 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-16 01:00:15 +00:00
hikerstk
68ceea8619 Fixed time-trial mode - no more boxes will be added to the track.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4275 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-10 02:10:19 +00:00
hikerstk
9e133ac141 Bugfix: distance-from-start calculations could become inconsistent at places where two drivelines
merge together, resulting in kart-order changing more or less randomly.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4272 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-08 12:13:30 +00:00
hikerstk
5b58714fff Revmoed support for irrlicht 1.5 (which doesn't have all functions we need anyway).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4236 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-04 01:09:40 +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
a5a90be806 1) Started to add split screen (though not all parts of the race gui are displayed correctly yet).
2) The name of an AI kart will now only get the AI name added if it's profile mode (to prevent
   the name with AI name to be displayed in game)
3) Some code cleanup.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4226 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-11-23 05:20:05 +00:00
auria
9929dde3ac Minor lighting code tweaks
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4166 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-29 20:46:16 +00:00
auria
29355419e5 Fixed lighting issues (was caused by having two sets of ambient light : the scene one, and the sun one. Only one ambient light is needed.)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4164 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-29 17:29:41 +00:00
auria
fa7152b188 minor cleanup
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4155 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-28 22:27:11 +00:00
hikerstk
31325de16c Minor code cleanup.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4150 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-23 01:52:56 +00:00
hikerstk
b21b0c230b Increased the effect of changing the ambient light back to its original strength.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4135 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-20 12:33:47 +00:00
hikerstk
b5ac1c4028 1) Moved the sun position from the track file to the scene files.
2) Added support for setting the sun position and light and fog data
   from the track exporter.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4134 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-20 05:15:55 +00:00
auria
0f14b098cd Completely removed the IRR_SVN macro, makes it confusing for people trying to build STK from autotools. irrlicht version is now detected from irrLicht includes.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4092 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-06 19:17:16 +00:00
hikerstk
5cd7fd2b45 Added support for quads that are incorrectly oriented (clockwise instead
of counterclockwise): quads are now turned, but a warning message is printed 
(since the track exporter should not export this kind of quads).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4070 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-02 11:28:05 +00:00
hikerstk
9ebdf59fcd Bugfix: animated textures would cause an assert failure.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4055 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-27 23:17:13 +00:00
auria
64958b0edf Fixed a few warnings and a TODO
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4049 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-27 18:04:33 +00:00
hikerstk
049ab14678 1) Fixed 'objects' import from blender script: objects are now
converted into the physics track model (previously they were
   only shown, but karts could drive through them).
2) Cleaned start position code: arena and normal tracks now use
   the same way and variables/functions to specify the start
   positions.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4046 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-24 14:26:03 +00:00
hikerstk
54cf897dc2 Fixed several inconsistencies between track exporter and STK; made
checkline properties a bit easier to set (added type="lap", instead 
of the two properties type="check" lap="lap" previously).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4042 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-22 22:43:38 +00:00
hikerstk
31324e54e6 Added support for edge-line tag in graph files (which were already generated from the
track exporter, but not actually supported from STK).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4038 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-22 13:26:13 +00:00
hikerstk
66256f64cd Bugfixes for debug track display.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4035 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-21 12:51:28 +00:00
hikerstk
7d4d50afe3 1) Made check structures activating more general (not only new-lap lines
can be activated now, and each check structure that changes the activation
   state has one other check structure associated with it (instead of all
   previously where all activtation state changing structures would activate
   all (and only) new-lap structures.
2) Added support for activation toggle (instead of only switching on)
3) Renamed Checkline to CheckLine (and checline.?pp to check_line.?pp) to be
   consistent with other names.
MAKE DISTCLEAN most likely necessary!


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4028 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-17 02:54:48 +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
hikerstk
6fd6063bcd 1) Bugfix: lap length was sometimes computed using the distance between consecutive
center-points of quads instead of the length of the current quad, resulting in
   lap length being somewhat wrong.
2) Bugfix: the first quad would have a distance along track that's not 0.
3) New-lap lines can now be anywhere on the quad graph, as long as the line is
   'on' a line dividing two consecutive quads.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4022 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-15 03:58:41 +00:00
hikerstk
d863d37c72 Bugfix: kart position were not computed correctly if crossing the start line for the
first time doesn't trigger a new lap (and therefore karts starting at lap -1).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4021 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-10 03:25:42 +00:00
hikerstk
6aafb3e83c Added support for different modes of a track (i.e. one track.xml file can have several
quads, graphs, and scene files). ATM there is no way of actually selecting a different more yet.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4019 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-09 13:32:08 +00:00