Commit Graph

12184 Commits

Author SHA1 Message Date
konstin
acc32703ed Merge branch 'master' of https://github.com/supertuxkart/stk-code into a 2014-06-05 18:26:28 +02:00
konstin
173725a9d4 add a restart button + better looking on 600x800 2014-06-05 18:26:11 +02:00
Flakebi
bf76fbff6e Fix bug with deactivated widgets where visibility is changed 2014-06-05 16:16:08 +02:00
hiker
b61e8e24db Disable online flag in register screen if user did not enable
internet in the dialog. Removed unused function.
2014-06-05 21:28:30 +10:00
hiker
48b9016384 Fixed compiler warnings. 2014-06-05 17:07:54 +10:00
hiker
c2a3b3870d Fixed crash on windows (caused by a variable beeing a large negative
value).Vlj, can you please have a look!
2014-06-05 17:02:53 +10:00
vlj
588ec08bc1 Merge branch 'CS' 2014-06-05 03:33:02 +02:00
Vincent Lejeune
03b66f4f59 Use immutable storage for depth/shadows/RSM 2014-06-05 03:19:19 +02:00
Vincent Lejeune
5b400b7ccb Add some new gpu timers. 2014-06-05 03:19:19 +02:00
vlj
eb45954684 Implement Gaussian blur using Compute Shader
The filters are ~3.5 time faster with CS.
2014-06-05 03:19:18 +02:00
vlj
8cc1df3dd1 Update glext.h 2014-06-05 03:19:17 +02:00
Vincent Lejeune
cead5081be Fix MLAA 2014-06-05 02:56:25 +02:00
Marianne Gagnon
02c68d5b02 Merge branch 'NewRTTWidget' 2014-06-04 20:46:24 -04:00
Marianne Gagnon
2b0f28669e Merge branch 'NewRTTWidget' of https://github.com/supertuxkart/stk-code into NewRTTWidget 2014-06-04 20:29:40 -04:00
Marianne Gagnon
9af15c7bdf Fix sky not cleared when exiting race, would show up on kart selection screen 2014-06-04 20:29:37 -04:00
Vincent Lejeune
87da1f9186 Fix attempt for black ribbon without gi. 2014-06-05 02:26:33 +02:00
Vincent Lejeune
bed088bd51 Fix proposal for dark stk track with gi enabled. 2014-06-05 02:18:53 +02:00
hiker
46ca3a2679 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-05 10:14:19 +10:00
hiker
b417a5c612 Fix deactivating entry field. 2014-06-05 10:12:26 +10:00
hiker
67c6e1b61e Merge branch 'Flakebi-master' 2014-06-05 09:52:43 +10:00
Vincent Lejeune
f995c31372 Add sun to rtt 2014-06-05 01:44:15 +02:00
Vincent Lejeune
219bfbca93 Fix crashes and add a hunk I forgot 2014-06-05 01:34:12 +02:00
Vincent Lejeune
5f1413e140 Merge branch 'master' into NewRTTWidget 2014-06-05 01:30:45 +02:00
Vincent Lejeune
3f619e8e21 Fix ambient if no shadow are present. 2014-06-05 01:08:31 +02:00
hiker
5619509ebb Prevent NANs/crash. 2014-06-05 08:59:24 +10:00
hiker
e3513b10c6 Merge branch 'master' of https://github.com/Flakebi/stk-code into Flakebi-master 2014-06-05 08:23:47 +10:00
hiker
781820abef Fix the online name (to force people to use only one online name).
This prevents people from passing achievements from one online
account to another (once two way synching is in place).
2014-06-05 08:17:59 +10:00
hiker
8960b79181 Wait for request_manager to be ready to be deleted (i.e. current request
have been properly aborted, and sign out done). Also shut down more of
STK after signaling the request manager to shut down, so that the user does
not notice the time for the sign out. Also added docs.
2014-06-05 07:56:51 +10:00
hiker
c579267e9a Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-05 07:51:46 +10:00
Flakebi
be39fc4f96 Reset speed when porting to a challenge 2014-06-04 19:06:45 +02:00
Flakebi
7ea68064d8 Fix improvements 2014-06-04 18:27:32 +02:00
Flakebi
4b70feede1 Improve scripts 2014-06-04 17:56:09 +02:00
Flakebi
d7b3e0f46a Fix RegisterScreen 2014-06-04 16:45:54 +02:00
Flakebi
af6c121a22 Run whitespaces.py 2014-06-04 15:10:20 +02:00
Flakebi
4069e233fe Unify some things 2014-06-04 15:06:35 +02:00
Arthur-D
cad6d5b3ae Set player icons as 128x128 instead of 160x120 so the image ratio is correct. 2014-06-04 14:55:13 +02:00
Flakebi
4ae98f4610 Clean up when closing the window 2014-06-04 12:53:11 +02:00
Flakebi
39e5b57233 Add visual effect for disabled textfields 2014-06-04 12:49:41 +02:00
hiker
49a9ac54d5 Added a 'non-abortable' flag to the signout request. Re-enabled cancelling
ongoing downloads to allow for a quicker exit of STK.
2014-06-04 17:05:35 +10:00
hiker
c62cc7fbaa Added CanBeDeleted class, which implements a timeout function. It is
used to make sure that (in this case) the NewsManager thread does not
need the file manager anymore when stk exists (which can only happen
on very very quick exists, and slow downloads). This avoids a potential
crash that the NewsManager thread could access the file manager after
the file manager was deleted.
2014-06-04 16:51:29 +10:00
Marianne Gagnon
9c1e371803 Allow disabling text boxes 2014-06-03 19:13:25 -04:00
Marianne Gagnon
6982a3de59 Work on porting feature unlocked screen to new cutscene system 2014-06-03 18:48:37 -04:00
vlj
803dc41ebb Accidently reverted a commit that fixed a crash. 2014-06-04 00:08:14 +02:00
vlj
f0b3cbfcd0 Gather bloom effect to avoid extra texture read.
I have a .5ms win here...
2014-06-03 20:46:01 +02:00
vlj
55ddffaf54 Another round of big triangle port. 2014-06-03 20:28:42 +02:00
vlj
e5a5c78045 Use a big triangle instead of 2 to cover full screen.
This allows to rasterize a single primitive instead of two, and avoid
trashing the cache between the 2 triangles drawing.
2014-06-03 19:56:59 +02:00
vlj
d4fe539385 Do not write specular value in gi/diffuseenvmap 2014-06-03 17:40:21 +02:00
hiker
8c7b586f45 Fix 'remember password' setting being not remembered. 2014-06-03 21:10:39 +10:00
hiker
24f8918061 Fixed assertion in GP editor. 2014-06-03 15:52:33 +10:00
hiker
71b79cc72f Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-03 13:50:52 +10:00