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

2329 Commits

Author SHA1 Message Date
hiker
98bb7e3959 Merge branch 'bumpy' 2014-08-13 11:16:03 +10:00
Vincent Lejeune
292aa0cbc4 Factorize FullScreen shaders invocations. 2014-08-13 02:01:29 +02:00
hiker
11f3c1fc11 Added the recovery dialog back in :) 2014-08-11 22:39:08 +10:00
hiker
3f5ab358df Merge branch 'leyyin' 2014-08-11 14:22:30 +10:00
Marianne Gagnon
2c1feb5f06 Improve debug values popup 2014-08-10 19:09:44 -04:00
hiker
940a296366 Merge remote branch 'origin/master' into leyyin 2014-08-11 09:05:34 +10:00
hiker
42453325c4 Increased impule to keep kart parallel a bit more, changed the bevel shape 
to be slighlty longer.
 2014-08-11 09:02:45 +10:00
hiker
a8189eccfc Increase impulse to keep the kart parallel (to avoid the kart being 
90 degrees on its side and not being able to get straight again).
 2014-08-11 08:10:04 +10:00
hiker
4d1d4492b1 Removed support for non-bevelled shapes (has not been used in years). 
Fixed position of physical (raycast) wheels to be in (or on the edge)
of the collision body, not outside. Removed support for defining
kart-specific physical kart position (was never used).
 2014-08-10 21:54:18 +10:00
Vincent Lejeune
020e939e2b Normalize normals in normal view. 2014-08-09 21:24:50 +02:00
Vincent Lejeune
c546b25ae9 Fix perspective in normal view. 2014-08-09 21:19:26 +02:00
Vincent Lejeune
c07aed260a Visualize vertex normals in normal view. 2014-08-09 21:09:31 +02:00
Vincent Lejeune
bcc2196ccf Fix SSAO on splatting material. 2014-08-09 20:05:49 +02:00
vlj
768d51d0c3 Add sliders to change ssao parameters. 2014-08-09 19:22:30 +02:00
vlj
496269e73b Make SSAO param changeable. 2014-08-09 18:51:52 +02:00
konstin
c59f243550 Merge branch 'master' of https://github.com/supertuxkart/stk-code into save_gp 2014-08-09 17:06:16 +02:00
hiker
f39e22e442 Merge branch 'master' of https://github.com/leyyin/stk-code into leyyin 2014-08-08 11:10:56 +10:00
Vincent Lejeune
8db09a55cd Add Splatting RSM shader type. 2014-08-08 01:07:55 +02:00
vlj
60f76ee612 Fix RSM 2014-08-07 22:45:25 +02:00
vlj
6c3aeceb51 Fix GI 
It was using wrong swizzle for depth texture.
 2014-08-07 22:32:42 +02:00
Vincent Lejeune
95fb3ea580 Add support moving texture in rsm. 2014-08-07 20:44:33 +02:00
Vincent Lejeune
e932638aef Port sunlight* shaders to singleton. 2014-08-07 20:07:03 +02:00
hiker
20242dae5e Merge remote-tracking branch 'origin/master' into bumpy 2014-08-07 10:13:07 +10:00
Vincent Lejeune
87bf242164 Fix shadows for unlit with alpha ref. 2014-08-07 02:12:13 +02:00
Vincent Lejeune
858b789419 Support vertex color for alpha ref material. 2014-08-07 02:11:55 +02:00
hiker
e68d09c2e4 Merge remote-tracking branch 'origin/master' into bumpy 2014-08-07 10:00:16 +10:00
Vincent Lejeune
c0d57100a7 Enable ref + vertex color for unlit mat. 2014-08-07 01:50:53 +02:00
Vincent Lejeune
79fba1779e Port stkbillboard to singleton shader 2014-08-07 00:52:44 +02:00
Sachith Hasaranga Seneviratne
8aa4e998f2 Minor change in script order 2014-08-06 10:31:06 +05:30
Sachith Hasaranga Seneviratne
f27ed7b144 Got barrel working 2014-08-06 10:07:45 +05:30
Marianne Gagnon
30c11ad6d4 tweak braking config value 2014-08-05 20:10:46 -04: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
Sachith Hasaranga Seneviratne
e7585906ea Added enable method specific to Physical Objects to allow previously disabled track objects to be renabled 2014-08-05 20:20:26 +05:30
Sachith Hasaranga Seneviratne
e4e0b7ec2f Changed example scripts to use the new function 2014-08-05 20:00:25 +05:30
Sachith Hasaranga Seneviratne
127162190a Temporarily disabled explosion creation for the sand-barrel example 2014-08-04 22:44:41 +05:30
Sachith Hasaranga Seneviratne
be0f09a828 Moved trigger creation to onstart script 2014-08-04 22:43:56 +05:30
hiker
c4928ceb7f Modify suspension parameters and visual positioning of the kart to 
test less bumpiness.
 2014-08-04 13:54:43 +10:00
