Commit Graph

15922 Commits

Author SHA1 Message Date
Marianne Gagnon
9500331716 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-06 20:01:48 -05:00
Marianne Gagnon
04999c35ee More work on networking UI 2016-03-06 20:01:40 -05:00
Benau
2d1d912ee8 Fix #1841 2016-03-05 16:01:42 +08:00
Benau
e3cf054ea7 Fix #1835 2016-03-05 12:55:20 +08:00
Benau
6fd6dd8792 Remove hack 2016-03-05 10:04:05 +08:00
Benau
70d5114dd7 Display localized name instead of English translation 2016-03-05 09:49:03 +08:00
Marianne Gagnon
14c8ecddb5 Add waiting screen for networking 2016-03-01 18:58:51 -05:00
Benau
96a10ce92c Update strings 2016-02-29 10:59:42 +08:00
Benau
4438664907 Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-29 10:25:19 +08:00
Marianne Gagnon
ba4e9d1a79 Tweak default config as suggested in ticket #2438, it's not perfect but seems much better that what we had previously in most cases 2016-02-24 19:20:14 -05:00
Benau
abdd32c070 Fix warning 2016-02-22 07:43:29 +08:00
Benau
8f1daabbe1 Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-22 07:26:26 +08:00
auriamg
c0bfd46ee9 Merge pull request #2441 from tobbi/missing_override
Add forgotten override's where necessary
2016-02-21 18:18:25 -05:00
Benau
dafde30077 Fix crash when press save replay key when it's not initialized. 2016-02-21 15:13:32 +08:00
Tobias Markus
d8cce95b0e Add forgotten override's where necessary 2016-02-21 01:36:15 +01:00
Benau
abd9ed189c Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-19 08:43:11 +08:00
auriamg
91bd844dca Merge pull request #2439 from Odd0002/master
Update AngelScript to version 2.30.2
2016-02-18 18:37:03 -05:00
Odd0002
0289e93bcc Silence AngelScript warning as in 6af30b68f0 2016-02-18 09:50:49 -06:00
Odd0002
e69e96af19 Fixed cmake based on https://github.com/supertuxkart/stk-code/issues/2325 and the related commit 2016-02-17 23:48:59 -06:00
Odd0002
fdd6f36b46 Update angelscript to 2.30.2 2016-02-17 22:07:55 -06:00
Benau
64522d9d13 Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-17 14:03:58 +08:00
Benau
c65b0aaae0 Save jumping event in replay file 2016-02-17 14:02:33 +08:00
Marianne Gagnon
1e0586dc40 Add missing files forgotten in previous commit 2016-02-16 18:52:54 -05:00
Marianne Gagnon
9c49312714 Work on networking GUI, combine older server interfaces with the newer online/profile screens 2016-02-16 18:33:09 -05:00
Benau
ee68b5ccce Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-16 10:55:53 +08:00
Benau
51bfc327d7 Make race end-able 2016-02-16 10:20:05 +08:00
Benau
71c1fadcd3 Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-16 09:57:41 +08:00
hiker
05a1a8a785 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-02-16 12:37:43 +11:00
hiker
2f0a69525a Use kart id instead of kart name to identify kart that has collected an item. 2016-02-15 18:16:31 +11:00
Benau
c8ecb78ffa Remove useless header 2016-02-15 15:16:26 +08:00
hiker
132ecfe409 Created separate function for handling received collectedItem messages. 2016-02-15 18:00:09 +11:00
hiker
d15a234ace Let only the server decide when a kart finished the race. Notify
all clients if this happens.
2016-02-15 17:45:24 +11:00
Benau
a6412d7a07 Add ghost icon, use it in race setup screen 2016-02-15 09:28:36 +08:00
Benau
bd1380a240 Do not crash if used addon track not found in local STK 2016-02-15 01:19:53 +08:00
Benau
05093852bc Add sorting support in ghost replay selection screen 2016-02-15 01:12:13 +08:00
Benau
4ea6ea8ea6 Add confirm dialog when deleting replay file 2016-02-14 13:52:16 +08:00
Marianne Gagnon
52b3d533f5 Fix memory management issue 2016-02-13 21:18:03 -05:00
Benau
aa81925860 Don't crash if kart not found loaded by replay files 2016-02-14 09:25:04 +08:00
Benau
c46bccc6e3 Finished GUI 2016-02-13 11:55:42 +08:00
Benau
8a121ed32b Add Ghost replay GUI 2016-02-13 01:34:00 +08:00
Benau
5cd27f8f99 Seperate directory for replay files
It allows replay GUI to load them easier
2016-02-12 10:01:54 +08:00
Benau
a6c4a72e2c Make lap counting works for ghost kart
As no m_terrain_info->update in ghost kart update
2016-02-12 01:18:26 +08:00
hiker
1ad782e6a6 Added comments. 2016-02-11 17:24:55 +11:00
Benau
7765b43d42 Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-11 13:45:16 +08:00
Benau
ece95cbb81 Use MessageQueue to show whether the replay file is saved successfully 2016-02-11 13:42:25 +08:00
Benau
1278394740 More clean 2016-02-11 10:09:31 +08:00
Benau
80152d2989 Clean up 2016-02-11 10:05:40 +08:00
Benau
4daa752bb6 Don't hurt a kart when it's already hurt enough 2016-02-11 09:08:12 +08:00
Benau
3f89512b34 Remove most isGhostKart() hack when avoidable 2016-02-11 09:01:09 +08:00
Marianne Gagnon
fe6bbb80c4 Delete unused da_DK translation, closes #2435 2016-02-10 19:56:45 -05:00