Marianne Gagnon
4948f5acb2
Merge branch 'master' of https://github.com/sudip1401/stk-code
...
Conflicts:
data/achievements.xml
src/achievements/achievement_info.hpp
2014-03-18 19:16:43 -04:00
Vincent Lejeune
dd5997d277
Start working on instancing library node
2014-03-18 23:47:53 +01:00
Csaba Molnar
806da15a12
Skidding achievement
2014-03-18 23:47:38 +01:00
hiker
3d5fbaa92f
Merge branch 'master' of https://github.com/gupascal/stk-code into gupascal-master
...
Fixed some merging issues.
Conflicts:
data/achievements.xml
src/achievements/achievement_info.hpp
2014-03-18 10:44:11 +11:00
Csaba Molnar
e8eabc80c9
Fixing achievement description
2014-03-17 22:26:53 +01:00
Csaba Molnar
60f1d8ae20
Achievement reset-after-lap beta
2014-03-17 22:07:55 +01:00
sudip1401
89d7663112
Poweruplover achievement
2014-03-18 02:04:01 +05:30
auriamg
847ceca671
Merge pull request #1243 from mcsab/master
...
Skidding achievement
2014-03-15 15:01:41 -04:00
Marianne Gagnon
0425cf2ef4
Implement color variation in particle system
2014-03-15 13:35:51 -04:00
Guillaume P
8a34be1ab3
Add a new Gold Driver achievement.
2014-03-15 15:12:28 +01:00
Csaba Molnar
385f108b16
Skidding achievement
2014-03-15 00:38:16 +01:00
Vincent Lejeune
cb344520ef
Merge branch 'BatchedDrawCalls'
2014-03-14 16:57:18 +01:00
Vincent Lejeune
0c5d5ce96e
IBL: Fix sampling ignoring cubemap rotation
2014-03-14 16:51:07 +01:00
Vincent Lejeune
740c251808
Use Instancing for lights.
2014-03-14 16:51:06 +01:00
Guillaume P
955b27bf75
Add a Marathoner achievement.
2014-03-12 14:15:16 +01:00
Vincent Lejeune
e9e60339bf
Fix non compiling shader on mesa
2014-03-09 21:06:02 +01:00
auriamg
605e4c6dff
Merge pull request #1218 from divvy81/downstream
...
1195 Multiplayer kart selection
2014-03-05 18:04:03 -05:00
Dk
c5d23f7154
1195 Multiplayer kart selection commit 18
2014-03-05 23:02:23 +05:30
Dk
eddc512b16
1195 Multiplayer kar selection screen commit 17
2014-03-05 21:37:07 +05:30
Dk
0e17d39f1a
1195 Multiplayer kart selection commit 15
2014-03-05 20:47:05 +05:30
Dk
1dab0daeb5
1995 Multiplayer kart selection screen commit 14
2014-03-05 20:16:48 +05:30
Vincent Lejeune
8600d3bc61
IBL: Spheremap now reflects skybox
2014-03-04 23:37:45 +01:00
Vincent Lejeune
391053e368
IBL: Implement IBL
2014-03-04 23:28:24 +01:00
Vincent Lejeune
718c1cacb0
Improved caustics effect.
2014-03-04 22:30:33 +01:00
Vincent Lejeune
c93c921028
STKMesh: Support caustic material.
2014-03-04 18:42:33 +01:00
Vincent Lejeune
e1d879a1f2
STKMesh: Improve displace effect.
2014-03-03 23:59:12 +01:00
Dk
14467e320b
1195 Multiplayer kart selection screen
2014-03-03 23:32:43 +05:30
samuncle
7393fa0603
Add an attenuation based on depth
2014-03-03 16:38:26 +01:00
samuncle
ee76d9b579
Reduce the brightness of the vignette
2014-03-03 15:19:22 +01:00
samuncle
4b92ee1716
Add a vignette to simulate a real camera
2014-03-03 14:12:56 +01:00
Vincent Lejeune
9f83b1ab76
Remove unneeded varying in sky.frag.
2014-03-02 17:50:42 +01:00
Vincent Lejeune
da4896c3d8
SSAO: tweak fade distance.
2014-03-01 22:50:22 +01:00
Dk
33a5dbacfd
1195 multiplayer Kart selection
2014-03-01 00:05:24 +05:30
Dk
84cc9dd972
1195 Multiplayer kart selection
2014-03-01 00:01:32 +05:30
Vincent Lejeune
baba5f79d1
Remove some unused shaders.
2014-02-28 17:30:25 +01:00
Vincent Lejeune
af862cb6c5
#version autoadded to shaders and turn some v120
2014-02-28 17:29:05 +01:00
hiker
1903aee114
Changed lower and upper bound (at lower speed less speed should be
...
lost), capped speed fraction. Tweaked parachutes parameters somewhat.
2014-02-28 23:57:49 +11:00
Dk
15faf7dbee
1195-Multiplayer kart selection
2014-02-28 16:51:27 +05:30
Bart Cools
89a336ff9a
Tweaked the logic of parachutes to be more modifiable. There now is an upper bound percentage and lower bound percentage which will be applied if you are driving faster and slower respectively. Also added those values in stk_config.xml to make playtesting easier (ticket #1135 )
2014-02-28 11:10:25 +01:00
Marianne Gagnon
a5eba8bf83
remove leftover floating ribbon in giftbox model
2014-02-26 19:50:19 -05:00
Vincent Lejeune
108e82afc2
Fix Sara's moving textures.
2014-02-27 01:49:03 +01:00
Vincent Lejeune
9941b18d7f
Rework moving textures support.
2014-02-27 01:22:34 +01:00
Vincent Lejeune
7532ea1768
Skybox: Do some cleaning.
2014-02-26 22:28:06 +01:00
Vincent Lejeune
9ffa4681d3
Better when actually include the shaders.
2014-02-26 21:53:29 +01:00
hiker
6cce1199e9
Fixed typo in new achievement (attribute must be named goal).
2014-02-26 07:41:06 +11:00
hiker
f8a462a39f
Added support for different types of achievement checking: besides
...
'all-at-least' (all keys must be >= the corresponding goal value) now also
'one-at-least' (at least one key is >= a constant goal value) is supported.
Implemented 'Arch Enemy' achievement: hit the same kart at least 5 times
in one race.
2014-02-25 17:20:24 +11:00
Marianne Gagnon
317f147406
Fix normals in item boxes and bananas
2014-02-23 19:05:09 -05:00
hiker
4f266639aa
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-24 08:22:55 +11:00
hiker
5fc300d7bb
Removed Single and MapAchievent (and Singe/MapAchievementInfo), instead
...
using the generic key-value mapping Map* has provided for everything.
Changed format of achievements.xml to be more compact.
2014-02-24 08:21:15 +11:00
Vincent Lejeune
2d1acf5353
Godray: improve the effect and its stability.
2014-02-23 20:16:03 +01:00
Vincent Lejeune
04fc4c3be7
Reenable Godray (on all track atm)
2014-02-23 20:02:15 +01:00
Vincent Lejeune
778cdcf3ce
Godray/Godfade now declared in new pipeline.
2014-02-23 18:59:24 +01:00
Vincent Lejeune
a00abffb01
MotionBlur: Use direct GL calls.
2014-02-23 00:13:22 +01:00
Vincent Lejeune
8ba0fcb8e0
STKMesh: Transparent texture can move now.
2014-02-20 18:31:00 +01:00
Vincent Lejeune
40c4155bd2
STKMesh: Support for (non ref) moving texture
2014-02-20 00:01:02 +01:00
samuncle
073a049389
Correction of a syntax error
2014-02-17 22:36:00 +01:00
Vincent Lejeune
e5a174d85b
Add compatibility keyword on and remove some unused shaders
2014-02-17 15:34:57 +01:00
Vincent Lejeune
d5d57bbae0
Shadows: Softer edge and smoother cascade transitions
2014-02-15 20:45:47 +01:00
Vincent Lejeune
57079cbff5
Shaders: Declare penumbraH/V and shadowgen
2014-02-12 23:32:18 +01:00
Vincent Lejeune
0243546e4d
Use an openGL 3.3 compatibility context when available.
2014-02-12 22:16:10 +01:00
Vincent Lejeune
70f89a8bce
Shadow: Use 4 cascades.
...
Now that we use GS and textures array it's easier to add a cascade.
4 is still not optimal but I'd like to avoid cascade count inflation as
much as possible ; 4 x 1024x1024 has the bandwidth requirement of the
single 2048x2048 shadowmaps we previously had.
2014-02-11 21:49:46 +01:00
Vincent Lejeune
934d1f10b8
Shadow: Use Geometry Shader for better perfs.
...
The 3 cascades are now rendered in a single pass, using 2D array texture and
a GS to do the dispatch ("layered rendering").
It's possible to use instancing instead but it requires the AMD_vertex_shader_layer
extension which is oddly part of opengl 4.2.
2014-02-11 21:07:44 +01:00
Vincent Lejeune
c8844486fa
Shadow: Tweak bias
2014-02-10 15:58:09 +01:00
Vincent Lejeune
515bcbc750
Shadow: very crude csm support
2014-02-10 15:42:17 +01:00
Vincent Lejeune
19d490a26d
Lights: Remove unused export value.
2014-02-09 21:18:15 +01:00
Vincent Lejeune
5d5ac34648
Shadow: soften edge a little
2014-02-09 20:03:54 +01:00
Vincent Lejeune
63db565fd7
Shadow: Better bias.
2014-02-09 19:42:22 +01:00
Vincent Lejeune
f0ef8e9913
Shadow: reenable shadows
...
It's just plain basic shadowmaps, a lot of tweak is still necessary but
it gives a way to see how light values are affected in some places.
(cave in chocolate for instance)
2014-02-09 19:20:55 +01:00
Vincent Lejeune
ab05cb45b8
Shaders: Remove some unused shaders.
2014-02-08 18:19:16 +01:00
Vincent Lejeune
653a695eda
Fix fog looking weird on transparent.
...
But mixing alpha with 0 instead of 1.
2014-02-05 15:07:57 +01:00
Vincent Lejeune
5964809f3c
Forget to add transparentfog.frag shader.
2014-02-03 20:14:12 +01:00
Vincent Lejeune
6e93178d68
Fog: Do not use camposition in the shader.
2014-02-03 20:04:00 +01:00
Vincent Lejeune
cd43ee3c9d
Lightprepass: Remove now useless lightblend shader.
2014-02-02 20:18:05 +01:00
Vincent Lejeune
2bb1254fa4
Fix bloom shader
2014-02-02 02:13:04 +01:00
Sachith Hasaranga Seneviratne
fa72b7716e
Fixed bug #1056 Addons search last updated option text is cropped
...
changed addons_screen.stkgui to ensure the filterdate spinner had adequate space.
Signed-off-by: Sachith Hasaranga Seneviratne <sachith500@gmail.com>
2014-01-30 12:56:54 +05:30
Vincent Lejeune
fd968a0acf
OGL32CTX: Factorize UI shaders
...
This should fix UI disappearing after resolution change.
2014-01-28 21:26:16 +01:00
Vincent Lejeune
f50e6f817d
Use another normal encoding method from a crytek slide.
2014-01-27 23:29:46 +01:00
Vincent Lejeune
1c98cf0b61
Normalize normals when they are used to get more precision
2014-01-27 22:31:01 +01:00
Vincent Lejeune
5771dd98c7
Fix typo
2014-01-27 22:31:01 +01:00
Deve
a65d538b05
Upload patch from ubuntu backports for supertuxkart.desktop file
...
and add polish translation.
2014-01-27 21:52:05 +01:00
Vincent Lejeune
d642bc1489
Lightprepass: Only store normals in rtt
...
Use a more economical rtt format.
2014-01-27 21:47:25 +01:00
Vincent Lejeune
22ccf3bab3
GPUParticle: Use depthbuffer
2014-01-27 20:33:21 +01:00
Vincent Lejeune
dbcf60003b
SunLight: Use DepthBuffer
2014-01-27 20:25:45 +01:00
Vincent Lejeune
ecac127dd6
Fog: Use depthbuffer.
2014-01-27 20:25:19 +01:00
Vincent Lejeune
0b531b20f7
SSAO: Use depth buffer.
2014-01-27 20:24:57 +01:00
Vincent Lejeune
5e68334ce9
PointLight: Use depthbuffer
2014-01-27 20:22:01 +01:00
Vincent Lejeune
c77ffb1882
STKBillboard: Create new SceneNode wrapper.
2014-01-27 17:33:08 +01:00
Vincent Lejeune
ac8a729bcd
SSAO: Actually simplifying code was a mistake.
2014-01-27 00:56:58 +01:00
Vincent Lejeune
684d265924
SSAO: Disable alpha test and simplify code
2014-01-27 00:53:52 +01:00
Vincent Lejeune
993d1e26dc
Revert "SSAO: Remove the strenght parameter"
...
This reverts commit b92f0b6ecc
.
2014-01-27 00:52:20 +01:00
Vincent Lejeune
63882318a7
SSAO: Fix typo and use 16 samples
2014-01-27 00:47:35 +01:00
Vincent Lejeune
b92f0b6ecc
SSAO: Remove the strenght parameter
2014-01-27 00:41:41 +01:00
Vincent Lejeune
31991ecd7e
SSAO: Improve randomness using NEAREST filtering
2014-01-27 00:09:36 +01:00
Marianne Gagnon
30011be115
My tweaks to SSAO, to improve randomness and final blending
2014-01-25 22:03:47 -05:00
Vincent Lejeune
8b5df4143f
Fix attempt for black objects.
2014-01-26 01:56:08 +01:00
Vincent Lejeune
88561aa838
STKMesh: Implement (single) texture detail support for objectpass shaded objects.
2014-01-26 01:33:13 +01:00
Vincent Lejeune
2e994502e3
Properly handle unlit object.
2014-01-26 01:09:25 +01:00
Vincent Lejeune
8bd6d7945c
STKAnimatedMesh: Support for rimlit karts
2014-01-24 20:29:54 +01:00
hiker
1e721906e7
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-01-23 09:55:52 +11:00
Vincent Lejeune
b94f8f0c18
Light: Factorize some code.
2014-01-22 22:22:54 +01:00