Commit Graph

14658 Commits

Author SHA1 Message Date
hiker
ca2b5335dc Removed hopefully unnecessary string copy. 2015-02-08 22:22:06 +11:00
hiker
33cb6d9356 Merge branch 'clang-fix' of https://github.com/Flakebi/stk-code into Flakebi-clang-fix 2015-02-08 22:12:39 +11:00
hiker
43aadcef34 Follow coding style for #includes. 2015-02-08 22:12:08 +11:00
Marianne Gagnon
758eb6e003 Use label with word_wrap instead of list for terms. See #1812 2015-02-06 20:11:15 -05:00
Vincent Lejeune
13393ef04b Fix 1808 2015-02-07 01:55:14 +01:00
Flakebi
d56472c224 Rename some .h files to .hpp 2015-02-05 21:32:17 +01:00
Flakebi
31d4c34fbb Improve clang bugfix 2015-02-05 15:18:57 +01:00
hiker
2d4200c754 Removed rather embarrassing left-over debug code. 2015-02-05 18:29:05 +11:00
hiker
0ab3d12eab Fixed invalid name openal error when setting the volume of fast
music (apparently caused by trying to set the music of the actually
freeded normal music just before).
2015-02-05 15:22:20 +11:00
hiker
5f59985ef1 Added documentation about which asset version is used for which
STK version.
2015-02-05 13:59:16 +11:00
Flakebi
38f0e31a48 Fix clang build, freeing memory too early 2015-02-05 02:58:55 +01:00
Marianne Gagnon
ecad7c2996 Mark some emitters as important so that they are never disabled by options, fixes #1808 2015-02-04 20:13:06 -05:00
auriamg
f4909d7c46 Merge pull request #1957 from Flakebi/highscore
Improve the layout of the race result screen
2015-02-04 18:50:54 -05:00
hiker
1e994748cc Properly handle volume setting from sfx thread, removed MusicManager
from friends of MusicInformation to enforce this. Added error checks
to properly detect location of warning when faster music is plaued
(still under investigation).
2015-02-05 09:22:13 +11:00
konstin
d489393ff8 set "Adjust Lights" base position to camera position 2015-02-04 19:31:11 +01:00
Flakebi
1aa6f7c173 Improve the layout of the race result screen 2015-02-04 14:42:10 +01:00
hiker
ddc60f98a1 Removed unnecesary #include. 2015-02-04 18:18:37 +11:00
hiker
eb37092643 Moved all remaining music commands to be handled by sfx thread. 2015-02-04 17:08:22 +11:00
hiker
6aa9ff86a4 Removed unnecessary function. 2015-02-03 16:29:54 +11:00
hiker
b2049eae48 Merge branch 'master' of github.com:supertuxkart/stk-code 2015-02-03 16:28:09 +11:00
hiker
4658bd83de Handle playing and stopping of music in separate thread. Make the sfx
manager thread use CanBeDeleted to allow for timed deleting.S
2015-02-03 16:27:05 +11:00
hiker
b9a7c11dab Removed unnecessary #includes. 2015-02-03 14:30:18 +11:00
Deve
f2a738f3d9 Fixed problems with non-supported languages.
These language files such as "sco.po" or "jbo.po" weren't ignored on STK side and they were displayed in languages list without a name.
2015-02-02 19:13:40 +01:00
hiker
c37e1eec0d Updated documentation and minor style changes. 2015-02-02 16:31:54 +11:00
auriamg
c7060cf0e2 Merge pull request #1949 from AMDmi3/patch-1
Include unistd.h for usleep()
2015-02-01 21:19:05 -05:00
Vincent Lejeune
831c1e7285 Duplicate rule for gallium 2015-02-02 00:42:16 +01:00
Dmitry Marakasov
94bf5949f5 Include unistd.h for usleep()
Fixes build on FreeBSD
2015-02-02 00:08:30 +03:00
Vincent Lejeune
1e0a9022a3 Fix attempt for void scene in non advanced pipeline 2015-02-01 19:46:49 +01:00
Deve
2c8639f105 Correct icons path 2015-01-30 18:36:10 +01:00
deve
01835f3e5d Merge branch 'master' of https://github.com/supertuxkart/stk-code 2015-01-30 11:42:26 +01:00
deve
ab01161c28 Check more plural forms formats.
Launchpad atm. returns plural forms format without parentheses. We can just check both cases - with and without parentheses.
2015-01-30 11:40:33 +01:00
hiker
0b0c1fbaee Workaround or fix for #1922 - warning about plural form. 2015-01-30 16:29:29 +11:00
hiker
4cf20ff73b Fix #1940 (achievement do not contain text). 2015-01-30 16:18:26 +11:00
hiker
85b5654d14 The uninstaller is now more secure, it will not delete recursively
the install directory anymore, instead only delete subdirs recursively,
and then delete individual files and finally the install directory
non recursively.
2015-01-30 16:17:04 +11:00
hiker
be661c85f8 Merge branch 'Odd0002-master' 2015-01-30 14:18:41 +11:00
hiker
36e903429d Merge branch 'master' of https://github.com/Odd0002/stk-code into Odd0002-master 2015-01-30 14:18:00 +11:00
Vincent Lejeune
6a50b4b9ac Revert "WIP wayland"
This reverts commit d33efd8800.
2015-01-29 18:05:01 +01:00
Vincent Lejeune
d33efd8800 WIP wayland 2015-01-29 18:00:33 +01:00
Odd0002
8abccf3ee4 Vastly improve data optimization script
Changes include:
- Make each type of data optimization optional
- Multithread all data optimization
- Add B3D to B3DZ compression (disabled by default)
- Optimize images in many more ways
- More comments describing each section and some explanations
- Ability to vastly increase runtime for a few more mb saved (enabled by default; depends on types of optimizations used)
- Probably a few more minor changes
2015-01-27 22:50:52 -06:00
Marianne Gagnon
8755b1b72a Fix CMake files on OS X to be packaging-friendly 2015-01-27 20:09:00 -05:00
hiker
62bbed278d Fixed duplicated entries in credits. 2015-01-28 11:05:16 +11:00
hiker
6482d8cc80 Fixed osx compilation (hopefully). 2015-01-28 11:04:40 +11:00
hiker
e724770af5 Merge branch 'master' of github.com:supertuxkart/stk-code 2015-01-28 09:41:43 +11:00
hiker
a13e13d1d0 Updated donation section. 2015-01-28 09:37:41 +11:00
hiker
82d2240da6 Added support for editor installation. 2015-01-27 16:25:17 +11:00
Vincent Lejeune
886c43ea07 Do not assume glMemoryBarrier does exist if buffer storage does.
There is no way to add a fence for client upload then.
2015-01-27 00:13:31 +01:00
hiker
98bf6ccef0 Added test cases for problems discovered with version numbers in #1923 (which
have been fixed by now in 07dffdc).
2015-01-27 07:59:42 +11:00
Deve
07dffdcbc2 Fixed bug with comparing versions 2015-01-25 21:36:24 +01:00
Vincent Lejeune
b7eca5e5c3 Sleep when waiting for sync 2015-01-24 22:27:47 +01:00
Vincent Lejeune
56f1dff65d Split scattering function in ambiant/point light part
This fix #1913
2015-01-24 20:00:04 +01:00