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

9099 Commits

Author SHA1 Message Date
Marianne Gagnon
c425e7e153 Also export GPU markers to CSV 2014-08-14 19:41:33 -04:00
Marianne Gagnon
58f509d953 Fix vlj's profiler code, only worked in single player 2014-08-14 19:08:21 -04:00
Vincent Lejeune
07bff38427 Fix a typo. 2014-08-14 21:45:31 +02:00
Vincent Lejeune
f9c692052e Try a fix for nvidia and GI 2014-08-14 21:26:16 +02:00
vlj
49779d36bf Do not update mesh in shadow pass. 
It may introduce some 1 frame latency between shadows and geometry but
in practice it's not noticeable.
 2014-08-14 18:55:21 +02:00
vlj
33e3b43346 Add a (quite big) timeout to sync. 2014-08-14 18:40:14 +02:00
Vlj
8ec4fb6308 Use sync object 2014-08-14 18:12:15 +02:00
vlj
18981ff943 Set unsynchronized bit in transparent pass 2014-08-14 16:29:59 +02:00
vlj
1c7fe8c518 Use mapbuffer to modify animated mesh buffer content. 2014-08-14 16:14:36 +02:00
vlj
6ef8f666ee Add mapbuffer glfunction. 2014-08-14 16:06:42 +02:00
vlj
d1f83c0334 Properly clean/regen vbo in updatevbo() 2014-08-14 14:27:18 +02:00
vlj
9840650038 Update some data usage hint. 2014-08-14 14:11:04 +02:00
vlj
21683251a2 Fix shadow lod level in singleplayer 2014-08-14 02:43:01 +02:00
hiker
52fba7958a Fixed pre-2011 compilation. 2014-08-14 10:24:23 +10:00
hiker
3521368112 Oops - committed file with typo :( 2014-08-14 10:21:26 +10:00
hiker
27155b5543 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-08-14 10:19:54 +10:00
Marianne Gagnon
a5f36ec412 Add new particles flag for vlj 2014-08-13 20:23:21 -04:00
hiker
f338282a15 Merge branch 'master' of github.com:supertuxkart/stk-code 
Conflicts:
	src/graphics/stkinstancedscenenode.cpp
 2014-08-14 10:19:31 +10:00
Marianne Gagnon
1de0e50607 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-08-13 20:10:28 -04:00
Marianne Gagnon
5c3c7afeae Fix bogus cast resulting in reading random URL in particles 2014-08-13 20:10:02 -04:00
vlj
5f78f2687f Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-08-14 02:09:15 +02:00
vlj
9120d792be Fix GPUTimer 2014-08-14 02:09:12 +02:00
Marianne Gagnon
ba3027b6bb Little improvement to for_in macro. Still only works on PtrVector though 2014-08-13 19:47:59 -04:00
hiker
86ea16bd43 Fixed compilation for pre-C++-2011 compilers. 2014-08-14 09:38:31 +10:00
vlj
47e176d4a3 User wrong VS for instanced normal 
Also fix the srgb normal map.
 2014-08-14 00:55:12 +02:00
Marianne Gagnon
b95765c172 use better tool to calculate tangents 2014-08-13 18:35:07 -04:00
Marianne Gagnon
976ea043bb Add missing bit of code 2014-08-13 18:25:21 -04:00
Vlj
3e277f8edf Dont alloc quaternion buffer if not flip 2014-08-13 23:56:27 +02:00
Vlj
c7a4d45d08 Fix malloc/delete mismatch 2014-08-13 23:52:47 +02:00
Vincent Lejeune
b5016ba85e Factorise simulation code. 2014-08-13 22:47:03 +02:00
Vincent Lejeune
00e945e75c Port heightmap simulation shader. 2014-08-13 22:42:02 +02:00
Vincent Lejeune
47cfe08fe1 Port simple simulation particle shader. 2014-08-13 22:32:15 +02:00
Vincent Lejeune
8117260bf6 Factorise attribute location of simulation program. 2014-08-13 22:26:52 +02:00
Vincent Lejeune
e6eac5b57f Clean quaternionbuffer at the right place. 2014-08-13 22:02:18 +02:00
Vincent Lejeune
f43538aad7 Factorize again code in gpuparticle. 2014-08-13 21:59:57 +02:00
Vincent Lejeune
b5f89501f6 Factorize some GL code in gpuparticle. 2014-08-13 21:38:33 +02:00
Vincent Lejeune
013e823408 Extract ParticleVBO from gpuparticle.cpp 2014-08-13 21:13:28 +02:00
Vincent Lejeune
dc02eec7b6 Port particle rendering shaders too. 2014-08-13 21:04:03 +02:00
Vincent Lejeune
22137eee88 Port UI shaders. 2014-08-13 20:25:56 +02:00
Vincent Lejeune
dc9993d780 Add Debug for instanced vertex type mismatch. 2014-08-13 19:28:02 +02:00
Vincent Lejeune
70b0fce50c Add support for instanced normal map mesh. 2014-08-13 19:20:40 +02:00
Vincent Lejeune
ebacfcfcef Put RSM draw in its own method. 2014-08-13 18:59:30 +02:00
Vlj
fda6aac5dd Reenable shadows for instanced mesh 2014-08-13 17:33:10 +02:00
hiker
de16d1ace3 Bugfix: A new local only user was now able to change the online account. 
If a new account is created with an online account, make the online account
the default.
 2014-08-13 21:46:53 +10:00
hiker
7111eb55ee Merge branch 'laps' of https://github.com/konstin/stk-code into konstin-laps 2014-08-13 16:01:22 +10:00
Vlj
ce5d09f159 Move instanced rendering code to render_geometry.cpp 
Shadows are disabled temporary
 2014-08-13 04:11:44 +02:00
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
Vincent Lejeune
955e0d3259 Move RHDebug code to post process 2014-08-13 01:21:48 +02:00
Marianne Gagnon
345a3bc451 Fix logic in video settings popup 2014-08-12 19:18:38 -04:00
Vincent Lejeune
03a6499c27 Port RHDebug and Passthrough Layer 2014-08-13 01:13:41 +02:00
hiker
c5a1d8bf34 Merge branch 'fix-camera' into bumpy 2014-08-13 08:55:16 +10:00
hiker
d26547aa16 Try to stop the karts from hovering. 2014-08-13 08:53:31 +10:00
Vincent Lejeune
0dd1fd605c Port MLAA Shaders 2014-08-13 00:51:32 +02:00
Vincent Lejeune
b0d63ab399 Fix windows build 2014-08-13 00:21:43 +02:00
Vlj
465e52713e Port passthrough and glow shaders 2014-08-13 00:08:02 +02:00
Vlj
c3cead9f9c Port Bloom shaders. 2014-08-12 23:45:56 +02:00
Vlj
d8e4a352ba Port gaussianV shaders 2014-08-12 23:20:03 +02:00
Vlj
be52d07418 Port motion blur and GaussianH shaders 2014-08-12 21:14:37 +02:00
Vlj
44c03ce99d Port light shaft shaders 2014-08-12 19:55:01 +02:00
vlj
9dd2021f8d Factorize List* related code. 2014-08-12 19:18:01 +02:00
vlj
838bb4fa7c Clean some code. 2014-08-12 18:57:54 +02:00
vlj
d6015c12af Revert "Factorize tuple remap." 
This reverts commit 8c032a7df6.
 2014-08-12 16:38:47 +02:00
vlj
d9be494db1 Revert "Use function object when unrolling args." 
This reverts commit c5216e7cff.
 2014-08-12 16:38:43 +02:00
vlj
05a63ac595 Revert "Factorize render pass code" 
This reverts commit 10ce84fe46.
 2014-08-12 16:38:38 +02:00
Vlj
10ce84fe46 Factorize render pass code 2014-08-12 00:05:46 +02:00
vlj
c5216e7cff Use function object when unrolling args. 2014-08-11 23:15:27 +02:00
vlj
8c032a7df6 Factorize tuple remap. 2014-08-11 22:57:07 +02:00
vlj
671ab38d18 Inverted uniform names. 2014-08-11 22:03:03 +02:00
Vlj
23df4c99dd Fix 2014-08-11 21:21:58 +02:00
Vlj
1afe0fa4ee Port some shaders 2014-08-11 20:50:10 +02:00
hiker
11f3c1fc11 Added the recovery dialog back in :) 2014-08-11 22:39:08 +10:00
hiker
40224a85f6 For old server change actions change-password to change_password 
and 'recover' to 'recovery'. Removed unused API::VERSION.
 2014-08-11 21:56:13 +10:00
