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 |
|
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 |
|
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 |
|
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 |
|
vlj
|
822c8725dd
|
Remove rimlight material
|
2014-07-10 01:02:52 +02:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
vlj
|
475d738d4b
|
Merge remote-tracking branch 'origin/NewRTTMinimap'
|
2014-07-02 00:24:03 +02:00 |
|
Bart Cools
|
4a13eebc00
|
Merge branch 'master' into properties
|
2014-07-01 13:55:10 +02:00 |
|
Bart Cools
|
41a5b5275b
|
properties group node is not really necessary
|
2014-07-01 13:32:26 +02:00 |
|
Bart Cools
|
0fa6df587f
|
Removed redundant kart configuration
|
2014-07-01 12:25:02 +02:00 |
|
Bart Cools
|
1bbd294750
|
Forgot to add documentation to a single node
|
2014-07-01 10:43:00 +02:00 |
|
Bart Cools
|
a73462759b
|
Moved the default kart-type to <general-kart-defaults> to better catch missing values in the kart-type nodes. Also moved the documentation again to properly fit the fields.
|
2014-07-01 10:37:00 +02:00 |
|
vlj
|
b861c3fb73
|
Use fixed attribute location for instanced objects.
|
2014-06-29 22:19:10 +02:00 |
|
vlj
|
bc7e2cd517
|
Some cleanups
|
2014-06-29 16:26:12 +02:00 |
|
Vincent Lejeune
|
8f59d8cac0
|
Add a weight for vignette.
|
2014-06-28 00:20:44 +02:00 |
|
Bart Cools
|
109f783fa4
|
Finally implemented the correct way to parse the data
|
2014-06-27 23:26:02 +02:00 |
|
vlj
|
bde17a28d5
|
Fix for GL 3.1 context
|
2014-06-27 20:58:52 +02:00 |
|
Marianne Gagnon
|
394fb9be9b
|
Merge branch 'master' into NewRTTMinimap
|
2014-06-26 20:23:02 -04:00 |
|
Bart Cools
|
000fa2cf73
|
Fixed skill bars to return correct values. Also minor fix in kart properties
|
2014-06-26 13:43:53 +02:00 |
|
Bart Cools
|
c3e862f40c
|
fix for different kart properties, now based on kart type set in kart.xml
|
2014-06-26 12:53:17 +02:00 |
|
Bart Cools
|
0fa746c805
|
Changes to stk_config to make 3 groups of karts, which will default to the medium, and can be set in the kart.xml
|
2014-06-26 12:09:22 +02:00 |
|
vlj
|
79838bffe3
|
Add 50% transparency to minimap.
|
2014-06-26 00:46:55 +02:00 |
|
vlj
|
a93b96d0b1
|
Use UBO matrixes in displace.
|
2014-06-25 01:22:03 +02:00 |
|
vlj
|
8e6fba3185
|
Some fixes
|
2014-06-24 23:57:29 +02:00 |
|
vlj
|
948c5e8aa2
|
Use explicit attribute location.
Should help implementing basevertex later, and simplify vao creation a
lot.
|
2014-06-24 23:17:41 +02:00 |
|
vlj
|
edc38c9933
|
Use object_pass.vert for transparent objects.
|
2014-06-24 22:20:01 +02:00 |
|
Arthur-D
|
d4bbb50e0a
|
Fixed accidental and embarrassing error.
|
2014-06-23 13:28:06 +02:00 |
|
Arthur-D
|
31d8234776
|
Added friend message icon.
|
2014-06-23 13:11:42 +02:00 |
|
Arthur-D
|
1a590e0fe1
|
Added new achievement background
|
2014-06-23 05:38:56 +02:00 |
|
hiker
|
6231e618d8
|
Added new message system to show achievements in race (and not as a
dialog later). Work in progress ... it doesn't look particulary nice yet ;)
|
2014-06-23 09:13:44 +10:00 |
|
vlj
|
d2fc258124
|
Tweak ssao (again)
Random factor is less perdicable, no more spiral.
|
2014-06-23 01:03:55 +02:00 |
|
vlj
|
f76cd6e7a9
|
Implement bilateral with fragment codepath.
|
2014-06-22 18:04:46 +02:00 |
|
vlj
|
8f5dd6edae
|
Some tweak to ssao.
|
2014-06-22 18:04:46 +02:00 |
|
Vincent Lejeune
|
3219e564d0
|
Implemented bilateral for compute path.
|
2014-06-22 18:04:45 +02:00 |
|
vlj
|
7e8486d670
|
Merge remote-tracking branch 'origin/shadowdebug'
|
2014-06-22 02:21:15 +02:00 |
|
Vincent Lejeune
|
71969acd22
|
Use a precomputed invmatrix in gi.frag
(General) matrix inversion is costly, it's better if it's done a single
time on cpu. Improve performance.
|
2014-06-20 23:10:31 +02:00 |
|
Flakebi
|
e16a7de617
|
Change xml style of screens and fix some issues with screens
|
2014-06-19 09:49:36 +02:00 |
|
Vincent Lejeune
|
32e6942b55
|
Merge branch 'master' into shadowdebug
|
2014-06-18 01:02:51 +02:00 |
|
Vincent Lejeune
|
e2ef26e667
|
Add wireframe frustrum view.
|
2014-06-18 00:27:03 +02:00 |
|
hiker
|
f1c8fcc6d4
|
Fix 1366.
|
2014-06-15 22:14:50 +10:00 |
|
samuncle
|
08369d1fcb
|
Added a new particle system for the torches and bring back the vignette
|
2014-06-14 00:42:57 +02:00 |
|
hiker
|
1dc63849c9
|
Use a sigmar as big digit font and display time and
lap using this font (temporarily till we agree on a font).
|
2014-06-12 09:27:45 +10:00 |
|
hiker
|
89d8a19dab
|
Fixed shader compilation errors.
|
2014-06-11 09:11:07 +10:00 |
|
vlj
|
8cbeca44fd
|
Add a way to display shadow map.
|
2014-06-08 22:18:32 +02:00 |
|
vlj
|
e959d6c857
|
MLAA: Use srgb for auxiliary buffer.
|
2014-06-08 03:28:24 +02:00 |
|
vlj
|
9bc89e0f40
|
Lower MLAA threshold.
|
2014-06-08 03:06:20 +02:00 |
|
vlj
|
588ec08bc1
|
Merge branch 'CS'
|
2014-06-05 03:33:02 +02:00 |
|
vlj
|
eb45954684
|
Implement Gaussian blur using Compute Shader
The filters are ~3.5 time faster with CS.
|
2014-06-05 03:19:18 +02:00 |
|
Vincent Lejeune
|
cead5081be
|
Fix MLAA
|
2014-06-05 02:56:25 +02:00 |
|
Marianne Gagnon
|
02c68d5b02
|
Merge branch 'NewRTTWidget'
|
2014-06-04 20:46:24 -04:00 |
|
Vincent Lejeune
|
5f1413e140
|
Merge branch 'master' into NewRTTWidget
|
2014-06-05 01:30:45 +02:00 |
|
hiker
|
e3513b10c6
|
Merge branch 'master' of https://github.com/Flakebi/stk-code into Flakebi-master
|
2014-06-05 08:23:47 +10:00 |
|
Arthur-D
|
cad6d5b3ae
|
Set player icons as 128x128 instead of 160x120 so the image ratio is correct.
|
2014-06-04 14:55:13 +02:00 |
|
Flakebi
|
39e5b57233
|
Add visual effect for disabled textfields
|
2014-06-04 12:49:41 +02:00 |
|
vlj
|
f0b3cbfcd0
|
Gather bloom effect to avoid extra texture read.
I have a .5ms win here...
|
2014-06-03 20:46:01 +02:00 |
|
vlj
|
55ddffaf54
|
Another round of big triangle port.
|
2014-06-03 20:28:42 +02:00 |
|
vlj
|
e5a5c78045
|
Use a big triangle instead of 2 to cover full screen.
This allows to rasterize a single primitive instead of two, and avoid
trashing the cache between the 2 triangles drawing.
|
2014-06-03 19:56:59 +02:00 |
|
vlj
|
d4fe539385
|
Do not write specular value in gi/diffuseenvmap
|
2014-06-03 17:40:21 +02:00 |
|
vlj
|
e571afc43b
|
Speed up SSAO again
Use log2(xy) = log2(x) + log2(y), and approximate log2(alpha) =
log2(previous alpha) + .5.
Log2 is indeed a costly instruction.
|
2014-06-03 03:41:05 +02:00 |
|
vlj
|
164ffa2b4f
|
Spped up SSAO
Avoid using cos/sin too much, use sum of cos/sin formula instead.
|
2014-06-03 03:14:39 +02:00 |
|
hiker
|
0358e55e2e
|
Added 'back' button to user screen.
|
2014-06-02 08:21:36 +10:00 |
|
Marianne Gagnon
|
588b4189ac
|
Merge branch 'master' into NewRTTWidget
|
2014-05-30 20:44:38 -04:00 |
|
Marianne Gagnon
|
5e132f7410
|
Add GI to video options
|
2014-05-30 19:49:21 -04:00 |
|
Vincent Lejeune
|
44f70454ad
|
Fix dof overwriting alpha value.
|
2014-05-30 02:32:01 +02:00 |
|
Marianne Gagnon
|
7e9252e5b3
|
Merge branch 'master' into NewRTTWidget
|
2014-05-29 20:00:58 -04:00 |
|
vlj
|
40df4afc74
|
Support some debug option for GI
|
2014-05-28 07:47:06 +02:00 |
|
vlj
|
af16682a9e
|
Add GI support
|
2014-05-28 07:47:06 +02:00 |
|
Vincent Lejeune
|
5caf028a71
|
Add RH support
|
2014-05-28 07:47:06 +02:00 |
|
Vincent Lejeune
|
180bd939e0
|
Add RSM support
|
2014-05-28 07:47:06 +02:00 |
|
Flakebi
|
d5de7d49d9
|
Add graphics for deactivated buttons
|
2014-05-27 16:07:53 +02:00 |
|
hiker
|
36d705f021
|
Added 'always-show-login-screen' option, moved 'remember-password'
option from UI-options to UserScreen.
|
2014-05-27 15:36:44 +10:00 |
|
vlj
|
2cf9bb6d2c
|
Use UBO in MLAA
|
2014-05-25 03:21:08 +02:00 |
|
vlj
|
670c25dd26
|
Return alpha value in tonemap.
|
2014-05-25 03:13:19 +02:00 |
|
hiker
|
3b721d3803
|
New zipper icon by Connor.
|
2014-05-24 12:31:43 +10:00 |
|
hiker
|
6ca40916f7
|
Used proper icons for user screen.
|
2014-05-24 11:22:12 +10:00 |
|
hiker
|
e879dcf0a8
|
Merge remote-tracking branch 'origin/master' into new_login
|
2014-05-24 10:06:50 +10:00 |
|
samuncle
|
d5f781433d
|
Adding a new particle system for falling leaves
|
2014-05-21 23:23:08 +02:00 |
|
samuncle
|
bffc615a49
|
Tweak the scattering value to reduce the effect
|
2014-05-21 02:36:48 +02:00 |
|
Marianne Gagnon
|
8b8a17de21
|
Improve material compat fallback + update one handwritten materials XML
|
2014-05-20 20:04:21 -04:00 |
|
hiker
|
1472e69c66
|
Merge remote-tracking branch 'origin/master' into new_login
|
2014-05-20 22:17:03 +10:00 |
|
Stephen Just
|
f4992b80fc
|
Fix errors when compiling shaders with UBOs disabled
|
2014-05-19 09:57:31 -06:00 |
|
hiker
|
9ae67f5c7a
|
Merge remote-tracking branch 'origin/master' into new_login
|
2014-05-19 12:36:17 +10:00 |
|
Vincent Lejeune
|
0ccac4c552
|
Forget to remove some unused shaders.
|
2014-05-18 19:59:03 +02:00 |
|
Vincent Lejeune
|
eca3999d52
|
Do some cleaning
|
2014-05-18 19:56:25 +02:00 |
|
Vincent Lejeune
|
838b44fc00
|
Remove Cautics effect
It's not used anywhere and I have no way to test it so it's useless.
|
2014-05-18 19:28:53 +02:00 |
|
vlj
|
32b2359f21
|
Spheremap: Flip y and add light.
|
2014-05-18 03:39:53 +02:00 |
|
vlj
|
a2e1724389
|
Use correct mapping for spheremap
|
2014-05-18 03:19:18 +02:00 |
|
vlj
|
dc7e6cb99f
|
Revert to spheremapped reflection
|
2014-05-18 03:01:24 +02:00 |
|
hiker
|
cf297c67b4
|
Fixed heading.
|
2014-05-17 11:40:16 +10:00 |
|
vlj
|
9c98012e09
|
Fix dof and transparent fog.
|
2014-05-17 03:09:21 +02:00 |
|
vlj
|
883b39591f
|
Width and height are passed by UBO
|
2014-05-17 02:39:55 +02:00 |
|
hiker
|
71603816fa
|
Merge remote-tracking branch 'origin/master' into new_login
|
2014-05-16 14:21:13 +10:00 |
|
hiker
|
0459c33f66
|
Added a tabbed version of the user screen, and integrated it into
the option menu of STK.
|
2014-05-15 22:59:21 +10:00 |
|
Marianne Gagnon
|
aae7d01e57
|
Try to make the custom GUI settings popup work on any resolution
|
2014-05-14 19:29:39 -04:00 |
|
hiker
|
71d4e380b3
|
Disabled guest account.
|
2014-05-15 08:56:46 +10:00 |
|
hiker
|
ce52bf90e4
|
Merge branch 'new_login' of github.com:supertuxkart/stk-code into new_login
|
2014-05-14 14:10:10 +10:00 |
|
hiker
|
d9daf928e5
|
Merge remote branch 'origin/master' into new_login
|
2014-05-14 14:06:06 +10:00 |
|
vlj
|
229b461a6c
|
SSAO: Less abrupt transition
|
2014-05-14 03:26:43 +02:00 |
|
vlj
|
1d4bcd5ade
|
SSAO: Increase beta constant to avoid error
|
2014-05-14 02:27:17 +02:00 |
|
vlj
|
86c8b9f83d
|
Some tweaking to make ssao more apparent
|
2014-05-14 02:12:18 +02:00 |
|
vlj
|
0ccac5d316
|
Replace texture2D by texture in dof.frag
|
2014-05-14 00:59:51 +02:00 |
|
Vincent Lejeune
|
59484ea09a
|
DS buffer is not linear and cant be mipmapped
Use the method provided by SAO paper (ie convert to linear and then
mipmap)
|
2014-05-13 19:40:30 +02:00 |
|
vlj
|
26d48cdad0
|
SSAO: Stronger blur + tweak param
Use another algorithm to have gaussian blur that lets us customise
radius more easily.
|
2014-05-12 23:59:17 +02:00 |
|
vlj
|
bba9e3ca2c
|
Add a 17 tap blur filter
and use it for SSAO
|
2014-05-12 20:49:47 +02:00 |
|
vlj
|
8e17ae90b6
|
Resolution independent ssao
|
2014-05-12 20:13:12 +02:00 |
|
Vincent Lejeune
|
96babc81ad
|
Reenable custom light radius
|
2014-05-12 19:37:00 +02:00 |
|
vlj
|
23ba597a1c
|
SSAO: Use int rounding
|
2014-05-12 18:39:33 +02:00 |
|
vlj
|
229b72f84a
|
Render SSAO at fullscreen resolution.
|
2014-05-12 01:06:33 +02:00 |
|
vlj
|
4fcec02123
|
Remove ssao depth guard.
|
2014-05-12 00:34:44 +02:00 |
|
vlj
|
7e1625da5e
|
Tweak SSAO params.
|
2014-05-12 00:30:36 +02:00 |
|
vlj
|
f8544493b6
|
Improve SSAO perf
|
2014-05-12 00:14:50 +02:00 |
|
vlj
|
11b7d20ad8
|
Use the mipmap trick to speed up ssao.
|
2014-05-12 00:03:42 +02:00 |
|
Vincent Lejeune
|
567974aeed
|
Use dFdX/dFdY to compute normals in SSAO.
|
2014-05-11 18:09:48 +02:00 |
|
Vincent Lejeune
|
e5410e23a2
|
Use Alchemy SSAO
|
2014-05-11 18:00:30 +02:00 |
|
samuncle
|
518a5fd8ef
|
Fix pre-c++2011 + improved waterfall effect
|
2014-05-11 02:58:23 +02:00 |
|
Vincent Lejeune
|
648d076e00
|
Premultiply alpha for particles too.
|
2014-05-10 20:58:43 +02:00 |
|
Vincent Lejeune
|
6936f30b36
|
Premultiply alpha for billboards.
|
2014-05-10 20:49:30 +02:00 |
|
Guillaume P
|
deb74f4a00
|
Merge remote-tracking branch 'remotes/upstrem/master' into hd-textures-option
Conflicts:
src/graphics/glwrap.cpp
|
2014-05-08 18:40:14 +02:00 |
|
hiker
|
8d4b33f221
|
Removed tabs, and use a separate screen instead. Some more refactoring
to make remember-me a global setting.
|
2014-05-08 22:17:15 +10:00 |
|