Vincent Lejeune
|
17aafae42c
|
Merge remote-tracking branch 'origin/esm'
|
2014-11-03 01:02:27 +01:00 |
|
hiker
|
841ae8814e
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-11-03 08:56:19 +11:00 |
|
hiker
|
62b81b3e9a
|
Shortened labels to fit on smaller screens.
|
2014-11-03 08:23:35 +11:00 |
|
hiker
|
0be0d7ee72
|
Merge branch 'perPlayerDifficulties' of https://github.com/Flakebi/stk-code into Flakebi-perPlayerDifficulties
|
2014-11-03 06:52:31 +11:00 |
|
Vincent Lejeune
|
ddecd23472
|
Tweak values
|
2014-11-02 19:07:02 +01:00 |
|
Vincent Lejeune
|
ebe11370a2
|
Reenable bluring
|
2014-11-02 16:30:44 +01:00 |
|
Vincent Lejeune
|
c5186e3ab3
|
Use depth in exp space
|
2014-11-02 16:26:46 +01:00 |
|
Vincent Lejeune
|
b975b63eea
|
Use proper depth linear value
|
2014-11-02 16:00:41 +01:00 |
|
Vincent Lejeune
|
f5a44c0a19
|
Take more sample
|
2014-11-02 02:42:44 +01:00 |
|
Vincent Lejeune
|
9113aa7a39
|
Implement Exponential Shadow map
|
2014-11-02 02:36:10 +01:00 |
|
Vincent Lejeune
|
7679213e26
|
Use exp algorithm for the gaussian blur
|
2014-11-02 02:35:02 +01:00 |
|
Vincent Lejeune
|
6aed902ae0
|
Store depth in color buffer instead of depth
This allows for instance to blur it using already existing shaders
|
2014-11-01 22:38:38 +01:00 |
|
Flakebi
|
9ca1c03480
|
Applying merges correctly is difficult...
|
2014-10-31 18:54:52 +01:00 |
|
Flakebi
|
abf7bacfea
|
Merge branch 'upstream/master' into perPlayerDifficulties
Conflicts:
src/graphics/stkmesh.cpp
src/states_screens/kart_selection.cpp
|
2014-10-31 16:47:34 +01:00 |
|
Vincent Lejeune
|
ee687440c7
|
Increase shadow filtering
|
2014-10-29 18:57:39 +01:00 |
|
Marianne Gagnon
|
bf0f75a367
|
Fix (again) initial scattering of now so that it falls evenly
|
2014-10-28 19:06:29 -04:00 |
|
Arthur-D
|
6c0ace85ee
|
Slight improvement on notification backgrounds. Feedback welcome.
|
2014-10-28 07:16:29 +01:00 |
|
Flakebi
|
f27597c450
|
Revert "Fix incorrect alignment in spinner widgets"
This reverts commit 4cb8be6ab4 .
|
2014-10-26 18:02:28 +01:00 |
|
Flakebi
|
46f3fa5f74
|
Merge branch 'upstream/master' into perPlayerDifficulties
Conflicts:
data/gui/options_ui.stkgui
src/graphics/stkmesh.cpp
src/states_screens/options_screen_ui.cpp
|
2014-10-26 17:47:29 +01:00 |
|
Flakebi
|
4cb8be6ab4
|
Fix incorrect alignment in spinner widgets
|
2014-10-26 17:10:28 +01:00 |
|
Flakebi
|
690e632e1b
|
Move handicap to ui options and to the player name spinner
|
2014-10-26 16:56:50 +01:00 |
|
Arthur-D
|
ef2cf3b17d
|
Sorry for the previous messy merge - no files were changed remotely so should be safe. Due to my mishap I need to commit the files I wanted to again. Those are new bg images for achievement and friend notifications. Feedback welcome.
|
2014-10-26 15:34:51 +01:00 |
|
hiker
|
f7893afbef
|
Adjusted button position, thanks to auria.
|
2014-10-24 11:16:08 +11:00 |
|
hiker
|
8bc6aa91bb
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-10-24 10:34:59 +11:00 |
|
hiker
|
1920703f09
|
Converted label to button, just for tests.
|
2014-10-24 10:34:10 +11:00 |
|
Vincent Lejeune
|
794ab54b7a
|
Clamp lodval
|
2014-10-24 00:41:34 +02:00 |
|
hiker
|
b4f95d672a
|
Started to indicate the name of the logged in user ... still work in
progress (black writing on dark grey).
|
2014-10-23 22:26:11 +11:00 |
|
Vincent Lejeune
|
9ca4d7e3e6
|
Improve ibl specular reflexion using mipmap chain
|
2014-10-22 14:49:06 +02:00 |
|
hiker
|
c012e98f9b
|
Allow disabling of hw stats collection.
|
2014-10-22 08:20:26 +11:00 |
|
Flakebi
|
57afd1d585
|
Merge remote-tracking branch 'origin/master' into perPlayerDifficulties, this time the right branch...
Conflicts:
data/gui/user_screen.stkgui
data/gui/user_screen_tab.stkgui
src/graphics/glwrap.cpp
src/graphics/weather.cpp
src/states_screens/user_screen.cpp
|
2014-10-20 22:36:54 +02:00 |
|
Marianne Gagnon
|
c95e90b925
|
Tweak checkbox position on login screen
|
2014-10-17 19:24:21 -04:00 |
|
Vincent Lejeune
|
2f45266c6f
|
Fix position of speedmeter
Only need to get the texture
|
2014-10-17 18:51:41 +02:00 |
|
Vincent Lejeune
|
ce7f017adf
|
Some fixes
|
2014-10-17 18:43:39 +02:00 |
|
Deve
|
3499975b03
|
Move track name to center.
It allows a bit longer track names and looks better.
|
2014-10-16 19:33:54 +02:00 |
|
hiker
|
50c21cc11e
|
Added secret achievement (i.e. progress not shown in list).
|
2014-10-09 23:32:17 +11:00 |
|
auriamg
|
3061123e3e
|
Merge pull request #1606 from Flakebi/fix
Fix some more bugs
|
2014-10-08 18:18:37 -04:00 |
|
Vincent Lejeune
|
ea3cc141ff
|
Fix grass in azdo mode
|
2014-10-08 01:01:28 +02:00 |
|
hiker
|
4ff00018b4
|
Fixed alignment of password field.
|
2014-10-08 08:25:00 +11:00 |
|
Flakebi
|
0193c4c7a5
|
Fix #1170 Add "Don't Assign" option when configuring inputs
|
2014-10-07 00:06:15 +02:00 |
|
Vincent Lejeune
|
9de7d11ee4
|
Fix bloom effect on mesa
|
2014-10-07 00:00:16 +02:00 |
|
Vincent Lejeune
|
20ea7ca271
|
GI use sun color value
|
2014-10-06 22:51:41 +02:00 |
|
vlj
|
b10f1a3ef2
|
Tweak envmap
|
2014-10-06 02:29:18 +02:00 |
|
vlj
|
c7b98c4e6c
|
Emulate envmap specular reflexion
|
2014-10-06 02:19:21 +02:00 |
|
hiker
|
cb40f68229
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-10-06 09:07:34 +11:00 |
|
hiker
|
6f5b7aa4ae
|
Tried a different layout for the checkboxes (sorry, but I didn't like the
previous approach at all). Only disadvantage now (I can think of) is that
the width of the lables is now hard coded to 40% of the screen.
|
2014-10-06 07:48:15 +11:00 |
|
Vincent Lejeune
|
44792a1490
|
Fix splatting
|
2014-10-05 22:46:02 +02:00 |
|
Vincent Lejeune
|
9394f275cd
|
Merge branch 'specmap'
|
2014-10-05 21:56:10 +02:00 |
|
Vincent Lejeune
|
019db1a11d
|
Revert "Revert "Prepare shader for specmap value""
This reverts commit 780482edba .
|
2014-10-05 21:56:04 +02:00 |
|
Vincent Lejeune
|
0db951f374
|
Try to emulate enery conservation
|
2014-10-05 21:53:06 +02:00 |
|
Vincent Lejeune
|
300a09746f
|
Additionnal fixes
|
2014-10-05 21:45:56 +02:00 |
|