ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,335 Commits 9 Branches 28 Tags 433 MiB
9fdec3067e
Commit Graph

492 Commits

Author SHA1 Message Date
hiker
9a5eec3761 Try tp reduce sudden rotation after a collision, and reduce frequencies 
of kart being pushed into the air.
 2017-03-16 16:14:48 +11:00
hiker
30cff00757 Reduce internal physics timestep to test if collision handling improves. 2017-02-20 07:48:25 +11:00
hiker
4d406490e1 Made ScriptingEngine a singleton and removed it from World, which reduces 
more dependencies on world.
 2016-12-13 09:18:59 +11:00
hiker
b12453e9ca Made Physics a singleton, removing the accessor functions from World. 
Removes dependency on World for a few files.
 2016-12-13 08:31:08 +11:00
hiker
cd149ab5d7 Moved m_track out of World into a static m_track in Track. Makes 
world smaller and removes a few dependencies on World.
 2016-12-13 07:53:33 +11:00
hiker
8949e89809 Merge remote-tracking branch 'origin/master' into rewind 
Fixed conflicts.
 2016-10-05 08:21:10 +11:00
hiker
9595a76d36 Removed unnecessary flag to keep track if speed icnrease is defined. 2016-10-04 08:28:01 +11:00
hiker
a6568e01ea Propperly handle instand speed increases in the physics when rewinding. 2016-09-26 09:01:18 +10:00
hiker
f09ed569cc Bugfix: kart rewinder stored incorrect bullet zipper speed. 2016-09-21 17:27:08 +10:00
Benau
36eca8bc55 Avoid setting gravity in btKart 2016-09-19 11:18:16 +08:00
Benau
ffd497276b Fix kart flying 2016-09-18 12:38:36 +08:00
Benau
b137dbb71c Set gravity inside btKart, allowing starting upside down in arena 2016-09-18 10:53:58 +08:00
hiker
f8b48a0313 Added zipper speed to state of kart. 2016-09-13 09:55:51 +10:00
Benau
ba047a4f99 Keep flying karts parallel to the ground in the physics, not outside 
Like 44da1fb4f2, but takes terrain
into account
 2016-09-11 15:35:42 +08:00
Benau
21dc569f70 Start to clean up quad and graph node 2016-09-04 11:56:03 +08:00
hiker
c01f838b0f Merge remote-tracking branch 'origin/master' into rewind 2016-08-08 14:34:24 +10:00
hiker
a15c9529a5 Merge remote-tracking branch 'origin/master' into rewind 2016-08-01 08:18:38 +10:00
hiker
cdde62dadb Further tweaked restitution for track and bowling ball to avoid 
bowling balls jumping up and down, while still maintaining a push
back for soccer balls.
 2016-08-01 08:00:14 +10:00
hiker
8f7d47d3c3 Fix ball-track collision (which should also improve kart-track 
collision).
 2016-07-29 09:53:37 +10:00
Benau
143bc2618e Remove a unneeded setting 2016-06-13 09:09:18 +08:00
Benau
1e1093dccc Fix default value of m_angular_damping 2016-06-12 08:09:28 +08:00
hiker
321fc09a15 Fixed compiler warning. 2016-06-10 16:02:24 +10:00
hiker
9de6def4cf Fixed missing collision callbacks for e.g. soccer balls. 2016-06-10 09:31:12 +10:00
hiker
3ec56386df Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-05-25 21:35:17 +10:00
hiker
566df3dee6 Made more physics parameters for objects adjustable in the xml file 
(for now to support a puck).
 2016-05-25 17:21:31 +10:00
Benau
221a757942 Merge branch 'arena_ai_profiling' 2016-05-24 15:52:32 +08:00
hiker
92be0c65ad Added support for setting the restitution for physical objects. 2016-05-19 13:25:29 +10:00
Benau
d2f26fe70d First playable advanced soccer ai 2016-05-16 15:24:05 +08:00
hiker
7d0953ad83 Merge branch 'master' into rewind 2016-04-12 17:36:56 +10:00
Odd0002
47bac3b33d Fix debug build on GCC 5.3.0 2016-03-26 22:36:22 -05:00
hiker
ee320588d5 Merge remote-tracking branch 'origin/master' into support_nw_splitscreen 2016-02-09 17:40:59 +11:00
Benau
3a3963bf8d Make STK soccer mode more like real match 
1. Short win animation is shown in a kart if it scored correctly

2. Possible to identify own goal in result gui

Also player name is shown instead of kart name in result gui for all modes.
 2016-01-19 16:21:58 +08:00
hiker
d3a7c75a62 Replaced many uses of getPlayer with Controller::canGetAchievements. 
Removed some unused variables.
 2016-01-15 08:02:36 +11:00
hiker
68e37c902f Merge remote-tracking branch 'origin/master' into refactor_networking 2015-12-15 22:52:55 +11:00
hiker
dbd210d08c Renamed PlayerController into LocalPlayerController. 2015-12-10 17:54:29 +11:00
auriamg
f0fafc2651 Merge pull request #2245 from Flakebi/kart-properties 
Kart properties
 2015-12-07 18:44:14 -05:00
