Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improved combination input UI, OWML config menu, refactoring of menu code #174

Merged
merged 46 commits into from
Jul 14, 2020

Conversation

amazingalek
Copy link
Collaborator

@amazingalek amazingalek commented Jul 11, 2020

This needs a lot of testing...

Raicuparta and others added 23 commits July 2, 2020 23:41
Revert "Launch game with OpenVR flag if VR is required"
* moved CommandLineArguments.cs to ModHelper
* common base class for ModButton and ModLayoutButton
* sharing methods for adding and getting buttons
* added command to event signatures
* made it possible to assign multiple commands

Co-authored-by: Aleksandr <[email protected]>
* cleanup up base config menu
* introduced default config for owml
* common base class for ModConfigMenu and OwmlConfigMenu. removes hacky code (#153)
* creating config file from default if missing
* implemented menus for setting input combinations

* Changed behaviour of combination collision checking, now it works a bit better

* Made most GetComponentInChildren check inactive objects

* gotta block next OnRelease as a preparation for some stuff switching to OnNewlyReleased

Co-authored-by: Ricardo Lopes <[email protected]>
Co-authored-by: AmazingAlek <[email protected]>
* added IsSelected to ModInput and ModButton

* added common parents where it made sense
* Implemented ModPromptButton
* gathered all file reading/writing to one place
@amazingalek
Copy link
Collaborator Author

image
👀

TAImatem and others added 6 commits July 12, 2020 12:20
* made PromptButton inherit TitleButton
changed some stuff in ModMenu to properly handle PromptButtons

* Alek's suggestions

* Alek's suggestion
fixed error from pipeline (there was GUID of TAIcheat still in there)
* made PromptButton inherit TitleButton
changed some stuff in ModMenu to properly handle PromptButtons

* Alek's suggestions

* Now Menus react to buttons a bit nicer :3

* Fixed some bugs I found while testing

* fixed incorrect merge
Alek's suggestion
currently looking at `using`s

* removed no longer needed `using`s in modified files
* Now ModPopupInputs properly react to buttons
* static GameObject -> Object (just to remove warnings)
@amazingalek amazingalek marked this pull request as ready for review July 12, 2020 18:57
* removed unnessessary property
@amazingalek
Copy link
Collaborator Author

Todo for release:

  • make a (draft?) release on GitHub for v 0.5.0, so that the build pipeline gets the correct version number.
    • first: disable the webhook that posts releases to Discord
  • make sure the correct files are copied to the ZIP in the build pipeline.
    • Check OWML.Config.json and OWML.DefaultConfig.json

@TAImatem
Copy link
Contributor

part 2 is done 😋

* sacrifice ControllerButton for a better code :P

Co-authored-by: AmazingAlek <[email protected]>
TAImatem and others added 11 commits July 13, 2020 02:40
* added `A` binding

Co-authored-by: AmazingAlek <[email protected]>
* fix conflicting bindings in Combination editor menu
* I hate it, but it works

Co-authored-by: Aleksander Waage <[email protected]>
* Fixed minor bug when registering game's bindings

* made it possible to have colliding combinations

* more graceful fail with invalid keys (shows empty keys in their place)

* more readable warnings

* just some stuff

Co-authored-by: Aleksander Waage <[email protected]>
…Properly

made sure PopupInput will be reselected after Popup gets closed
* Fix duplicate mod errors and fix dependency errors, simplified a lot of the dependency checking code
* removed a hack \o/
* Tai/fix combination menu (#202)
* CombinationMenu gets initialized only once (#203)

Co-authored-by: Aleksandr <[email protected]>
Copy link
Contributor

@TAImatem TAImatem left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

100 files tho

@amazingalek amazingalek merged commit e0f76eb into master Jul 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants