Commit Graph

10546 Commits

Author SHA1 Message Date
hiker
ada5a20445 Added some (commented out) debug lines that are useful when comparing
different kart physics.
2015-02-17 17:14:53 +11:00
hiker
93fa075471 Hopefully proper fix for #1938 (crash on osx when exiting race). 2015-02-17 00:14:26 +11:00
hiker
aae307c8b6 Fixed #1985 (improve message for per-player handicaps). 2015-02-16 09:35:49 +11:00
Marianne Gagnon
975aa7628b Fix #1981 2015-02-14 18:36:03 -05:00
Marianne Gagnon
e6aea6e0b6 Improve tools and usage of XML encoding, fixes #1982 2015-02-14 18:30:23 -05:00
Flakebi
92f78aae29 Improve sorting resolutions 2015-02-13 11:47:10 +01:00
Flakebi
6e8f8a15bd Sort resolutions by size 2015-02-13 11:47:10 +01:00
hiker
cdb35b0804 Added missing initialisation, fixed line endings. 2015-02-13 08:42:09 +11:00
hiker
f437781dcc Fix #1980. 2015-02-13 08:41:19 +11:00
hiker
11f233938d Cherry picked pull request #1917. 2015-02-13 08:26:25 +11:00
hiker
f6542194d8 Fixed line length. 2015-02-13 08:16:38 +11:00
Daniel Butum
769eaf4742 Log API requests that do not return success 2015-02-12 10:47:14 +02:00
hiker
4e88cb6753 Fixed #1978 (by removing unnecessary stopMusic in World, which actually
stops the menu music, not the tutorial music. It's unnecessary since
startMusic (main menu) later will first stop currently running music.
2015-02-12 16:56:25 +11:00
hiker
93c5012f57 Fixed incorrect label 'debug' for verbose messages and vice versa. 2015-02-12 16:49:16 +11:00
hiker
f589b2063e Fix crash when going story mode while music is disabled. 2015-02-12 13:19:58 +11:00
hiker
c675b6f38c Avoid warning at runtime about missing texture. 2015-02-12 13:00:12 +11:00
hiker
2d5f78974a Merge pull request #1975 from Flakebi/sound
Set correct volume for last lap music
2015-02-12 08:02:10 +11:00
hiker
57414348fa Merge pull request #1976 from Flakebi/nographics
Fix crash with --nographics
2015-02-12 08:00:18 +11:00
hiker
72ce6c8bf6 Fixed race over music not playing when sfx are disabled. 2015-02-12 07:57:51 +11:00
hiker
33f87e28f7 Prevent flooding of terminal with "music not playing" messages, added
debug error check.
2015-02-12 07:57:25 +11:00
Flakebi
d4f982d7dd Fix crash with --nographics 2015-02-11 20:52:05 +01:00
Marianne Gagnon
2ba46cff9e Merge remote-tracking branch 'Flakebi/skidding-light' 2015-02-10 20:09:03 -05:00
hiker
98195c4079 Merge branch 'master' of github.com:supertuxkart/stk-code 2015-02-11 09:18:20 +11:00
hiker
f57ad3c1ed Try to fix #1972 (things went wrong when stk tried to delete uninitialised
sound sources).
2015-02-11 09:16:48 +11:00
Vincent Lejeune
401187dcf0 Try to fix 1937 2015-02-10 22:38:15 +01:00
hiker
a598b0ed1a Fix after-race sfx which wasn't playing anymore (caused by quick sound
effects not having update() called, which is necessary to detect if they
have stopped playing).
2015-02-11 08:06:28 +11:00
Flakebi
91d042da31 Set correct volume for last lap music 2015-02-10 16:52:50 +01:00
hiker
84a84b6776 Try to fix playing without music. 2015-02-10 17:31:35 +11:00
hiker
7d0875878b Simplified startMusic call. 2015-02-10 17:27:07 +11:00
hiker
ec598d6f41 Start music properly in thread, avoid starting track music more than once. 2015-02-10 17:07:46 +11:00
hiker
2106e0caaf Merge branch 'minor-fixes' of https://github.com/Flakebi/stk-code into Flakebi-minor-fixes 2015-02-10 15:41:28 +11:00
hiker
325d1a11c1 Merge branch 'rename-h' of https://github.com/Flakebi/stk-code into Flakebi-rename-h 2015-02-10 11:34:21 +11:00
hiker
95ecd0eed1 Let the audio thread run 'all the time' by sending itself an
update package after the queue is empty.
2015-02-10 09:22:23 +11:00
hiker
58f0ce412e Removed unnecessary m_adjusted_gain variable and resetTempVolume
function. Fixed that music volume in race could not be changed.
2015-02-10 08:32:05 +11:00
Flakebi
604e712b81 Apply konstin's idea which makes it much shorter 2015-02-09 22:28:47 +01:00
Flakebi
683f42527e Add light effect when skidding 2015-02-09 15:18:53 +01:00
Flakebi
f86a92286c Set the music before updating to fix -N too 2015-02-09 01:56:56 +01:00
Flakebi
4abe3ce327 Make music and sound work with fast starts, fixes #1291 2015-02-09 01:22:47 +01:00
Flakebi
d5cbf4fc6b Math works better with brackets 2015-02-09 01:22:47 +01:00
hiker
70ed2b47d0 Fix #1962. 2015-02-09 08:22:35 +11:00
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
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
Vincent Lejeune
1e0a9022a3 Fix attempt for void scene in non advanced pipeline 2015-02-01 19:46:49 +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
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
e724770af5 Merge branch 'master' of github.com:supertuxkart/stk-code 2015-01-28 09:41:43 +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
hiker
6d7adcf08d Merge branch 'master' of github.com:supertuxkart/stk-code 2015-01-23 11:06:50 +11:00
hiker
6088de960e Merge branch 'master' of github.com:supertuxkart/stk-code 2015-01-23 11:09:53 +11:00
Vincent Lejeune
9dcdd53425 Add advanced pipeline GR to hd3000 2015-01-23 01:00:05 +01:00
hiker
27ed23a6e7 Fixed warnings about missing screenshots caused by 'prefetching'
screenshots.
2015-01-23 10:59:16 +11:00
Vincent Lejeune
29f19711db Add a rule in graphic restriction for advanced pipeline 2015-01-23 00:56:14 +01:00
hiker
b8ba6f9eb7 Merge branch 'master' of https://github.com/leyyin/stk-code into leyyin-master 2015-01-23 10:35:30 +11:00
Vincent Lejeune
fdfab19382 Use a reference in parseSceneManager to avoid copying 2015-01-23 00:16:28 +01:00
Daniel Butum
f18167d345 Fix abortable requests which in turn fixes the sending of the 'client-quit' request to the server when quiting 2015-01-22 17:56:30 +02:00
hiker
9ee520e95b Fixed version recognition for some amd/ati cards; added test cases. 2015-01-22 16:43:25 +11:00
hiker
94d663eead Fixed compiler warnings. 2015-01-22 16:29:06 +11:00
Marianne Gagnon
e62253c76a Fix #1897 2015-01-21 20:24:41 -05:00
hiker
e17add7bc8 Allow users to enable high res textures, even if their default
value stats that they should be disabled.
2015-01-22 11:38:15 +11:00
hiker
678eeac836 Disable highdef textures on intel cards on windows. 2015-01-21 09:15:41 +11:00
hiker
b6c26651e0 Pre-fill online username with local username. 2015-01-21 08:14:56 +11:00
hiker
7725a26dfb Fixed compiler warning. 2015-01-20 16:40:12 +11:00
hiker
f923a317a8 Select offline tab when internet access is disabled. 2015-01-20 16:39:06 +11:00
hiker
f724369a8e Merge branch 'freebsd-fixes' of https://github.com/leper/stk-code into leper-freebsd-fixes 2015-01-20 14:56:25 +11:00
Vincent Lejeune
b5243089a5 Enable dynamic lights by default 2015-01-20 03:20:33 +01:00
Vincent Lejeune
6c78278292 Remove Apple section in central_settings
Hopefully it will just work
2015-01-20 03:11:54 +01:00
Vincent Lejeune
4fd08fa791 Try to fix graphical restriction on OSX 2015-01-20 03:07:23 +01: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
hiker
64ce3897e6 Merge branch 'master' of github.com:supertuxkart/stk-code 2015-01-19 10:18:38 +11:00
hiker
a74a20c699 Enable all message dialogs to work in the DialogQueue. 2015-01-18 12:40:06 +11:00
Marianne Gagnon
636a9bc3cf Try to fix travis build 2015-01-17 20:21:31 -05:00
Marianne Gagnon
2e14a8fe20 Do not crash if user config contains an invalid langage, fixes #1905 2015-01-17 19:19:25 -05:00
Marianne Gagnon
bbf8a6c934 Merge "cherry-picked" interesting commits from pull request #1850 2015-01-16 18:35:37 -05:00
Marianne Gagnon
0ba0b2fe23 Change previous commit, do it the old way, since travis still uses gcc 4.6 2015-01-16 18:31:01 -05:00
Vincent Lejeune
c8bd922314 Fix attempt for #1836
Reinitialize m_sun_interposer each time we load a track
2015-01-17 00:26:06 +01:00
Marianne Gagnon
d2e84c8e86 Fix uninitialized variable 2015-01-16 18:18:56 -05:00
Vincent Lejeune
6e2f2becf7 Fix analysis false positive 2015-01-16 20:41:50 +01:00
hiker
02f4aa3015 Fixed crash (in race). 2015-01-16 14:58:40 +11:00
Marianne Gagnon
d7266c3300 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2015-01-15 20:18:39 -05:00
Marianne Gagnon
84821ad604 Add focus callback to GUI engine 2015-01-15 20:18:31 -05:00
Vincent Lejeune
c1d85e8674 Remove shadow volume code
We use shadowmap
2015-01-16 01:51:56 +01:00
Marianne Gagnon
d3708ba798 Avoid division by 0 in sfx 2015-01-15 19:40:56 -05:00
Vincent Lejeune
f22cf2a05e Use a fullscreen pass for skybox 2015-01-15 20:50:19 +01:00
Vincent Lejeune
86b2d2f327 Remove old functions 2015-01-15 18:52:41 +01:00
Vincent Lejeune
38dcce8fb5 Fix race condition when calculing SH coeffs 2015-01-15 02:54:10 +01:00
auriamg
1baa51418f Merge pull request #1895 from marcoll/0.8.2-beta
Fix music stop problem when loading track selection screen
2015-01-13 18:09:04 -05:00
Deve
cacb474c42 Add initial values in TrackObject 2015-01-13 17:57:16 +01:00
Deve
6e4f8eef9e Make sure that we have created SoccerWorld before typecasting 2015-01-13 17:49:06 +01:00
hiker
3eb2d87029 Fix crash first time STK is run. 2015-01-13 17:07:29 +11:00
hiker
593e52dd6f Reduced indentation somewhat. 2015-01-13 17:04:08 +11:00
hiker
21d27f99e8 Merge branch 'master' of github.com:supertuxkart/stk-code 2015-01-13 16:51:02 +11:00
hiker
a45867244f Added unit testing for all currently know variations of mesa version
numbers. Fixed all cases in which an incorrect version was detected
previously.
2015-01-13 16:49:10 +11:00
Marianne Gagnon
a2c8e1d982 Prevent crashes due to invalid values in shadow resolution 2015-01-12 19:05:54 -05:00
hiker
ea59e77d5f Merge branch 'master' of github.com:supertuxkart/stk-code 2015-01-13 08:13:18 +11:00
hiker
ba484d8be2 Fixed incorrect default selection in tabbed screen. 2015-01-13 08:12:43 +11:00
hiker
d70a398cc8 Merge branch 'Flakebi-fixes' 2015-01-13 08:06:39 +11:00
Deve
2f0524dcbd Fixed memory corruption in three strikes battle 2015-01-12 21:06:47 +01:00
hiker
47026e614c Merge branch 'fixes' of https://github.com/Flakebi/stk-code into Flakebi-fixes 2015-01-12 22:29:08 +11:00
hiker
d47981dd43 Auto-login a new user from the register screen, without requiering
to select the user or enter the password again.
2015-01-12 22:27:45 +11:00
hiker
370091e1b9 Removed debug code. 2015-01-12 16:36:42 +11:00
Marianne Gagnon
c791fd46c1 Path fix attempt 2015-01-11 21:08:46 -05: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
Marianne Gagnon
81bd79a736 Use absolute paths to lookup materials, fixes karts with identical texture names being in conflict. Also, when a texture is misisng, log an error but don't abort 2015-01-11 20:15:37 -05: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
8798eda41b Remove hardware skinning files 2015-01-11 00:59:09 +01:00
Vincent Lejeune
c18f2bc87b Blur according to shadow resolution in ESM case 2015-01-11 00:51:22 +01:00
Vincent Lejeune
019ec344fe Allow to reduce shadow resolution 2015-01-11 00:45:38 +01:00
Vincent Lejeune
53c8df6733 Remove remaining MD3 support 2015-01-10 21:03:44 +01:00
Flakebi
3128e59d22 Update checkboxes and textfield in the tabbed user screen too 2015-01-09 21:37:02 +01:00
Marc Coll Carrillo
798130a40d Fix music stop problem when loading track selection screen
Populate irrlicht's texture cache on startup with all the track
screenshots to avoid the problem
2015-01-09 16:23:37 +01:00
hiker
5ccedfc349 Use tabs in register screen (work in progress). 2015-01-09 09:42:18 +11:00
Deve
d0f96a7673 Allow to cross-compile Windows build under Linux using MinGW.
It works fine on Ubuntu. You only need to use:
cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw.cmake
2015-01-08 21:46:59 +01: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
hiker
526b38fc2a Added some kind of unit testing for version numbers in graphics
restrictions. It's only doing asserts for the tests :)  Use
--unit-testing command line switch.
2015-01-08 10:05:19 +11:00
hiker
1eb51db5ea Added command line option for keyboard debugging. 2015-01-08 09:05:04 +11:00
hiker
474012c442 Prevent potential NULL pointer access. 2015-01-08 08:15:58 +11:00
hiker
d070474445 Merge branch 'master' of github.com:supertuxkart/stk-code 2015-01-08 08:11:30 +11:00
hiker
8b0a2f303c Try to fix #1879: avoid using NULL pointer in case of ignored
devices.
2015-01-08 08:09:17 +11:00
Deve
2b6ef130da Make sure that next track is not higher than tracks size. 2015-01-07 21:42:22 +01:00
Deve
85800f48e6 Disable saving GPs on abort for now because it requires proper implementation.
m_next_track should have higher value in this case because race is already finished.
2015-01-07 21:24:52 +01:00