Commit Graph

64 Commits

Author SHA1 Message Date
unitraxx
2711744ed8 merge with trunk
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13477 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-15 00:20:28 +00:00
auria
2693043395 The hayball in farm will now flatten you (exporter still left to do)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13473 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-13 00:36:37 +00:00
hikerstk
df9d90b342 Merged bubble bum branch into trunk. The new bubble gum
shield is still work in progress.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13444 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-08 03:11:03 +00:00
hilnius
ed6e4ebfb4 correcting the ai kart bug due to the former networking removal
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13088 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-05 12:01:29 +00:00
hilnius
2a0a9a3617 merging uni's and hilnius's branches in networking
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13077 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 17:24:20 +00:00
hilnius
613e97d0d6 breaking everything that was working. cannot even start a race now, need to rewrite the network manager and part of the race startup sequence
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13032 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-29 22:57:18 +00:00
curaga
9ddeac772a Likewise for userconfigparams
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12986 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-26 13:32:02 +00:00
auria
485551aa89 Apply patch by KroArtem to fix minor issues : unused variables and other minor warnings from cppcheck, crash when launching from terminal with AI karts in a mode where AI is not supported
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12857 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-09 20:04:07 +00:00
hikerstk
a529a07c99 Fix #981: karts are sometimes rescued when restarting, or facing the
wrong direction. Reason was an incorrect rotation in the projection
code. Instead of fixing it, I let the kart fall a little bit, so the
code is now correct, much easier to understand, and the bounce after
a reset fits the game imho.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12852 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-06 23:08:52 +00:00
curaga
b56bf4dc53 Remove trailing space, git doesn't like it
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12797 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-29 22:04:35 +00:00
hikerstk
04c3b93bb1 Avoid NAN problem if a kart with velocity 0 is involved in a collision.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11949 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-15 00:10:36 +00:00
hikerstk
49f54f2aee Added different impulse in case of a kart-track collision
(just acting along the normal). This solves some of the odd
behaviour with the previous implementation if the kart is
off track. The new way is now the default, but the 'push
towards driveline' can be set in stk_config.xml.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11923 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-11 21:56:54 +00:00
hikerstk
09e9768df0 Removed unnecessary tests.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11760 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-10-25 20:54:19 +00:00
auria
4f7f1379df Add small feature : in addition to allow resetting a kart when touching something, allow making it 'explode' the kart like when receiving a cake
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11687 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-10-16 00:09:33 +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
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
hikerstk
53b3c78598 1) Added first version of 'cannon' (flying the kart to a specific
location) support. ATM only linear interpolation of the position
   is used (i.e. no rotation).
2) To be consistend renamed 'forceRescue' to 'rescue', 
   'handleExplosion' to 'explode' (and added shootTo for the canon).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11021 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-03-25 23:16:53 +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
hikerstk
5feea5c8f2 Fixed byg and naming inconsistencies in kart pushing, more
tuning towards collision impulse.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10875 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-19 21:41:54 +00:00
hikerstk
1698d1dfe5 Removed unused function.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10872 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-17 11:53:29 +00:00
hikerstk
5535564467 Consider the 'sideway' speed with which karts hit each other: this makes
it possible to intentionally push karts off track by crashing into them
sideways. This is experimental ;)
Also renamed some variables to better describe what they are.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10830 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-09 05:41:13 +00:00
hikerstk
90e6a02193 Improved collision handling to better detect left/right side
collisions. Made collisions more bouncy than before (but I am
still tuning).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10827 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-08 20:22:00 +00:00
hikerstk
9d5485a9e3 1) Moved attachment handling from physics to attachment.
2) Split Kart::crashed into two public functions for collisions with
   kart and collisions with track, and one private function with code
   common to both collisions.
3) Removed #include of attachment.hpp from kart.hpp to reduce compile
   time.
Sorry for not splitting this up into three parts.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10775 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-31 12:02:10 +00:00
hikerstk
ee88af76b9 1) Added adjustment of rotation of chassis after skidding.
2) Renamed setTimedImpulse to setTimedCentralImpulse.
New skidding is still disabled.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10652 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-12 00:09:04 +00:00
hikerstk
c3586684d3 Cosmetic changes only.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10451 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-19 22:02:48 +00:00
hikerstk
c3a057f206 Added options to apply an impulse for a certain amount of time. This
way pushing two karts away from each other is less abrupt. This is
now enabled, feedback (or tweaks) welcome.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10439 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-18 20:55:27 +00:00
hikerstk
d06acf1f7b 1) Added an (additional) impulse to push karts away from each other.
This impulse does not cause any rotation of the kart, it just pushes
the kart orthogonal to its velocity.
2) The rotational velocity is set to 0 in case of a collision, hopefully
avoiding the problem that karts will rotate as result of a collision.
3) A collision pair now stores the exact collision point for both bodies
(which is then used to determine the side in which the impulse to be
applied).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10422 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-14 21:02:15 +00:00
hikerstk
8ab469d4d8 1) Added an additional impulse to push karts away in case of a collision (unused atm)
2) Saved one collision point for each collision pair so that a frontal detection
   can be detected (atm unused).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10407 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-12 05:42:40 +00:00
