Commit Graph

486 Commits

Author SHA1 Message Date
auria
92385e68e5 Fix compilation for non-C++2011 compilers, oops
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11318 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-06-17 22:33:30 +00:00
auria
aced31cbfa Add support for playing sounds at given points during the cutscene
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11310 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-06-16 23:35:51 +00:00
auria
cff2dd75bc A few audio adjustments for intro cutscene, and now play the scene when playing on the story mode button (sorry story mode will be unavailable for a little while, but you can comment out the sdebugging code that launches the intro)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11306 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-06-16 19:41:21 +00:00
auria
86e346daeb Instead of harcoding where the camera looks during cutscenes, import it from blender. Unfortunately this makes the camera jumpy, not sure why?
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11302 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-06-16 17:41:34 +00:00
hikerstk
e7b0874274 Applied a (slightly modified) version of jskij7's patch to create
an AI that actively collects items. This is (for now) the new default
AI - feedback welcome!


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11291 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-06-10 19:52:11 +00:00
hikerstk
6536b4d112 Improved handling of controller name so that the end
controller keeps the name of the original controller, 
which allows proper statistic output in profile mode.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11287 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-06-09 15:48:18 +00:00
hikerstk
351c3f4367 Added support for a text that is shown above a kart to the
kart (and changed the FTL code to display 'Leader' so that
it uses this feature now).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11284 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-06-08 21:14:00 +00:00
hikerstk
4995fd22a3 Fixed compiler warnings (and removed some digits which I guess
are unnecessary).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11279 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-06-06 10:06:10 +00:00
auria
dae00f0828 Add first version on intro cutscene. Still incomplete but goes somewhere :) Ask me for the menu patch if you want to look at it
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11276 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-06-05 00:27:34 +00:00
auria
9ba0c7f137 More work to make cutscenes work
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11272 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-06-02 22:35:09 +00:00
auria
553385fe9d Start work to allow showing worlds without kart, for cutscenes. Does not work yet but getting closer
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11266 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-31 01:32:27 +00:00
hikerstk
1398184b35 Removed unused new AI controller, and created
new skidding ai which is at this stage a copy
of the default AI controller.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11254 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-21 06:57:05 +00:00
hikerstk
c6336649b3 Fixed #634 - crash when exiting a game with ghost
(ghost karts were not removed, causing problems when
drawing all later).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11252 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-20 00:29:03 +00:00
auria
e5a3a45153 Add missing file
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11243 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-16 00:21:34 +00:00
auria
87b2ee2b5d Add sample implementatiomn for ticket 263, add text to hover over karts, in follow the leader
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11242 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-16 00:12:16 +00:00
auria
a5a630f410 Use the new OVERRIDE macro in a couple more places
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11232 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-14 00:20:00 +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
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
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
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
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
8a919816e1 Fixed returning reference to temporary
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11145 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-23 23:41:51 +00:00
auria
db2cd01922 Allow going to a challenge in the overworld by clicking on the minimap
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11143 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-23 19:23:21 +00:00
wardje
9eed9409e5 Add functionality to end a race early (#486).
* Only adding for standard races (normal race + time trial), didn't make as
  much sense elsewhere.
* Places still active players at the back of the final result and gives
  them penalty time.
* Add button to race pause dialog, temporarily using options_ui.png.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11093 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-07 21:58:11 +00:00
auria
9e3ba88f98 Don't allow starting a race from overworld while being rescued
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11091 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-05 02:28:21 +00:00
hikerstk
ae5b3b923e Bugfix: Casting Kart to TerrainInfo is not correct anymore,
added getTerrainInfo() function instead and dynamic_casts.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11081 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-04 00:43:52 +00:00
hikerstk
eca5b3e570 Refactored handling of kart animations: instead of
using a fixed object in the kart, now each animation
(rescue, explosion, canon) has its own object and 
implementation using a common interface. This
simplifies AbstractKartInterface, and makes it
easier to add new functionailty. 
Instead of using: kart->rescue(...),  or kart->explode(...)
you use new ExplosionAnimation(kart, ...) etc. Memory
handling is done by the object (and abstract kart).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11070 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-01 22:57:41 +00:00
auria
b83202439c When returning to overworld, bring back player to approximately where they were upon leaving
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11067 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-01 17:17:36 +00:00
auria
74ab49b1ac Hide lap messages in overworld
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11066 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-01 15:45:10 +00:00
auria
6f58350098 Return to overworld when exiting a race if race was started from overworld
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11065 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-01 15:42:44 +00:00
auria
ea3d5ca9b5 Updated Xcode project, plus fix quite a few issues found by Clang (Xcode now uses clang by default) - some of them genuine nasty bugs, great
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11029 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-03-27 22:04:44 +00:00
hikerstk
e3de48350d Removed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11024 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-03-25 23:56:25 +00:00
hikerstk
ebbc1a71d8 Introduced an 'abstract kart' class, which is used to
de-couple kart implementation and its interface. This
significantly reduces compile time when changing kart.hpp,
but is at this stage still work in progress.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10997 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-03-19 20:21:11 +00:00
auria
40efd3fbfc Apply patch by Wardje to skip the ready-start-go pahse for voerworld, thanks
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10989 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-03-17 18:43:11 +00:00
hikerstk
bbb0954ae8 Applied Wardje's patch to have separate high scores for reverse mode.
Thanks a lot!


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10967 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-03-14 22:37:56 +00:00
hikerstk
629f9a27e2 Removed dependencies on controller.hpp from kart.hpp (to
reduce compile time on controller changes).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10952 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-03-08 22:56:33 +00:00
hikerstk
72070db1a0 Fixed memory leak: the virtual createPhysics function of
GhostKart was not called, since it was called during when
the contrsuctor of Kart was executed (at this time the
GhostKart vtable wasn't set up, so Kart::createPhysics)
was called - which resulted in a memory leak since all
physics parts of the kart were actually allocated (just
not used). To fix this, karts are not constructed in two
phases: first a constructor, followed by a call to init
(during which virtual function can be used).
Fixed several bugs were physics data for a GhostKart
were accessed.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10947 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-03-07 02:41:41 +00:00
hikerstk
3fc43d4d14 Refactored replay by splitting it into one base class, and dedicated
classes for recording and for replaying. Added compression (by use of
interpolation) settings to stk_config - atm only using a certain
frequency (delta-t setting in stk_config) is used.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10904 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-28 22:33:49 +00:00
hikerstk
4f1961044c Avoid crash in case of a kart-track collision while during resetAllKarts (which
apparently happens in doing-the-dishes with 20 karts).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10903 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-28 03:36:18 +00:00
hikerstk
bce6113fd7 Added first version of (uncompressed) replays - atm only
kart positions and rotations are saved.
To save a replay, press ctrl-F10 which will create a file
in the stk config dir 'trackname'.replay .
To replay, use --ghost command line, and select the
track with the same name (at this stage the replay is
loaded even if number of laps and difficulty is different).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10897 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-27 05:52:17 +00:00
auria
c953803f13 Start refactor to turn around a bad design decision regarding challenges. Oops. Number of required trophies moved from scene.xml to .challenge file.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10885 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-23 01:36:24 +00:00
hikerstk
579715a8d8 Merged trunk with this branch. ATM the track screenshot does not work -
I am going to fix this next.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/reverse_mode@10862 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-16 04:57:49 +00:00
hikerstk
94be2cfec2 Automatically switch to camera 0 when the lap line is crossed. This
improved handling of end cameras for reverse mode (otherwise one
additional end camera would need to be defined to be used just
when the lap line is crossed).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/reverse_mode@10850 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-15 05:23:21 +00:00
hikerstk
e13a7078d8 Fixed warnings being printed at race start when using 0 lap races.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/reverse_mode@10845 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-14 23:25:43 +00:00
hikerstk
fcdf44c764 1) Fixed computing of checkling requirements to work properly with
reverse tracks. Simplified code by moving some functionality
   from QuadGraph to CheckManager.
2) Added comments, renamed some functions to better indicate
   what they are doing.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/reverse_mode@10843 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-14 20:51:29 +00:00
auria
da25bc6105 Fix entering garage in a cleaner way
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10817 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-07 01:25:56 +00:00
auria
a8dd687071 Revert change I did that introduced bug
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10811 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-06 02:55:41 +00:00
auria
65b4eed110 Implement going in the garage to change kart
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10807 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-05 19:32:17 +00:00