Commit Graph

14104 Commits

Author SHA1 Message Date
samuncle
b54ddb9828 Add emit map to object pass 2 shader 2014-12-21 09:58:03 +01:00
hiker
d3224712c9 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-12-18 16:54:38 +11:00
hiker
6a806470f1 Fixed #1799 (linking issue) - use of VS only functions that were not
enclosed on #ifdef (not an issue with default link options, since the
functions using the VS only functions are not actually used in STK).
2014-12-18 16:51:08 +11:00
Vincent Lejeune
116cdec611 Try old method of creating a context 2014-12-18 01:50:09 +01:00
Vincent Lejeune
6139f43108 Do not allow fog start to be null 2014-12-18 01:30:53 +01:00
hiker
e3879abb5b Work around #1780 (font corruption). 2014-12-17 11:08:28 +11: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
hiker
edd11e3fd2 Changed version number from 'svn' to 'git'. 2014-12-16 11:46:38 +11:00
hiker
62f8e3be2d Merge branch 'master' of github.com:supertuxkart/stk-code 2014-12-16 09:31:51 +11: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
hiker
0e569d1c7f Give the first player tux as icon (instead of sara). Fixes #1771 for now. 2014-12-15 16:49:12 +11:00
hiker
7a9d724bd9 Missing patch in previous commit. 2014-12-15 14:04:55 +11:00
hiker
e4e0dbd5b7 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-12-15 11:37:56 +11:00
hiker
eba7d709c1 Added support for wip-tracks and wip-karts directories, which are only
used when artist debug mode is enabled.
2014-12-15 11:10:54 +11:00
hiker
f48f20da94 Fix memory leak. 2014-12-15 10:58:23 +11:00
Vincent Lejeune
22b26dc985 Remove extra uniforms in IBL shader 2014-12-15 00:42:59 +01:00
Vincent Lejeune
03694d9c7c Factorise SH coefficient in an UBO 2014-12-15 00:18:03 +01:00
Vincent Lejeune
3f8fdc7976 Move FS template declaration in shaders.hpp 2014-12-14 21:58:42 +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
hiker
17fe9812b1 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-12-14 12:52:13 +11:00
hiker
8ea8c41597 Fixed memory leaks. 2014-12-14 12:51:53 +11:00
Vincent Lejeune
d50dde4c97 Revert "Try to fix ibl precision issue"
This reverts commit 1cf592394b.
2014-12-14 02:48:47 +01:00
hiker
e1c07b3e2c Fixed memory leak. 2014-12-14 12:30:21 +11:00
hiker
6ffb30d63a Fixed memory leak. 2014-12-14 12:04:48 +11:00
hiker
6cf4d381ee Merge branch 'master' of github.com:supertuxkart/stk-code 2014-12-14 11:41:47 +11:00
hiker
0ca09019a2 Fixed minor memory leak. 2014-12-14 11:41:07 +11: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
Deve
7114657c02 Merge pull request #1781 from thamlett/master
Fix some typos
2014-12-13 18:07:18 +01:00
Deve
1a4f6e51ee Fixed problem in dynamic ribbon widgets which contain animations, labels and more than one row.
Thanks to marcoll.
2014-12-13 12:49:07 +01:00
Mathieu Laprise
15927f319c When entering gp_name, display buttons vertically to allows gamepad selection 2014-12-12 20:19:27 -05:00
Marianne Gagnon
91f6fbbb43 Fix typo in previous fix, reported by Math07 2014-12-12 19:41:15 -05:00
hiker
ba990318d1 Merge remote-tracking branch 'origin/master' into new_server 2014-12-13 10:49:45 +11:00
Deve
42d2591bf8 Use default track if remembered track doesn't exist.
It avoids issues in #1776 and probably other problems with addons tracks.
2014-12-12 19:54:30 +01:00
Deve
dff1a330ea Fixed crash in kart selection screen 2014-12-12 19:36:53 +01:00
Marianne Gagnon
72a02128de Fix gand prix 2014-12-11 20:20:42 -05:00
Marianne Gagnon
59d6a2f258 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-12-11 20:18:29 -05:00
Marianne Gagnon
3226189d82 Force disable shadows and GI when OpenGL is not recent enough. Fixes #1722 2014-12-11 20:18:00 -05:00
Vincent Lejeune
2cf2630362 Forgot UBO support check in shadow 2014-12-12 02:13:33 +01:00
Vincent Lejeune
834683f414 Add codecheck before rendering GI/Shadow 2014-12-12 02:12:14 +01:00
Vincent Lejeune
13360de345 Add a check for GS support 2014-12-12 02:04:33 +01:00
Marianne Gagnon
9b3b99610a MInor GUI XML cleanup 2014-12-11 19:39:30 -05:00
Marianne Gagnon
0aacea1c0b Apply math07's patch for taking padding into account in height="fit", fixes #1762 2014-12-11 19:33:44 -05:00
Vincent Lejeune
5f47fee897 Cleanup skybox preparation code 2014-12-11 20:42:18 +01: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