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 |
|
hiker
|
15f43a0537
|
Merge branch 'master' into new_login
|
2014-05-08 13:35:40 +10:00 |
|
Vincent Lejeune
|
a73f03a2c4
|
Make use of gl_amd_vertex_shader_layer when available
|
2014-05-08 01:16:02 +02:00 |
|
vlj
|
fd7399d983
|
Use instancing to expand shadows instead of GS
|
2014-05-07 23:57:07 +02:00 |
|
hiker
|
6fb9832fc2
|
Added box around screen, hide 'guest' if no online login is requested.
|
2014-05-07 17:10:02 +10:00 |
|
hiker
|
83c29b0778
|
Instead of individual 'remember-me' settings, use one global setting.
|
2014-05-07 16:39:09 +10:00 |
|
hiker
|
6fab5e89fd
|
Merge remote branch 'origin/master' into new_login
|
2014-05-07 13:04:35 +10:00 |
|
hiker
|
737c8a9983
|
Added 'delete player' functionality.
|
2014-05-06 16:52:36 +10:00 |
|
Stephen Just
|
efb85943d1
|
Fix for #1297. DoF shader compiles in mesa now. The other problem noted
in the issue was just texture compression + intel.
|
2014-05-05 07:59:20 -06:00 |
|
hiker
|
d847e8de00
|
Renamed StoryModeLobby to UserScreen.
|
2014-05-05 21:17:46 +10:00 |
|
hiker
|
6010831654
|
Removed original login screen, made the new login screen a tab.
Removed guest tab (and started to use a checkbox for that for now).
Work in progress.
|
2014-05-05 20:46:48 +10:00 |
|
Vincent Lejeune
|
65e4177f5c
|
Merge branch 'master' of https://github.com/supertuxkart/stk-code
|
2014-05-05 01:47:00 +02:00 |
|
Vincent Lejeune
|
d316263660
|
Tweak light extent again to improve perf
|
2014-05-05 01:46:57 +02:00 |
|
hiker
|
00cf9a3dbe
|
Merge remote branch 'origin/master' into new_login
|
2014-05-05 09:20:37 +10:00 |
|
Marianne Gagnon
|
654651215a
|
Merge branch 'master' of https://github.com/supertuxkart/stk-code
|
2014-05-04 18:54:46 -04:00 |
|
Marianne Gagnon
|
5acb763ac8
|
Work on cutscenes
|
2014-05-04 18:54:37 -04:00 |
|
Vincent Lejeune
|
d6d7c6179c
|
Simplify pointlight.vert
|
2014-05-04 19:46:21 +02:00 |
|
Vincent Lejeune
|
94ae8fb21e
|
Use a more tighly fitting quad for pointlights.
|
2014-05-04 19:21:09 +02:00 |
|
vlj
|
35df307c3f
|
Tweak light extend.
|
2014-05-03 23:44:27 +02:00 |
|
vlj
|
5e62347d11
|
Fix attempt for #1308
|
2014-05-03 17:36:27 +02:00 |
|
Guillaume P
|
a863757365
|
Merge remote-tracking branch 'remotes/upstrem/master' into hd-textures-option
Conflicts:
data/gui/custom_video_settings.stkgui
src/states_screens/dialogs/custom_video_settings.cpp
|
2014-05-03 10:32:47 +02:00 |
|
Marianne Gagnon
|
423a833bb8
|
Add DOF checkbox to the graphics options
|
2014-05-02 19:02:58 -04:00 |
|
Guillaume P
|
14508bc2ac
|
Merge remote-tracking branch 'remotes/upstrem/master' into hd-textures-option
|
2014-05-02 19:18:58 +02:00 |
|
vlj
|
2a1623d8ca
|
Use a more efficient screen to view conversion
Also use the opportunity to use UBO where possible.
|
2014-05-02 18:11:34 +02:00 |
|
vlj
|
2f1578ba32
|
Potential fix for #1305
|
2014-05-02 13:54:23 +02:00 |
|
hiker
|
d7219f3a2d
|
Added 'ok' button to 'new player' dialog. I can't seem to get them next
to each other, so for now they are just on top of each other.
|
2014-04-30 16:57:22 +10:00 |
|
hiker
|
af9fb24d2e
|
Handle disabled internet (and provide a message to the user if he
tries to login with internet disabled).
|
2014-04-30 16:37:05 +10:00 |
|
hiker
|
5124ba2bed
|
Merge remote-tracking branch 'origin/master' into new_login
|
2014-04-30 11:28:13 +10:00 |
|
hiker
|
ecef685b32
|
Adding new players now works.
|
2014-04-30 07:54:49 +10:00 |
|
hiker
|
b412d0507d
|
Merge pull request #1303 from leyyin/master
Fix some bugs in the online screens
|
2014-04-29 16:25:18 +10:00 |
|
hiker
|
396e3bb54e
|
Merge remote-tracking branch 'origin/master' into new_login
|
2014-04-29 09:10:37 +10:00 |
|
hiker
|
812da3e0c0
|
Some work on new login screen, though wip atm.
|
2014-04-29 09:02:44 +10:00 |
|
Guillaume P
|
03fbdc260d
|
Add a new option for high-definition textures.
|
2014-04-28 18:42:23 +02:00 |
|
hiker
|
2f17264f39
|
Very eary first version of a new login screen.
|
2014-04-28 16:41:47 +10:00 |
|
Vincent Lejeune
|
18aa119890
|
Tweak light attenuation.
Doesnt really change the look of the light but reduce their extent.
|
2014-04-27 18:31:00 +02:00 |
|
Vincent Lejeune
|
9ac57c3919
|
Tigher fit of light extent
|
2014-04-27 18:04:39 +02:00 |
|
Daniel Butum
|
a769563878
|
Fix back button size in guest login screen
|
2014-04-26 14:03:14 +03:00 |
|
Marianne Gagnon
|
924e09b3e9
|
Very slight tweak
|
2014-04-25 20:02:16 -04:00 |
|
vlj
|
2ca11c3166
|
Auria provided tonemap coefficients
|
2014-04-26 02:00:50 +02:00 |
|
vlj
|
3e4254b3a7
|
Tonemap: Use J. Hable filmic operator
It gives better result on stk enterprise, slightly saturating blacks.
|
2014-04-25 17:57:10 +02:00 |
|
Vincent Lejeune
|
84ddd7119e
|
Use glPolygonOffset to remove shadow acne
It's a 2002 trick from M. Kilgard
|
2014-04-24 21:02:24 +02:00 |
|
vlj
|
85e720a58f
|
Shadow: tweak bias to remove acnee
|
2014-04-24 18:33:05 +02:00 |
|
vlj
|
ef07b25202
|
Make possible to tweak exposure/lwhite in adm
|
2014-04-24 17:47:17 +02:00 |
|
hiker
|
370e2e4935
|
Merge remote-tracking branch 'origin/master' into new_login
|
2014-04-24 12:26:29 +10:00 |
|
samuncle
|
ba3cce6046
|
Limit the DoF influence
|
2014-04-24 02:44:34 +02:00 |
|
Marianne Gagnon
|
2e53328847
|
Add debug sliders for vlj
|
2014-04-23 19:03:23 -04:00 |
|
hiker
|
d7684668db
|
Fixed comments.
|
2014-04-24 08:16:19 +10:00 |
|
vlj
|
b939d06be5
|
Properly add Depth of Field
|
2014-04-23 22:08:37 +02:00 |
|
vlj
|
22d993dfbe
|
Merge branch 'tonemap'
Conflicts:
data/shaders/tonemap.frag
|
2014-04-23 18:20:30 +02:00 |
|
vlj
|
f83eb399fd
|
Revert "Revert "Fix a typo in tonemap.frag""
This reverts commit 812b2afcd8 .
|
2014-04-23 18:19:46 +02:00 |
|
vlj
|
19d2f1f9ac
|
Revert "Revert "Use a less intrusive delta value""
This reverts commit 230076ffcb .
|
2014-04-23 18:19:00 +02:00 |
|
vlj
|
77795c796f
|
Revert "Revert "Enable tonemap.""
This reverts commit e57339841b .
|
2014-04-23 18:18:43 +02:00 |
|
vlj
|
fb56a4086f
|
Fix normalmap roughness
|
2014-04-23 18:09:48 +02:00 |
|
Vincent Lejeune
|
eb0c948e41
|
Tweak exposure/whiepoint/saturation
|
2014-04-23 18:09:47 +02:00 |
|
hiker
|
7bab6fdb82
|
Removed swap file added accidentally.
|
2014-04-23 14:39:16 +10:00 |
|
Vincent Lejeune
|
da15aebcda
|
SSAO: Clamp to 0.
|
2014-04-22 18:22:39 +02:00 |
|
Vincent Lejeune
|
6f16831d00
|
Revert "Some color are negative, clamp them in loglum"
This reverts commit 43df357cfb .
|
2014-04-22 18:18:18 +02:00 |
|
hiker
|
2e3adee1a2
|
Merge branch 'master' of https://github.com/whichrakesh/stk-code into whichrakesh-master
Fix counting of bananas only for current player. Fixed conflicts.
Conflicts:
src/achievements/achievement_info.hpp
|
2014-04-22 17:20:40 +10:00 |
|
Vincent Lejeune
|
17ba0f515c
|
Revert "Use some realist order of magnitude of light"
This reverts commit 2aa6676050 .
|
2014-04-22 02:32:42 +02:00 |
|
Vincent Lejeune
|
b0e56ca2b0
|
Use some diffent value/equation for tonemap
|
2014-04-22 02:29:22 +02:00 |
|
Vincent Lejeune
|
e57339841b
|
Revert "Enable tonemap."
This reverts commit a0e63dea46 .
|
2014-04-22 00:44:58 +02:00 |
|
Vincent Lejeune
|
230076ffcb
|
Revert "Use a less intrusive delta value"
This reverts commit d7e3976ef5 .
|
2014-04-22 00:44:49 +02:00 |
|
Vincent Lejeune
|
812b2afcd8
|
Revert "Fix a typo in tonemap.frag"
This reverts commit b8d5719a82 .
|
2014-04-22 00:44:39 +02:00 |
|
Vincent Lejeune
|
d4718df127
|
Revert "Use some realist order of magnitude of light"
This reverts commit 2aa6676050 .
|
2014-04-22 00:44:08 +02:00 |
|
Vincent Lejeune
|
b8d5719a82
|
Fix a typo in tonemap.frag
Also tweak whitepoint and exposure. They should be manually set by track
somehow.
|
2014-04-21 22:37:26 +02:00 |
|
vlj
|
2aa6676050
|
Use some realist order of magnitude of light
|
2014-04-21 19:40:10 +02:00 |
|
vlj
|
d7e3976ef5
|
Use a less intrusive delta value
|
2014-04-21 19:39:39 +02:00 |
|
vlj
|
43df357cfb
|
Some color are negative, clamp them in loglum
I have yet to investigate how the pipeline can produce negative values
somewhere.
|
2014-04-21 19:29:13 +02:00 |
|
vlj
|
a0e63dea46
|
Enable tonemap.
|
2014-04-21 02:33:12 +02:00 |
|
vlj
|
2e1b0ac9f4
|
Avoid negative value when Yxy->RGB
|
2014-04-21 02:19:09 +02:00 |
|
vlj
|
8947242de4
|
Add proper tonemap, although disabled.
It currently generates way too much HDR.
|
2014-04-21 01:52:44 +02:00 |
|
vlj
|
d0afcce32d
|
Merge branch 'master' of https://github.com/supertuxkart/stk-code
|
2014-04-20 02:56:10 +02:00 |
|
vlj
|
878a639a84
|
Another ssao tweak.
|
2014-04-20 02:56:07 +02:00 |
|
Marianne Gagnon
|
8e579d4874
|
Add UBOs flag to graphics options
|
2014-04-19 20:23:49 -04:00 |
|
vlj
|
e8b36f2490
|
Fix for shadow acne in chocolate.
|
2014-04-20 02:20:09 +02:00 |
|
vlj
|
87248b46f3
|
Tweak shadows CSM split.
|
2014-04-20 02:01:29 +02:00 |
|
vlj
|
1291d0cc93
|
Increase shadow fidelity.
|
2014-04-20 00:21:30 +02:00 |
|
vlj
|
a457b9f423
|
Shadows: Clean shaders.
|
2014-04-20 00:04:49 +02:00 |
|
vlj
|
dd3e15b298
|
Debug: display cascade in shadow debug mode
|
2014-04-19 23:57:27 +02:00 |
|
Vincent Lejeune
|
d7eaaf4885
|
Add a m_ubo_disabled switch in user config file.
This should be used to workaround a bug in intel windows drivers.
|
2014-04-19 18:38:57 +02:00 |
|