hiker
506b64b587
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-03-18 21:18:30 +11:00
hiker
2173ae8280
Try to work around the currently reported build problem by travis.
2014-03-18 21:17:40 +11:00
sudip1401
0bca25504a
Poweruplover achievement
2014-03-18 13:18:50 +05:30
hiker
03b1994041
Merge branch 'master' of https://github.com/konstin/stk-code into konstin-master
2014-03-18 16:22:59 +11:00
hiker
0f4fb50fd6
Merge branch 'master' of https://github.com/KroArtem/stk-code into KroArtem-master
2014-03-18 16:15:14 +11:00
Nathan Osman
6b8f12b1b5
Check for libbluetooth on Unix platforms.
2014-03-17 19:02:53 -07:00
hiker
cd7e9ff8a9
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-03-18 10:47:53 +11:00
hiker
3d5fbaa92f
Merge branch 'master' of https://github.com/gupascal/stk-code into gupascal-master
...
Fixed some merging issues.
Conflicts:
data/achievements.xml
src/achievements/achievement_info.hpp
2014-03-18 10:44:11 +11:00
Marianne Gagnon
3d6fd8e792
Add patch to mention firing back in tutorial
2014-03-17 18:52:36 -04:00
Csaba Molnar
249635f01a
onLapEnd() fix
2014-03-17 22:30:17 +01:00
Csaba Molnar
e8eabc80c9
Fixing achievement description
2014-03-17 22:26:53 +01:00
Csaba Molnar
60f1d8ae20
Achievement reset-after-lap beta
2014-03-17 22:07:55 +01:00
sudip1401
72920ab0ab
Poweruplover achievement
2014-03-18 02:20:51 +05:30
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
