Commit Graph

15176 Commits

Author SHA1 Message Date
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
hiker
d27ba5f6fe Fix #2249 (show points and points increasing in a FTL GP). 2015-07-29 08:58:42 +10:00
hiker
6ada5a0666 Revert "Properly ignore the leader in the ftl scoreboard"
(this patch only fixed the problem that happens when a non-leader
is number one. By now the code has fixed that it is guaranteed
that the leader is always number one, so this patch is not
necessary anymore, and it complicates the loop).

This reverts commit e9d78326fb.

Conflicts:

	src/states_screens/race_result_gui.cpp
2015-07-29 08:12:23 +10:00
hiker
3f468b254c Removed unused/duplicated code, use World::setKartPosition instead
of Kart::setPosition (since this will keep an index array up-to-date).
2015-07-29 07:59:46 +10:00
hiker
8dbaea6456 Merge branch 'master' of github.com:supertuxkart/stk-code 2015-07-28 09:40:27 +10:00
hiker
5efb44a430 Fixed scores in FTL GPs. All score handling is now done by the World,
not race manager (which removes if tests).
2015-07-28 09:39:00 +10:00
hiker
5c66273712 Fixed compiler warning. 2015-07-27 16:41:46 +10:00
samuncle
9087d0f837 Increase the strenght of the lens dust 2015-07-27 02:00:34 +02:00
hiker
95b86ea914 Fixed #2247. 2015-07-27 09:56:58 +10:00
auriamg
35949b198a Merge pull request #2252 from tobbi/fix_story_mode_crash
Fix crash when loading story mode
2015-07-26 19:06:20 -04:00
Marianne Gagnon
51fe38f76e Use <cmath> instead of <math.h>, apparently fixes OSX compilation. Closes #2253 2015-07-26 19:05:05 -04:00
auriamg
df1bb8b3dd Merge pull request #1956 from Flakebi/feature
Use camera position for LoD instead of the kart position, fixes #1742
2015-07-26 18:54:22 -04:00
Tobias Markus
fcc3e75a99 Fix crash when loading story mode 2015-07-26 16:41:36 +02:00
samuncle
1ca6339589 Add color to the lens dust 2015-07-26 05:30:29 +02:00
samuncle
51bd87d303 ground work for lens dust 2015-07-26 04:48:29 +02:00
Marianne Gagnon
4356dfde0c Document missing command-line option, fixes #2095 2015-07-25 20:06:42 -04:00
Marianne Gagnon
a268354ac9 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2015-07-25 19:55:55 -04:00
Marianne Gagnon
e0dd736a7c Main menu : prevent text on mouse over from overflowing the bounds of the screen. FIxes #2163 2015-07-25 19:55:17 -04:00
samuncle
d95f9d844d put into comment the blue lens flare if we need in the future 2015-07-26 01:51:28 +02:00
samuncle
1ec0c18d5a Change the fov (hiker you can still tweak or make an option 2015-07-26 01:49:29 +02:00
samuncle
33a60ae8d5 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2015-07-26 01:46:50 +02:00
samuncle
12b1ea5a6c Turn on color for lens flare 2015-07-26 01:46:19 +02:00
hiker
d9e806f610 Changed unsigned int to int (dest_pos can become negative, and
while de-facto it still works with unsigned, it's just bad style :) ).
2015-07-26 00:32:11 +10:00
hiker
a9aa37ea97 Minor code style fixes. 2015-07-26 00:31:15 +10:00
hiker
c8909b9197 Fixed missing display of points for non-winners in a FTL GP (partly fix
for #2249).
2015-07-26 00:30:09 +10:00
hiker
cd256061e1 Fix #2248 (crash when taking screenshot). The assert was not appropriate
(avoiding the call to clearAllMessages would have been quite ugly).
2015-07-26 00:26:43 +10:00