Commit Graph

7867 Commits

Author SHA1 Message Date
auria
dd487346aa Introduce (in a totally optional way) the C++2011 feature to explicitely mark overrides. This bit us quite a few times in the past, so if we start using this more then those with GCC 4.7 will at least catch the errors when they happen :)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11231 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-14 00:04:26 +00:00
hikerstk
3980f1a667 Removed 'jump' in visual rotation when skidding is ended.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11230 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-13 21:49:28 +00:00
stephenjust
ebefe53b01 Updated VC10 project files
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11229 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-13 01:51:24 +00:00
auria
c82ce876de File i forgot to commit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11228 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-12 17:20:22 +00:00
hikerstk
04c3624d63 Fixed missing music (and count down) in demo mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11226 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-10 13:05:45 +00:00
hikerstk
a526fef588 Made m_phase and m_auxiliary_timer private, and added
setPhase. Removed usage of auxiliary timer in overworld
(instead set phase to race_phase) - as a result there
is no mpre 'Go!' being displayed (which I think is
actually better for the overworld).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11225 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-10 12:57:45 +00:00
auria
81691b00c0 Show title of track in the dialog to pick a challenge difficulty
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11224 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-10 01:20:50 +00:00
auria
c310e1b300 Hide points when showing track names so that both don't overlap
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11223 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-10 01:11:59 +00:00
hikerstk
7c4cebcbd5 Disabled new skidding code again.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11220 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-09 23:47:24 +00:00
hikerstk
4aecbb7ec3 Removed unnecessary settings of a demo mode in ProfileWorld.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11218 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-09 23:05:25 +00:00
hikerstk
fb249f43bf Allowed to enable smooth-normals per track, and added this flag as an
example to lighthouse track. Note atm both needs to be set: smooth-normals
in the track.xml file and in stk_config. 


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11217 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-09 22:57:51 +00:00
hikerstk
fdbeca93a2 Converted line endings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11214 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-08 07:09:51 +00:00
hikerstk
5963f31079 Removed physics.hpp #include from world.hpp.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11213 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-08 07:07:15 +00:00
hikerstk
7bcb6a780b Made animations cyclic.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11211 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-08 04:42:15 +00:00
hikerstk
d7aa324c25 Made animation cyclic.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11209 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-08 04:27:32 +00:00
hikerstk
23d643390a Re-exported with animations marked as cyclic.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11207 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-08 04:23:16 +00:00
auria
78a6da45f2 Rename 'end race' button so that it's clearer what it does
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11206 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-08 01:00:32 +00:00
hikerstk
ddace7368c Set a more sensible default value for number of tracks in demo mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11204 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-08 00:17:33 +00:00
hikerstk
995124093d Fixed compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11203 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-08 00:12:19 +00:00
auria
b12e73fe5c Add 'global' idle for demo mode
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11202 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-07 23:59:16 +00:00
hikerstk
c74fa3fcf0 Fixed #625 (seagull animation not working), by setting the extend type
to cyclic (instead of constant). This also fixes the zipper which used
old style attribute names in materials.xml (fade_out_time instead of
fade-out-time etc).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11199 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-07 23:37:42 +00:00
hikerstk
fe35613323 Fixed #560: if a rigid body has more than one collision (and one collision can be
reported p to 4 times by bullet), a crash would be caused when the rigid body is
removed (meaning that all further collisions with this body are invalid/removed,
while the loop in physics still tries to access them).
This patches removes bodies only when it is safe to do so, i.e. after the collision
loop. Removals done in the loop will be stored and executed later.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11198 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-07 21:59:21 +00:00
undef-in-ed
0b329b1542 Bugfix: Overwriting PATH breaks gcc toolchain on some systems
This has been the reason for the IRRLICHT_WITH_XF86VM and
IRRLICHT_WITHOUT_XF86VM failures on some Linux machines.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11197 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-07 17:40:18 +00:00
auria
85ba896d04 More work to communicate the points system to the player
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11196 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-07 02:03:03 +00:00
auria
60f26bde9f Better show in overworld GUI how trophies become points
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11195 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-07 01:54:32 +00:00
auria
f2cb7a8eac Give more points when solving hard challenges
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11194 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-07 01:42:11 +00:00
auria
6a50f23ea0 Nice little hack to make the GPs appear in the right order in the GUI
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11193 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-07 01:14:26 +00:00
mbjornstk
680c478332 Add new demo_world.[ch]pp files to build system.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11192 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-07 00:57:59 +00:00
mbjornstk
8813c65758 Set property to make sure EOLs are not mangled in future.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11191 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-07 00:51:12 +00:00
hikerstk
601430a066 Updated cmake config file for new files.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11190 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-07 00:10:55 +00:00
hikerstk
c15528f903 First version of demo mode. Use --demo-mode T to start
a demo after T seconds of idle time, --demo-tracks a,b,c
to specify a list of tracks to use for demo mode, --demo-karts
to specify the number of karts.
This is WIP, esp. it crashes if ESC is pressed during a race
(other keys will successfully return to main menu).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11189 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-07 00:10:33 +00:00
hikerstk
48bac59013 Replaced simple cast with proper dynamic cast to avoid potential incorrect cast
problems (I can't figure out what this line is supposed to do ... as far as I
could see it appears not to be used at all, and m_phase never reaches FINISH_PHASE).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11188 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-06 23:54:53 +00:00
auria
70a49e4922 Check if window is larger than screen, if so switch back to 800x600
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11187 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-06 14:49:39 +00:00
auria
95a8ba37e0 Make animated textures work with LOD
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11186 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-06 01:13:03 +00:00
auria
fa861267a0 Only keep the latest *approved* version of an add-on if user does not have artist debug mode enabled
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11185 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-05 19:44:33 +00:00
auria
157081edf2 Add fog support to water shader
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11184 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-04 01:33:13 +00:00
auria
05e467fb87 Minor : Add a couple svn ignore properties
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11183 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-04 00:29:24 +00:00
hikerstk
484f0fa2d0 Fixed #626, a kart that was being affected by an explosion would get
affected again (resulting in an assertion crash).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11182 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-03 01:41:56 +00:00
wardje
8f073e66e5 Don't show end race button before the GO.
Ending before the GO gave you a time of 0:00:00.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11181 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-01 20:48:52 +00:00
wardje
49c5f1a093 Only give penalty time while in SET_PHASE as per suggestion in mailing list.
Also remove some commented out code from ages ago, as well as some random
spaces only lines.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11180 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-01 20:28:22 +00:00
hikerstk
6abcea8dfe Removed commented out code.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11179 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-30 06:47:24 +00:00
hikerstk
1bd05f8707 Fixed incorrect 'release' behaviour when a cannon is used.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11178 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-30 06:45:58 +00:00
hikerstk
15ad3f845d Enable cannons to be used in reverse mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11177 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-29 23:08:50 +00:00
hikerstk
e3a1d40588 Supply special operator== and operator!= functions to avoid the
use of those functions from btQuadWord (which also test the W
component, which is for our case wrong).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11176 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-29 23:07:41 +00:00
auria
fcfbd4e163 Change the default screen size from 800x600 to 1024x768... everyone supports more than 800x600 nowadays and that is just too small
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11175 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-29 13:22:41 +00:00
auria
b15d9356d8 Attempt to fix case where driving on water is possible
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11174 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-29 13:19:41 +00:00
hikerstk
5e9b555afe Made turning of cannon animations smoother (by using a weighted
average of previous and new heading).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11173 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-29 12:11:16 +00:00
wardje
78e09b4d1b Make punishment for the players less brutal, see #486.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11172 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-29 11:00:58 +00:00
auria
55193a0e48 Make sure the water splash particles decay
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11171 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-28 21:07:51 +00:00
wardje
f426aac6cb Stop random starting of overworld after multiplayer kartselection
Since the variable m_from_overworld wasn't being initialized, its value could randomly be true.
It was also not being set when clicking multiplayer in main menu.
Making it initialize to false as well as setting it when clicking multiplayer to be on the safe side.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11170 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-27 18:09:09 +00:00