ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,003 Commits 9 Branches 28 Tags 433 MiB
133f8d5966
Commit Graph

15003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
hiker
76a779fc1c Merge branch 'ftl-scoreboard' of https://github.com/Flakebi/stk-code into Flakebi-ftl-scoreboard 2015-07-25 12:17:02 +10:00
hiker
622d0821cf Fixed rescue (which my previous commit broke). 2015-07-24 21:38:35 +10:00
hiker
6345272727 Removed unnecessary #include in kart.hpp. 2015-07-24 16:51:03 +10:00
hiker
ac779d0652 Merge branch 'master' of github.com:supertuxkart/stk-code 2015-07-24 16:40:37 +10:00
hiker
a2c4160ce0 Added TerrainInfo raycast to debug view. 2015-07-24 16:37:13 +10:00
hiker
cefce3152c Fixed #2246. 2015-07-24 16:36:55 +10:00
hiker
672314fbe2 Added camera-at-side-of-kart debug mode. 2015-07-24 11:00:13 +10:00
hiker
c10bd01703 Merge branch 'Flakebi-fixes' 2015-07-24 10:24:05 +10:00
hiker
8bc398a1c1 Merge remote-tracking branch 'origin/master' into Flakebi-fixes 2015-07-24 10:23:47 +10:00
Marianne Gagnon
aacf1293da Eliminated karts in GPs get 0 points. Fixes #2177 2015-07-23 20:01:54 -04:00
Marianne Gagnon
5c27769ceb Fix uninitialized variable use, fixes #2179 2015-07-23 19:52:30 -04:00
Marianne Gagnon
52313c1468 Draw achievements a bit later so that they are on top. FIxes #2237 2015-07-23 19:21:43 -04:00
Elderme
cf80dde333 Move skybox things from irr_driver to Skybox class. 2015-07-23 14:21:47 +02:00
Elderme
94d6d2efd6 Add a Skybox class 2015-07-23 14:21:47 +02:00
auriamg
5164a55472 Merge pull request #2244 from Flakebi/addons-rtl 
Fix reversed rtl string part
 2015-07-22 18:35:22 -04:00
hiker
2f51406e3d Made field-of-view configurable in the config file. 2015-07-22 08:12:44 +10:00
Flakebi
2eb0f151b7 Fix reversed rtl string part 2015-07-21 11:52:23 +02:00
hiker
bb058deea5 Avoid that the kart is 'shaking' backwards/forwards when flying. 2015-07-21 16:56:51 +10:00