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

26 commits

Author SHA1 Message Date
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
3d6ea34eeb
Use layout.arc to Build UI (#473)
* Update lib.rs

* Remaining fixes

* Initial

* Forgot to commit

* Clippy

* Initial

* Use feature gate

* Fixes

* layout.arc actually working. Add training_mod_menu_button

* Add docstring, fix from static

* Use include_flate to keep binary smaller

* Add most menu features back

* Add help, tabs

* Add help, tabs

* Small refactor

* Fix clippy, some other issues

* Updated menu buttons, inactive text colour (btns), layouts

---------

Co-authored-by: Matthew Edell <edell.matthew@gmail.com>
2023-02-09 07:51:40 -08:00
jugeeya
d23dcdf968
Deprecate Web Menu (#472)
* Initial

* Fixes
2023-02-07 06:01:52 -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
f35f10e4f4
Fix two bugs which caused some OnOffs to work incorrectly (#454) 2022-12-31 12:02:49 -08:00
jugeeya
c1a6f6626d
Add HUD toggle (#452)
* 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

* Last impls for resources, small cleanup

* Use macro for pane names

* Format

* Add HUD toggle

* Small change

* Fix for reentering training mode

* Last cleanup

* Format Rust code using rustfmt

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-12-30 15:56:35 -08:00
gnaomo
743d5dbce0
Changed Menu Defaults (#423)
* Changed Menu Defaults

* Update lib.rs
2022-11-07 08:37:46 -08:00
asimon-1
b66d5189c7
Separate SdiFrequency and ClatterFrequency. Make the clatter strength faster (#397) 2022-11-01 17:42:01 -07: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
bbc0c93c9a
Refactor input_delay from i32 to Delay (#386)
* Change input_delay to use Delay structure instead of i32

* Update input_delay.rs
2022-10-06 16:03:41 -07:00
asimon-1
945ef21f60
Mash Triggers (#385)
* Create mash triggers; remove mash in neutral and escape options

* Add landing condition

* Make default more readable
2022-10-06 12:15:36 -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
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
Matthew Edell
16f975a9d0
Update web UI for better maintenance (#380)
* Updated menu buttons and icons

* Cleaned up .devcotainer

* removed dockerfile from .devcontainer in favour
of using image

* Added JS settings, updated menu template, css, js

* Updated tab width to 4

* Refactored openTab and closeAllItems,
default tab content to be hidden,
added polyfill for NodeList.forEach

* Refactored openItem, made targeting modals easier

* Refactored toggleOption

* Fixed clicking tab not closing active modals

* Updated aerial delay and falling aerial icons

* Updated colours of defensive settings menu icons

* Updated misc tab menu icon colours

* Fixed oos_offset, shield_state, and shield_tilt

* Fixed all tabs defaulting to active,
Updated modals to be outside menu_items,
Refactored JS to work with new HTML hierarchy

* Updated settings to be JSON

* Fixed single options not populating correctly from url

* Updated menu to edit settings object when toggled

* Removed updating settings from menu before exit

* Refactored comments to fewer lines

* Refactored to use const,
Refactored to use camelCase,
Refactored resetCurrentSubmenu & resetAllSubmenus

* Fixed size and alignment of menu item text,
Fixed size of option button's text,
Fixed colour of crouch icon

* Updated stroke width for crouch icon feet & arms

* Updated check to use fontawesome as a base,
Changed colour to have better contrast,
Added outline for better contrast

* Updated one-winged angel option to 1-winged angel

* Updated openTab and resetCurrentMenu to play sfx
2022-08-04 19:34:25 -07:00
asimon-1
9d2f87290b
Add Crouch Setting (#373)
* Hold stick down when requesting crouch

* Add icon
2022-06-16 07:38:33 -10:00
asimon-1
5e1f523bb6
Fix input delay getting passed to url params incorrectly (#371) 2022-06-07 18:54:26 -07:00
jugeeya
283279b10c
Fixes for Quick Menu Multi-selections (#362) 2022-05-31 20:43:00 -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
41ecb8aa38
Save state autoload (#352)
* Add save state autoload option

* Add autoload option

* Format Rust code using rustfmt

* Update save_states.rs

* Add files via upload

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-05-16 21:58:32 -07:00
asimon-1
2cd382e0bc
Feature: Clatter Strength (#337)
* Initial clatter work

* Add clatter to menus

* Change joint to hip

* Update SDI and Clatter to use the same enum

* Avoid early clatter/sdi input
2022-05-03 23:23:01 -07:00
jugeeya
92a3d5711d
Another bugfix for input_delay 2022-05-03 17:52:49 -07:00
asimon-1
fb6de31aa4
bugfix for input delay (#339) 2022-04-23 07:21:14 -07: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
2c3e0d752c Fixes to menu; use left side of screen 2022-03-21 00:51:58 -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