hiker
3f5ab358df Merge branch 'leyyin' 2014-08-11 14:22:30 +10:00
hiker
93fcb9a2a7 Added server-version configuration, which supports the GSOC server (version 2). 
Made version 1 compatible with the 0.8.1 stkaddon server (i.e. all commands
are sent to client-user.php, and receive the actual command as 'action' parameter).
 2014-08-11 14:10:01 +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
vlj
495cd25d1c Do some symetry on skybox top/bottom.. 2014-08-10 23:15:02 +02:00
vlj
856169794d Use singleton for DoF. 2014-08-10 22:27:26 +02:00
vlj
0f5effc2d9 Use collision shape for RSM size. 2014-08-10 22:05:00 +02: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
Marianne Gagnon
b2e08c94a7 Fix physics of instanced nodes 2014-08-09 21:22:12 -04:00
Vincent Lejeune
e6b558262b Do not display grass normal 
It requires taking account of the wind, ie another shader.
 2014-08-09 21:37:31 +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
konstin
f3d0d3cf4e better comments 2014-08-09 19:56:01 +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
Vincent Lejeune
41cca2e56e Fix ambient handling. 2014-08-09 01:41:30 +02:00
Vincent Lejeune
54c9f32033 Store ambientlight directly in irr_driver. 2014-08-09 01:30:36 +02:00
Vincent Lejeune
c8a9515ad0 Use debug slider to change ambient on the fly. 2014-08-09 01:10:19 +02:00
Vincent Lejeune
5dffc86d26 Use lambda for debug_slider instead. 2014-08-09 00:43:28 +02:00
Vincent Lejeune
281fceee0b Revert "Try to use lambdas." 
This reverts commit cdb760ae51.
 2014-08-09 00:36:12 +02:00
