ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,994 Commits 9 Branches 28 Tags 433 MiB
0066722dab
Commit Graph

2962 Commits

Author SHA1 Message Date
Vincent Lejeune
8e221df753 Ask newer driver if catalyst below 14.4 2015-01-19 00:46:12 +01:00
Vincent Lejeune
95cb413e39 Remove comment in graphic restriction 2015-01-19 00:43:48 +01:00
hiker
234d59a5fd Fix error in xml causing a crash. 2015-01-19 10:38:04 +11:00
hiker
79df2151e9 Add a popup window to be shown first if it is detected that 
the driver is too old.
 2015-01-19 10:21:41 +11:00
Vincent Lejeune
73a20508ef Remove unused shaders 2015-01-17 02:49:48 +01:00
hiker
111b3f6361 Merge branch 'master' of github.com:supertuxkart/stk-code 2015-01-16 11:55:31 +11:00
hiker
5f4ce613c0 Updated help text for new register screen layout. 2015-01-16 11:54:59 +11:00
Vincent Lejeune
f22cf2a05e Use a fullscreen pass for skybox 2015-01-15 20:50:19 +01:00
Vincent Lejeune
70e8b4c854 When there are 8 lod level, 7 is the max 2015-01-15 19:52:48 +01:00
auriamg
c5cf42755f Merge pull request #1882 from math07/working 
Make note spinner values of addons search bar readable in low resolution
 2015-01-14 19:28:53 -05:00
samuncle
fc670cecf2 Add two new particle effect 2015-01-15 00:11:14 +01:00
Vincent Lejeune
08cb4b4297 Fix tangent/bitangent computation 
Shouldn't make any difference since we don't rescale that much
 2015-01-12 23:01:35 +01:00
Vincent Lejeune
cfbbeef441 Clamp lod level in SSAO shader later. 2015-01-12 22:47:53 +01:00
Vincent Lejeune
95e2213b1e SSAO can me 0 sometimes 2015-01-12 20:13:11 +01:00
Vincent Lejeune
b8ab68b31a Fix precision issue in SSAO 2015-01-12 20:05:40 +01:00
Vincent Lejeune
3bcdc04279 Fix precision issue in CIE/RGB conversions 2015-01-12 20:05:16 +01:00
deve
1b5ee918f0 Fixed inconsistency in CREDITS file. 
GP editor wasn't available in 0.8.1 version.
 2015-01-12 09:56:20 +01:00
hiker
342cb82653 Merge branch 'new_register_screen' 2015-01-12 12:19:56 +11:00
hiker
a2006c3e16 Merge branch 'master' of github.com:supertuxkart/stk-code 2015-01-12 12:10:23 +11:00
hiker
7bd1126df8 Improve flow from register screen back to user screen. Now password 
and online user name do not need to be added again.
 2015-01-12 09:41:34 +11:00
Vincent Lejeune
019ec344fe Allow to reduce shadow resolution 2015-01-11 00:45:38 +01:00
Marianne Gagnon
bf1fa71be9 Vlj was a little too humble when adding himself to the credits ;) 2015-01-09 21:58:06 -05:00
Vincent Lejeune
7dd48f4d3b Add myself to the credits 2015-01-09 22:35:21 +01:00
hiker
5ccedfc349 Use tabs in register screen (work in progress). 2015-01-09 09:42:18 +11:00
hiker
b0879514fb Merge branch 'master' of github.com:supertuxkart/stk-code 2015-01-08 13:33:16 +11:00
hiker
520625adae Removed 'sign' (in/out), use 'log' (in/out) instead. 2015-01-08 13:32:50 +11:00
Marianne Gagnon
91b4c6e08a Apply modified version of pull request #1881, fixing #1859 2015-01-07 19:53:25 -05:00
Marianne Gagnon
b55d1a2367 Set minimum OS X version in Info.plist, fixes #1863 2015-01-07 18:46:35 -05:00
Vincent Lejeune
cc43861896 Tangent/Bitangent direction only matters. 2015-01-07 21:51:23 +01:00
Vincent Lejeune
02cf7afcf3 Use graphic restrictions system for all CVS query 2015-01-06 23:46:36 +01:00
Mathieu Laprise
24944a810c Add a new achievement : Mosquito Hunter 2015-01-06 14:54:21 -05:00
samuncle
91b062ee52 Add amanda in the credits 2015-01-06 01:04:09 +01:00
Mathieu Laprise
765484efd9 Make note spinner values of addons search bar readable in low resolutions 2015-01-05 19:04:01 -05:00
auria
f672bbb77e Extract strings 2015-01-02 18:38:11 -05:00
leper
d21f0ffa2b Support plural translations. Fixes #1852. 2015-01-03 00:25:53 +01:00
konstin
fa10561d09 Merge branch 'master' of https://github.com/supertuxkart/stk-code into lights 2015-01-01 23:05:26 +01:00
Vincent Lejeune
3451d4e9a0 Add a ESM/PCF switch 2015-01-01 20:06:34 +01:00
Vincent Lejeune
883ab43e29 Assume __VERSION >= 130 everywhere 2015-01-01 03:18:13 +01:00
konstin
531b94a0ac cleaning up and adding radius and energy sliders 2014-12-30 18:47:25 +01:00
Deve
aa9de807f9 Generate achivements in supertuxkart.pot 2014-12-27 22:50:03 +01:00
Deve
3e6677b755 Rename "title" to "name" in achievements to keep consistency with other xml files such as tracks and karts 2014-12-27 22:43:25 +01:00
Deve
a80d449aaf Improved update_pot script 
- added stk-assets path
 - restored karts and tracks
 - added achevements
 - better formatting and faster executing