deve
0bd15acb93 Fixed compiler warning. 
gcc complains that std::auto_ptr is deprecated.
 2015-12-03 14:51:26 +01:00
Flakebi
aea68a2c14
Remove characteristics from kart 2015-11-29 04:08:12 +01:00
Flakebi
ffa85d2206 Merge remote-tracking branch 'upstream/master' into kart-properties 2015-11-21 23:03:58 +01:00
Nado
d66a70b250 Fixing some -Wunused-variable 2015-11-17 11:42:28 +01:00
Thomas Glamsch
a5a9b9f6c1 Fix a memory leak in PhysicalObject::init(). 2015-11-02 01:43:54 +01:00
Flakebi
5e6e85ab79 Merge branch master into kart-properties 2015-10-03 15:20:06 +02:00
hiker
642a333e5e Fixed kart getting stuck at doors of overworld (and other static 
physical objects).
 2015-09-26 01:08:10 +10:00
hiker
fc67252e78 Fix #2300 (mostly,karts get stuck there atm, but can't drive through the door). 2015-09-25 09:15:47 +10:00
Marianne Gagnon
9a6b41d2b5 Apply offset on meshes with exact collision shape, fixes #2300 2015-08-31 19:57:55 -04:00
Flakebi
b51eadae28 Merge branch 'master' into kart-properties 2015-08-16 16:45:47 +02:00
Marianne Gagnon
7b8da0ef34 Bugfix : objects with a physics collision from a library should rotate and scale according to the parent library object 2015-08-11 20:55:04 -04:00
Marianne Gagnon
d488c043d1 Continue work on scripting, fixing #2268. Use this as an opportunity to clean up a lot of old hardcoded overworld code, and replace it with cleaner scripting. Make sure to update SVN and the exporter (other commits in SVN coming soon) 2015-08-09 21:38:01 -04:00
hiker
b44f0605dc Try to bring karts quicker back on the ground when the kart is 
on its side, without overcompensating (and therefore shaking)
when the kart is only slightly non-parallel to the ground
when flying.
 2015-08-05 17:00:40 +10:00
Flakebi
5d36b95c95 Merge remote-tracking branch 'upstream/master' into kart-properties 
Conflicts:
	data/stk_config.xml
	sources.cmake
	src/karts/kart.cpp
	src/karts/kart.hpp
	src/karts/kart_properties.cpp
	src/karts/kart_properties.hpp
	src/tracks/track.cpp
 2015-07-29 02:48:43 +02:00
hiker
95b86ea914 Fixed #2247. 2015-07-27 09:56:58 +10:00
hiker
622d0821cf Fixed rescue (which my previous commit broke). 2015-07-24 21:38:35 +10:00
hiker
6345272727 Removed unnecessary #include in kart.hpp. 2015-07-24 16:51:03 +10:00
hiker
a2c4160ce0 Added TerrainInfo raycast to debug view. 2015-07-24 16:37:13 +10:00
hiker
bb058deea5 Avoid that the kart is 'shaking' backwards/forwards when flying. 2015-07-21 16:56:51 +10:00
hiker
e755a7eda8 Merge remote-tracking branch 'origin/master' into graphical_chassis_to_physical_chassis 2015-07-18 11:53:49 +10:00
Marianne Gagnon
675b0b9458 Improve scripting error handling, more work on different shapes for collision triggers 2015-07-17 19:18:12 -04:00
hiker
9f687fd6cf Removed unnecessary computation (now that physics does not include 
wheel rotation).
 2015-07-14 17:27:06 +10:00
Flakebi
9fc6f84545 Switch from properties to characteristics 2015-07-11 19:22:27 +02:00
Flakebi
1ceab872b1 Remove PlayerDifficulty class 2015-07-11 16:16:40 +02:00
hiker
93282f8abf Completely removed the usage of a physical wheel radius in the physics, it was 
never really necessary, the phsyics are basically the same). Wheel rotation is
was refactored to be completely done in KartModel now.
 2015-07-09 23:59:53 +10:00
hiker
3b9e85af0b Converted bullet's TravelCM (i.e. in cm) into Travel (i.e. in m). 2015-07-09 00:06:19 +10:00
Marianne Gagnon
403d61e754 Allow creating initially hidden objects, that can later be shown through scripting 2015-06-17 19:33:53 -04:00
Marianne Gagnon
cb510840ae Work on scripting, namely improving interaction with library objects 2015-06-05 19:34:46 -04:00
Marianne Gagnon
238578c921 More work towards handling library nodes in scripting 2015-06-04 20:12:03 -04:00
hiker
f59d277f3e Improve handling of sudden steeper uphill section by increasing the 
suspension force, which makes it less likely for the kart to hit
the terrain.
 2015-06-03 09:03:40 +10:00
