Commit Graph

15201 Commits

Author SHA1 Message Date
deve
2e1045f717 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2015-08-06 10:03:07 +02:00
deve
a0e54bb0b8 Avoid timespec structure redeclaration on VS2015.
Still seems to be a bit messy, because in newer pthread header (gcc 5.1) I see _TIMESPEC_DEFINED instead of HAVE_STRUCT_TIMESPEC. But it should work with our dependencies files.

And still wiiuse library needs to be recompiled to make it working with VS2015.
2015-08-06 10:00:08 +02:00
hiker
52e8df44fd Fixed compiler warning. 2015-08-06 16:47:41 +10:00
hiker
a19119a2f2 Merge remote-tracking branch 'origin/master' into lensdust 2015-08-06 16:40:00 +10:00
hiker
43c12c1a1e Fixed slightly outdated documentation. 2015-08-05 20:57:27 +10:00
Elderme
0b479a8bb0 Moved spherical harmonics things from IBL.cpp to ShericalHarmonics class 2015-08-05 11:13:25 +02:00
hiker
41f744baf3 Merge branch 'master' of github.com:supertuxkart/stk-code 2015-08-05 17:02:55 +10:00
hiker
b44f0605dc Try to bring karts quicker back on the ground when the kart is
on its side, without overcompensating (and therefore shaking)
when the kart is only slightly non-parallel to the ground
when flying.
2015-08-05 17:00:40 +10:00
Marianne Gagnon
c2feb458af When restoring ribbon selection, consider that maybe the ribbon does not anymore contain as many items as previously. Fixes #2260 2015-08-04 19:31:38 -04:00
Marianne Gagnon
bd85f51779 Improve memory management in GP manager, fixes #2261 2015-08-04 19:26:12 -04:00
hiker
f36672c104 Merge branch 'master' of github.com:supertuxkart/stk-code 2015-08-05 08:16:10 +10:00
hiker
9e75d28eeb Write the reverse flag into history files. 2015-08-05 08:15:31 +10:00
hiker
93a5a91628 Fix #2152 (star effect not showing in graphics level 1). 2015-08-05 08:07:58 +10:00
hiker
ba07515b4f Merge pull request #2259 from konstin/master
remove patch file
2015-08-04 19:37:37 +10:00
konstin
cdfa571855 remove patch file 2015-08-04 11:15:29 +02:00
Elderme
c3f77a3b72 Fixed kart selection screen rendering (ambient light was broken) 2015-08-04 10:49:39 +02:00
hiker
4f4a1c0373 Added support for reverse mode in history files. 2015-08-04 17:14:36 +10:00
hiker
2a56cc6241 Fix 2192 (key names like "Left" are not translatable). 2015-08-04 09:45:38 +10:00
hiker
340dec329c Support to mirror a texture around U or V axis if a track is driven
in reverse.
2015-08-03 23:25:11 +10:00
hiker
6f11156c04 Fixed crash if a player kart in a saved GP is deleted. 2015-08-03 22:02:13 +10:00
Elderme
53b6ab0a48 Moved specular probe computations from IBL files to Skybox class 2015-08-03 11:35:51 +02:00
hiker
8d0cad3cb8 Use proper call instead of hard coded constant. 2015-08-03 15:44:44 +10:00
hiker
a852cf94fb Don't save random GPs (which can not be continued anyway), and allow only
one saved data set (for each GP and difficulty). Previously saved 'random'
GPs (which can't be continued anyway) are deleted now, cleaning up the
config.xml file.
2015-08-03 15:10:36 +10:00
hiker
085627364c Fix #2162 (switch kart when loading a GP). 2015-08-03 07:53:21 +10:00
Elderme
6fc28b5d7c Removed render_skybox.cpp file 2015-08-02 23:07:05 +02:00
Elderme
3a50a4d5d2 Moved remaining spherical harmonic things from render_skybox.cpp to SphericalHarmonic class 2015-08-02 23:01:52 +02:00
Elderme
2817fda910 Merge branch 'master' into skybox_refactoring 2015-08-02 00:09:10 +02:00
Elderme
a8b16bb1d4 Fixed bug in tracks without skybox 2015-08-01 23:45:46 +02:00
hiker
2f902f769d Fixed minor memory leak. 2015-08-01 22:02:00 +10:00
hiker
78c592e4e5 Added a file with a 'unique filename' with version number which is used by STK
to detect that stk is reading the right data files (and therefore avoids #2073,
in which stk finds the wrong data directory).
2015-07-31 22:06:21 +10:00
hiker
b6165ce5f5 Merge branch 'master' of github.com:supertuxkart/stk-code 2015-07-31 16:51:27 +10:00
hiker
a81366c414 Removed rescue-code duplication in battle mode and soccer mode. 2015-07-31 16:27:52 +10:00
hiker
431853b451 Removed some unused code, added better error message in case
stk_config.xml could not be found.
2015-07-31 15:45:25 +10:00
auriamg
7fbfad664a Merge pull request #2228 from tobbi/misc_coverity
Fix a couple of deref after NULL check in states_screens
2015-07-30 19:21:46 -04:00
hiker
9557ad9be9 Merge branch 'master' of github.com:supertuxkart/stk-code 2015-07-31 07:51:23 +10:00
hiker
25c1880c18 Fixed rescue in soccer mode (which would previously used World's
moveKartAfterRescue, not its own custom function).
2015-07-31 07:49:54 +10:00
Tobias Markus
a9761e30da Fix various issues reported by coverity 2015-07-30 18:46:01 +02:00
Elderme
8642e14bc3 Removed m_diffuse_coefficients_calculated attribute in RTT (diffuse coefficients are now managed in SphericalHarmonic class) 2015-07-30 17:51:42 +02:00
hiker
bf858dd3ff Fixed compiler warning. 2015-07-30 17:14:18 +10:00
hiker
7799e9835d Added a getStartTransform function to World. Use this to change
the start position of the non-leader karts in a FTL race, so that
those karts now start at the end of all start positions, and not
directly behind the leader.
2015-07-30 17:12:48 +10:00
Elderme
133f8d5966 solved conflicts 2015-07-30 08:29:28 +02:00
Elderme
39d1c87b11 Fixed incorrect rendering when there is no spherical harmonic textures 2015-07-30 08:14:57 +02:00
Elderme
97ed8b2dbf splitted skybox class in Skybox and SphericalHarmonic classes 2015-07-30 08:14:57 +02:00
Elderme
3640e4a69a Move skybox things from irr_driver to Skybox class. 2015-07-30 08:14:57 +02:00
Elderme
cf40c402ba Add a Skybox class 2015-07-30 08:14:57 +02:00
Marianne Gagnon
738e7bc780 Fix inverted if condition in input options screen, fixes #2255 2015-07-29 18:55:40 -04:00
Marianne Gagnon
3687eb79d6 Apply modified version of patch from Benau to fix chinese word wrapping. See #2110 2015-07-29 18:51:03 -04:00
hiker
75b49b4d4f Merge branch 'master' of github.com:supertuxkart/stk-code 2015-07-29 17:29:45 +10:00
hiker
b18d0275fd Display a finish (survival) time in FTL result screen. 2015-07-29 17:27:43 +10:00
Marianne Gagnon
280ddf967d Add missing character to the font, fixes #2226 2015-07-28 19:17:37 -04:00