1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2025-03-19 12:56:10 +00:00
Commit graph

98 commits

Author SHA1 Message Date
jugeeya
bf78f06f7d
Initial Save State Slots (#474) 2023-02-10 22:02:56 -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
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
jugeeya
5bb12d04fb
[Github Action] no-dkp image; Move to cargo clippy as simple runner to fix PRs (#462)
* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Fixes for clippy

* Fix clippy again

* Also run check

* Add names

* Remove rustfmt
2023-01-31 15:17:00 -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
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
a1c9e35b19
Use UI text box for Frame Advantage; add ui2d backend (#449)
* 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

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-12-22 14:22:37 -08: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
asimon-1
1c5a5a71fa
Don't tech untechables (#442) 2022-12-12 19:55:15 -08:00
github-actions[bot]
30cdd61e26
Format Rust code using rustfmt 2022-11-01 20:58:36 +00:00
asimon-1
fa451986e0
Randomized percent on load (#394)
* Create save states tab

* Initial work - crashes on boot

* Change usizes to u32's.
Refactor toggle "checked" logic.
Add blujay's panic tracker.

* Rename tui mins/maxes

* Fix misc. TUI bugs

* Fix panic caused by prematurely setting the submenu state to GaugeState::None

Set submenu state to GaugeState::MinHover when opening a slider menu so that the slider is immediately loaded

When changing from GaugeState::Min/MaxSelected to Min/MaxHover, commit changes from App.current_sub_menu_slider to SubMenu.slider so that it can be exported to JSON

* Merge save_damage and save_state_pct_rand_enable settings

* Add comments to training_mod_tui::lib.rs

* Add icon

* Initial work on web slider

Todo:
Styling polish
Bugfix for initial settings load
Handle dragging using gamepad

* Style and fix web slider

* Add separate settings for player random damage

* TUI styling fixes

* Paginate TUI tabs

* Address CR comments
2022-11-01 13:52:38 -07:00
asimon-1
4314251664
Don't preload session by default (#392) 2022-10-16 16:32:24 -07:00
jugeeya
0e2500c77f Revert to use web session 2022-10-12 16:19:43 -07:00
jugeeya
458758faf9 Spawn web session normally; use web_session feature gate for experimental version 2022-10-10 17:53:08 -07:00
jugeeya
2f032c1fc0 Fix button config parsing 2022-10-10 17:17:20 -07:00
asimon-1
a1d5fe7fac
Instead of hardcoding, load button combo configuration from a file (#388)
* Instead of hardcoding, load button combo configuration from a file

* Rename conf files, remove extra logging

* Inform the user which keys are invalid
2022-10-09 14:09:47 -07:00
jugeeya
3f5e8398d7 Fix Quick Menu selection (failed to r/w hitbox vis + quick menu previously) 2022-10-04 01:23:55 -07:00
github-actions[bot]
afb8427c0d
Format Rust code using rustfmt 2022-10-03 16:06:19 +00:00
jugeeya
ef5fb1c1e4
Don't spawn web menu thread on emulator 2022-10-03 08:52:12 -07:00
github-actions[bot]
17f2b05940
Format Rust code using rustfmt 2022-09-08 02:39:14 +00:00
asimon-1
36c6e8859a
Refactor to use Web Sessions (#384)
* Initial commit

* don't rewrite file each time

* Format Rust code using rustfmt

* Receive menu settings from web via message

* Adjust logic

* Stub changes for json messages

* Rust: receive menu as json

* Small JS changes for desktop

* Attempt to fix exit issues

* Fix filename issue

* JS: Export menu as json

* Use JSON for Rust -> JS message

* Update .conf file schema to json

* Tear down session when leaving training mode

* Remove URL behavior, rename WebAppletResponse -> MenuJsonStruct

* Update TUI to use JSON

Co-authored-by: jugeeya <jugeeya@live.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-09-07 19:34:39 -07:00
jugeeya
283279b10c
Fixes for Quick Menu Multi-selections (#362) 2022-05-31 20:43:00 -07:00
jugeeya
9cc4c6b73b
Update to cargo-skyline 3.0.0 (with updated Rust STD!) (#359)
* Try cargo-skyline 3.0.0

* Update Cargo.toml

* Update lib.rs

* Update combo.rs
2022-05-25 15:07:56 -07:00
jugeeya
ac78fb4a4d
Save States with items (#350)
* initial

* Complete refactor, add save state autoload

* forgot to commit consts folder

* Format Rust code using rustfmt

* Refactor, attempt CPU as well

* Update items.rs

* Format Rust code using rustfmt

* Fix web menu

* Format Rust code using rustfmt

* Fix crashes due to cpu kind not set

* Format Rust code using rustfmt

* Prevent Nana from Spawning with Items (#353)

Simple check before giving items

* somehow this code caused blackscreens on ryujinx?

* remerge

* Link and Diddy fixes, Players spawning with CPU item fixes (#355)

* Format Rust code using rustfmt

* Delete mash buffer queue entirely when spawning items to fix diddy as cpu; nits

* fix merge

* nit

* Format Rust code using rustfmt

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GradualSyrup <68757075+GradualSyrup@users.noreply.github.com>
2022-05-21 17:57:41 -07:00
jugeeya
71c30990e4
Quick Menu: B Button hold fix, update from web menu (#345)
* Fix prev_frame_is_pressed

* Update menu when not active

* Update lib.rs

* Actual fix using frame_counter

* Format Rust code using rustfmt

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-05-09 21:40:09 -07:00
asimon-1
866035ce7f
Fix SDI crest bug (#336)
* Fix SDI crest bug

* Fix clippy warnings
2022-04-22 12:45:14 -07:00
github-actions[bot]
3255a0349d
Format Rust code using rustfmt 2022-04-09 22:14:25 +00:00
asimon-1
a6bed95de3
Tabbed Web Menu (#333)
* Web menu refactor

* Fix some menu items

* Fixes for quick_menu, general clippy fixes

* Revert small testing change

* Add quick menu SVG

* Fix defaults saving/loading

* Log the last URL from the web menu

Co-authored-by: jugeeya <jugeeya@live.com>
2022-04-09 15:10:44 -07:00
jugeeya
6da6aa41b7
Clippy Linter Fixes (#323)
* initial

* small fix

* Update rust.yml

* Update lib.rs

* Format Rust code using rustfmt

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-03-24 23:48:50 -07:00
jugeeya
63d31499f5
Use colors in Quick Menu (#325) 2022-03-24 09:27:14 -07:00
jugeeya
42ab764757 Some Quick Menu fixes 2022-03-21 10:03:08 -07:00
jugeeya
6976c53172 Small fixes to Quick Menu 2022-03-20 11:23:45 -07:00
jugeeya
e4e2de0a79
Quick Menu + Ryujinx Compatibility (#313)
* Initial commit

* Format Rust code using rustfmt

* Add back fs calls

* working with drawing

* wow we're almost there

* multi-lists working, selection within tui working

* working with tabs

* working with smash

* amend warnings, fix menu actually saving inputs

* small refactors

* Fully working!

* Fix warnings

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-03-20 11:09:25 -07:00
jugeeya
884c00b069
Metrics Pipeline (#278)
* initial commit

* plotting working

* allow plotting

* Change spacing in workflow YML

* Fix get_random_option calls

* Format Rust code using rustfmt

* Amend removed feature

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-02-20 19:14:22 -08:00
asimon-1
b52112bb12
Configurable default menu (#288)
* Allow saving current menu as new defaults

* Save menu defaults in the HTML file. Write html when saving

* Add effect when saving defaults

* Adjust effect size

* Use URL param to save defaults instead of ingame chord

* Update the menu to include checkbox for saving defaults

* Fix menu styling

* Update README

Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-12-19 17:43:57 -08:00
jugeeya
bc3d2d8df5
Add rustfmt action (#265)
* Add rustfmt action

* Update rust.yml

* Format Rust code using rustfmt

* Update consts.rs

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2021-09-14 14:05:48 -07:00
jugeeya
198bf23031
Add Firebase logging via HTTPS (#248)
* trying

* trying

* try with json to compile

* Update Cargo.toml

* Update Cargo.toml

* Update Cargo.toml

* Update Cargo.toml

* Update lib.rs

* Update Cargo.toml

* further testing

* continually testing

* simplify

* remove unnecessary diffs

* working!

* Use cargo-skyline image with devkitpro

* Update rust.yml

* Update rust.yml

* Remove clippy PR for now
2021-09-13 08:24:43 -07:00
jugeeya
c82cd073f4 Revert "Blujay's visualizer"
This reverts commit f8dba57044.
2021-08-24 19:27:29 -07:00
jugeeya
f8dba57044 Blujay's visualizer
Use blujay's visualizer plugin for hitbox/hurtbox visualization (#236)

* working

* Update rust.yml

Fix GH Action for getting visualizer.nro

Fix to visualization, allow hitbox/hurtbox toggle
2021-08-24 19:27:04 -07:00
jugeeya
40a5a08754 add simple macros for onoff/single option menus 2021-08-16 13:48:58 -07:00
jugeeya
f41bfff9f8
Load menu from file, write on menu exit (#222)
* Load menu from file, write on menu exit

* Update lib.rs

* Update lib.rs

* Update lib.rs

* Update lib.rs

* Update lib.rs

* Update lib.rs

* Update lib.rs

* Update menu.rs

* Try response as well

* Don't hold response variable

* use static mut option

* everything in a thread

* remove brace

* Try GH actions change

* try

* try

* use container tag

* test

* try abs path

* try checkout

* try showing

* try installing

* test proj

* try stable toolchain spec

* try image

* explicit version

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Try clippy

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* fixes

* only if the conf makes sense

* small clippy fixes
2021-08-15 18:41:40 -07:00
jugeeya
46484bafff
Make changes to satisfy clippy; add cargo clippy PR commenter (#223)
* raygun print frame advantage

* Don't release, but allow action for raygun-print branch

* Add as menu option, only print in that case

* revert change to workflow file

* fixes

* add workflow clippy spec
2021-08-14 19:06:25 -07:00
jugeeya
3d563b9450
Add back frame advantage using raygun shot printer (#219)
* raygun print frame advantage

* Don't release, but allow action for raygun-print branch

* Add as menu option, only print in that case

* revert change to workflow file
2021-08-09 21:33:03 -07:00
asimon-1
427d6ee953
Instructions for Version Update from v2.6 (#218)
* Do version check and remove overlay if it exists

* Use format! instead of mutable string

* Handle missing overlay

* Use cargo package version instead of hardcoded str

Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-08-03 15:03:47 -07:00
asimon-1
cd8755012c
Fix GH Actions Workflow (#208)
* Add workflow_dispatch

* Add specific lock_api version

* Update to latest cargo-skyline version

* Update workflow with skyline-rs toolchain

* Separate cargo-skyline install and toolchain update

* Use Rust docker container

* Try rustocker/rustup container

* Revert "Try rustocker/rustup container"

This reverts commit 26fff6a44f.

* Try fork of cargo-skyline

* Revert "Try fork of cargo-skyline"

This reverts commit 0465c39e94.

* Try installing own Rust

* Fix syntax error

Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-06-22 13:47:29 -07:00
jugeeya
1a273f7cbf
Initial Web Menu Implementation (#170)
* initial commit with some nice css

* add beginnings of templating. revert to qa model

* add most options visually

* add parser and full input checks

* separate menu code, use ControlModule

* add tests for menu rendering locally

* wip sliders

* add AttackAngle

* remove tesla overlay

* begin with into_string

* add slider.js

* don't use in html yet

Co-authored-by: jugeeya <jugeeya@llive.com>
2021-04-14 10:21:51 -07:00
asimon-1
509f2383ac
Ledge hang (#180)
* Initial work on ledge hang

* Change ledge hang logic from a delay to a persistent selected option

* Disallow ledge-climb if WAIT is picked

* Move is_enable_transition_term hook from lib.rs into existing mod.rs hook

Co-authored-by: Andrew Simon <asimon@domeng.com>
2020-12-10 10:03:42 -08:00
jugeeya
67a03dd38a satisfy clippy rules 2020-09-27 22:24:50 +00:00