Updated supertuxkart.pot
 2014-12-27 22:12:16 +01:00
Vincent Lejeune
d8b3cf9c8f Factorise MRP 2014-12-27 03:22:06 +01:00
Vincent Lejeune
e42cdc5d64 Used #ifndef in header.txt 2014-12-27 03:21:55 +01:00
GunChleoc
ed56858321 Fixed a typo. 2014-12-23 16:21:47 +01:00
samuncle
c54fed411f Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-12-21 09:58:06 +01:00
samuncle
b54ddb9828 Add emit map to object pass 2 shader 2014-12-21 09:58:03 +01:00
Vincent Lejeune
c4e5a720f7 Do not undefine builtin macros. 2014-12-18 22:09:14 +01:00
Marianne Gagnon
0af3f3de83 Misc tweaks, mainly to include new island tracks in challenges and GPs, and other minor fixes 2014-12-15 21:34:22 -05:00
Vincent Lejeune
84cf087ae6 Forget to update grass pass 2 sun location 2014-12-16 02:10:26 +01:00
Vincent Lejeune
7aa7e2d148 Factorise sun color/position 2014-12-15 23:09:19 +01:00
Deve
2995051f7c Merge pull request #1779 from math07/working 
When entering gp_name, display buttons vertically to allows gamepad
 2014-12-15 12:17:00 +01:00
hiker
3fa8625c78 Fixed incorrect icon name. 2014-12-15 17:10:34 +11:00
Vincent Lejeune
03694d9c7c Factorise SH coefficient in an UBO 2014-12-15 00:18:03 +01:00
Vincent Lejeune
4b2abef56c Remove redondant uniform in IBL 2014-12-14 21:55:15 +01:00
Vincent Lejeune
1732b1cfef Clean up sunlight shader + factorize diffusebrdf 2014-12-14 21:39:18 +01:00
Vincent Lejeune
d50dde4c97 Revert "Try to fix ibl precision issue" 
This reverts commit 1cf592394b.
 2014-12-14 02:48:47 +01:00
Vincent Lejeune
1cf592394b Try to fix ibl precision issue 2014-12-13 22:35:46 +01:00
Vincent Lejeune
7872bc7860 Fix image format for bilateral blur 2014-12-13 22:28:16 +01:00
Mathieu Laprise
15927f319c When entering gp_name, display buttons vertically to allows gamepad selection 2014-12-12 20:19:27 -05:00
hiker
ba990318d1 Merge remote-tracking branch 'origin/master' into new_server 2014-12-13 10:49:45 +11:00
Marianne Gagnon
72a02128de Fix gand prix 2014-12-11 20:20:42 -05:00
Marianne Gagnon
9b3b99610a MInor GUI XML cleanup 2014-12-11 19:39:30 -05:00
Marianne Gagnon
334cca21ad Merge branch 'Math07_master' 2014-12-10 21:06:09 -05:00
Marianne Gagnon
7cc28a9755 Revert "Friends Search bar goes off the bottom of the screen #1762" 
This reverts commit f98a169e9c.
 2014-12-10 21:04:57 -05:00
Vincent Lejeune
1c05d9ef68 Port colored lines too 2014-12-11 01:44:58 +01:00
Vincent Lejeune
db6600a687 Frustrum shader is updated to new system 2014-12-11 01:19:17 +01:00
hiker
c0c4357331 Switch from IP address to addons.supertuxkart.net (including new 
certificate).
 2014-12-10 23:53:47 +11:00
samuncle
cb8017cae1 clamping values to avoid pink specularity 2014-12-10 03:02:36 +01:00
hiker
83f49ec319 Merge remote-tracking branch 'origin/master' into new_server 
Conflicts:
	src/online/http_request.cpp
 2014-12-10 11:25:16 +11:00
Vincent Lejeune
a8ce996047 Revert "Simplify sunlight shadow shader." 
This reverts commit cc7f95163c.
 2014-12-09 21:20:55 +01:00
