Commit Graph

11258 Commits

Author SHA1 Message Date
hiker
e9367dd1c9 Fixed potential crash if RelationInfo should not exist, which I saw
once while a decline was in progress), started some minor refactoring.
2014-03-18 07:48:52 +11:00
sudip1401
89d7663112 Poweruplover achievement 2014-03-18 02:04:01 +05:30
KroArtem
4dec9c3fc5 having fun reverting changes 2014-03-17 23:56:49 +04:00
konstin
de50ea46e8 Allow karts to specifie a different sound effect for their engine; closes #1234 2014-03-17 17:01:34 +01:00
Guillaume P
45ab7e6907 Clean up some minor coding style issues 2014-03-17 08:21:49 +01:00
Guillaume P
b4fe033331 Revert "Now IA don't fire a cake if the kart is driving too slow. Also correct some comments."
This reverts commit 9030291340.
2014-03-17 08:10:21 +01:00
KroArtem
66c5d4a645 removed unused functions 2014-03-16 15:28:46 +04:00
KroArtem
d4e90f83f2 revert unique_ptr back to auto_ptr 2014-03-15 23:30:15 +04:00
Vincent Lejeune
ce12ebe9ce Bring back minimap. 2014-03-15 20:05:04 +01:00
auriamg
847ceca671 Merge pull request #1243 from mcsab/master
Skidding achievement
2014-03-15 15:01:41 -04:00
Csaba Molnar
c175f2450e Tab fix 2014-03-15 19:58:25 +01:00
Marianne Gagnon
037688b020 Fix terminal warning flood, and improve error detection. Thanks to vlj for help 2014-03-15 14:39:27 -04:00
Csaba Molnar
bc3850ebdb Wrong include corrected (\ -> /).
Drift counting fixed.
2014-03-15 19:18:03 +01:00
Vincent Lejeune
1b4863d7aa Add asserts before binding vao and fix 0 glow vao 2014-03-15 18:59:22 +01:00
Marianne Gagnon
0425cf2ef4 Implement color variation in particle system 2014-03-15 13:35:51 -04:00
Guillaume P
5af377da07 Fix a build issue for Travis CI. 2014-03-15 15:58:17 +01:00
KroArtem
a3a851b300 Merge remote-tracking branch 'upstream/master' 2014-03-15 18:30:17 +04:00
Guillaume P
8a34be1ab3 Add a new Gold Driver achievement. 2014-03-15 15:12:28 +01:00
Guillaume P
9030291340 Now IA don't fire a cake if the kart is driving too slow. Also correct some comments. 2014-03-15 10:52:01 +01:00
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
Csaba Molnar
385f108b16 Skidding achievement 2014-03-15 00:38:16 +01: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
KroArtem
ccd6019f48 Merge remote-tracking branch 'upstream/master' 2014-03-15 01:15:48 +04: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