Commit Graph

194 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
curaga
ead8c059cb Remove some unused irr_driver includes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12985 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-26 13:31:38 +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
57c3cbae3e Space cleanup pass on the headers
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12817 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 19:47:39 +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
7460418153 Code cleanup: renamed kinetic to 'is_dynamic' in order to follow the categorization of
different rigid bodies in bullet. Some layout fixes, removed unused or unnecessary
functions and constructors.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12779 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-19 22:02:34 +00:00
hikerstk
3bbb6b30f3 Fixed performance bug: static objects were created as dynamic rigidbodies, causing
constant collisions.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12775 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-16 23:40:39 +00:00
auria
d1759b8d88 Add missing conversion from radians to degrees when moving track object from physics
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12616 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-06 00:21:57 +00:00
auria
35b508ae14 Fix uninitialized pointer
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12615 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-06 00:17:35 +00:00
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
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
50e033f9f4 Fixed 'flying' problem in new mine track when driving into the water.
I have to confirm with bullet developers why this only happens sometimes.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12513 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-18 06:19:39 +00:00
hikerstk
21063342a1 The 'feature' that objects below -100 are automatically reset
to their initial position (which was used to reset stones
falling down a volcano) must now be explicitely requested
(reset-when-below). This fixes the prpblem of floating
barrels in sandtrack.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12461 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-08 05:24:21 +00:00
hikerstk
1b90422deb Fixed shaking of karts.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12137 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-02 21:16:20 +00:00
auria
77b84f3042 Fix bug related to physical LOD nodes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12087 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-26 01:32:04 +00:00
hikerstk
fe6294d0d4 Fixed two uninitialised variables, removed unnecessary #include.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12017 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-20 02:57:21 +00:00
hikerstk
43b7f28d54 Added a setting to stk_config.xml to replace normals that are
'too different' from the normal of the triangle with the
normal of the triangle for interpolating the normals which
are used by the physics.
This should make 'smooth normals' more useful for tracks where
track and (say) a wall are connected, resulting in incorrect
normals for the physics.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11989 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-18 22:22:30 +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
auria
9dd3bb9468 Fix : objects like the subsea seagul would be animated even when animations were turned off
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11314 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-06-17 00:05:32 +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
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
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
auria
8dcc237c28 Fix tons of warnings when building with Mingw. Yes I know I did a few changes in bullet. I don't care, the warnings were too annoying
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11002 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-03-20 01:51:28 +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
288f43d481 Made the bonus speed given for a skidding boost configurable (the values
were for bonuses were changed, but are still not considered to be tweaked).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10963 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-03-13 20:51:50 +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
650af20260 Fixed #550: zippers have much less effect.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10909 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-29 09:10:16 +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
fd4eb3fa5e Added comment.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10707 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-23 06:06:17 +00:00
hikerstk
0836380d9e Apply the additional rotation to be applied to a body also
to the interpolated world transform. This fixes a bug for
rotations that are applied only once, since kart.cpp would
use the interpolated world transform, which is otherwise
not updated till the next time step, resulting in a jump
of the kart rotation.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10706 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-23 05:37:21 +00:00
hikerstk
79e2b7d0ae More work on skidding (still disabled by default).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10686 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-16 21:52:47 +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