Vincent Lejeune
cc7f95163c Simplify sunlight shadow shader. 2014-12-09 19:00:21 +01:00
Vincent Lejeune
c91c04c862 Same for shadow blur pass 2014-12-09 18:54:27 +01:00
Vincent Lejeune
b24fd621a5 Precompute coefficient in gaussian blur pass 2014-12-09 18:43:48 +01:00
Vincent Lejeune
d97b9f2d0e Clamp SpecularIBL value on positive range 2014-12-09 01:33:58 +01:00
Vincent Lejeune
2667791621 Tweak IBL 2014-12-08 19:36:23 +01:00
Vincent Lejeune
72fdf816e7 Fix Importance sampling 2014-12-08 19:16:26 +01:00
Vincent Lejeune
2b0680d92d Use texture buffer instead of uniform for samples 
Should fix nvidia glsl error
 2014-12-08 18:24:43 +01:00
Vincent Lejeune
6041c48fbe Source DiffuseIBL algorithm 2014-12-07 21:37:16 +01:00
Vincent Lejeune
a320eebece Cleanup tonemap shader 2014-12-07 21:27:26 +01:00
Vincent Lejeune
a094bbae19 Factorize DiffuseIBL and SpecularIBL 2014-12-07 19:10:22 +01:00
Vincent Lejeune
e491422bdc Weight sample in importance sampling 2014-12-07 18:26:51 +01:00
Mathieu Laprise
f98a169e9c Friends Search bar goes off the bottom of the screen #1762 2014-12-06 17:28:02 -05:00
Mathieu Laprise
107e434fe9 Missing button in grand prix editor name dialog #1765 2014-12-06 15:14:27 -05:00
auria
d3ba1ca283 Update strings 2014-12-05 19:26:09 -05:00
Marianne Gagnon
f05618b3b9 Add possibility to specify non-translated texts in GUI XML files, and use it for debug strings that should not be translated 2014-12-05 19:17:52 -05:00
Vincent Lejeune
1e2656dc88 Use clamp instead of max(0, dot(normalized, normalized)) 
Should help GLSL compiler to optimize them.
 2014-12-05 17:51:18 +01:00
Vincent Lejeune
8f3b8cf448 Implement specular IBL properly 2014-12-05 16:42:49 +01:00
hiker
48593534a5 Added certificate for our vps. 2014-12-05 13:57:27 +11:00
Vincent Lejeune
4079c18050 Update graphic restriction 
This should fix bug #1519
 2014-12-05 01:38:54 +01:00
Vincent Lejeune
fd2da4085b Rename some shader to improve their meaning 2014-12-05 00:20:16 +01:00
Vincent Lejeune
23b781e7dd Move glossmap formula to getspecular shader 2014-12-05 00:09:15 +01:00
hiker
645f01a508 Removed 'can use existing stkaddons' account from message. 2014-12-04 16:24:14 +11:00
Marianne Gagnon
35f55c19a1 Tweak jungle challenge to use Cocoa Temple and a slightly adjusted time 2014-12-01 18:42:46 -05:00
samuncle
3627719440 min max where inverted 2014-12-01 23:54:34 +01:00
Vincent Lejeune
354dad7392 Fix an error when indirect instancing is not supported 2014-12-01 01:46:50 +01:00
hiker
020c129691 Specify the replay buffer size as time value (i.e. how many seconds), 
not how many frames.
 2014-11-27 16:15:53 +11:00
hiker
ea3a433147 Fix #1620 (Player's achievements can only be seen when logged in). 2014-11-25 17:12:47 +11:00
hiker
ebfbf5e2aa Updated pot file (just to check launchpad integration, no string freeze yet). 2014-11-25 15:05:51 +11:00
Marianne Gagnon
cd7bc96d68 Fix invalid snow particles XML file that would cause assertion failures 2014-11-24 18:31:38 -05:00
samuncle
82b8548066 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-11-24 21:10:08 +01:00
samuncle
92801f2b74 Tweak the snow 2014-11-24 20:23:55 +01:00
Deve
54b311f6f7 Allow to set custom ratio for images from xml file. 
It avoids crashes and memory leaks after changing resolution.
 2014-11-24 19:31:46 +01:00
Marianne Gagnon
5d5460d845 Add way to test intro cutscene easily; do not throttle sound effects on cutscenes 2014-11-22 18:21:31 -05:00
samuncle
91736e1941 Add the support for emit map. For the moment it's only for solid objects 2014-11-22 15:59:22 +01:00
Vincent Lejeune
d426a395bb Use old formula for glossmap 2014-11-22 02:03:20 +01:00
Vincent Lejeune
f3a637fb99 Fix sun area light 2014-11-21 02:44:27 +01:00
Vincent Lejeune
79e5e9f880 Revert "Use f0 in fresnel schlick" 
This reverts commit acdafc5566.
 2014-11-21 02:09:02 +01:00