Marianne Gagnon
346faff845 Clean up video settings dialog. Not a bad attempt vlj but not quite there ;) 2014-08-03 19:57:33 -04:00
vlj
c0e554de30 Remove UBO settings in the options 2014-08-04 01:50:04 +02:00
Sachith Hasaranga Seneviratne
66aa65e827 Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-08-02 09:38:50 +05:30
Sachith Hasaranga Seneviratne
8eb5fc0d94 Fixed mesh objects trying to remove physical bodies when there are none and fixed logic for barrel test to remove the animation 2014-08-02 09:15:48 +05:30
Sachith Hasaranga Seneviratne
30bd018738 Added sandbarrel to hacienda and tested explosion creation near the barrel 2014-08-02 08:39:22 +05:30
Vincent Lejeune
ca30bf7d5a Add screen fallback in case no ubo are here. 2014-08-02 01:02:06 +02:00
Vincent Lejeune
09d0c2eef5 Forget a shader + remove shader output 2014-08-02 00:56:36 +02:00
Vincent Lejeune
58c094917e Use an header included in every shaders. 2014-08-02 00:50:56 +02:00
Sachith Hasaranga Seneviratne
8c2f0f1e14 fixed some scripts not using Vec3 in trigger creation 2014-08-01 19:51:39 +05:30
Sachith Hasaranga Seneviratne
c3a774fcc9 Merged master 2014-08-01 18:40:05 +05:30
konstin
fb50c9c338 moving the button to xml 2014-07-30 14:58:53 +02:00
Vincent Lejeune
f9c7c3db5e Try a fix for intel and kart selection screen. 2014-07-30 01:25:27 +02:00
Vincent Lejeune
a35c33e4f6 Remove ambient 
It's already added in the diffuse env pass
 2014-07-29 23:56:48 +02:00
hiker
c322c507da Fix shader error (vlj, please check). 2014-07-22 13:28:12 +10:00
Marianne Gagnon
939e5d9fff Rework graphics settings popup to make it clear which options require the advanced pipeline 2014-07-21 19:48:17 -04:00
vlj
4e079b0e14 Fixes shader errors reported by Auria 2014-07-17 02:17:49 +02:00
vlj
23bc1f9344 Remove use of texture2d in rh.frag 2014-07-17 02:11:04 +02:00
vlj
40a7ab0780 Raise one of ssao tolerance value. 2014-07-17 00:12:54 +02:00
Sachith Hasaranga Seneviratne
16e6401fab Merged master, resolved conflict in CMakeLists.txt 2014-07-15 22:28:20 +05:30
Sachith Hasaranga Seneviratne
cbebfcd428 Changed trigger creation method to use Vec3 2014-07-15 22:19:41 +05:30
hiker
55df48d3e6 PLEASE UPDATE stk-assets! Moved data/models to stk-assets to help with 
editor development.
 2014-07-15 10:52:57 +10:00
