Commit Graph

20635 Commits

Author SHA1 Message Date
Benau
ef6f9041f5 Update translation source 2019-01-06 01:25:29 +08:00
Benau
bb31d6b226 Allow player going back to lobby without disconnecting the server 2019-01-06 00:21:51 +08:00
Benau
641b16e1c7 Add a thread safe way to clear game protocols when deleting world 2019-01-05 14:20:30 +08:00
Benau
37e5ea6806 Don't count spectator as players in game for testing reset 2019-01-05 14:10:56 +08:00
Benau
9747f59e00 Update lobby button with pre-translated string 2019-01-05 11:40:27 +08:00
Deve
7f3d895f70 Allow to switch karts in spectator mode on android 2019-01-05 00:53:17 +01:00
Benau
a59898c4ba Fix compiler warning 2019-01-05 03:21:06 +08:00
Benau
5668b9c7bd Update network document 2019-01-05 03:06:48 +08:00
Benau
4066557c8a Update translation 2019-01-05 02:56:55 +08:00
Benau
2e6a61d9d0 Update translation source string 2019-01-05 02:43:20 +08:00
Benau
c7449d0a7f Use better english by alayan 2019-01-05 02:39:51 +08:00
Alayan
94a0988a71 Simplify code 2019-01-04 19:20:33 +01:00
Alayan
4d6be5934e Skip eliminated karts when switching camera target in spectating mode 2019-01-04 19:19:26 +01:00
Benau
f4a932271f Remove addons karts in server if live players is on 2019-01-05 01:31:04 +08:00
Benau
6a7ec37462 Merge remote-tracking branch 'origin/master' into live_join 2019-01-05 01:24:06 +08:00
Benau
6a1a1740c0 Make live join or spectate a server option 2019-01-05 01:20:25 +08:00
Benau
214272468d Add left or right player action to change spectating target 2019-01-05 00:42:00 +08:00
Benau
66794781fe Handle reserved player ranking correctly in ffa 2019-01-05 00:10:02 +08:00
Benau
ca34b64ba4 Only hover the kart during active race phase or complete live join world 2019-01-05 00:02:20 +08:00
Benau
2950238d2b Add live join and spectate button to lobby 2019-01-04 23:56:50 +08:00
Benau
582ec771c0 Fix splitscreen kart id checking 2019-01-04 22:10:21 +08:00
Benau
c16727302a Add arena ai to test live join 2019-01-04 22:07:15 +08:00
Benau
7c34818c04 Send go back to lobby message to all peers in server 2019-01-04 21:16:10 +08:00
Benau
e3a006c151 Move startListening to main thread to avoid race condition for accessing lobby 2019-01-04 21:01:53 +08:00
Benau
72db382c76 Add current track info to server screen 2019-01-04 18:53:45 +08:00
Benau
4b22465836 Add current playing info to lobby 2019-01-04 17:40:25 +08:00
Benau
38043de27c Don't start engine sound for reserved karts 2019-01-04 15:25:32 +08:00
Benau
7a112ee6ef Draw music description properly in network 2019-01-04 14:54:00 +08:00
Benau
62ce61d980 Add save and restore complete state for soccer world 2019-01-04 14:01:31 +08:00
auria.mg
54ef7542eb Update translations 2019-01-03 19:52:19 -05:00
hiker
856a75cfbb
Merge pull request #3612 from qwertychouskie/patch-4
Fix issues with COPYING (see desc.)
2019-01-04 09:06:44 +11:00
hiker
893bb38c5a Merge branch 'master' of github.com:supertuxkart/stk-code 2019-01-04 09:01:54 +11:00
hiker
4e8fae6e73 Applied most of qwertychouskie's patch #3520. 2019-01-04 09:00:40 +11:00
Deve
d46f0aeddb Some tweaks in soccer setup screen 2019-01-03 21:44:15 +01:00
Deve
b0ff15873e Fixed cmake warning 2019-01-03 20:53:08 +01:00
Mrxx99
fbb44a7a34 fix in setCollapsed (#3676) 2019-01-03 20:41:09 +01:00
Benau
78b4799b82 Fix #3675 which tracks screen is used in ghost race 2019-01-04 01:24:23 +08:00
Benau
17ecbe69af Don't show disconnected players in result screen for ffa and ctf 2019-01-03 16:35:16 +08:00
Benau
ab353dd632 Save and restore complete world status for ffa and ctf 2019-01-03 16:27:16 +08:00
Benau
b2ac7489d9 Change the definition of reserved network profile
So player name doesn't go away if disconnection happens
2019-01-03 16:00:11 +08:00
hiker
09b07713f0 Merge branch 'qwertychouskie-patch-2' 2019-01-03 17:45:57 +11:00
hiker
40559d7cdb Merge branch 'patch-2' of git://github.com/qwertychouskie/stk-code into qwertychouskie-patch-2 2019-01-03 17:40:18 +11:00
hiker
96235f3068 Merge branch 'STK-helper-wiiuse-update' 2019-01-03 17:38:03 +11:00
hiker
082d64c3d8 Merge branch 'wiiuse-update' of git://github.com/STK-helper/stk-code into STK-helper-wiiuse-update 2019-01-03 17:30:44 +11:00
hiker
c37aebff94 Fixed compiler warnings. 2019-01-03 17:30:00 +11:00
Benau
c680181c9c Fix compiler warning 2019-01-03 14:20:22 +08:00
Benau
40e3ec1e56 Show server days since starting 2019-01-03 14:19:15 +08:00
Benau
27f08661b2 Don't update cursor if no graphics
It hangs when reseting screen in windows with server creation in gui
2019-01-03 13:08:47 +08:00
Mrxx99
c959836e34 Move soccer options to track info screen (#3638)
* moved soccer race options to track info screen

* using one spinner for both target mode values

* merged pointamount-spinner with lap-spinner and renamed it to target-value-spinner

* fixed identation

* small fix in track_info screen

* storing target value when value was changed

* making sure tartet spinners are invisible when not needed; small adjustments

* some test with solving space issues on small resolutions

* Revert "some test with solving space issues on small resolutions"

This reverts commit f6b6526681.

* test with collapsing widgets

* removed deleting childs of widgets in track_info_screen

* readded deleted spacer

* collapsing target type widgets is now working

* made target type spinner wider to have enough space for text in it on small resolutions

* re-added setting target value to invisible/visible

* using new collapsing widget function in track info screen for target type widgets
2019-01-02 20:29:53 -05:00
hiker
e142f04487 Merge branch 'Partmedia-master' 2019-01-03 09:30:35 +11:00