Vincent Lejeune
593f462ec5 Revert "Use color for specular" 
This reverts commit fcba1dab86.
 2014-11-21 02:09:00 +01:00
Vincent Lejeune
4a8afd2d40 Implement sun as an disk area light. 
Solid angle is defaulted to sun's one.
 2014-11-21 01:54:30 +01:00
Vincent Lejeune
fcba1dab86 Use color for specular 2014-11-20 22:57:32 +01:00
Vincent Lejeune
acdafc5566 Use f0 in fresnel schlick 2014-11-20 22:51:22 +01:00
Vincent Lejeune
bcd3452b70 Remove bubble shaders 2014-11-20 22:05:19 +01:00
Vincent Lejeune
a78b889b05 Modelise Beer Lambert absorption for fog 2014-11-20 21:23:33 +01:00
Vincent Lejeune
c594295288 Tweak shadow blur 2014-11-18 03:44:45 +01:00
Flakebi
4ab84a6b83 Unify I18N attributes in screens 2014-11-17 00:08:47 +01:00
Marianne Gagnon
d8b0f79428 Tweak register script so that the "Online" checkbox is closer to the text 2014-11-15 18:38:51 -05:00
Vincent Lejeune
c2859d24ce Improved shadow stability 2014-11-15 21:27:15 +01:00
Vincent Lejeune
448f254a2b Fixes 2014-11-15 21:02:24 +01:00
Vincent Lejeune
a7b8ba13cd Add shader content 2014-11-15 20:43:44 +01:00
Vincent Lejeune
7e3c2c4897 Add a shader to blur shadow 2014-11-15 20:37:47 +01:00
Vincent Lejeune
687bb6e065 Spare a few lds inst 2014-11-15 19:18:07 +01:00
Vincent Lejeune
3c42223add Try graphical restrictions on nvidia old drivers 2014-11-15 03:10:23 +01:00
Vincent Lejeune
6cc721eaf9 Use CS for gaussian6 2014-11-15 01:11:26 +01:00
hiker
2ec5c3765a Added a config file which can be used to disable certain graphical 
options dependeing on card, os, driver version.
 2014-11-15 10:06:54 +11:00
Marianne Gagnon
c6651489c1 Tweak nitro for new engine 2014-11-13 19:24:15 -05:00
Deve
5c32aa8baa Minor modifications for skidding and nitro. 
Still could be better, I'm not an artist ;p
 2014-11-13 19:24:53 +01:00
samuncle
bd9823dbbe Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-11-13 18:02:49 +01:00
samuncle
ffb76788a9 Minor tweak with transluscent material 2014-11-13 18:02:25 +01:00
hiker
22b6aaea25 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-11-13 22:47:05 +11:00
hiker
753c3d7168 Fixed #1638 (text overflows behind buttons) - partially by removing 
the confirmation field for the emal address.
 2014-11-13 22:42:32 +11:00
Deve
c1fd2d3614 Fixed skidding and nitro particles. 
Not perfect but at least working.
 2014-11-12 22:20:33 +01:00
Deve
91d26e92ef A bit better rain. 2014-11-12 16:31:41 +01:00
hiker
25b4d35a65 Merge branch 'perPlayerDifficulties' of https://github.com/Flakebi/stk-code 2014-11-12 15:45:03 +11:00
hiker
28db99b7c1 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-11-12 12:26:00 +11:00
hiker
4b01d090c6 Fixed track name for GP. 2014-11-12 12:25:33 +11:00
samuncle
1bd3ee24c6 Add a description to the shader 2014-11-12 01:22:33 +01:00
samuncle
f39ae90b6e merge with trunk + try to adapt to the new blur system 2014-11-12 00:08:21 +01:00
Vincent Lejeune
192ed8a486 Fix classic fog 2014-11-11 22:43:25 +01:00
Vincent Lejeune
09fa1ee3cb Implement scattering for point light 2014-11-11 22:36:27 +01:00
Vincent Lejeune
bd4fe57524 Use fog start value to determine density 2014-11-11 21:52:54 +01:00
Vincent Lejeune
84affec451 Change fog equation 2014-11-10 22:08:12 +01:00
Vincent Lejeune
85bbc0f8b8 Use variable sigma for blur filter 2014-11-10 21:32:04 +01:00
samuncle
d0caeb3b63 Merge branch 'master' of https://github.com/supertuxkart/stk-code into lensflare 2014-11-10 06:51:10 +01:00
hiker
8dff64644a Fixed #1687 (time too long when using many karts in ftl)> 2014-11-10 16:49:13 +11:00
samuncle
e20d8bdcdf Merge branch 'master' of https://github.com/supertuxkart/stk-code into lensflare 
Keep lens flare updated with trunk
 2014-11-08 01:51:40 +01:00
