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

RC 1 of Hotkeys #1

Merged
merged 7 commits into from
Oct 18, 2021
Merged

Conversation

zaknafean
Copy link
Owner

Release Candidate for hotkey upgrade

Jowan-Spooner and others added 7 commits October 17, 2021 20:23
* Fixed Dependecies

I moved some scenes in the last minute. Stupid me. I hope it is fixed now.

* Revert "Fixed Dependecies"

This reverts commit 9e7bcd8.

* Auto stash before merge of "main" and "upstream/main"

* Update Changelog

To contain the changes I made during the last week.

* Revert "Auto stash before merge of "main" and "upstream/main""

This reverts commit 8e1699d.

* Add the new styles to the remaining pickers

TimelinePicker, ThemePicker, OperationPicker, GlossaryPicker. It also removes the [] around the items, except for the operation picker. I wasn't sure if it wouldn't make readability harder having three similar buttons next to each other, so I kept the [] there. 

And it adds a "Bus:" label to the AudioPicker, because I thought it would make it cleaner.

* Cleanup and Simplification of the MasterTree.gd

* Auto stash before merge of "main" and "upstream/main"

* Remove more Engine.get_singleton()'s

:(

* Make the DocsTreeHelper ignore the mouse

It was blocking a small part of the MasterTree. This should fix #414

* VoiceSupport Feature Fix: Make sure no default bus is needed

There was a little annyoing warning popping up a lot.

* Small Documentation fix

* Add event documentation

Adds a basic documentation of
- Leave Event
- Question Event
- Choice Event
- End Event
- Condition Event
- Set Value Event

* Add the new documentations to the events

You now have these little buttons on the right of the events that instantly lead to the documentation.

* Test of Anchor and GoTo events

* Check for complete dialogic_state information in start_from_save

Apparently you can manage to save dialog_data that is empty. Maybe it has to do with the Autosave on timeline end? Need to investigate this. But this thing adds a check if the data is valid.

* Changing the start_from_save function once again

You now need to have "/" if you want to use the currently loaded state (mostly after importing). 
Lot's of more checks added.

* Fixing Timeline Editor merge issues

* Small update fixes

As always, the easiest way to handle merge conflicts for me is just to redo some parts of the code.

* renaming the anchor to label, adding icons, updating timeline editor buttons

Co-authored-by: Emilio Coppola <coppolaemilio@gmail.com>
…ng the Dialogic.get_action_button() function
@zaknafean zaknafean merged commit 893582c into zaknafean:hotkey-support-#577 Oct 18, 2021
zaknafean pushed a commit that referenced this pull request Jun 27, 2023
zaknafean pushed a commit that referenced this pull request Dec 4, 2023
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