Commit Graph

9060 Commits

Author SHA1 Message Date
auria
61720b2661 Add back ability to programmatically add track objects, use it in 3 strikes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12610 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-05 01:30:34 +00:00
auria
f296461d21 Fix physics angles
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12609 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-05 00:39:34 +00:00
auria
6bc216f203 Add full support for LOD in track objects
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12608 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-05 00:20:14 +00:00
auria
94cd32d20d Do not stop music during tutorial
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12607 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 23:14:52 +00:00
auria
3cd4cc1cad Fix reading freed memory after deleting world, plus add what it takes to detect further such issues easily
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12606 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 23:09:53 +00:00
auria
d807871ec6 Bring back LOD + particles
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12605 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 23:02:15 +00:00
auria
8bae4c1549 Minor cleanup
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12604 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 22:57:07 +00:00
mbjornstk
0e8eec0f88 Add new track files.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12603 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 22:55:32 +00:00
auria
27d454ad05 Move some track object classes to new files
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12602 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 22:52:37 +00:00
hikerstk
f4b121feff Fixed incorrect arrival time estimation (#903 and #859).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12601 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 21:17:39 +00:00
mbjornstk
5d58993364 Removed deleted files.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12600 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 21:09:46 +00:00
auria
7a3989dd94 Cutscenes need a GUI
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12599 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 01:52:02 +00:00
hikerstk
4a6f2beb50 Update for deleted files.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12598 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 01:49:26 +00:00
hikerstk
ca39376f25 Fixed windows compilation, updated VS9 project file.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12597 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 01:32:45 +00:00
auria
bc1d1e7d31 First part of track object refactor
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12596 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 01:15:37 +00:00
hikerstk
cc6446cd1c Removed unused files.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12595 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 00:42:26 +00:00
hikerstk
8fe1875db1 Removed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12594 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 00:41:34 +00:00
hikerstk
9429beef79 Simplified more code, fixed some coding style.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12593 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-03 21:15:13 +00:00
hikerstk
aea7a001c5 Bugfix: when playing batle mode, the number of karts is set to the number of players
(independent on the number of AIs selected), and UserConfigParam::m_num_karts is not
changed (which is correct imho).
When then a single race is started, the displayed number of AIs is based on this
m_num_karts. But if a normal race is started (without adjusting the number of
AI karts), the number of karts in the race_manager was not updated (it is only
updated when changing the number of AIs), resulting in the wrong number of karts to
be used (based on the battle mode, and not based on the number shown in the GUI).
This patch just updates the race_manager with the number of AI karts that is shown
in the GUI, so that those values are now in synch.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12592 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-03 11:12:25 +00:00
hikerstk
820ebd2673 Refactoring: removed code duplication in some init() and restartRace()
functions of game modes (caused by restartRace only called in case of
a restart, not the first time a race is started). The function restartRace()
was renamed to reset(), which is now called always before a race is started
or restarted.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12591 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-03 06:05:34 +00:00
auria
4cd55d0dc5 Fix bogus documentation
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12590 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-02 23:55:38 +00:00
hikerstk
ecfdae57f8 Yet another fix for addons :( Now installation of addons might
work as well as deleting them.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12589 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-27 21:52:40 +00:00
hikerstk
9dfb6c4ccb When pressing ctrl-F8 in artists debug mode only make player karts
invisible. This allows to take screenshots with AI (and if you don't
want AI, just race without AI).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12588 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-27 21:11:12 +00:00
hikerstk
b967e5a492 Fixed addons management (deleting), which I broke in r12581: Addons used
their id as directory name (and since the id was changed to have addon_
as prefix, this didn't work anymore).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12587 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-27 21:01:05 +00:00
hikerstk
2ed38db288 Fix #890 - crash when deleting tracks (caused by not adjusting
indices in main track group when a track is deleted. That happened
since the soccer mode was added).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12586 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-27 12:17:09 +00:00
hikerstk
f78f254a3e Fixed #894: nameclash when an addon track/kart has the same directory name (and therefore
identifier) as a track included in STK.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12581 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-26 06:16:53 +00:00
hikerstk
81d6353d7b Fixed typoes (see #897), thanks to bkerensa for the patch.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12580 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-26 05:22:25 +00:00
hikerstk
516e57d274 Fixed compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12575 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-25 22:13:16 +00:00
hikerstk
f857393ca2 Removed time limit from easter eggs (if used in a challenge, the
challenge will define the time limit), which also fixes #861 (no
timer when easter egg mode is started first). Added high-scores for
easter egg mode.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12574 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-25 06:16:23 +00:00
hikerstk
b7e5480fb6 More work on improving documentation.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12572 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-21 10:46:35 +00:00
auria
734b9707bc Fix motion blur on some picky GPUs
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12571 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-21 00:02:07 +00:00
hikerstk
4c33490a78 Improved doxygen documentation.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12570 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-20 23:02:12 +00:00
auria
87f316fd03 Support combining splatting and lightmaps
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12567 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-18 01:08:35 +00:00
auria
98d8ef74ac Simplify shader, removing the need to make a fallback mesh
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12565 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-18 00:21:28 +00:00
auria
7a81d37f69 Allow vertex colors to be used with lightmaps
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12564 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-17 23:06:37 +00:00
samuncle
82ce55b443 Water improvement
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12563 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-17 21:24:44 +00:00
samuncle
24d81c3b1a A new topology for mines. To be continued
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12560 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-17 20:35:18 +00:00
samuncle
8434a6b633 Smooth the transition for clouds using vertex alpha
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12559 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-17 01:02:56 +00:00
auria
1cb4d02075 Some minor cleanup in cmake
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12556 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-15 23:02:05 +00:00
hikerstk
b54125fa38 Changed variable boost_amount to be boost_time, added comments,
and fixed incorrect blur direction.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12555 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-15 05:48:58 +00:00
hikerstk
de2112f101 Removed debug code (2nd player would also get zippers
in artist mode when pressing F7).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12554 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-15 05:35:03 +00:00
auria
cab6469443 Complete Cmake OSX 10.7 support. Hopefully Cmake is now ready to take over the manually maintained Xcode project
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12553 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-14 23:10:20 +00:00
hikerstk
5445cec7ba Enabled motion blur shader in split screen multiplayer.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12552 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-14 21:04:48 +00:00
hikerstk
a14a9df3f1 Removed unnecessary "\n" in Log messages.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12551 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-14 05:26:17 +00:00
auria
8baa499323 Tweak CMake's ability to generate Xcode projects in addition to makefiles on OSX
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12550 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-14 02:06:09 +00:00
auria
a9056ee6bc Adapt CMake to make it able to compile on OSX in 10.5 compatibility mode. The next step might be removing the Xcode project, less maintenance...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12549 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-14 01:39:23 +00:00
auria
d4fa9e0cb6 Finalize integration of cmake build on osx with builtin irrlicht
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12548 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-13 04:03:26 +00:00
hikerstk
9299418079 Tweaked default wiimote settings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12547 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-13 04:00:19 +00:00
auria
af17db18c4 Integrate irrlicht into the STK build system
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12546 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-13 01:31:09 +00:00
auria
1a7bf5ea9c Update track list after installing addon so that it appears without restarting STK
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12545 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-11 01:26:07 +00:00