hiker
5401e7f3b7 First try to prevent #1566: kart chassis appears inside of terrain. 2014-11-08 11:43:06 +11:00
Vincent Lejeune
04d313671c Fix sqrt(int) in diffuseenvmap 2014-11-08 01:02:46 +01:00
Vincent Lejeune
5eefe0c0ad Make envmap reflexion less blurry 2014-11-08 00:57:49 +01:00
samuncle
2a440bb2cb minor modification to the blueish mood of lens flare 2014-11-07 16:20:39 +01:00
samuncle
1e547652f7 Merge branch 'master' of https://github.com/supertuxkart/stk-code into lensflare 
Keep lens flare updated with master
 2014-11-07 16:14:11 +01:00
Vincent Lejeune
d7f3198ac9 Merge branch 'sdsm' 2014-11-07 13:42:29 +01:00
Vincent Lejeune
909948c9a4 Implement depth histogram to position cascade split 2014-11-07 13:42:13 +01:00
Vincent Lejeune
cacb008ae6 Prepare compute shader to stretch lightcoord 2014-11-07 13:42:13 +01:00
hiker
cfb4dc13a8 Updated GP for new mines track. 2014-11-05 13:39:57 +11:00
Flakebi
9dd86c8332 Don't handicap AIs 2014-11-04 23:57:33 +01:00
Flakebi
5a84b471e4 Add 'handicapped' to player name 2014-11-04 23:36:16 +01:00
samuncle
52bc4cebd4 Add the lensflare shader 2014-11-04 21:15:18 +01:00
Vincent Lejeune
92ecd01e61 Make cascade split modifiable 2014-11-04 20:53:32 +01:00
samuncle
d7caebe847 enable vignette during races 2014-11-03 21:53:44 +01:00
hiker
dec5ac8aa2 Fixed several xml errors (unclosed <space> tags). 2014-11-03 15:25:39 +11:00
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
Vincent Lejeune
a8161288a9 Convert remaining shaders 2014-10-05 20:47:13 +02:00
Vincent Lejeune
9f2b66d195 Use specmap on others mats 2014-10-05 20:37:49 +02:00
hiker
2730c3c026 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-05 21:37:42 +11:00
hiker
df62c8921e Added limited lazy-load flag to avoid loading of all font textures 
(most of which might not be needed). Fixes #1592.
 2014-10-05 21:35:14 +11:00
Flakebi
dc78c35b50 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	data/gui/user_screen.stkgui
	data/gui/user_screen_tab.stkgui
	src/karts/kart.cpp
 2014-10-05 12:10:39 +02:00
Vincent Lejeune
780482edba Revert "Prepare shader for specmap value" 
This reverts commit 88954a5d88.
 2014-10-05 02:30:15 +02:00
Vincent Lejeune
0121ae8db6 Use specmap value 2014-10-05 02:30:01 +02:00
Vincent Lejeune
88954a5d88 Prepare shader for specmap value 2014-10-05 02:12:04 +02:00
Marianne Gagnon
83b25768cc tweak players screen, checkbox placement was weird 2014-10-04 19:44:04 -04:00
hiker
f63e7d93b8 Fixed #1598 (error message about font texture not found). 2014-10-04 23:32:54 +10:00
samuncle
97772ba1ae set the downard impulse to 5 + a more easy to use backward camera 2014-10-02 13:53:59 +02:00
vlj
30dda3e343 Fix sky warp 2014-10-02 02:53:31 +02:00
hiker
de9a1f51a7 Removed empty 'online overview' page, show the achievements page instead. 2014-10-02 07:59:24 +10:00
vlj
2236e8dd1c Fix extra respawning particles 2014-10-01 01:19:49 +02:00
Flakebi
47da30dd24 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-30 19:22:18 +02:00
samuncle
af037d6267 tweak particle.xml 2014-09-29 12:30:43 +02:00
hiker
a593c81a64 Some improvement for #1505, but still wip. 2014-09-26 16:33:47 +10:00
hiker
2d7b8228e9 Fix #1565: Added better instructions for account creation screen (and also made the 
instructions actually visible).
 2014-09-26 08:57:52 +10:00
Flakebi
2cf9707294 Merge branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	src/states_screens/kart_selection.cpp
I hope I got everything
 2014-09-24 17:58:12 +02:00
