Commit Graph

11013 Commits

Author SHA1 Message Date
hiker
be9d7292f2 Replaced template function to simplify setting online request data with
function (since template doesn't compile on linux without -std=gnu++0x or so).
2014-03-11 17:13:37 +11:00
hiker
642797bdde Cosmetic changes to follow our coding style. Also fixed incorrect
'waiting for friends' message while waiting for achievements.
2014-03-11 17:03:07 +11:00
auriamg
14424ee10f Merge pull request #1238 from gupascal/master
Fix a compilation issue with VS10.
2014-03-09 19:54:07 -04:00
Vincent Lejeune
e9e60339bf Fix non compiling shader on mesa 2014-03-09 21:06:02 +01:00
Guillaume P
16cff9097b Fix a compilation issue with VS10. 2014-03-09 10:10:34 +01:00
auriamg
6c3a5375d7 Merge pull request #1235 from GiedriusS/master
Fixed a typo in TODO.md
2014-03-08 19:16:30 -05:00
auriamg
112c46fa14 Merge pull request #1236 from divvy81/downstream
Change of color player kart when any player quits
2014-03-08 19:11:14 -05:00
Marianne Gagnon
56a8fe8fbe Some cleanup in particles. Make 'scale affector' behavior uniform between GPU particles and fallback irrlicht particles 2014-03-08 19:02:42 -05:00
Dk
b4d922512e 1195 Multiplayer Kart selection screen commit 22 2014-03-08 21:08:06 +05:30
Giedrius Statkevičius
8968c3b510 Fixed a typo in TODO.md 2014-03-08 16:13:31 +02:00
hiker
796d43ebb2 For now avoid the use of the template, since it doesn't work on linux. 2014-03-08 12:24:44 +11:00
hiker
0146a1265c Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-08 11:49:33 +11:00
hiker
56b53cc3c0 Another try to fix linux compilation. 2014-03-08 11:49:18 +11:00
hiker
841d360b93 Fixed one problem with linux compilation. 2014-03-08 11:38:07 +11:00
hiker
51f3a6d555 Added static template function to CurrentUser to create html requests,
which will prefill the HTML request with the details of the current user.
So far used only in online_profile.
2014-03-08 10:29:40 +11:00
hiker
809cb27d89 Fixed crash when clicking on empty achievement list. 2014-03-07 16:35:13 +11:00
hiker
f86646abb9 Fixed crash (when clicking on empty friend list). 2014-03-07 16:33:07 +11:00
hiker
3c1a7b1c7b Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-07 16:05:17 +11:00
hiker
c8749a3400 Fixed unnecessary include. 2014-03-07 16:04:59 +11:00
hiker
1ccac0db7c Fix #1232 (GP causes crash). 2014-03-07 16:04:10 +11:00
Marianne Gagnon
10caa7a2ec Post-merge tidying up 2014-03-06 19:19:39 -05:00
auriamg
780201b1ad Merge pull request #1226 from konstin/master
Solving Issue 1180 - Load addon GPs from local folder
2014-03-06 19:12:29 -05:00
hiker
58c325e6c3 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-07 11:02:53 +11:00
hiker
7cb7651c07 Renamed Profile to OnlineProfile to better distinguish the various profiles we use. 2014-03-07 11:02:07 +11:00
Vincent Lejeune
cbd7453f7b Do not crash if old shaders dont compile 2014-03-07 00:03:26 +01:00
hiker
d19b5a2732 Fxed support for searching for data and assets based on the executable location. 2014-03-07 07:53:35 +11:00
konstin
f7953f4f12 Adding debug messages for 1180 2014-03-06 20:30:52 +01:00
Dk
52e910a438 1195 Multiplayer kart selection commit 21 2014-03-06 23:39:33 +05:30
Dk
7c8a32a10e 1195 MUltiplayer kart selection cmmit 21 2014-03-06 23:31:34 +05:30
konstin
9ddd5a2d5c reducing the pull request to it's content 2014-03-06 11:58:09 +01:00
konstin
baa56f3254 Merge remote-tracking branch 'upstream/master' 2014-03-06 11:45:19 +01:00
konstin
b561f440ba 1180 Loading Grand Prix's from locale directory 2014-03-06 11:30:51 +01:00
hiker
0208dbaf8a Fixed #38, fixed #1230 (which is a duplicate). 2014-03-06 17:11:22 +11:00
hiker
58a5928b17 Fixed #1228 (crash when no default player is set and -N, -R, ... is used). 2014-03-06 17:06:41 +11:00
auriamg
605e4c6dff Merge pull request #1218 from divvy81/downstream
1195 Multiplayer kart selection
2014-03-05 18:04:03 -05:00
hiker
b0018d4e5f Removed unnecessary variable. 2014-03-06 08:49:30 +11:00
hiker
352863a763 Handled case that friends are not in cache when looking at the friend list
(which can happen when you look at friends of friends, your own friends
are persistent).
2014-03-06 08:21:54 +11:00
hiker
ebc2299150 Added more comments, code style cleanup only. 2014-03-06 08:04:43 +11:00
hiker
6450c569ac Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-06 07:44:18 +11:00
hiker
b80e9217f5 Fix camera tilting (some debug left-over broke it). 2014-03-06 07:43:51 +11:00
Dk
796c8b823a 1195 Multiplayer karts selection screen commit 20 2014-03-06 00:18:12 +05:30
Dk
7d87d79d20 1195 Multiplayer Kart Selection commit 19 2014-03-05 23:22:41 +05:30
Dk
c5d23f7154 1195 Multiplayer kart selection commit 18 2014-03-05 23:02:23 +05:30
Dk
de7d0aa995 Merge remote-tracking branch 'multiplayer/downstream' into downstream 2014-03-05 21:39:20 +05:30
Dk
eddc512b16 1195 Multiplayer kar selection screen commit 17 2014-03-05 21:37:07 +05:30
divvy81
6f98d1d371 Update Ocean.stkskin 2014-03-05 21:15:04 +05:30
Dk
b5feb9740a 1195 Multiplayer kart selection commit 16 2014-03-05 21:08:17 +05:30
Dk
0e17d39f1a 1195 Multiplayer kart selection commit 15 2014-03-05 20:47:05 +05:30
Dk
1dab0daeb5 1995 Multiplayer kart selection screen commit 14 2014-03-05 20:16:48 +05:30
konstin
c09a3172f1 Solving Issue 1180 - Load addon GPs from local folder 2014-03-05 12:11:20 +01:00