ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,827 Commits 9 Branches 28 Tags 433 MiB
39e5b57233
Commit Graph

11827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hiker
1946df97be Fixed start with no players (including aborting the create user screen), 
added 'lastWasOnline' flag to enable saving of a login token even
when the account is used offline in between.
 2014-05-17 11:43:05 +10:00
hiker
cf297c67b4 Fixed heading. 2014-05-17 11:40:16 +10:00
vlj
9c98012e09 Fix dof and transparent fog. 2014-05-17 03:09:21 +02:00
vlj
883b39591f Width and height are passed by UBO 2014-05-17 02:39:55 +02:00
vlj
c465900ee3 Use rtt with fitting size. 2014-05-17 02:05:31 +02:00
Marianne Gagnon
4ff8b813fa Create RTTs only when loading a track 2014-05-16 19:30:39 -04:00
vlj
12ecd4e58e Attempt to fix travis ci 2014-05-17 00:56:16 +02:00
Vincent Lejeune
fef87b4853 Reenable splitscreen 2014-05-16 19:37:16 +02:00
Vincent Lejeune
a8a97d28ce Move final blit to render.cpp 2014-05-16 19:28:15 +02:00
hiker
b38a31f303 Simplified handling of current player: instead of storing a flag 
in each player, PlayerManager now just uses its m_current_player
to write this information in the players.xml file.
 2014-05-16 15:39:33 +10:00
hiker
63b270283d Merge remote-tracking branch 'origin/master' into new_login 2014-05-16 14:34:09 +10:00
hiker
c4ed2fbc7c Merge branch 'master' of github.com:supertuxkart/stk-code 2014-05-16 14:29:06 +10:00
hiker
fd0b017b5f Fixed compiler warnings (m_ssao is bool, not int). 2014-05-16 14:28:12 +10:00
hiker
71603816fa Merge remote-tracking branch 'origin/master' into new_login 2014-05-16 14:21:13 +10:00
Marianne Gagnon
b049acb81d Make STKMeshSceneNode destructor virtual, as it should 2014-05-15 21:17:01 -04:00
hiker
94457e7a53 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-05-16 09:56:19 +10:00
hiker
7544850012 Merge branch 'solistice-properties' 2014-05-16 09:55:50 +10:00
hiker
636f34160a Finished using Log:: instead of printf, removed separate 'profile' 
level, instead use 'profile' as component.
 2014-05-16 09:54:32 +10:00
Marianne Gagnon
2b7dc07cda Fix crash-on-second-load bug 2014-05-15 19:41:44 -04:00
hiker
629ecc8ecb Removed old player management screen. 2014-05-16 08:50:10 +10:00
vlj
ecca6911d1 Encapsulate fbos in a class 2014-05-16 00:37:26 +02:00
hiker
1102702f5b Removed saving of all online ids in players.xml file. 2014-05-16 08:31:58 +10:00
hiker
6650827784 Fixed various bugs in menu not showing up. 2014-05-16 08:24:15 +10:00
Bart Cools
61d9b7a0ea Output of logging profile tests changed to the stdout.log instead of standard output. type of output also changed to space separated values instead of tsv 2014-05-15 18:30:16 +02:00
hiker
0459c33f66 Added a tabbed version of the user screen, and integrated it into 
the option menu of STK.
 2014-05-15 22:59:21 +10:00
hiker
f4a5949198 Fixed invalid memory read (thanks to valgrind). 2014-05-15 15:37:23 +10:00
hiker
cc03578056 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-05-15 12:41:35 +10:00
hiker
a3c01a6b2a Merge branch 'master' of github.com:supertuxkart/stk-code 2014-05-15 11:17:36 +10:00
hiker
d3f6aa5e52 Fixed some memory problems reported by valgrind. 2014-05-15 11:17:05 +10:00
Marianne Gagnon
78d8199de8 disable crash reporter in debug mode 2014-05-14 20:10:23 -04:00
Marianne Gagnon
aae7d01e57 Try to make the custom GUI settings popup work on any resolution 2014-05-14 19:29:39 -04:00
hiker
717a989bf8 Fixed --profile-laps command line parameter. 2014-05-15 09:08:18 +10:00
hiker
137b5033dd Merge remote-tracking branch 'origin/master' into new_login 
Conflicts:
	src/karts/controller/skidding_ai.cpp
 2014-05-15 08:58:29 +10:00
hiker
4f14ddb944 Fixed crash when local user name is empty. 2014-05-15 08:57:02 +10:00
hiker
71d4e380b3 Disabled guest account. 2014-05-15 08:56:46 +10:00
hiker
5966cefed9 Merge pull request #1325 from solistice/properties 
small patch for --no-graphics mode and small bug fix
 2014-05-15 08:42:31 +10:00
Bart Cools
f521ba0242 fix issue #1328 2014-05-14 17:57:22 +02:00
Bart Cools
6a6ba94a16 added check for --no-graphics argument 2014-05-14 17:37:28 +02:00
Bart Cools
1fdeaf375a Merge branch 'master' of https://github.com/supertuxkart/stk-code into properties 2014-05-14 14:19:08 +02:00
Bart Cools
585b79f555 small patch for --no-graphics mode 2014-05-14 14:06:09 +02:00
hiker
ce52bf90e4 Merge branch 'new_login' of github.com:supertuxkart/stk-code into new_login 2014-05-14 14:10:10 +10:00
hiker
d9daf928e5 Merge remote branch 'origin/master' into new_login 2014-05-14 14:06:06 +10:00
vlj
229b461a6c SSAO: Less abrupt transition 2014-05-14 03:26:43 +02:00
vlj
1d4bcd5ade SSAO: Increase beta constant to avoid error 2014-05-14 02:27:17 +02:00
vlj
86c8b9f83d Some tweaking to make ssao more apparent 2014-05-14 02:12:18 +02:00
Marianne Gagnon
474bbb4373 Try to convert icon rendering to new helper function (for GL3 support) 2014-05-13 20:00:16 -04:00
vlj
dd81f02fea Fix for #1324 2014-05-14 01:51:40 +02:00
Marianne Gagnon
9410a0fd90 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-05-13 19:39:42 -04:00
Marianne Gagnon
03ad82267a Fix OSX 10.7 compilation 2014-05-13 19:39:19 -04:00
vlj
0ccac5d316 Replace texture2D by texture in dof.frag 2014-05-14 00:59:51 +02:00