vlj
58e1b73752 Fix bloom computation 2014-09-24 01:19:37 +02:00
hiker
06523a62c3 Fixed typo, renamed file to have proper extension. 2014-09-23 22:58:08 +10:00
hiker
13cbde2e09 Added new supertuxkart.appdata file from hughsie (#1545). 2014-09-23 15:51:06 +10:00
hiker
4cea6bd7fe Fixed #709 (Missing R with caron in title font). Thanks! 2014-09-22 15:53:40 +10:00
hiker
249c34cd0d Fixed achievement warning. 2014-09-22 07:54:34 +10:00
Vincent Lejeune
5643e38886 Some factorisation for non instanced path 2014-09-20 19:28:06 +02:00
Vincent Lejeune
b3e124b93e Some fixes 2014-09-20 18:48:22 +02:00
Vincent Lejeune
f6d2ff92f1 Merge remote-tracking branch 'origin/glossmap' 2014-09-20 01:57:55 +02:00
Vincent Lejeune
b034049a28 Support for 3 tex mats 2014-09-19 23:09:22 +02:00
Deve
12977c3764 Merge pull request #1530 from marcoll/master 
Some improvements to the GP editor

Merged because it fixes some issues. Previously I wasn't able to create new GP without a crash.
 2014-09-19 21:54:38 +02:00
Vincent Lejeune
24cd727899 Add glossytex to textures 2014-09-19 19:54:00 +02:00
Flakebi
9bcc76127f Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-17 13:20:09 +02:00
Vincent Lejeune
1d2c77d86a Use ProjectionViewMatrix in glow_object.vert 2014-09-17 02:12:28 +02:00
Vincent Lejeune
b769e46a00 Use texture instead of image in SSAO. 2014-09-16 15:18:29 +02:00
Vincent Lejeune
4c6df4821d Revert "Do not allow specvalue to be below 0." 
This reverts commit 6b4430caaa.
 2014-09-16 00:37:49 +02:00
Vincent Lejeune
fbb71bca7e Revert "Fix negative value inside tonemap" 
This reverts commit 16dc973faa.
 2014-09-16 00:37:37 +02:00
Vincent Lejeune
b5598fda57 Revert "Force non negative value in bloom" 
This reverts commit cb922ed4db.
 2014-09-16 00:37:23 +02:00
vlj
cb922ed4db Force non negative value in bloom 2014-09-15 22:11:53 +02:00
Vincent Lejeune
16dc973faa Fix negative value inside tonemap 
It should be checked before but since it's not always reproducible.
 2014-09-15 01:10:12 +02:00
Vincent Lejeune
6b4430caaa Do not allow specvalue to be below 0. 
Just in case it shouldnt be possible anyway.
 2014-09-15 01:06:15 +02:00
Vincent Lejeune
7c54ac4d81 Fix second texcoord in instanced_object_pass.vert 2014-09-14 23:07:10 +02:00
Marc Coll Carrillo
5cf3ad220f Some improvements to the GP editor: 
- GP are now classified into groups, just like tracks: standard, user defined, and add-ons
    - allow empty GPs to be loaded by the GP manager, so that they can appear
      on the GP editor (but not on the track selection screen)
    - enable/disable buttons depending on the available options
    - provide some feedback after pushing the "save" button
    - some minor bug corrections and improvements
 2014-09-13 10:40:27 +02:00
Vincent Lejeune
dea23d7a69 Properly reapply HD3000 particle fix 2014-09-10 18:57:40 +02:00
Vincent Lejeune
e77b5dddeb Revert "Forgot to fix a particle shader for hd3000" 
This reverts commit 48fcea8ee8.
 2014-09-10 18:57:03 +02:00
Vincent Lejeune
48fcea8ee8 Forgot to fix a particle shader for hd3000 2014-09-10 18:09:38 +02:00
Vincent Lejeune
8fd97615f3 Fix particle for hd3000 2014-09-10 01:42:51 +02:00
Flakebi
9c911a2891 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-09 12:07:34 +02:00
hiker
1a7b384633 Fixed typo. 2014-09-09 13:14:56 +10:00
Flakebi
f7b22cd97c Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-07 20:17:12 +02:00
Vincent Lejeune
94cd8d5c51 Avoid some useless computation in some vert shaders 2014-09-05 23:41:12 +02:00
Flakebi
5858c05e74 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-05 22:46:17 +02:00
Vincent Lejeune
1e172dbf33 Fix glowobject frag shader 2014-09-05 22:17:57 +02:00
hiker
1c23309161 Merge branch 'master' into gui_screen 2014-09-05 09:18:17 +10:00
hiker
8fd6877e92 Fixed #1486. Made most menus more consistent (e.g. same position 
and height for heading).
 2014-09-05 08:46:06 +10:00
hiker
8ffe09de29 Combined GPInfoScreen and RandomGPInfoScreen into one class, requiring 
only one stkgui file.
 2014-09-04 16:49:15 +10:00
hiker
7c3164a9c1 Added 'reload' random GP support, fixed 'back' icon on screen. 2014-09-04 09:38:25 +10:00
vlj
3083df450f Gather object in instanced calls 2014-09-02 23:23:23 +02:00
Flakebi
a84c5d596c Fix focus crash in kart selection screen 2014-09-02 03:43:08 +02:00
hiker
7dbfc151bf Added random GP functionality into gp_info screen. Changed GPData 
in GPInfoScreen from a pointer to be an object, while this adds
some coping of this object, it removes potential memory leaks.
 2014-09-02 09:32:12 +10:00
