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
Commit Graph

492 Commits

Author SHA1 Message Date
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 0290564310ee3014561abd8ffb2f99f04a23e113.
 2014-06-05 12:38:38 +05:30
Sachith Hasaranga Seneviratne
0290564310 Revert "Merge sources.cmake change" 
This reverts commit 03bff8819fcbf3e0f48752c2a79d80bfdb13fcb6, reversing
changes made to 540c7818aaa554296f49813e68f0ce3f2307ce16.
 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