summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraMannus <mannusmenting@gmail.com>2023-06-02 03:40:10 +0200
committerGitHub <noreply@github.com>2023-06-01 21:40:10 -0400
commit6eb15cb8aab8f392ea63eadfdb534957996b0519 (patch)
tree20c024c241a48524dd6d1ff930614db0b69f25f0
parent78492ec09cc25eb8ce300d9370e477a55a5cfeb5 (diff)
[Feature] Boss Rush (#2923)
* Ganon(dorf) cutscene skips * Remove leftover code * Load into chamber of sages * Fix loading into chamber without fast file select * Boss warps in chamber done * Change warps back to chamber * Initial proof of concept done * ganon(dorf) cutscene skips * Code cleanup & auto age equipment * Gameplay stats timer + tweaks * Scuffed timer * Better timer * remove arena props + fix arena exits * Fix blue warps * Attempt to fix build * Fix build again * And again.. * Try no. 9001 * Handle dying and saving * Child link face fire medallion * Fix build * Fix warps after reset/death * Disable doors and move player spawns in boss rooms * Fix boss rush logo rendering * Start of ingame options menu * File Select cleanup * Fix build * Render char text PoC * Move functions to be more generic * Fix build * Fix other builds * Initial text scaling/kerning * Special characters prep * All special characters work now * Attempt to fix build * Fix build question mark * Finish all kerning * Start of ingame options menu with vertical scrolling * Barebones functional options menu * More options menu progress * More visual elements for options menu * Options menu visual changes, implement all options, tons of cleanup * Cleanup and comments * Shorter enums * More options * Change default heart count * Finish French translations * Implement timer in cosmetics editor * Uncomment timer requirement * Variable name change * German translation & small UI tweaks * Animated up/down arrows in options UI * Better arrows in options UI * Cleaner timer + make it usable for general gameplay * More cleanup + ganon & ganondorf boss option * Implement never heal option * Slight up arrow in options UI tweak * Add BGS option * Reintroduce ganondorf cutscene skip * Change encoding to UTF on bossrush.cpp * Fix build hopefully * Fixed static variables leading to options not properly resetting * Fix BR completed timestamp * Change timer to render on top of everything * Offset final BR time by 0.1 second from boss timestamps * Add missing check for boss rush * Implement soh_assets.h * Revert merge mistake * Fix special characters with UTF-8 * Fix build * here's the fix you can merge from your phone * Fix quest select crash with oot.otr only * Use OoT's kerning * Fix HD textures on options menu * Fix special character kerning * "Heal every boss" fixes * Seperate headers + bunny hood option * Remove GetUnixTimestamp() externing * Clean up extern "C"'s * Address review comments * Fix build question mark * Remove accidental styling change --------- Co-authored-by: briaguya <briaguya@alice>
-rw-r--r--assets/objects/object_mag/gTitleBossRushSubtitleTex.rgba32.pngbin0 -> 6291 bytes
-rw-r--r--assets/textures/parameter_static/gArrowDown.ia16.pngbin0 -> 17227 bytes
-rw-r--r--assets/textures/parameter_static/gArrowUp.ia16.pngbin0 -> 17217 bytes
-rw-r--r--assets/textures/title_static/gFileSelBossRushSettingsENGTex.ia8.pngbin0 -> 4004 bytes
-rw-r--r--assets/textures/title_static/gFileSelBossRushSettingsFRATex.ia8.pngbin0 -> 3942 bytes
-rw-r--r--assets/textures/title_static/gFileSelBossRushSettingsGERTex.ia8.pngbin0 -> 3884 bytes
6 files changed, 0 insertions, 0 deletions
diff --git a/assets/objects/object_mag/gTitleBossRushSubtitleTex.rgba32.png b/assets/objects/object_mag/gTitleBossRushSubtitleTex.rgba32.png
new file mode 100644
index 0000000..624a299
--- /dev/null
+++ b/assets/objects/object_mag/gTitleBossRushSubtitleTex.rgba32.png
Binary files differ
diff --git a/assets/textures/parameter_static/gArrowDown.ia16.png b/assets/textures/parameter_static/gArrowDown.ia16.png
new file mode 100644
index 0000000..cdb51d7
--- /dev/null
+++ b/assets/textures/parameter_static/gArrowDown.ia16.png
Binary files differ
diff --git a/assets/textures/parameter_static/gArrowUp.ia16.png b/assets/textures/parameter_static/gArrowUp.ia16.png
new file mode 100644
index 0000000..1ed3f1c
--- /dev/null
+++ b/assets/textures/parameter_static/gArrowUp.ia16.png
Binary files differ
diff --git a/assets/textures/title_static/gFileSelBossRushSettingsENGTex.ia8.png b/assets/textures/title_static/gFileSelBossRushSettingsENGTex.ia8.png
new file mode 100644
index 0000000..e7a7aaa
--- /dev/null
+++ b/assets/textures/title_static/gFileSelBossRushSettingsENGTex.ia8.png
Binary files differ
diff --git a/assets/textures/title_static/gFileSelBossRushSettingsFRATex.ia8.png b/assets/textures/title_static/gFileSelBossRushSettingsFRATex.ia8.png
new file mode 100644
index 0000000..8cbf633
--- /dev/null
+++ b/assets/textures/title_static/gFileSelBossRushSettingsFRATex.ia8.png
Binary files differ
diff --git a/assets/textures/title_static/gFileSelBossRushSettingsGERTex.ia8.png b/assets/textures/title_static/gFileSelBossRushSettingsGERTex.ia8.png
new file mode 100644
index 0000000..4553901
--- /dev/null
+++ b/assets/textures/title_static/gFileSelBossRushSettingsGERTex.ia8.png
Binary files differ