Flakebi
e2089fcea6 Switch per player difficulty to player config 2014-09-02 01:18:58 +02:00
Flakebi
44add00944 Rename icons to more generic names 2014-09-01 22:21:17 +02:00
Flakebi
8c40f279cd Add break_time_increase to perPlayerDifficulty 2014-09-01 11:31:39 +02:00
Flakebi
dc4a30202f Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-01 11:31:26 +02:00
Vincent Lejeune
99b110cc99 Use uvec2 instead of sampler2D 2014-08-29 01:30:19 +02:00
hiker
4ba8e85169 Give the race setup screen a background box and added a text for difficulty. 2014-08-29 07:42:42 +10:00
vlj
5878cb35ec Implement runtime detection of srgb bindless fix 2014-08-28 22:02:12 +02:00
hiker
db3db6f8b5 First version of the GP info screen (instead of dialog). 2014-08-27 22:08:50 +10:00
vlj
53c52470ee Use one call for each shadow cascade instead of a big one. 2014-08-26 21:56:16 +02:00
Vincent Lejeune
bf5410b793 Add unlit instanced shader 2014-08-26 20:34:59 +02:00
Vincent Lejeune
cad1efbff1 Add instanced detail shader 2014-08-26 20:34:37 +02:00
Vincent Lejeune
0960f090dc Add instanced spheremap shader 2014-08-26 20:34:26 +02:00
hiker
e309008736 Use header font for title, removed second 'back' button. 2014-08-25 23:16:59 +10:00
hiker
76767141f7 Removed old track info dialog, fixed crashes in track info screen 
(caused when making some spinners etc. visible).
 2014-08-25 22:20:42 +10:00
hiker
4b507a4eda Made more space for credits that span more than one line. 
Siwtch left and right side of the top screen.
 2014-08-25 11:12:00 +10:00
hiker
c9936ffb97 Forgot to actually add the new files :( 2014-08-25 10:47:36 +10:00
hiker
0de942b5f3 Alpha version of a track info screen (instead of a dialog). 2014-08-25 10:40:37 +10:00
Deve
0fa38161b5 Install icons in $PREFIX/share/icons/hicolor path. 
Don't use static paths in .desktop file. Actually I don't know about any application which uses it :P
 2014-08-24 21:58:34 +02:00
Vincent Lejeune
7bff68870c Read sampler from attributes. 2014-08-24 21:50:59 +02:00
Vincent Lejeune
6ac3d69471 Play with bindless textures 2014-08-22 23:48:28 +02:00
hiker
84e78d884a Merge remote-tracking branch 'origin/master' into no_floating 
Conflicts:
	src/karts/kart.cpp
 2014-08-22 12:23:55 +10:00
Vincent Lejeune
547018f0ab Port PointLight shader 2014-08-22 00:30:14 +02:00
hiker
c6f7448911 Use sqrt(speed) to scale the collision impulse, which results in 
weaker impulses when hitting the terrain.
 2014-08-21 22:34:51 +10:00
hiker
15cccf9301 Make the graphical y offset configurable (and basically disable 
it for now by setting it to 0).
 2014-08-21 17:28:06 +10:00
Marianne Gagnon
83a1acc961 Merge branch 'save_gp' 2014-08-16 15:42:46 -04:00
hiker
8c525ab2d4 Make the physics settings configurable, but default to use the old 
settings for now.
 2014-08-16 10:20:24 +10:00
vlj
f77695c098 Add Tangent/Bitangent in instanced object shader. 2014-08-15 17:15:19 +02:00
Vlj
7fbe529e6f Forget to add Tangent/BiTangent with pre 330 2014-08-15 02:14:30 +02:00
Vlj
d3ec1a27ce Completly unroll the loop 2014-08-15 00:02:43 +02:00
Vlj
4829b8ddd8 Manually unroll rh shader 2014-08-14 23:58:11 +02:00
Vincent Lejeune
f9c692052e Try a fix for nvidia and GI 2014-08-14 21:26:16 +02:00
Vincent Lejeune
8117260bf6 Factorise attribute location of simulation program. 2014-08-13 22:26:52 +02:00
samuncle
a91bcfa746 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-08-13 21:32:12 +02:00
samuncle
d1f46fdb7f Bring back the rain 2014-08-13 21:30:27 +02:00
Vincent Lejeune
dc02eec7b6 Port particle rendering shaders too. 2014-08-13 21:04:03 +02:00
Vincent Lejeune
22137eee88 Port UI shaders. 2014-08-13 20:25:56 +02:00
Vincent Lejeune
70b0fce50c Add support for instanced normal map mesh. 2014-08-13 19:20:40 +02:00
hiker
98bb7e3959 Merge branch 'bumpy' 2014-08-13 11:16:03 +10:00
Vincent Lejeune
292aa0cbc4 Factorize FullScreen shaders invocations. 2014-08-13 02:01:29 +02:00
hiker
11f3c1fc11 Added the recovery dialog back in :) 2014-08-11 22:39:08 +10:00
hiker
3f5ab358df Merge branch 'leyyin' 2014-08-11 14:22:30 +10:00
Marianne Gagnon
2c1feb5f06 Improve debug values popup 2014-08-10 19:09:44 -04:00
hiker
940a296366 Merge remote branch 'origin/master' into leyyin 2014-08-11 09:05:34 +10:00
hiker
42453325c4 Increased impule to keep kart parallel a bit more, changed the bevel shape 
to be slighlty longer.
 2014-08-11 09:02:45 +10:00
