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

12264 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
hiker
7ec2bae8e7 Minor style changes. 2014-07-08 14:41:59 +10:00
hiker
32707b8f88 Changed m_grand_prix of RaceManager to be an object (and not a pointer to 
an object) anymore, which fixes a memory leak (and I also reverted my quick
fix from last night de7ceb0c2d to fix a crash,
which now not necessary anymore.
 2014-07-08 13:20:53 +10:00
Vincent Lejeune
887438a0d0 Reduce blur amount 2014-07-08 02:37:00 +02:00
Marianne Gagnon
e229effba0 Fix gnu and sara on kart selection screen 2014-07-07 19:43:49 -04:00
Vincent Lejeune
d961a9a8bc Fix vertex color for object_pass2 2014-07-08 01:35:04 +02:00
vlj
7bf6d4db8b Change location where srgb fbo is disabled. 2014-07-08 00:24:21 +02:00
Vincent Lejeune
23bebff5c2 Forgot to add shaders.cpp to last commit 2014-07-07 19:33:01 +02:00
Vincent Lejeune
746e910e46 Remove some Motion Blur unused vars 2014-07-07 19:25:41 +02:00
Vincent Lejeune
f23f7b05e5 Turn motion blur into camera space motion blur 2014-07-07 18:44:25 +02:00
hiker
de7ceb0c2d Quick fix to avoid crash at end of race, full fix to follow later ;) 2014-07-07 23:31:43 +10:00
Sachith Hasaranga Seneviratne
6b70ea36af Bound sfx-emitters to scripts 2014-07-07 14:43:23 +05:30
hiker
09a9863a72 Merge branch 'konstin-a' 2014-07-07 17:01:48 +10:00
hiker
5611f1544d Fixed VS compilation. 2014-07-07 16:54:25 +10:00
hiker
cab0b2d833 Fixed compiler warning. 2014-07-07 16:53:42 +10:00
hiker
c222bbcb1c Merge branch 'a' of https://github.com/konstin/stk-code into konstin-a 2014-07-07 16:15:34 +10:00
hiker
0ff48588d0 Merge pull request #1387 from leyyin/master 
Fix embarrassing clang compilation mistake (thanks to solistice and cand).
 2014-07-07 16:02:29 +10:00
Sachith Hasaranga Seneviratne
d850b838ef Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-07-07 09:02:43 +05:30
Vincent Lejeune
d501125e9d Remove some unused variables. 2014-07-06 21:06:27 +02:00
Sachith Hasaranga Seneviratne
d5d0ffceb4 Bound particle emitters to scripts and added move functionality 2014-07-05 08:54:49 +05:30
Sachith Hasaranga Seneviratne
6af28141a4 Merged master 2014-07-05 06:58:43 +05:30
Marianne Gagnon
1f5dd2fff3 Improve moving objects in library behavior. 2014-07-04 20:42:06 -04:00
Marianne Gagnon
3f8bff33f3 Improve a bit more movable objects in library 2014-07-04 19:59:22 -04:00
Marianne Gagnon
41c47e59be Slightly improve behavior of moving objects in library. A problem still remains 2014-07-04 19:50:46 -04:00
Daniel Butum
680cd3370a Merge remote-tracking branch 'upstream/master' 2014-07-04 18:19:45 +03:00
vlj
b3489678e7 Prevent null SunCamViewMatrix from crashing stk. 2014-07-04 15:08:43 +02:00
Daniel Butum
361d4dfade Optimize loop (thanks to cand) 2014-07-04 13:09:46 +03:00
Daniel Butum
27f2a18f37 Fix clang compilation (thanks to solstice) 2014-07-04 11:22:09 +03:00
Sachith Hasaranga Seneviratne
eb4f585b29 Added ability to trigger explosions (graphical only) via scripts, currently uses the cake explosion_bomb.xml 2014-07-04 12:04:28 +05:30
Sachith Hasaranga Seneviratne
097a6b6394 Hardcoded explosion working in hacienda now. TODO move into scripts for custom locations 2014-07-04 11:44:40 +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
b69c92198e Merge branch 'master' of github.com:supertuxkart/stk-code 2014-07-04 08:51:07 +10:00
hiker
235800a119 Merge branch 'properties' 2014-07-04 08:46:05 +10:00
hiker
26fd76b904 Fixed warnings and unnecessary divisions. 2014-07-04 08:45:12 +10:00
hiker
736c7264b9 Merge branch 'properties' of https://github.com/solistice/stk-code into properties 2014-07-04 08:34:48 +10:00
hiker
2228897f46 Merge pull request #1384 from leyyin/master 
Fix move on unitialised values in displayFPS
 2014-07-04 08:32:37 +10:00
Bart Cools
c274a3beef Inserted fix for wrong use of parameters. The kart bars are now set correctly, but the use of "magical numbers" in the bars should be avoided somehow 2014-07-03 23:42:34 +02:00
Daniel Butum
e2418aea13 Fix c++11 feature 2014-07-04 00:34:37 +03:00
Daniel Butum
efac42f746 Fix move on unitialised values in displayFPS 2014-07-03 17:22:00 +03:00
Sachith Hasaranga Seneviratne
84fe9b09b7 Added move to meshes, created an example in greenvalley 2014-07-03 14:01:58 +05:30
hiker
80d09825bb Fix (potential) problem with exponential spring response (which is 
not used atm).
 2014-07-03 16:53:12 +10:00
hiker
926f5fc641 Merge branch 'properties' 2014-07-03 15:25:08 +10:00
Sachith Hasaranga Seneviratne
8292b4bce7 Moved triggers in green-valley in preparation for implementing 'move' for track objects 2014-07-03 09:56:29 +05:30
hiker
15dbc752d8 Added a space, hoping that this will trigger an automatic run of cmake 
to discover new files to build.
 2014-07-03 14:23:35 +10:00
hiker
be3882845c Merge branch 'properties' of https://github.com/solistice/stk-code into properties. 
Fixed conflict.
Conflicts:
	src/guiengine/widgets/model_view_widget.cpp
 2014-07-03 14:17:45 +10:00
Sachith Hasaranga Seneviratne
b47ad6df4d Added script folders for all tracks 2014-07-03 08:15:25 +05:30
Sachith Hasaranga Seneviratne
3573452519 Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-07-03 07:39:09 +05:30
vlj
ad913bc961 Fix crash without advanced pipeline. 2014-07-02 22:37:52 +02:00