Commit Graph

307 Commits

Author SHA1 Message Date
Deve
6e4f8eef9e Make sure that we have created SoccerWorld before typecasting 2015-01-13 17:49:06 +01:00
Vincent Lejeune
53c8df6733 Remove remaining MD3 support 2015-01-10 21:03:44 +01:00
hiker
006a7f95c9 Cherrypicked pull request #1743 (cppcheck performance fixes). 2014-12-01 15:14:27 +11:00
hiker
084ae89b55 Try to fix physics crash. 2014-11-17 08:44:21 +11:00
hiker
884daf9093 Fix #1665 (kart hovering in pyramid after jump) by only cushioning with
half the computed impulse.
2014-11-05 22:53:25 +11:00
Flakebi
abf7bacfea Merge branch 'upstream/master' into perPlayerDifficulties
Conflicts:
	src/graphics/stkmesh.cpp
	src/states_screens/kart_selection.cpp
2014-10-31 16:47:34 +01:00
Marianne Gagnon
139f20b39d Merge remote-tracking branch 'sachith/ScriptEngine'
Conflicts:
	CMakeLists.txt
	sources.cmake
	src/io/file_manager.cpp
	src/io/file_manager.hpp
	src/modes/world.hpp
	src/tracks/track.hpp
	src/tracks/track_object_presentation.cpp
2014-10-27 18:43:09 -04:00
Flakebi
57afd1d585 Merge remote-tracking branch 'origin/master' into perPlayerDifficulties, this time the right branch...
Conflicts:
	data/gui/user_screen.stkgui
	data/gui/user_screen_tab.stkgui
	src/graphics/glwrap.cpp
	src/graphics/weather.cpp
	src/states_screens/user_screen.cpp
2014-10-20 22:36:54 +02:00
hiker
c18579d86a Fixed compiler warning. 2014-10-14 09:57:53 +11:00
Flakebi
dc78c35b50 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
Conflicts:
	data/gui/user_screen.stkgui
	data/gui/user_screen_tab.stkgui
	src/karts/kart.cpp
2014-10-05 12:10:39 +02:00
hiker
a643905053 Minor fix for the (currently unused) downward impulse: only apply it
when all four wheels are touching the ground (otherwise the jump
distance is significantly shortened); also fix handling of negative
speed (plus some changes to commented out debug output).
2014-10-01 23:41:13 +10:00
hiker
49176dd348 Removed debug output, added documentation. 2014-10-01 12:28:10 +10:00
hiker
e55959555e Added more debug output. 2014-09-30 23:59:17 +10:00
hiker
11916dd187 Different implementation of soft-landing. 2014-09-30 23:13:48 +10:00
hiker
79873e2d45 Added (some) support for driving on walls, added documentation. 2014-09-29 11:54:46 +10:00
hiker
a86b4e489c First version of 'smooth landing' in physics. 2014-09-28 23:18:52 +10:00
Flakebi
2cf9707294 Merge branch 'upstream/master' into perPlayerDifficulties
Conflicts:
	src/states_screens/kart_selection.cpp
I hope I got everything
2014-09-24 17:58:12 +02:00
hiker
ad20635cce Applied patch for #600 (support 64 bit compilation on windows). 2014-09-23 14:41:32 +10:00
hiker
29c162bdf8 Fixed compiler warnings. 2014-09-23 08:56:07 +10:00
Flakebi
9bcc76127f Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-17 13:20:09 +02:00
Sachith Hasaranga Seneviratne
10e2634f22 Merged master 2014-09-13 08:45:41 +05:30
hiker
bf135095d8 Updated documentation, removed commented out code. 2014-09-12 08:37:03 +10:00
hiker
68e45db8d3 Start to support driving (and rescuing) on physical track objects. 2014-09-11 21:48:03 +10:00
Sachith Hasaranga Seneviratne
118db58a02 Merged Master 2014-09-07 11:28:15 +05:30
Flakebi
5858c05e74 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-05 22:46:17 +02:00
vlj
8da557d153 Use GLEW for our GL function support. 2014-09-05 18:21:07 +02:00
vlj
13e1a40b7b Remove stkinstancedscenenode.h/cpp 2014-09-03 01:33:52 +02:00
Marianne Gagnon
102e517497 Remove manual LOD code, it's now automatic 2014-09-02 18:54:38 -04:00
Flakebi
a31ec772ff Replace accidently placed tabs 2014-09-02 03:57:48 +02:00
Flakebi
dc4a30202f Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-01 11:31:26 +02:00
Sachith Hasaranga Seneviratne
a695c197b2 Merge master 2014-08-13 12:12:51 +05:30
hiker
940a296366 Merge remote branch 'origin/master' into leyyin 2014-08-11 09:05:34 +10:00
Deve
99ce91dc46 Strength of bouncy edges should depend on soccer ball mass. 2014-08-08 23:07:03 +02:00
hiker
03160e3b7b Increase the brake force the longer the brake key is pressed (before it
took ~1.6 seconds for a kart to stop, now 0.5; while hardly any change to
short brakes to slow down the kart a bit only). Also made the impulse to
keep karts parallel to the ground configurable.
2014-08-06 07:52:02 +10:00
hiker
44da1fb4f2 Keep flying karts parallel to the ground in the physics, not outside.
This avoids odd side effects that happened before (e.g. very bad collisions
with track; problems when dropping karts on rescue on the walldriving branch).
2014-08-05 08:21:52 +10:00
Sachith Hasaranga Seneviratne
c3a774fcc9 Merged master 2014-08-01 18:40:05 +05:30
Flakebi
bc458c42d3 Apply per-player difficulty 2014-07-30 22:26:59 +02:00
Flakebi
55090a0566 Unify log output 2014-07-22 12:54:11 +02:00
Sachith Hasaranga Seneviratne
f4b357d03c Merged master 2014-07-11 07:04:25 +05:30
konstin
ce7da4b237 running whitespace.py 2014-07-08 20:59:34 +02:00
Sachith Hasaranga Seneviratne
be9e9a326d Merged master 2014-07-08 18:18:56 +05:30
Sachith Hasaranga Seneviratne
008bf124ba Added different types of collision triggered scripts. Only available on a couple of tracks for testing at the moment 2014-07-08 17:52:47 +05:30
hiker
a65959da42 Replaced upright constraint with simpler code that keeps the kart
in mid air aligned to the gravity. This will also enable jumps in
section where the gravity is not in the default direction.
2014-07-08 16:52:09 +10:00
Sachith Hasaranga Seneviratne
6af28141a4 Merged master 2014-07-05 06:58:43 +05:30
Sachith Hasaranga Seneviratne
850ec1124e Added kart-physical object collision detection and made the barrels on hacienda removable via colliding with them (No speed logic implemented in scripts yet) 2014-07-04 11:14:44 +05:30
hiker
80d09825bb Fix (potential) problem with exponential spring response (which is
not used atm).
2014-07-03 16:53:12 +10:00
Sachith Hasaranga Seneviratne
3573452519 Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-07-03 07:39:09 +05:30
hiker
2b6e1b8432 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-07-01 09:51:56 +10:00
Deve
ff6af6b072 Change power of bouncy edges in soccer field as temporary solution for #1367.
Ideally power of bounce should depend on soccer ball weight.
2014-06-30 18:20:31 +02:00
hiker
621539849a Removed unused code. 2014-06-30 16:45:00 +10:00