1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2024-11-28 04:44:06 +00:00
Commit graph

711 commits

Author SHA1 Message Date
jugeeya
9ef506aac7
[Build] Fix formatting (#557)
* [Build] Fix formatting

* Another set of fixes
2023-08-02 13:53:24 -07:00
jugeeya
1486ad8d05
Fix standby end criteria (#555) 2023-08-02 12:30:34 -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
jugeeya
3a40d46fca
Add input recording slots as menu options, randomize playback slots (#553) 2023-08-02 10:27:50 -07:00
GradualSyrup
ba93011069
Dash Attack Fixes (#546)
* Initial (still has parry roll, dash attack is 1 frame late)

* Initial working commit

* Cleanup
2023-07-31 18:37:25 -07:00
GradualSyrup
aed803e449
Update standby function to use controller input (#544)
* Update standby function to use controller input

* Reuse constants
2023-07-30 10:38:58 -07:00
GradualSyrup
e07d8f322a
Lower trigger navigation threshold for plugs (#543) 2023-07-30 09:46:12 -07:00
asimon-1
ace4654f3d
Set tumble trigger as default (#541) 2023-07-29 13:39:09 -07:00
GradualSyrup
78d4b36400
Override ledge fix and input recording menu fixes (#542)
* 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

* Needs proper selection of action

* Ledge overrides work without trigger, remove playback/record slot until working
2023-07-29 13:12:32 -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
jugeeya
24ffba4e09
Satisfy clippy for fn_null_check (#534)
* Satisfy clippy for fn_null_check

* Update lib.rs

* Update lib.rs

* Use comparison with 0

* Update mod.rs

* Update lib.rs

* Update mod.rs

* Update lib.rs
2023-07-13 09:46:34 -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
Matthew Edell
b34fc6b4a9
Fixed bug where icons show on slider menu (#528)
* Fixed bug by hiding icon for buttons when rendering Slider Menu

* Fixed formatting

* Fixed build
2023-05-09 07:40:42 -07:00
jugeeya
dbfa60bebc
Fix Save State Slots menu crash (#526)
* Update options.rs

* Update save_states.rs

* Update options.rs
2023-04-29 12:22:45 -07:00
jugeeya
9b9070cff2
Fix Save State Slot Effect Removal (#521)
* Initial

* Clippy + Format

* Update save_states.rs

* selected vs random

* fix

* Formats

* Format

* Format

* Fix for effect removal

* 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 16:20:05 -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
188e7decad
Add mass rustfmt commit to ignore-revs file (#519) 2023-04-11 15:05:47 -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
Chris McDonald
67948f7373
Fix clippy CI: once_cell is stabilized (#517)
This feature has been stabilized in 1.70-nightly, so remove the feature
flag so that Clippy stops complaining about it.
2023-04-11 14:01:21 -07:00
Chris McDonald
907630f9da
Add ignore-revs file for git blame (#515)
A small change to add an ignore-revs file for `git blame`. This file
contains a list of revisions that `git blame` will ignore, usually meant
for preserving a useful blame history through mass reformats or similar
bulk changes. You can configure your git to use this ignore-revs file
by running `git config blame.ignoreRevsFile .git-blame-ignore-revs`.

The list of commits in this ignore-revs file was generated via:
`git --no-pager log --grep="Format Rust code using rustfmt" --author="github-actions" --format="%H"`

See the following for an explanation and docs:
https://akrabat.com/ignoring-revisions-with-git-blame/
https://www.git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt
2023-04-11 13:37:52 -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
b5735c54d7
Update GH Action Dependency 2023-03-23 08:28:21 -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
66477b346a
Ensure save states effect kills happen only in training (#509) 2023-03-22 14:22:11 -07:00
Austin Traver
c74a2b3432
Adjust wording of some help-text (#508) 2023-03-14 18:29:16 -07:00
Austin Traver
8521321598
Update Rust toolchain override file (#504) 2023-03-14 09:29:12 -07:00
jugeeya
9ea0ddb690
Hotfix 2 for panic for icons (#507)
* Update menu.rs

* Update menu.rs

* Update save_states.rs
2023-03-14 08:44:01 -07:00
jugeeya
14bf45de4f
Hotfix panic when icon is not found (#506) 2023-03-14 07:21:14 -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
89569c7154 Hotfix: Nana not moving on save state load 2023-03-05 09:31:42 -08:00
jugeeya
745baef640
Fix beta file upload 2023-03-04 20:15:37 -08:00
jugeeya
cd399eb922
Update README for 5.0 (#479)
* Update README.md

* Update README.md

* Update Cargo.toml

* Update README.md

* Update README.md

* Add files via upload

* Update README.md

* Add files via upload

* Delete 2022051021130700-0E7DF678130F4F0FA2C88AE72B47AFDF.jpg

* Delete 2022051021131000-0E7DF678130F4F0FA2C88AE72B47AFDF.jpg

* Delete 2022051021131300-0E7DF678130F4F0FA2C88AE72B47AFDF.jpg

* Delete 2022051021134700-0E7DF678130F4F0FA2C88AE72B47AFDF.jpg

* Delete 2022051021135400-0E7DF678130F4F0FA2C88AE72B47AFDF.jpg

* Delete 2022060221360900-0E7DF678130F4F0FA2C88AE72B47AFDF.jpg

* Delete 2022060221415900-0E7DF678130F4F0FA2C88AE72B47AFDF.jpg

* Update README.md

* Add files via upload

* Add files via upload

* Delete mash_trigger_tumble.mp4

* Update README.md

* Add files via upload

* Update README.md

* Add files via upload

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update rust.yml
2023-03-04 19:12:58 -08:00
jugeeya
8e5b180d7e
Update Cargo.toml (#500) 2023-03-01 16:54:07 -08: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
e0fec0039e
Use our own Menu Title button (#498) 2023-02-24 22:07:35 -08:00
jugeeya
f268137bc4
Don't panic on failure to remove legacy dir (#495) 2023-02-24 11:22:06 -08:00
jugeeya
22ded3b379
Fix arena UI disappearing (#494) 2023-02-23 09:51:50 -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
jugeeya
7fb93ea309
Minreq/Native TLS: Ignore handshake failure (#487)
* Ignore handshake failure

* Update Cargo.toml
2023-02-19 22:44:21 -08:00
jugeeya
9ca84013b7
PT Load State Fix: After Training Mode Reset (#485)
* Damage percent fix

* PT is fixed!

* Fix ICs
2023-02-18 10:37:04 -08:00
Matthew Edell
10221973fa
Added early return for checked button on single option (#486) 2023-02-16 21:53:49 -08:00
jugeeya
b6398794c9
Don't upload static files or Skyline in beta release (#484)
* Don't upload static files or Skyline in beta

* Add Discord link
2023-02-16 16:12:39 -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
b20a44ca5c
Fix menu buttons for Gamecube Controller users (#481)
* Initial

* Move filepaths

* Small fix

* Notification on save state save

* Fix buttons for GCC
2023-02-15 00:07:45 -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
8ac2a3e8b1
Fix PT load state freeze after L+R+A (#478) 2023-02-12 15:34:01 -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