Commit Graph

11805 Commits

Author SHA1 Message Date
Marianne Gagnon
0057e40e6d Work on cutscene+menu combination. Fix bugs in GPWin cutscene, make them easier to work with in general 2014-06-01 21:03:48 -04:00
Marianne Gagnon
c7606cf6ef Fix for nvidia 2014-06-01 20:19:31 -04:00
Marianne Gagnon
31f23b437e Fix win-GP scene scale, so that effects render correctly 2014-06-01 20:18:28 -04:00
Vincent Lejeune
db9b9834d0 Separate point light and sun light in renderlights. 2014-06-02 01:23:18 +02:00
hiker
0358e55e2e Added 'back' button to user screen. 2014-06-02 08:21:36 +10:00
hiker
c733378bf3 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-02 08:09:20 +10:00
hiker
5c959e07a2 Fixed multiplayer kart selection. Now guests are created on demand,
and are not saved to the players.xml file anymore.
2014-06-02 08:08:42 +10:00
vlj
63992a3908 Play with glTexStorage2D
Should reduce memory movements.
2014-06-01 02:48:03 +02:00
vlj
baf128059d Add 3 new gl api calls 2014-06-01 02:24:19 +02:00
Marianne Gagnon
aff3b32bc6 compilation fix when c++2011 is enabled 2014-05-31 19:47:32 -04:00
auriamg
2877cedd1c Merge pull request #1317 from konstin/random-gp
Changes in preparation for Random GP
2014-05-31 18:44:59 -04:00
Vincent Lejeune
f31e5763d2 Fix condition. 2014-05-31 22:24:32 +02:00
vlj
21317f561f Remove sun specular if there is no shadow in track.
Avoid the ghost specular in star track.
2014-05-31 18:00:16 +02:00
Vincent Lejeune
5d095d4d24 Use options to determine if a fbo is needed. 2014-05-31 17:49:00 +02:00
konstin
2534abeed2 trying to merge upstream 2014-05-31 15:11:05 +02:00
vlj
e9cb12a1fb Used wrong condition. 2014-05-31 02:57:21 +02:00
vlj
5945ee878b Start GI at the second tick. 2014-05-31 02:53:16 +02:00
hiker
e39f2164b5 Removed OnlineProfile from ActivePlayer, since it was not used at all. 2014-05-31 10:26:02 +10:00
hiker
a0ee4d0bc5 Don't save guest players to the players.xml file. 2014-05-31 10:25:08 +10:00
vlj
6643f749b1 Remove unneeded profilers. 2014-05-31 02:04:32 +02:00
vlj
0f833b0619 Remove unneeded shaders/wrong assignements. 2014-05-31 01:59:33 +02:00
vlj
2d921ca588 Add a profiler for Dof 2014-05-31 01:52:10 +02:00
Marianne Gagnon
5e132f7410 Add GI to video options 2014-05-30 19:49:21 -04:00
vlj
aa0691015a Fix crash with 3.1 context when cleaning rtt. 2014-05-30 15:34:24 +02:00
hiker
a907df37ad Save the last three stdout.log files (which is useful in diagnosing
crashes caused by e.g. a problem in a previous run).
2014-05-30 16:00:28 +10:00
hiker
bb09ec9e37 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-05-30 11:03:46 +10:00
hiker
23e56e9454 Fixed indentation. 2014-05-30 11:03:32 +10:00
hiker
c705ad7732 Combined windows and non-windows handling of redirecting log to file (no
idea why there was ever made a distinction).
2014-05-30 10:54:08 +10:00
hiker
1cb7445e1b Merge branch 'master' of github.com:supertuxkart/stk-code 2014-05-28 21:41:56 +10:00
hiker
b18d7e75ac Rewrote insertionSort to only require operator< (no >),
and removed the unnecessary operators.
2014-05-28 21:41:07 +10:00
hiker
dd04c11260 Sort tracks first by locked/unlocked status, then alphabetically.
Added support for special sort names for each track (e.g. 'The Island'
can be sorted as 'Island' etc).
2014-05-28 17:15:00 +10:00
vlj
220719e507 Allow to toggle off GI. 2014-05-28 07:47:06 +02:00
vlj
40df4afc74 Support some debug option for GI 2014-05-28 07:47:06 +02:00
vlj
af16682a9e Add GI support 2014-05-28 07:47:06 +02:00
Vincent Lejeune
5caf028a71 Add RH support 2014-05-28 07:47:06 +02:00
Vincent Lejeune
180bd939e0 Add RSM support 2014-05-28 07:47:06 +02:00
vlj
b3a8b13a10 Add all necessary fbo for RH 2014-05-28 07:47:06 +02:00
vlj
c96bc37975 Support 3 rtts 2014-05-28 07:47:06 +02:00
vlj
2dba00c45a Support for layered without depth stencil 2014-05-28 07:47:06 +02:00
Marianne Gagnon
aa1418050d Bugfix when GLSL disabled 2014-05-27 19:00:55 -04:00
hiker
fc228c96c4 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-05-28 08:57:45 +10:00
hiker
3f1029c55e Fixed overwritten icons (which prevents player from using their
own icons).
2014-05-28 08:57:00 +10:00
auriamg
544d2206ef Merge pull request #1343 from Flakebi/master
Add deactivated buttons and fix device-screen
2014-05-27 18:52:49 -04:00
Flakebi
e5b4121aef Fix behaviour of device-screen: Go to input-screen if pressing on the back button 2014-05-27 16:15:19 +02:00
Flakebi
d5de7d49d9 Add graphics for deactivated buttons 2014-05-27 16:07:53 +02:00
hiker
0494cc3164 1) Fixed saving of sessions ('save-session=1' was sent instead of
'save-session=true').
2) Made logout request same priority as stk-quit request, which means
that the logout request will executed before the quit, resulting
in players properly being marked as logged out.
2014-05-27 23:44:25 +10:00
hiker
36d705f021 Added 'always-show-login-screen' option, moved 'remember-password'
option from UI-options to UserScreen.
2014-05-27 15:36:44 +10:00
hiker
4ada050ca7 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-05-27 12:28:12 +10:00
hiker
a24e0cf5aa Also hide the 'online' label if a user is renamed. 2014-05-27 10:44:01 +10:00
hiker
726070b331 Use Log::, fix coding style issues. 2014-05-26 16:58:50 +10:00