1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2024-11-20 00:46:34 +00:00
Commit graph

737 commits

Author SHA1 Message Date
Austin Traver
e78ab92d4b
Fix soft-freeze on loading Quickplay lobby (#593)
* Fix soft-freeze on loading Quickplay lobby

* Formatting

---------

Co-authored-by: jugeeya <jugeeya@live.com>
2023-08-16 06:15:11 -07:00
jugeeya
6f1e4af332
Don't set CPU controls outside of training 2023-08-15 23:57:38 -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
f862abacaf
Remove references to NN HID hook (#590) 2023-08-14 08:55:05 -07:00
jugeeya
2b241dcb19
Upscale size of menu items for better visibility, hide non-menu UI elements (#589)
* Initial

* Last changes

* Update menu.rs

* Update menu.rs

* Update menu.rs
2023-08-13 17:20:14 -07:00
GradualSyrup
7c522c02bc
Option to Crop Recording when it ends with neutral inputs (#587)
* Working neutral end early

* fmt

* Default on

* Normalize namespace
2023-08-12 15:37:27 -07:00
GradualSyrup
eac960a547
Enforce death on save state, remove score FX (#588)
* Force death, CPU doesn't die when in hitstop

* Deal with stock aura effect
2023-08-12 15:36:38 -07:00
GradualSyrup
acd6c55f48
Fully Match Input Recording Notifications with the Current state (#577)
* Fully Match Input Recording Notifications with the current state

* Switch final record frame variable

* Use new hook for notifications, realign playback notif

* fmt

* Prioritize Frame Advantage

* clippy fmt
2023-08-11 13:33:11 -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
Yuri Pieters
43f7856727
Fix save state menu table (#583) 2023-08-10 06:26:16 -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
03cac66d5c
Record Trigger Refactor (#580)
* Initial

* Formatting
2023-08-07 20:11:26 -07:00
GradualSyrup
d5b774841a
Fix Mistech Toggles for Jab Lock (#576)
* Prevent Aegis's sword from vanishing on state load

* Include Pyra's sword

* no mr nice status request
2023-08-07 13:15:06 -07:00
jugeeya
85815f87ff
Input Recording Menu Refactor (#579)
* Initial

* Formatting

* Slight name changes
2023-08-07 11:59:47 -07:00
GradualSyrup
fea2651726
Aegis Sword disappearing on save state load fix (#574)
* Prevent Aegis's sword from vanishing on state load

* Include Pyra's sword
2023-08-06 18:24:33 -07:00
jugeeya
fb9d1648d4
Configurable Recording Frames (#570)
* Playback Slots for Actions and Ledge Options

* Inital attempt

* Fix playback slot

* Fix menu option, probably

* Fix reading from menu option
2023-08-06 17:07:01 -07:00
GradualSyrup
fe8ae6f39f
Buff Health Fixes (#571)
* Hooked AddDamage, pointer manipulation trouble

* Working Wii Fit Fix

* Inline Hook Setup for Sephiroth Wing (crashes)

* Revert Broken Wing Chanes

* Further revert

* Fix Sephiroth Buff Percentage glitches
2023-08-05 14:36:27 -07:00
jugeeya
60f8ffc410
Playback Slots for Actions and Ledge Options (#569) 2023-08-04 15:45:07 -07:00
GradualSyrup
b8b2446522
Update Github Actions Versions / Repos (#565)
* Update some action versions

* Use ructions instead of actions-rs

* Change ructions version

* dtolnay rust-toolchain testing

* dtolnay rust-toolchain testing

* More testing

* More testing

* Working Actions Update
2023-08-04 13:07:15 -07:00
GradualSyrup
dcb1e831dc
Shulk Monado Art Buffs, SFX and Visual Buff Fixes (#564)
* Monado Buffs, Shulk Dial on Input Recording, Silent Buffs

* All Buffs Silent

* Shulk Flash removed, working on KO UI update

* Little Mac Meter Update

* Remove a few debug functions

* More cleanup

* merge with main

* Paren

* Paren

* rustfmt

* Clippy Fixes

* Fix further Shulk effect issues, improve buff functions
2023-08-04 10:23:22 -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
dc6a1f8915
Input Recording Notifications (#561)
* Fix standby on Ryujinx; fix playback when no slot is selected

* Add notifications to input recording
2023-08-03 18:25:25 -07:00
jugeeya
a8f533da47
Fix standby on Ryujinx; fix playback when no slot is selected (#560) 2023-08-03 18:13:02 -07:00
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