Deve
99ce91dc46 Strength of bouncy edges should depend on soccer ball mass. 2014-08-08 23:07:03 +02:00
vlj
cdb760ae51 Try to use lambdas. 2014-08-08 21:46:55 +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
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
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
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
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
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
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
vlj
00b3049aad Forget to delete 2nd order SH coefficient arrays. 2014-08-04 01:26:35 +02:00
vlj
7f44467f67 Manually delete an IImage * 
Ref couting doesnt seem to work on this object.
 2014-08-04 01:16:41 +02:00
vlj
6c71334cda Only calculate diffuse coefficient once. 2014-08-04 01:12:45 +02:00
Marianne Gagnon
2ee9a29e11 Use new billboard text node in FTL 2014-08-03 18:19:38 -04:00
Marianne Gagnon
bfc4c43b3a Improve billboard text node 2014-08-03 18:17:25 -04:00
Marianne Gagnon
99135a9a40 Merge branch 'master' into NewBillboardText 2014-08-03 17:59:08 -04:00
Deve
03c3f1dae7 Fixed typo 2014-08-03 22:05:55 +02:00
Deve
b15c902aee Get dimensions of best resolution before creating irr device. 
I also changed default 800x600 resolution to the size screen because sometimes this resolution may not exist. For example in rotated screens.
 2014-08-03 21:50:59 +02:00
konstin
5fc44d25cd correct invisibility settings 2014-08-03 13:56:53 +02:00
Marianne Gagnon
55e880530a bugfix, only use the texture in layer 0 to apply material 2014-08-02 20:33:30 -04:00
Vincent Lejeune
a03a6809f7 Fix strange colors in rtts. 2014-08-02 22:30:48 +02:00
vlj
4b7918021e Try to fix too dark tracks. 2014-08-02 21:43:14 +02:00