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 |
|
Marianne Gagnon
|
423a833bb8
|
Add DOF checkbox to the graphics options
|
2014-05-02 19:02:58 -04: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 |
|
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 |
|