Marianne Gagnon
501dd14bb6 More scripting work on item-object collisions 2015-05-31 18:20:52 -04:00
Marianne Gagnon
8ef16c146e Scripting work : improve flyable vs object collision callbacks. More work to do still. 2015-05-31 18:09:51 -04:00
Marianne Gagnon
40ea7f94f0 Scripting work : improve object-kart collision callbacks 2015-05-28 19:57:36 -04:00
Marianne Gagnon
722cd0e181 Merge branch 'Scripting' 2015-05-21 19:29:01 -04:00
Marianne Gagnon
e290e9003d Tweak for scripting documentation 2015-05-17 20:12:39 -04:00
Marianne Gagnon
080936f144 Work on scripting 2015-05-17 19:27:25 -04:00
Marianne Gagnon
a29fa5c4a3 More work on scripting 2015-05-10 19:19:35 -04:00
Marianne Gagnon
d98c1044e6 More work on scripting 2015-04-30 20:36:54 -04:00
Marianne Gagnon
1559d03ea1 More work on scripting, test ways to pass arguments to script functions 2015-04-30 20:24:02 -04:00
Marianne Gagnon
585d1c5016 Scripting cleanup, remove hardcoded stuff in favor of more generic approaches 2015-04-30 19:37:11 -04:00
hiker
aaf20dc919 Fixed #2118. 2015-04-27 17:14:23 +10:00
hiker
e8b8bbdd3b Added display of normals at the vertices of the triangles the kart is driving on 
to the debug display, which is useful to find why interpolated normals are wrong.
 2015-04-15 07:44:50 +10:00
hiker
fb9d422f9b Made interpolated normals white to make them easier to distinguish. 2015-04-14 16:39:28 +10:00
hiker
2c44bd1201 Removed unnecessary copy, precompue area of triangle to reduce 
work when smoothing normals.
 2015-04-14 16:21:43 +10:00
hiker
a4264cc063 Visualise the (interpolated) normal at the points where the wheels touch the ground. 2015-04-14 09:33:55 +10:00
hiker
8d07d26c25 Updated (c) year to include 2015. 2015-03-30 11:42:50 +11:00
Marianne Gagnon
5e34ac3a44 Fix bug #2037 (objects in library objects with curve animations not working) 2015-03-18 21:48:22 -04:00
Marianne Gagnon
8bd33dba23 Improved handling of scaled physical objects 2015-03-05 20:14:33 -05:00
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
hiker
be76aae256 Interpolate the normal for the gravity to allow smoother changes of 
gravity - though it does not improve the bumpiness on twisted road section.
 2014-06-29 22:53:35 +10:00
Sachith Hasaranga Seneviratne
75ed68ac58 Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-06-08 20:32:08 +05:30
hiker
3cd2b97202 Added missing operator-(Vec3, btVector3). Without this operator 
additional typecast where necessary on VS when computing
Vec3-btVector3.
 2014-06-06 09:36:12 +10:00
Sachith Hasaranga Seneviratne
795a6022e5 Revert "Revert "Merge sources.cmake change"" 
This reverts commit 0290564310.
 2014-06-05 12:38:38 +05:30
Sachith Hasaranga Seneviratne
0290564310 Revert "Merge sources.cmake change" 
This reverts commit 03bff8819f, reversing
changes made to 540c7818aa.
 2014-06-05 11:46:11 +05:30
Sachith Hasaranga Seneviratne
03bff8819f Merge sources.cmake change 2014-06-05 11:30:28 +05:30
hiker
5619509ebb Prevent NANs/crash. 2014-06-05 08:59:24 +10:00
Sachith Hasaranga Seneviratne
2f57a14c87 On hitting a physical object with any item, the physical object is now removed (vanishes), can be tested on tutorial by shooting bowling balls at the boxes 2014-06-02 16:09:33 +05:30
Sachith Hasaranga Seneviratne
43f78a6a54 Added accessor methods for ID, set disabling/enabling/status checking to work for IDs as well 2014-06-02 13:07:51 +05:30
Sachith Hasaranga Seneviratne
038aaa6f3b Hitting a physical object with an object now triggers a message (Test in tutorial by shooting at the boxes). All currently suppported collision types now denote the type in the message that appears. 2014-05-29 18:51:48 +05:30
Sachith Hasaranga Seneviratne
870f438b06 Removing animations now also removes the corresponding PhysicalObject as well. Additionally opened up the PhysicalObject class to allow for the setting of the interaction type with the future goal of exposing it to scripts 2014-05-29 17:37:13 +05:30
sachith500
6f58864df0 Added namespaces Scripting, Scripting::Physics. Moved collision script code and function,callback binding to Scripting::Physics 2014-05-27 11:57:44 +05:30
sachith500
8c5606be08 Karts involved in collisions addressable by ID 2014-05-26 20:30:27 +05:30
sachith500
31f7ea7c89 Added very basic collisions 2014-05-26 18:03:41 +05:30
Marianne Gagnon
00ea15b7bb Yet another fix to pre-c++2011 compilation..... (not trying to raise my commit count, I swear!!) 2014-05-10 20:53:51 -04:00
Marianne Gagnon
7808fc8a09 Yet another fix to pre-c++2011 compilation..... 2014-05-10 20:50:18 -04:00