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

131 commits

Author SHA1 Message Date
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
github-actions[bot]
43b516aa56
Format Rust code using rustfmt 2022-10-09 21:14:11 +00: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
7bbae26f35
Pokemon Trainer: Save State Fix (#387)
* Initial; stay same pokemon, but still go through ball throw animation

* Remove PTrainer ball throw animation

* Merge with master

* Needed import

* Format Rust code using rustfmt

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-10-06 13:49:03 -07:00
github-actions[bot]
d25583cda2
Format Rust code using rustfmt 2022-10-06 19:20:07 +00: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
github-actions[bot]
c868fac2c3
Format Rust code using rustfmt 2022-10-04 08:28:51 +00:00
jugeeya
3f5e8398d7 Fix Quick Menu selection (failed to r/w hitbox vis + quick menu previously) 2022-10-04 01:23:55 -07:00
jugeeya
88abeadfdd Fix issue with not being able to reopen menu after fighter reset/reentry into training 2022-10-02 09:38:40 -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
asimon-1
e42e046b87
Make ganon's aerial sideb untechable (#375) 2022-06-22 03:49:57 -10: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
asimon-1
aa416d8065
Menu fixes (#347)
* Menu style nits

* Avoid creating junk folders
2022-05-10 18:45:24 -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
f948ceec53
Version check for v3.3 (#344)
* Version check for v3.3

* Use enum instead of Option<bool>
2022-05-08 15:48:13 -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
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
42ab764757 Some Quick Menu fixes 2022-03-21 10:03:08 -07:00
jugeeya
491b8f975f Fix quick menu disabling 2022-03-21 00:57:30 -07:00
jugeeya
2c3e0d752c Fixes to menu; use left side of screen 2022-03-21 00:51:58 -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
asimon-1
e2a5620ee3
Change from remote to local resource files (#315)
* Extract css into standalone file

* Move images to static folder

* Add fonts, fix focus animation

* Remove Nintendo JS dependencies

* Remove unused sliders templating

* Fix shadows

* Fix back button

* Work on Sound Effects

* Change htdocs folder

* Move fonts to a folder

* Refactor JS to remove jquery as a dependency

* Fix broken JS

* Update rust.yml
2022-03-05 13:55:13 -08: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
GradualSyrup
b598aaeee2
Buffing (#297)
* continued testing

* Scuffed Acceleratle Implementation

* Cleanup and Groundwork, Only Accel

* Wii Fit complete, Joker, Hero and Cloud WIP.

* Preparing for multiple spells

* Implemented Multi Buffing

* Cloud Hook, Hero Improvements

* Nearly complete, still messing around with KO Punch

* Works for both fighters now

* Add buff icon

* Wii Fit sound cut, Sepiroth darken fixed

* Cleanup

* Fix Hero Screen Shake

* Clean up buff a bit more

* slight clean up

* Update README.md

Add Buff Options info/file
2022-01-27 13:59:41 -08:00
github-actions[bot]
e0645a071c
Format Rust code using rustfmt 2021-12-27 21:14:24 +00:00
GradualSyrup
b4d5afd791
Bugfix: Ice Climbers savestates (#294)
* Fix working in frame by frame. Debug commands still present.

* Save States and Menu Delay fixed

* Full basic save state functionality, Debug removed

* NanaPosMove cleanup
2021-12-26 15:28:22 -08:00
GradualSyrup
6f6ce58a88
Throw options (#293)
* Initial Creation

* Initial attempt, no pummeling or actual throw directions implemented

* All throw directions + Throw Delay working

* Medium Delay

* Cleanup and warning fixing

* Menu grammar fix

* Menu Images

* Image Fix and Language Fix

* Renormalize line endings

* Fixed into_string() vs. as_str()

* Update README

* Update Version

* Update to 3.2.0

* Update Cargo.toml

Corrected version number
2021-12-26 10:07:17 -08:00
asimon-1
f9522d2699
Bugfix: PT savestates (#292)
* Prevent PT from respawning twice during save_state loads

* Save fighter_kind in state

* Fix bug where save states might not be loaded immediately if ptrainer status was wait

* Avoid endless loop with PT if loading a save state which was set without PT

* Move is_dead to common::mod.rs
2021-12-23 20:46:17 -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
jam1garner
9d1d2ca76b
Common module cleanup (#290)
* Cleanup src/common/consts.rs

* Cleanup src/common/events.rs

* Cleanup src/common/menu.rs

* Cleanup src/common/mod.rs

* Cleanup src/common/raygun_printer.rs

* Finish cleanup for common module
2021-12-19 13:03:44 -08:00
asimon-1
195e52dad7
Remove tumble from statuses on is_in_hitstun (#284) 2021-11-10 14:55:04 -08:00
jugeeya
b52a956f61
Enable save states toggle (#276)
* enable save state toggle

* update version to beta version

* fix

* fix 2

* Add icon
2021-09-29 08:37:11 -07: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
b454ffecfe
Fix Frame Advantage stuck at zero (#251)
* change init function

* Use menu::init
2021-09-01 10:40:08 -07:00
asimon-1
3fef1a78df
Restrict menu opening multiple times in rapid succession (#245)
Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-08-27 16:38:23 -07:00
jugeeya
c82cd073f4 Revert "Blujay's visualizer"
This reverts commit f8dba57044.
2021-08-24 19:27:29 -07:00
asimon-1
ee56f99652 Change menu file name to training_menu.html (#239)
Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-08-24 19:27:04 -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
asimon-1
516c85ec30
Menu help text (#234)
* Add footer with help text

* Set help text strings

Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-08-17 16:43:01 -07:00
jugeeya
841ea5e8fe
Single Option Menu (#231)
* add flag

* Update clickToggle() to handle single-option submenus (#232)

Co-authored-by: asimon-1 <asimon1@protonmail.com>

Co-authored-by: asimon-1 <40246417+asimon-1@users.noreply.github.com>
Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-08-16 17:09:51 -07:00
jugeeya
a4533a4810
Inclusive range for alphabet 2021-08-16 17:05:52 -07:00
jugeeya
40a5a08754 add simple macros for onoff/single option menus 2021-08-16 13:48:58 -07:00
jugeeya
6ffec53204
Remove threading from file write (#226) 2021-08-16 09:35:11 -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