Sachith Hasaranga Seneviratne
2fe031d24d
Added CmakeLists entry and comments to point to where to switch between linux and windows
2014-03-15 10:52:15 +05:30
hiker
de820054b6
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-03-15 11:55:28 +11:00
hiker
3f738b60d5
Fixed crash in UserInfoDialog if an invalid response is received (friend id
...
is not contained in the response --> profile not found --> crash. Now
the friend id is stored in the request itself, and not needed in the response
from the server). Moved RejectFriendRequest into UserInfoDialog.
2014-03-15 11:54:04 +11:00
Marianne Gagnon
3fb98fe85f
Work around crash in render code. Vlj, please review this, this is likely not the proper fix
2014-03-14 19:35:35 -04:00
hiker
aa169d0191
Moved AcceptFriendRequest into UserInfoDialog.
2014-03-15 10:27:13 +11:00
hiker
f76536ca31
Moved FriendRequest into corresponding GUI object.
2014-03-15 10:13:44 +11:00
hiker
e63ad2754d
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-03-15 09:48:14 +11:00
hiker
e77287d3ce
Moved signup request from CurrentUser to register screen.
2014-03-15 09:34:23 +11:00
Vincent Lejeune
5e03e461bc
Revert to compatibility context for linux build.
2014-03-14 17:04:44 +01:00
Vincent Lejeune
cb344520ef
Merge branch 'BatchedDrawCalls'
2014-03-14 16:57:18 +01:00
Vincent Lejeune
0c5d5ce96e
IBL: Fix sampling ignoring cubemap rotation
2014-03-14 16:51:07 +01:00
Vincent Lejeune
740c251808
Use Instancing for lights.
2014-03-14 16:51:06 +01:00
Vincent Lejeune
6cad7339e3
Factorize texture binding.
2014-03-14 16:51:05 +01:00
Vincent Lejeune
cf2035ca0a
Batch draw calls
2014-03-14 16:51:05 +01:00
hiker
c0a70830c2
Moved ServerCreationRequest from CurrentUser into the server creation screen.
2014-03-14 22:18:02 +11:00
hiker
6afc12c866
Moved recovery request into recovery dialog. Fixed recovery dialog to
...
work now (except the URL sent from the server is still wrong).
2014-03-14 16:44:58 +11:00
hiker
7e1a59fe99
Mark fulfilled achievements in blue.
2014-03-13 17:18:28 +11:00
hiker
cecb725228
Display correct results for achieved achievements.
2014-03-13 17:12:51 +11:00
hiker
a5f9d26f88
Fixed display of achievements when not logged in.
2014-03-13 08:31:06 +11:00
Guillaume P
955b27bf75
Add a Marathoner achievement.
2014-03-12 14:15:16 +01:00
hiker
4eb4ce1511
Bugfix: onRaceEnd was not called for achievements (resulting in
...
achievements not being reset at end of a race).
2014-03-12 22:40:43 +11:00
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
