Commit Graph

20803 Commits

Author SHA1 Message Date
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
hiker
696a0c778c Merge branch 'master' of git://github.com/Partmedia/stk-code into Partmedia-master 2019-01-03 09:17:10 +11:00
Benau
1483b2b703 Use unicode check mark and ballot x for Y/N 2019-01-03 01:37:57 +08:00
Benau
aa49f4ae8c Reset all smooth network body of rewinders during firstly live join 2019-01-02 16:16:59 +08:00
Benau
eb342b2707 Always update current physical object if there was live join 2019-01-02 15:30:56 +08:00
Benau
314c37ce0b Don't check for successful animation creation for eliminated karts 2019-01-02 14:57:39 +08:00
Benau
8332e0471e Save and restore NetworkItemManager completely for live join 2019-01-02 14:02:51 +08:00
Benau
0e4424b3ea Show message for back to lobby if needed 2019-01-02 12:44:18 +08:00
Benau
55430a31a2 Add invulnerability depends on kart for live join 2019-01-02 11:37:28 +08:00
Benau
52a4bbeac7 Add player name and team arrows for live join kart 2019-01-02 10:34:23 +08:00
Benau
a849229f27 Hide live joining karts util finish live join 2019-01-02 01:50:47 +08:00
Benau
ec123df108 Remove player list when leaving the lobby screen to avoid crash 2019-01-02 01:19:35 +08:00
Mrxx99
f64a1e19b2 Using a default music if specified music of track was not found (#3667)
* added default music to stk_config and using it for not found music files

* only using default music if no music was found for a track
2019-01-01 09:54:15 -05:00
Benau
81776cb4df Let other players know the newly joined player 2019-01-01 16:32:37 +08:00
Benau
2f8da236e3 Add initial live join handling for the one who does it 2019-01-01 15:46:45 +08:00
Benau
0431344886 Add copyFrom for RemoteKartInfo 2019-01-01 13:12:28 +08:00
Benau
564ed41ed3 Add live join world and kart handling 2019-01-01 01:01:49 +08:00
Mrxx99
8cba880ef9 small improvements regarding widget collapsing (#3666)
* small improvements regarding widget collapsing

* moved variables initialization to widget.cpp constructor
2018-12-31 12:12:08 +01:00
Benau
220a628f47 Add atomic for team and handicap in NetworkPlayerProfile 2018-12-31 14:56:28 +08:00
Benau
5410a34f9e Make kart selection screen usable with live join 2018-12-31 14:40:00 +08:00
Benau
2ceeabf882 Split kart assignment for live join 2018-12-31 14:05:21 +08:00
Benau
a4a60ae6f6 Separate load world message creation 2018-12-31 13:15:08 +08:00
Benau
7a60c4a35a Add shouldSaveSate with ticks for checking 2018-12-31 10:41:44 +08:00
Deve
17b83ac321 Don't crash when calling popMenu() with empty stack.
Maybe quit button in main menu gets two click events while it's waiting for app destroy event.
2018-12-31 00:06:42 +01:00
Benau
5458fcea4e Simplify waiting players joining 2018-12-31 01:21:17 +08:00
Benau
d9f1d18d9b Use placeholder tux for reserved players 2018-12-30 16:37:13 +08:00
Benau
414380e85a Fix memory leak of server only build network console exit 2018-12-30 13:03:57 +08:00
Benau
bd6264b3b0 Remove old method in GameSetup 2018-12-30 11:53:28 +08:00
Benau
50aa334912 Use new method to start game 2018-12-30 11:13:18 +08:00
Benau
b7da5b243d Fix compilation error 2018-12-30 10:56:08 +08:00
Mrxx99
2546c1280a Collapsing widget function (#3664)
* added function to collapse a widget more easily

* improved setCollapsed and added overload to specify the uncollapsed height

* used new collapse functions in online track_screen
2018-12-29 18:24:58 -05:00
Benau
9a4013843e Kick idling peers in server with new method 2018-12-29 16:10:41 +08:00
Benau
346f763cef Save grand prix scores in server with new method 2018-12-29 15:53:12 +08:00