vlj
9230cab9dd Add shadow for instanced grass. 2014-07-15 00:02:17 +02:00
vlj
ffe77e4aa4 Port instanced pass2 shaders to singleton 2014-07-14 23:41:47 +02:00
Vincent Lejeune
62bf54b8f3 Simplify displace handling 
Should be faster now
 2014-07-14 18:54:40 +02:00
Vincent Lejeune
f2acac7230 Inadverly inverted shadow and shadow_grass.vert 2014-07-13 21:37:12 +02:00
Vincent Lejeune
54b1ce39e4 Add Grass shadows. 
For non instancing object.
 2014-07-13 21:33:44 +02:00
Vincent Lejeune
7b9fc60f9c Factorise grass material 2014-07-13 18:56:17 +02:00
Vincent Lejeune
55a5185796 Avoid drawing negative color with splatting material. 2014-07-12 21:25:11 +02:00
Vincent Lejeune
d7139920ed Fix position reconstruction formula in ssao 2014-07-12 19:54:52 +02:00
Sachith Hasaranga Seneviratne
acd11ce738 Added sound trigger (one time and cyclic) 2014-07-12 09:13:47 +05:30
Sachith Hasaranga Seneviratne
44d502d1fe Added stop() to script-bound sounds 2014-07-12 07:34:35 +05:30
Sachith Hasaranga Seneviratne
f61fd2b13a Removed unnecessary script files 2014-07-12 07:34:15 +05:30
Sachith Hasaranga Seneviratne
060eb35898 Added access to kart location to scripts 2014-07-11 11:27:11 +05:30
Sachith Hasaranga Seneviratne
f4b357d03c Merged master 2014-07-11 07:04:25 +05:30
Sachith Hasaranga Seneviratne
07e4d35701 Added Vec3 to setVelocity function 2014-07-10 20:42:10 +05:30
Sachith Hasaranga Seneviratne
663869e729 Started unifying locations as Vec3 s 2014-07-10 16:38:15 +05:30
vlj
822c8725dd Remove rimlight material 2014-07-10 01:02:52 +02:00
Sachith Hasaranga Seneviratne
a5914e436b Changed all collision scripts to match new format 2014-07-09 23:52:05 +05:30
vlj
481a5bd0d0 Fix bubble shader with glsl < 330. 2014-07-09 17:49:47 +02:00
vlj
4c3db6ca59 Mix texture for displace. 2014-07-09 03:41:08 +02:00
Marianne Gagnon
ed97fca7b3 Ease debugging GPWin/GPLose/FeatureUnlocked scenes 2014-07-08 20:37:39 -04:00
Vincent Lejeune
ac55a70c83 Mimic previous motion blur behavior 
Depending on zypper + mask on center.
 2014-07-09 02:29:49 +02:00
Vincent Lejeune
aec31b28dd Merge remote-tracking branch 'origin/VAOGatherer' 2014-07-09 02:17:25 +02:00
samuncle
1ecaea18b2 Add a fade out to avoid bokeh on distant objects (stars, moon, planet, background mountain) 2014-07-09 01:21:31 +02:00
vlj
6276cafba2 Use global VAO for rendering 2014-07-08 18:31:46 +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
Vincent Lejeune
d961a9a8bc Fix vertex color for object_pass2 2014-07-08 01:35:04 +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
Sachith Hasaranga Seneviratne
6b70ea36af Bound sfx-emitters to scripts 2014-07-07 14:43:23 +05:30
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
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
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
Sachith Hasaranga Seneviratne
84fe9b09b7 Added move to meshes, created an example in greenvalley 2014-07-03 14:01:58 +05:30
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
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
fd5061057d Fix for instanced object with default material. 2014-07-02 22:37:51 +02:00
vlj
d5c91dcfe4 Remove Untextured material. 2014-07-02 22:37:51 +02:00