1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2025-03-28 17:22:42 +00:00
Commit graph

194 commits

Author SHA1 Message Date
jugeeya
00f2284397
Open Menu with Start Press (#598)
* Initial

* Another fix

* Don't allow opening our menu when vanilla menu is active

* Add menu option ; remove delay to close menu

* Fix issues when closing menu

* Show button config first, log fade

* Fix test

* Fix test again

* Fix initial notification, turn off hitbox visualization by default
2023-08-22 16:12:12 -07:00
asimon-1
cc66406216
More gracefully handle scenario when TOML file doesn't match schema (#599) 2023-08-18 10:21:47 -07:00
jugeeya
6ccdb7addd
Hotfix for auto-updater crash at launch 2023-08-18 01:29:30 -07:00
asimon-1
cc78dc7e4a
Automatically Keep the Modpack Up-to-Date (#595)
* Grab releases from Github and install

* Refactor

* Fix crash

* Work on fixing install() crash

* Fix the crash by increasing stack size

* Block main() execution on the auto-updater

* Improve error handling

* Delete hash.txt

* Fix get_update_policy()

* Use current time as default last_update_version; Compare publish date to last_update_version to determine if update should be applied.

* Use skyline_web dialogs for user_wants_to_install. Use default selections on emulator instead.

* Fix some logic

* Convert CURRENT_VERSION to a Mutex; implement functions to update the config file

* Adjust logging

* Remove unneeded file

* Allow unwrap after is_some() check

* Fix format

* Auto-updater (squashed)

* Move update policy from config file to menu

* Skip version check on emulator

* Rustfmt, clippy

---------

Co-authored-by: jugeeya <jugeeya@live.com>
2023-08-17 21:21:59 -07:00
jugeeya
afdd620c53
Fix Toggle Naming; Update import for skyline-web (#596)
* Initial

* Convert to using Display

* Small test refactor

* Fix for recent skyline_web change
2023-08-17 13:10:31 -07:00
Austin Traver
10ebff5a6f
Refactor string representation for buttons and menus (#592)
* Refactor string representation for buttons and menus

* Pass test cases

* Update help text
2023-08-15 19:37:35 -07:00
jugeeya
8abc20812e
[Menu Input] Fixes to input hold + consistency (#586) 2023-08-11 09:24:50 -07:00
GradualSyrup
a76808c838
Ledge Recording Fixes (#585)
* Add reusable print_fighter_info()

* rustfmt

* Clippy

* Standby fix, ngu fix, beginning posY fix, debugging ledge delay

* Fighter specific ledge adjustments

* Fix ledge delay

* Remove debug, fmt

* Fix Savestate Record

* fmt

* clippy
2023-08-11 08:33:46 -07:00
jugeeya
00268b3d72
Refactor Menu Input (#584) 2023-08-10 09:34:28 -07:00
jugeeya
77f527c99a
Use Native Smash Input for All Input Processing (#581)
* Initial

* Finishing up with button config

* Formatting, some clippy

* Move button config to menu

* Consts formatting

* Fix input_record_press (thanks test!)

* Properly migrate menu button inputs

* Updates to triggers, including text

* Convert to multi-select
2023-08-10 07:28:13 -07:00
Austin Traver
e69f1a93a9
Fix builds of modpack on M1 Mac (#572)
* Fix builds of modpack on M1 Mac

* Check if actions work now

* Fix clippy

* Use foreign function interface

* Update rust.yml

* Format code

* Revert change to workflow

* Revert change to workflow

* Update workflow

* Update workflow

* One additional tweak

* Update formatting

* Experiment with caching config

* Install the latest stdlib before building

* Remove unused environment variable
2023-08-07 23:28:40 -07:00
jugeeya
c2f5bd5bb1
Input Recording in Button Config (#562)
* Fix standby on Ryujinx; fix playback when no slot is selected

* Add notifications to input recording

* Move to button config
2023-08-03 18:37:18 -07:00
jugeeya
9ef506aac7
[Build] Fix formatting (#557)
* [Build] Fix formatting

* Another set of fixes
2023-08-02 13:53:24 -07:00
jugeeya
822db3969f
[Build] Clippy Fixes (#554)
* Add slots as menu options, randomize playback slots

* Clippy Fixes
2023-08-02 11:09:02 -07:00
GradualSyrup
e07d8f322a
Lower trigger navigation threshold for plugs (#543) 2023-07-30 09:46:12 -07:00
jugeeya
62298ecbc1
Input Recording (#539)
* GCC+tinkering

* First working pass with 8-byte structure usage.
Control scheme is effectively copied for CPU.

* CPU override, sticks not working properly

* Recording working again during record, playback issues.
Also, aerials are all nair, and jump/Dash Attack issues.

* Structure creation cleanup

* Continued testing, still aerial, jump, and dash attack issues

* Fix Dockerfile

* Rework with ControlModuleInternal and ControlModuleStored - same exact issues

* Fix playback inconsistency

* Dead code of trying to find attack air address

* It works! Fix mash.rs overrides of input playback

* Action passing groundwork; Clatter off by default for now

* All Overrides implemented, notes on Snake

* Input Submenu, dummy slots and save state/mash playback interaction

* Nana command fix, mash fix

* Initial Savestate/Ledge record (slight issues)

* Add TODO

* Lasso handled, ledge jump issue fixed, shield decay with input recording fixed, standby setup begun

* first frame playback clear, fix neutral getup

* Standy by groundwork, broken by our frame late record impl

* Prepare for structure change

* On time small structure recording, needs ledge adjustments

* Coloring fix for poessession, lockout implemented and full ledge functionality

* Cleaning and menu fix

* Fix ledge option loop and shield holding on mash

* Fix shielding issues

* turn off playback

* Enable input recording

* Resolving comments 1,2,4,5

* Resolve comments 6, 7, and 8

* External Mash Function

* No Trigger for Overrides, Clatter and Tumble Added

* LR Support, Full Hop Fix

* Starting Status WIP, Structure WIP, LedgeOption PLAYBACK renaming

* WIP Playback Mash - OoS issues - WIP Slots

* Merge branch 'main' into for-restructure prep

* more merge prep

* Return None fix

* More cleanup

* Block -> Shieldstun

* Don't crash on missing menu icons

* Add input recording tab to prevent crash

* Fix general override behavior

* Fix teching overrides

* Additional merge changes

* Nana fixes (also on master so this will be awkward)

* Additional Merge Fixes

* Remove extra tab, prevent panic on missing input recording items

* Remove some TODOs

---------

Co-authored-by: GradualSyrup <68757075+GradualSyrup@users.noreply.github.com>
2023-07-27 16:42:21 -07:00
asimon-1
7eec409086
Mash Overrides (#533)
* Merge from CookieScythe branch

* Rename block to shieldstun, add icons to layout.arc, add new options to ui_menu

* Address clippy warnings and reformat

* Add fn_null_check back to whitelist

* Pray to clippy gods
2023-07-12 11:36:32 -07:00
jugeeya
e0ef313297
Keep Mii hats and Luma on save state load; Fix Github Actions (#532)
* Exclude Mii hats and Luma

* Use allowlist to fix clippy

* More clippy

* More clippy

* Unnecessary cast

* Unnecessary vec!

* Spacing

* Import ordering

* Use a different action for test

---------

Co-authored-by: GradualSyrup <68757075+GradualSyrup@users.noreply.github.com>
2023-07-11 09:10:56 -07:00
jugeeya
1ce2850af3
Save State Slots as Menu Option (#520)
* Initial

* Clippy + Format

* Update save_states.rs

* selected vs random

* fix

* Formats

* Format

* Format

* Updated copy, 2 randomize_slots, 2 save_slot_state

* Update to 5.1, fix random logic

---------

Co-authored-by: Matthew Edell <edell.matthew@gmail.com>
2023-04-14 15:48:22 -07:00
Chris McDonald
5b2e4c7319
Add rustfmt CI checker and format (#518)
* Add rustfmt CI checker

Minimal checker that just runs `cargo fmt --check` on all targets.

* rustfmt
2023-04-11 14:56:14 -07:00
jugeeya
99da64d2a0
Break if layout doesn't contain icon; switch current/all default load in menu (#511)
* Return to break if layout doesn't contain icon; switch current/all default load in menu

* Update menu.rs

* unwrap_or_else

* fix

* Update menu.rs

* Updated save_state_slot_enable icon

---------

Co-authored-by: Matthew Edell <edell.matthew@gmail.com>
2023-03-26 16:09:17 -07:00
jugeeya
330976f490
Change default button config for save states: load/save to Shield, slots to Grab (#510)
* initial

* Change references to grab/shield

* Update README.md
2023-03-22 14:22:27 -07:00
jugeeya
58a18de2b9
Save State Slots: Add enabler toggle, switch to Shield+Left/Right (#505)
* Switch to Shield+Left/Right

* Add option in menu
2023-03-13 22:12:24 -07:00
jugeeya
0395bbe8ca
GC Digital Triggers Menu Fix (#497)
* Check for digital triggers

* Update menu.rs

* Special case digital triggers

* JK

* Update rust.yml

* Update menu.rs
2023-02-26 23:44:12 -08:00
Austin Traver
c3a36e78e5
Convert line separators from CRLF to LF (#499) 2023-02-26 12:14:03 -08:00
jugeeya
d05f8ce918
Change Menu Buttons and Help Text; HUD Off Outside Training (#488)
* Avoid making layouts invisible outside training mode with HUD off

* Switch menu buttons around; change defaults resetting texts

* Fix unused feature import
2023-02-20 21:45:33 -08:00
Austin Traver
d128b902ed
Add icons to the new menu (#482)
* Added test icons to layout,
toggle visibility of icon based on submenu_id

* disable icon container pane when menu is open

* Add icons to 'layout.arc'

* Add remaining icons to 'layout.arc'

* Apply suggestions from code review

Co-authored-by: jugeeya <jugeeya@live.com>

* Incorporate feedback, remove deltas from formatting differences

* Updated some icon textures, updated layout

* Swapped x for check icon on selected toggles

* Moved logic to collect submenu id's to app impl

---------

Co-authored-by: Matthew Edell <edell.matthew@gmail.com>
Co-authored-by: jugeeya <jugeeya@live.com>
2023-02-15 22:47:36 -08:00
jugeeya
e981a0bfd0
Move files to sd:/ultimate/TrainingModpack (#480)
* Initial

* Move filepaths

* Small fix

* Notification on save state save
2023-02-13 19:58:22 -08:00
jugeeya
228ff77673
Format; Optimize Imports (#477)
* Run IntelliJ's optimize imports + formatter

* Clippy
2023-02-11 17:07:29 -08:00
jugeeya
94ff25a921
Save State Slots across game load + Fixes galore: overwrite button config if invalid; exclusive button combos; remove wait when opening menu (#476)
* Overwrite button config if invalid; exclusive button combos

* Tons of fixes

* Fix save state settings load from file
2023-02-11 16:49:05 -08:00
jugeeya
bf78f06f7d
Initial Save State Slots (#474) 2023-02-10 22:02:56 -08:00
jugeeya
e10092b766
fix (#475) 2023-02-10 22:02:28 -08:00
jugeeya
c932961566 Frame Advantage only on shield for now; fix menu soft-lock with frame-by-frame 2023-02-10 14:22:29 -08:00
jugeeya
c1eb6409a4 Cursor Memory for the menu 2023-02-09 23:34:30 -08:00
jugeeya
0c64959333 Fix issue where you could not control the "select fighter with controller" menu when the quick menu is up. 2023-02-09 23:25:25 -08:00
jugeeya
d23dcdf968
Deprecate Web Menu (#472)
* Initial

* Fixes
2023-02-07 06:01:52 -08:00
jugeeya
9c590df189
Fail on clippy warnings in CI (#470)
* Update lib.rs

* Remaining fixes
2023-02-05 12:45:35 -08:00
jugeeya
62c22026d3
Developer TOML for hot-reloading configs (#469)
* Initial commit

* Update dev_config.rs

* Update dev_config.rs

* Update dev_config.rs

* Update interface

* typo

* Update dev_config.rs

* Update dev_config.rs

* Update dev_config.rs
2023-02-04 12:43:12 -08:00
jugeeya
d5c0d636a0
UI Code Refactor; Notifications; Save Defaults for Quick Menu (#461)
* Initial refactor

* Full refactor

* Depend only on pane creator flags

* Small refactor

* Small refactors; notification support

* Don't push event for every quick menu change

* Backend for defaults almost done

* Run tests on CI

* Finish save + reset defaults without confirmation

* Added slider menu UI

---------

Co-authored-by: xhudaman <edell.matthew@gmail.com>
2023-02-02 15:01:11 -08:00
asimon-1
8866d1a2ce
Only write HTML on Console (#464) 2023-02-01 07:29:22 -08:00
github-actions[bot]
37360c787a
Format Rust code using rustfmt 2023-01-27 19:24:09 +00:00
asimon-1
77f439a6eb
Improve Error Handling (#459)
* Add error messages by changing unwrap() calls to expect()

* Improve error messages by changing println! to info!/warn!/error!

* Address nits

* Change panic message

* details in panic
2023-01-27 11:19:18 -08:00
jugeeya
a364a214e2 Fix for recent rust-analyzer checkOnSave change; clippy fix 2023-01-17 17:23:24 -08:00
jugeeya
84fbe98d0d Quick Menu: fix speed, potential to deadlock 2023-01-17 16:02:19 -08:00
jugeeya
e174daeb6f Fix Quick Menu when used with joycons 2023-01-04 17:10:58 -08:00
asimon-1
f35f10e4f4
Fix two bugs which caused some OnOffs to work incorrectly (#454) 2022-12-31 12:02:49 -08:00
jugeeya
ed425d78e5
Add UI backing to text options in menu, always do new damage display (#451)
* A bunch of things

* Current progress

* Fix for ResAnimationContent

* Figure out Parts*

* Cleanup, just because

* New pane working!!!

* New null pane for hierarchy

* Success with parent pane

* Generate multiple panes

* Multiple panes, almost working text color

* MaterialColor test, but fails

* Forgot bitfield-struct

* Vtable for material. Fixes SetWhiteColor!

* Refactor color changing, change naming scheme

* Just Frame Advantage

* Merge

* Delete T_test.txt

* Delete set_txt_num_01.txt

* Delete libtraining_modpack.nro

* Format Rust code using rustfmt

* Ignore shell scripts in repo languages

* General refactor, add basis for quick menu

* Small refactor, fix ordering of submenu options

* Toggles, sliders

* Tons of progress...

* Correct dmg updater, remove old quick menu backend

* Fix damage percentage display

* Small QoL

* Format Rust code using rustfmt

* More edits. Use Quit Training button as Modpack Menu header

* Finish merge

* Format Rust code using rustfmt

* Use vanilla backgrounds for text options

* Format ui_hacks, also always do new percent display

* Fix merge

* That was the most awful merge ever

* Address clippy warnings

* Format Rust code using rustfmt

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-12-30 11:33:17 -08:00
jugeeya
52e3528292
Use ui2d-based Quick Menu; show dmg percentage on save state % reload with random damage (#450)
* A bunch of things

* Current progress

* Fix for ResAnimationContent

* Figure out Parts*

* Cleanup, just because

* New pane working!!!

* New null pane for hierarchy

* Success with parent pane

* Generate multiple panes

* Multiple panes, almost working text color

* MaterialColor test, but fails

* Forgot bitfield-struct

* Vtable for material. Fixes SetWhiteColor!

* Refactor color changing, change naming scheme

* Just Frame Advantage

* Merge

* Delete T_test.txt

* Delete set_txt_num_01.txt

* Delete libtraining_modpack.nro

* Format Rust code using rustfmt

* Ignore shell scripts in repo languages

* General refactor, add basis for quick menu

* Small refactor, fix ordering of submenu options

* Toggles, sliders

* Tons of progress...

* Correct dmg updater, remove old quick menu backend

* Fix damage percentage display

* Small QoL

* Format Rust code using rustfmt

* More edits. Use Quit Training button as Modpack Menu header

* Finish merge

* Format Rust code using rustfmt

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-12-29 20:09:22 -08:00
github-actions[bot]
01a2c60a29
Format Rust code using rustfmt 2022-12-16 04:03:44 +00:00
asimon-1
74e374db6d
Refactor untechables (#446)
* Fix rust-analyzer config

* Refactor tech.rs to no longer depend on a static mut
2022-12-15 19:56:36 -08:00