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

12721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hiker
4d085a134c Merge branch 'master' of github.com:supertuxkart/stk-code 2014-08-08 11:14:47 +10: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
5ba2f6c97b Inadvertantly inverted RSM and model matrixes. 2014-08-08 01:47:29 +02: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
dbed303d90 Try to fix ci 2014-08-07 21:02:16 +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
Vincent Lejeune
160d061e84 Port Tonemap shader to singleton 
Should fix kart selection screen without UBO support.
 2014-08-07 19:36:32 +02:00
Vincent Lejeune
4faa7cf2b7 Store current screen size 
When UBO support is lacking.
 2014-08-07 19:30:11 +02:00
Daniel Butum
c272d39d09 Merge remote-tracking branch 'upstream/master' 2014-08-07 13:33:21 +03:00
hiker
18cb4f6d12 Merge remote-tracking branch 'origin/master' into bumpy 2014-08-07 11:16:53 +10:00
Vincent Lejeune
8544ff10e9 Disable depth test in non dynamic light mode. 
Just in case...
 2014-08-07 02:47:07 +02:00
Vincent Lejeune
7c31275704 Forget the ... 2014-08-07 02:43:21 +02:00
Vincent Lejeune
506dca47eb Better if we dont remove the real function call... 2014-08-07 02:42:23 +02:00
Vincent Lejeune
27d3d3bfb3 Add a static assert. 
Check if we pass correct count of uniforms name to AssignUniforms().
 2014-08-07 02:37:53 +02:00
Vincent Lejeune
926fc3ac7c Use singletonshader template for colorize 2014-08-07 02:29:13 +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
8dcf9f6a21 Text billboard uses unlit material. 2014-08-07 01:51:10 +02:00
Vincent Lejeune
c0d57100a7 Enable ref + vertex color for unlit mat. 2014-08-07 01:50:53 +02:00
Marianne Gagnon
024f6f3fee clean up billboard text code 2014-08-06 19:33:09 -04:00
Vincent Lejeune
986fd8050a Fix ambient term. 2014-08-07 01:02:30 +02:00
Vincent Lejeune
79fba1779e Port stkbillboard to singleton shader 2014-08-07 00:52:44 +02:00
Vincent Lejeune
a0e457ac13 Port shadow shaders to singleton and remove non singleton. 2014-08-07 00:40:09 +02:00
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
Daniel Butum
28f7a45664 Do not show password_confirm field in the output when registering 2014-08-05 19:40:56 +03:00
Daniel Butum
c6c0c6e590 Rename some API calls 2014-08-05 19:12:56 +03:00
hiker
1ba6537e37 Merge remote-tracking branch 'origin/master' into bumpy 2014-08-05 08:26:05 +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
Daniel Butum
62e6a2d733 Merge remote-tracking branch 'upstream/master' 2014-08-05 00:19:49 +03:00
vlj
1abd3b7bac Merge pull request #1439 from konstin/master 
fix video options dialog
 2014-08-04 21:33:11 +02:00
konstin
03b2379eef fix video options dialog 2014-08-04 21:11:53 +02:00
Daniel Butum
c10ca31452 Use new API paths when calling the stk server 2014-08-04 21:55:56 +03:00
Daniel Butum
b3f9f9f407 Refactor online namespace. Define api php file names from a single place 2014-08-04 18:41:47 +03:00
deve
5511f55dd9 Add fallback if irrlicht won't report any resolution. 2014-08-04 08:39:02 +02:00
hiker
7e65d4d346 Merge remote-tracking branch 'origin/master' into bumpy 2014-08-04 14:29:31 +10:00
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
00e6e7bcc2 Fix billboard text scene nodes having wrong rotation when attached to a parent node (.e.g. a kart) 2014-08-03 20:17:11 -04:00
vlj
fb9dc7af74 Fix for travis-ci 2014-08-04 02:08:08 +02:00
Marianne Gagnon
072c118f95 Fix splatting, which had been broken by a recent commit of mine 2014-08-03 20:03:17 -04: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
Marianne Gagnon
bb7d83a89a Merge branch 'NewBillboardText' 2014-08-03 19:49:31 -04:00
vlj
2fcb574c90 Automate UBO fix detection. 
It only concerns Intel Sandy Bridge (maybe Ivy Bridge ?) gpu on Windows.
 2014-08-04 01:45:08 +02:00
Marianne Gagnon
fd1bde9eeb New billboard text scene node is almost complete now 2014-08-03 19:30:59 -04:00