From 56743e002ce9c1131f4837efd74af8c00856580e Mon Sep 17 00:00:00 2001 From: Deve Date: Fri, 15 Feb 2019 21:59:05 +0100 Subject: [PATCH 01/57] Explain startup boost in help --- data/gui/screens/help1.stkgui | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/data/gui/screens/help1.stkgui b/data/gui/screens/help1.stkgui index 406c0bfc9..70d4bae09 100644 --- a/data/gui/screens/help1.stkgui +++ b/data/gui/screens/help1.stkgui @@ -29,13 +29,13 @@ -
+
- + -
+
- +
+ + + +
+ +
From 4da2b1f75fdaddfc2f7c1b1cfe27114e84476f4a Mon Sep 17 00:00:00 2001 From: Alayan Date: Mon, 18 Feb 2019 16:26:11 +0100 Subject: [PATCH 03/57] Replace blackhill mansion by ravenbridge mansion in story mode --- data/challenges/mansion.challenge | 4 ++-- data/grandprix/3_tothemoonandback.grandprix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/challenges/mansion.challenge b/data/challenges/mansion.challenge index 2f2b85dd2..dd9a9c2da 100644 --- a/data/challenges/mansion.challenge +++ b/data/challenges/mansion.challenge @@ -1,13 +1,13 @@ - + - + diff --git a/data/grandprix/3_tothemoonandback.grandprix b/data/grandprix/3_tothemoonandback.grandprix index d0310a250..83a3ffff1 100644 --- a/data/grandprix/3_tothemoonandback.grandprix +++ b/data/grandprix/3_tothemoonandback.grandprix @@ -3,7 +3,7 @@ - + From 6e18dce62282f5cee5c4e7f25a6a016f093e94c4 Mon Sep 17 00:00:00 2001 From: Alayan Date: Mon, 18 Feb 2019 18:52:30 +0100 Subject: [PATCH 04/57] Update story mode to use ravenbridge mansion, reorder challenges --- data/challenges/candela_city.challenge | 2 +- data/challenges/cocoa_temple.challenge | 2 +- data/challenges/cornfield_crossing.challenge | 8 ++++---- data/challenges/green_valley.challenge | 10 +++++----- data/challenges/hacienda.challenge | 10 +++++----- data/challenges/lighthouse.challenge | 10 +++++----- data/challenges/mansion.challenge | 10 +++++----- data/challenges/minigolf.challenge | 2 +- data/challenges/olivermath.challenge | 10 +++++----- data/challenges/snowmountain.challenge | 10 +++++----- data/challenges/snowpeak.challenge | 2 +- data/challenges/stk_enterprise.challenge | 10 +++++----- data/challenges/volcano_island.challenge | 10 +++++----- data/challenges/xr591.challenge | 2 +- data/challenges/zengarden.challenge | 8 ++++---- data/grandprix/1_penguinplayground.grandprix | 6 +++--- data/grandprix/2_offthebeatentrack.grandprix | 10 +++++----- data/grandprix/3_tothemoonandback.grandprix | 4 ++-- data/grandprix/4_atworldsend.grandprix | 6 +++--- 19 files changed, 66 insertions(+), 66 deletions(-) diff --git a/data/challenges/candela_city.challenge b/data/challenges/candela_city.challenge index cca9f5e4a..10082f3ae 100644 --- a/data/challenges/candela_city.challenge +++ b/data/challenges/candela_city.challenge @@ -3,7 +3,7 @@ - + diff --git a/data/challenges/cocoa_temple.challenge b/data/challenges/cocoa_temple.challenge index 53b578b0b..3f058b99b 100644 --- a/data/challenges/cocoa_temple.challenge +++ b/data/challenges/cocoa_temple.challenge @@ -3,7 +3,7 @@ - + - + - + - + - + diff --git a/data/challenges/green_valley.challenge b/data/challenges/green_valley.challenge index 050988c72..711dfca67 100644 --- a/data/challenges/green_valley.challenge +++ b/data/challenges/green_valley.challenge @@ -3,22 +3,22 @@ - + - + - + - + - + diff --git a/data/challenges/hacienda.challenge b/data/challenges/hacienda.challenge index 05791643d..c3211c967 100644 --- a/data/challenges/hacienda.challenge +++ b/data/challenges/hacienda.challenge @@ -3,22 +3,22 @@ - + - + - + - + - + diff --git a/data/challenges/lighthouse.challenge b/data/challenges/lighthouse.challenge index 107f16b67..f20b4f065 100644 --- a/data/challenges/lighthouse.challenge +++ b/data/challenges/lighthouse.challenge @@ -3,22 +3,22 @@ - + - + - + - + - + diff --git a/data/challenges/mansion.challenge b/data/challenges/mansion.challenge index dd9a9c2da..d45eaa261 100644 --- a/data/challenges/mansion.challenge +++ b/data/challenges/mansion.challenge @@ -3,22 +3,22 @@ - + - + - + - + - + diff --git a/data/challenges/minigolf.challenge b/data/challenges/minigolf.challenge index 80f0d9718..e42dedd42 100644 --- a/data/challenges/minigolf.challenge +++ b/data/challenges/minigolf.challenge @@ -3,7 +3,7 @@ - + diff --git a/data/challenges/olivermath.challenge b/data/challenges/olivermath.challenge index 0e0b8742b..5955ac90f 100644 --- a/data/challenges/olivermath.challenge +++ b/data/challenges/olivermath.challenge @@ -3,22 +3,22 @@ - + - + - + - + - + diff --git a/data/challenges/snowmountain.challenge b/data/challenges/snowmountain.challenge index 41f3c533b..28bf6975e 100644 --- a/data/challenges/snowmountain.challenge +++ b/data/challenges/snowmountain.challenge @@ -3,22 +3,22 @@ - + - + - + - + - + diff --git a/data/challenges/snowpeak.challenge b/data/challenges/snowpeak.challenge index f877c1df4..c72874e86 100644 --- a/data/challenges/snowpeak.challenge +++ b/data/challenges/snowpeak.challenge @@ -3,7 +3,7 @@ - + diff --git a/data/challenges/stk_enterprise.challenge b/data/challenges/stk_enterprise.challenge index 57f09601b..7a9803cbc 100644 --- a/data/challenges/stk_enterprise.challenge +++ b/data/challenges/stk_enterprise.challenge @@ -3,22 +3,22 @@ - + - + - + - + - + diff --git a/data/challenges/volcano_island.challenge b/data/challenges/volcano_island.challenge index 7b0b759ec..064d851e4 100644 --- a/data/challenges/volcano_island.challenge +++ b/data/challenges/volcano_island.challenge @@ -3,22 +3,22 @@ - + - + - + - + - + diff --git a/data/challenges/xr591.challenge b/data/challenges/xr591.challenge index eb66fa889..92a90747f 100644 --- a/data/challenges/xr591.challenge +++ b/data/challenges/xr591.challenge @@ -3,7 +3,7 @@ - + diff --git a/data/challenges/zengarden.challenge b/data/challenges/zengarden.challenge index c90e5a366..a5f6607c3 100644 --- a/data/challenges/zengarden.challenge +++ b/data/challenges/zengarden.challenge @@ -6,19 +6,19 @@ - + - + - + - + diff --git a/data/grandprix/1_penguinplayground.grandprix b/data/grandprix/1_penguinplayground.grandprix index 096a84799..6687600e2 100644 --- a/data/grandprix/1_penguinplayground.grandprix +++ b/data/grandprix/1_penguinplayground.grandprix @@ -2,9 +2,9 @@ - - + - + + diff --git a/data/grandprix/2_offthebeatentrack.grandprix b/data/grandprix/2_offthebeatentrack.grandprix index a1e72cc72..085927c5d 100644 --- a/data/grandprix/2_offthebeatentrack.grandprix +++ b/data/grandprix/2_offthebeatentrack.grandprix @@ -1,10 +1,10 @@ - - - - - + + + + + diff --git a/data/grandprix/3_tothemoonandback.grandprix b/data/grandprix/3_tothemoonandback.grandprix index 83a3ffff1..8c36570e7 100644 --- a/data/grandprix/3_tothemoonandback.grandprix +++ b/data/grandprix/3_tothemoonandback.grandprix @@ -1,10 +1,10 @@ + - - + diff --git a/data/grandprix/4_atworldsend.grandprix b/data/grandprix/4_atworldsend.grandprix index 121a0e98f..ccd8db1bb 100644 --- a/data/grandprix/4_atworldsend.grandprix +++ b/data/grandprix/4_atworldsend.grandprix @@ -1,10 +1,10 @@ - - - + + + From b55ec5cfb87c4b69d1ab6aca70c76ba7c64b9f67 Mon Sep 17 00:00:00 2001 From: Mrxx99 <33566379+Mrxx99@users.noreply.github.com> Date: Thu, 21 Feb 2019 01:18:02 +0100 Subject: [PATCH 05/57] FFA for offline play (#3708) * added widget to track info screen to select between Free-For-All and Three Strikes Battle * setting AI to zero and setting time target to 2 minutes for testing * setting also hitcapture limit to prevent immediate race end * setting m_count_down_reached_zero to false in ffa reset to allow starting a new race after the previous ended through time limit * integrated necessary adjustments and made possible to set time target * removed unused spinner variable * use translations * centralized is_soccer and show_ffa_spinner variables * setting target value spinner visible/invisible depending on ffa game type * using no hittarget and fix for this in free for all mode * set use_highscores to false for FFA * disabling AI for FFA * disable hit limit icon for FFA if no hit limit is set ( = 0 ) * changed icon and name of three strikes battle to only battle in race setup screen * set AI to Battle AI if mode is FFA * added config parameters for FFA * added define which can be used to enable FFA AI * resolved merge conflict * moved ffa options higher * fix for setting ai karts * improved m_show_ffa_spinner and m_is_soccer * removed code for disabling widgets for FFA AI * implemented requested changes --- data/gui/screens/track_info.stkgui | 2 +- src/config/user_config.hpp | 6 ++ src/modes/free_for_all.cpp | 9 +- src/modes/world.cpp | 3 +- src/states_screens/race_gui.cpp | 3 +- src/states_screens/race_setup_screen.cpp | 5 +- src/states_screens/track_info_screen.cpp | 108 +++++++++++++++++------ src/states_screens/track_info_screen.hpp | 7 ++ 8 files changed, 108 insertions(+), 35 deletions(-) diff --git a/data/gui/screens/track_info.stkgui b/data/gui/screens/track_info.stkgui index 72d7bb980..4fced87ca 100644 --- a/data/gui/screens/track_info.stkgui +++ b/data/gui/screens/track_info.stkgui @@ -81,7 +81,7 @@ wrap_around="true" />
-