Commit Graph

14236 Commits

Author SHA1 Message Date
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
Mathieu Laprise
17113f8d0d Merge branch 'master' of https://github.com/math07/stk-code into working 2014-12-27 15:14:35 -05:00
Mathieu Laprise
7f6a1dfd56 Handle spinner custom text differently differently to fix issue #1837 problem with activation/deactivation and updategfxSlider 2014-12-27 15:10:39 -05:00
Vincent Lejeune
df12714f49 Factorize (and fix) gaussian weight computation 2014-12-27 03:22:18 +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
Vincent Lejeune
f644543bc1 Move all gfx related config to a separate file 2014-12-27 03:14:16 +01:00
auriamg
2d0c929a70 Merge pull request #1847 from gunchleoc/master
Some string fixes.
2014-12-26 19:43:21 -05:00
GunChleoc
38936fe79f Removed ngettext, because tinygettext can't handle it. 2014-12-24 14:54:09 +01:00
Marianne Gagnon
351e69e79d Fix build 2014-12-23 20:07:34 -05:00
Marianne Gagnon
526e565c4d Fix memory leak found by vlj 2014-12-23 19:57:29 -05:00
Vincent Lejeune
e421a05663 Remove unecessary files. 2014-12-23 20:35:54 +01:00
Deve
b02812662a Fixed crash in creating user screen, which occured after rename player.
It's a bit quick and lazy fix. Probably other variables should be cleared too.
2014-12-23 18:32:05 +01:00
GunChleoc
ed56858321 Fixed a typo. 2014-12-23 16:21:47 +01:00
GunChleoc
5a7f7781af Some string fixes. 2014-12-23 13:24:50 +00:00
Flakebi
fbba008a1a Restore ancient behaviour 2014-12-22 23:12:20 +01:00
hiker
8e142daa00 Fix crash when track is not found. 2014-12-22 08:20:19 +11:00
hiker
89317ce399 Removed unnecessary c_str(). 2014-12-22 08:19:54 +11:00
hiker
f4c9724fa9 Detect mesa version. 2014-12-22 07:59:51 +11: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
Deve
4f910713f5 Make some strings translatable 2014-12-20 14:03:11 +01:00
Vincent Lejeune
84ee2c7018 Disable texture compression on Intel Mesa too 2014-12-20 00:32:56 +01:00
Flakebi
57958aba36 Merge branch 'upstream/master' into fixes 2014-12-19 23:02:41 +01:00
Deve
be913245b3 Merge pull request #1833 from smalltock/smallRedundancy00
two redundant lines of code that may have caused a tiny memory leak
2014-12-19 11:48:35 +01:00
ZDarian
3995947c1d two redundant lines of code that may have caused a tiny memory leak 2014-12-19 03:11:18 -07:00
hiker
deb8672446 Allow command line options --kart and --track to select locked tracks.
This will allow reviewers to post screenshot of new tracks.
2014-12-19 16:08:35 +11:00
hiker
99f49fbd42 Fixed crash in debug mode when command line option -N is used. 2014-12-19 16:03:24 +11:00
Vincent Lejeune
c4e5a720f7 Do not undefine builtin macros. 2014-12-18 22:09:14 +01:00
Vincent Lejeune
bccde0ce34 Revert "No need to signal the shader the AMD_vertex_shader_layer is enabled"
This reverts commit 2e0bec5757.
2014-12-18 15:57:25 +01:00
deve
a41cac02a2 Update .gitignore file 2014-12-18 08:25:04 +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