Commit Graph

11950 Commits

Author SHA1 Message Date
vlj
698d892f73 Fix for OSX compilation
OSX supports GL up to 4.0 and is unlikely to ship gl header for later
version.
2014-06-13 13:39:23 +02:00
hiker
364c7434f6 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-13 09:09:36 +10:00
hiker
d36ff8b6db Call reset function of RaceGUIBase, which fixes #1363 (missing thunderbird). 2014-06-13 09:07:52 +10:00
Marianne Gagnon
e3a2246e25 More work on cutscene screens 2014-06-12 18:43:20 -04:00
Marianne Gagnon
bc2209284b Some fixes with menu-cutscenes 2014-06-12 18:25:54 -04:00
Marianne Gagnon
4ea1b7c6b1 Merge branch 'focus' 2014-06-12 18:01:41 -04:00
hiker
ed978cc6e7 Merge branch 'Flakebi-master' 2014-06-12 22:27:28 +10:00
hiker
8228a5bc15 Merge branch 'master' of https://github.com/Flakebi/stk-code into Flakebi-master 2014-06-12 22:09:49 +10:00
hiker
025d7fa114 Tweaked position of font somewhat. Fixed missing rank display
when kart is standing still.
2014-06-12 22:00:00 +10:00
hiker
d72decfa65 Fixed using the last used track when specifying -N. 2014-06-12 16:54:09 +10:00
hiker
e33fc3c1d6 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-12 16:00:45 +10:00
hiker
cfe93f96f2 Speed up the rank animation, and don't make the old value completely
disappear (which makes the animation even faster).
2014-06-12 15:58:40 +10:00
Marianne Gagnon
540df39128 fix crash when using track debug. unfortunately, visual aids are not yet functional 2014-06-11 20:50:53 -04:00
Marianne Gagnon
e5532c32ff Improve code to switch between GUI-cutscenes. Still not fully functional, but better 2014-06-11 19:37:04 -04:00
hiker
859dc3fbbd Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-12 09:34:22 +10:00
hiker
60f707b55d Fixed gcc compiler warning. 2014-06-12 09:33:52 +10:00
hiker
1dc63849c9 Use a sigmar as big digit font and display time and
lap using this font (temporarily till we agree on a font).
2014-06-12 09:27:45 +10:00
hiker
9ae8446fae Added -c CHARLIST option which will only export the characters
specified in the character list. Fixed auto-selection of export
used characters only.
2014-06-12 08:11:51 +10:00
Marianne Gagnon
ffe657b1c2 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-06-10 19:59:37 -04:00
Marianne Gagnon
8a4b4ae213 Update cutscene shortcuts 2014-06-10 19:59:30 -04:00
hiker
97a23e83cb Merge branch 'big_digit' 2014-06-11 09:22:57 +10:00
hiker
28737270d9 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-11 09:19:41 +10:00
hiker
89d8a19dab Fixed shader compilation errors. 2014-06-11 09:11:07 +10:00
Marianne Gagnon
d6c983cac3 Add support to load new style glossmap (more work remains to do before this is complete) 2014-06-10 18:59:36 -04:00
hiker
a5c7b295be Don't add the index offset for Asian fonts if no pot files are given. 2014-06-11 08:18:35 +10:00
hiker
e55d976aa2 Added simple animation when the player rank changes. 2014-06-10 16:58:43 +10:00
hiker
77400211ca Added some tests to avoid NAN values (which I have seen once). 2014-06-10 09:19:02 +10:00
hiker
02b0cfd069 Use big digit font to display the kart rank inside of the speedometer. 2014-06-09 22:38:19 +10:00
vlj
e959d6c857 MLAA: Use srgb for auxiliary buffer. 2014-06-08 03:28:24 +02:00
vlj
9bc89e0f40 Lower MLAA threshold. 2014-06-08 03:06:20 +02:00
vlj
877bf938bd Fix different color with/without mlaa. 2014-06-08 02:50:02 +02:00
vlj
f4ca8f1f39 Fix low brightness without mlaa. 2014-06-08 02:32:56 +02:00
vlj
59ad95b93f Fix ribbon not using ambient. 2014-06-08 02:26:40 +02:00
Marianne Gagnon
61d6caa521 Work on feature unlocked scene 2014-06-07 19:51:34 -04:00
vlj
31c773079e Add a performance counter for MLAA 2014-06-08 00:25:34 +02:00
vlj
94900fe2c8 Add a performance counter for GUI 2014-06-08 00:20:44 +02:00
vlj
ed98c4c8ff Fix linux with 4.3+ context. 2014-06-07 02:16:00 +02:00
vlj
b27b68f768 Fix attempt for linux
Actually remove the code block if not on windows.
2014-06-07 02:04:15 +02:00
vlj
559d4f3b9f Remove GI param test when reseting Ambient. 2014-06-07 01:49:23 +02:00
vlj
56896bab23 Minify ssao buffer. 2014-06-06 22:36:43 +02:00
Flakebi
9a37cd2c2b Change focus cycle so invisible and deactivated widgets are skiped 2014-06-06 22:23:52 +02:00
hiker
508431b030 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-06 21:56:23 +10:00
hiker
d0879cf075 Removed file that should never have been added in the first place ;) 2014-06-06 21:53:57 +10:00
Flakebi
de4e45280b Remember password better 2014-06-06 11:31:52 +02:00
Flakebi
03255a4156 Merge upstream/master into Flakebi/master 2014-06-06 10:06:25 +02:00
Lauri Kasanen
52b4651b9e Fix typo in 76d564f 2014-06-06 11:04:50 +03:00
hiker
b0417758d5 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-06 10:59:09 +10:00
hiker
76d564f61f Try to fix compilation with pre opengl 4 drivers. 2014-06-06 10:58:32 +10:00
Marianne Gagnon
be5577045d Work on new feature unlocked cutscene, starting to work correctly, more testing (and art work) needed 2014-06-05 20:06:27 -04:00
hiker
3cd2b97202 Added missing operator-(Vec3, btVector3). Without this operator
additional typecast where necessary on VS when computing
Vec3-btVector3.
2014-06-06 09:36:12 +10:00