auria
92eb0ebd2a Ran a small bash script to remove all of those annoying strings. The only thing they gave us were the need to rebuild after committing
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10363 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-06 18:43:36 +00:00
hikerstk
2c33ed75ed Merged the physics branch back to trunk. There should be no change at
this stage for users.
The physics branch added a few new stability options (which are disabled
by default), fixed bug and reproducing history files when using physics
replay, using --log=file command line option. See log on the physics
branch for full details.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10292 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-01 01:14:10 +00:00
hikerstk
a354f5521d Added support for animated physical objects to trigger a reset
of a kart on collision.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9924 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-30 06:29:00 +00:00
hikerstk
2b805c7d69 Added support for physical objects triggering rescue on collision
(#163). Objects must be declared with 'reset="Y"' in order
to trigger rescue.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9910 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-28 10:52:41 +00:00
hikerstk
2a542f011a Fixed comment.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9605 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-22 01:09:09 +00:00
hikerstk
da8ec214ce Added a very first version of a swatter (or inflatable hammer).
Details are in the wiki (http://supertuxkart.sourceforge.net/Items).
Note that the model is _obviously_ a placeholder, and I  used
the icon for the bomb (which isn't used in game atm) for the
swatter. I hope someone can provide a better model and icon.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9011 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-22 12:27:48 +00:00
hikerstk
9b64fa1406 1) Added new isInvulnerable function to kart, which is now
also used by emergency animation to make a kart invulnerable
   for a certain amount of time.
2) Karts are not not affected anymore by a explosion that
   just happens close by, see #258.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8814 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-04 13:29:35 +00:00
hikerstk
62fb47aeed Added support for textures to trigger a reset on collision (separately from
triggering reset when driving on).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8367 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-04-17 22:06:45 +00:00
mbjornstk
015443f582 Set props as per SVN-CONFIG for .[ch]pp, AKA SVN props clean up day. :)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7493 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-01-21 01:54:38 +00:00
hikerstk
af641ae196 Bowling balls will now bump off karts that have the star effect shown,
and not explode anymore.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7478 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-01-17 21:21:47 +00:00
hikerstk
c39cf57971 Support for nitro, slipstream and zipper to become faster than a kart's
maximum speed. Parameter in data/stk_config might need more tweaking.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6339 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-10-26 06:28:58 +00:00
hikerstk
b0ed33197b Improved/fixed terrain specific slowdown. Slowdowns are not specified in materials.xml
with two values: one specifying the percentage of max kart speed that can be reached
(e.g. 0.5 means a kart can only drive 50% of its maximum speed on this terrain),
the 'slowdown' value specifying how long it will take for a kart to be slowed down
to that value (e.g. a value of 3 for slowdown and 0.5 for max-speed means that
it will take 3 seconds of continuously driving on that terrain till the speed
is reduced to 50% of the karts maximum value).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6290 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-10-16 13:07:25 +00:00
hikerstk
32ed6f400a Removed calls to physics debug draw while the menu is shown.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/switch_coordinate_system@4904 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-02 05:15:33 +00:00
hikerstk
d7c44cc93d Physics debug mode now cycles through off, show karts and collision shape,
to show only collission shape and then back to off. The command line
option --bullet-debug was removed.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/switch_coordinate_system@4853 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-26 07:03:12 +00:00
hikerstk
fbeaa0524f More fixes to swap the bullet axis.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/switch_coordinate_system@4822 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-24 05:23:00 +00:00
hikerstk
092a59a7d2 Very first changes. Doesn't really work yet and will most likely crash - not recommended to use :)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/switch_coordinate_system@4813 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-23 13:27:01 +00:00
hikerstk
f41150eae7 Replaced OpenGL bullet debug view with irrlicht bullet debug view.
Debug view can now be switch on and off during a race (ctl-F11),
but currenlty does not display as much information as the 
original debug view (more to be implemented here).
Removed glut dependency.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4794 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-22 12:02:13 +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
9eb8995399 Fixed compilation problem (no idea why it ever compiled on VS).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4423 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-10 22:50:13 +00:00
hikerstk
2f268dce77 Added some code to add a 'push to the side' when crashing into a kart.
This code is for now disabled in the stk_config.xml file, since it needs
changes to the physics to be better playable.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4422 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-10 12:16:32 +00:00
rforder
e8dc5d4f4d Improved location of custom SFX calls to avoid multiple calls being made simultaneously
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3906 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-22 16:45:24 +00:00
davemk
271a157c6c use kart projection for rescue and initial simulation
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3882 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-18 11:05:40 +00:00