hiker
a8189eccfc Increase impulse to keep the kart parallel (to avoid the kart being 
90 degrees on its side and not being able to get straight again).
 2014-08-11 08:10:04 +10:00
hiker
4d1d4492b1 Removed support for non-bevelled shapes (has not been used in years). 
Fixed position of physical (raycast) wheels to be in (or on the edge)
of the collision body, not outside. Removed support for defining
kart-specific physical kart position (was never used).
 2014-08-10 21:54:18 +10:00
Vincent Lejeune
020e939e2b Normalize normals in normal view. 2014-08-09 21:24:50 +02:00
Vincent Lejeune
c546b25ae9 Fix perspective in normal view. 2014-08-09 21:19:26 +02:00
Vincent Lejeune
c07aed260a Visualize vertex normals in normal view. 2014-08-09 21:09:31 +02:00
Vincent Lejeune
bcc2196ccf Fix SSAO on splatting material. 2014-08-09 20:05:49 +02:00
vlj
768d51d0c3 Add sliders to change ssao parameters. 2014-08-09 19:22:30 +02:00
vlj
496269e73b Make SSAO param changeable. 2014-08-09 18:51:52 +02:00
konstin
c59f243550 Merge branch 'master' of https://github.com/supertuxkart/stk-code into save_gp 2014-08-09 17:06:16 +02:00
hiker
f39e22e442 Merge branch 'master' of https://github.com/leyyin/stk-code into leyyin 2014-08-08 11:10:56 +10:00
Vincent Lejeune
8db09a55cd Add Splatting RSM shader type. 2014-08-08 01:07:55 +02:00
vlj
60f76ee612 Fix RSM 2014-08-07 22:45:25 +02:00
vlj
6c3aeceb51 Fix GI 
It was using wrong swizzle for depth texture.
 2014-08-07 22:32:42 +02:00
Vincent Lejeune
95fb3ea580 Add support moving texture in rsm. 2014-08-07 20:44:33 +02:00
Vincent Lejeune
e932638aef Port sunlight* shaders to singleton. 2014-08-07 20:07:03 +02:00
hiker
20242dae5e Merge remote-tracking branch 'origin/master' into bumpy 2014-08-07 10:13:07 +10:00
Vincent Lejeune
87bf242164 Fix shadows for unlit with alpha ref. 2014-08-07 02:12:13 +02:00
Vincent Lejeune
858b789419 Support vertex color for alpha ref material. 2014-08-07 02:11:55 +02:00
hiker
e68d09c2e4 Merge remote-tracking branch 'origin/master' into bumpy 2014-08-07 10:00:16 +10:00
Vincent Lejeune
c0d57100a7 Enable ref + vertex color for unlit mat. 2014-08-07 01:50:53 +02:00
Vincent Lejeune
79fba1779e Port stkbillboard to singleton shader 2014-08-07 00:52:44 +02:00
Marianne Gagnon
30c11ad6d4 tweak braking config value 2014-08-05 20:10:46 -04:00
hiker
03160e3b7b Increase the brake force the longer the brake key is pressed (before it 
took ~1.6 seconds for a kart to stop, now 0.5; while hardly any change to
short brakes to slow down the kart a bit only). Also made the impulse to
keep karts parallel to the ground configurable.
 2014-08-06 07:52:02 +10:00
hiker
c4928ceb7f Modify suspension parameters and visual positioning of the kart to 
test less bumpiness.
 2014-08-04 13:54:43 +10:00
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
Flakebi
bc458c42d3 Apply per-player difficulty 2014-07-30 22:26:59 +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
Flakebi
a84094e55e Add difficulty to karts 2014-07-29 22:54:42 +02:00
Flakebi
71f8766cb1 Add per-player difficulty 2014-07-28 18:32:39 +02:00
Flakebi
4fe34007cd Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-07-23 15:18:46 +02:00
Flakebi
0195d95bad Adding basic gui for per-player difficulties 2014-07-23 15:18:40 +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
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