hiker
|
b412d0507d
|
Merge pull request #1303 from leyyin/master
Fix some bugs in the online screens
|
2014-04-29 16:25:18 +10:00 |
|
Marianne Gagnon
|
8d2b56a34a
|
Improve flying mode, part 2
|
2014-04-28 19:55:41 -04:00 |
|
Marianne Gagnon
|
389ec42bde
|
Improve flying mode
|
2014-04-28 19:55:30 -04:00 |
|
hiker
|
6f5c523e86
|
Fixed display of players, thanks to auria.
|
2014-04-29 09:46:00 +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 |
|
hiker
|
b3291caea2
|
Moved 'startup now' code in separate function to make main more readable.
|
2014-04-28 07:51:24 +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 |
|
Marianne Gagnon
|
2ee7f7a2e8
|
Bugfix : use ambient light from the sun when SH maps are not used
|
2014-04-26 20:04:16 -04:00 |
|
Daniel Butum
|
a769563878
|
Fix back button size in guest login screen
|
2014-04-26 14:03:14 +03:00 |
|
Daniel Butum
|
5ecfed293d
|
Fix back button in the register screen and login as guest
|
2014-04-26 13:42:30 +03:00 |
|
Daniel Butum
|
fc5da9eb9a
|
Fix back button in login screen and fix 'move on uninitialised value in MusicInformation'
|
2014-04-26 13:33:09 +03:00 |
|
vlj
|
a2e202a695
|
Missing "track->hasShadows" check
|
2014-04-26 02:22:33 +02: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 |
|
Marianne Gagnon
|
97b6db3fdc
|
Honor the per-track flag to disable god rays
|
2014-04-24 19:24:23 -04:00 |
|
vlj
|
c5fbd5ff84
|
Reenable ability to change exposure/lwhite.
|
2014-04-25 00:59:02 +02:00 |
|
vlj
|
5b8b1a8b57
|
Temporary comment out exposure/lwhite settings
|
2014-04-25 00:29:33 +02:00 |
|
Vincent Lejeune
|
7239154a3a
|
NormalMap should cast shadows too
|
2014-04-24 21:23:32 +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
|
84a1e32ade
|
Let cmake test if stk-assets exists in the expected place. If not,
cmake is aborted with an error message. The option -DCHECK_ASSETS=off
option can be used to disable this test. The latter is also used
for travis.
|
2014-04-24 14:22:38 +10:00 |
|
hiker
|
9c35da4b6c
|
Merge branch 'master' of https://github.com/abhishek1995/stk-code into abhishek1995-master
|
2014-04-24 14:01:37 +10: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
|
3f17545541
|
Use hasShadows flag from Track
|
2014-04-23 19:19:11 -04:00 |
|
Marianne Gagnon
|
2e53328847
|
Add debug sliders for vlj
|
2014-04-23 19:03:23 -04:00 |
|
hiker
|
ea2b797bb3
|
Keep track of online ids used in the player.xml file.
|
2014-04-24 08:17:44 +10: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
|
1bb4926ba2
|
Reorder post processes effects.
|
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
|
96c8180dfc
|
Remove color_in, it's been superseeded
Keep the shader because it will be partly used for dof.
|
2014-04-22 19:51:36 +02: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 |
|
hiker
|
469ac9c433
|
Don't fire a cake if the target kart is invulnerable. Some cosmetic
changes to reduce line length, and added more comments.
|
2014-04-22 16:53:12 +10:00 |
|
hiker
|
ef341344e7
|
Merge branch 'skiddingAI' of https://github.com/gupascal/stk-code into gupascal-skiddingAI
|
2014-04-22 14:29:35 +10:00 |
|
hiker
|
886e7614e2
|
Fixed -help command line options (which was broken elsewhere before).
|
2014-04-22 14:24:32 +10:00 |
|
hiker
|
1bff514c27
|
Merge branch 'master' of https://github.com/leyyin/stk-code into leyyin-master
|
2014-04-22 14:14:49 +10:00 |
|