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.

Sign up for GitHub

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

Input Settings Menu #100

Merged
merged 14 commits into from
Jul 19, 2022
Merged

Input Settings Menu #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
caa4cf2
Split Main and Pause Menus Into Their Own Modules
zicklag Jul 13, 2022
39864b3
Add Doc Comment
zicklag Jul 13, 2022
29c4271
Establish Basic Settings Menu Structure
zicklag Jul 14, 2022
b1d97fd
Refactor Input System
zicklag Jul 15, 2022
3b34b39
Add UI Widget Adjacency System
zicklag Jul 15, 2022
e98840f
Almost Functional Input Bindings!
zicklag Jul 16, 2022
43e1a06
Finish Implementing Input Settings Menu
zicklag Jul 16, 2022
c1057b5
Update Button Adjacencies and Hide Sound Tab
zicklag Jul 17, 2022
1dd462b
Tweak Input Binding Verbiage
zicklag Jul 17, 2022
b923b47
Only Focus Buttons When Mouse Hovers _and_ Moves
zicklag Jul 17, 2022
47ba38a
Hide the Quit Button on Web Builds
zicklag Jul 17, 2022
21fb9a8
Remove Unneeded Input Toggle Resource
zicklag Jul 17, 2022
fd0716e
Add Comments, Improve Style, Remove Unneeded Code
zicklag Jul 17, 2022
59b9191
Fix Spelling Mistakes
zicklag Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ anyhow = "1.0.58"
bevy = "0.7.0"
bevy-parallax = "0.1.2"
bevy_egui = "0.14"
egui_extras = "0.18.0"
bevy_kira_audio = { version = "0.10.0", features = ["mp3"] }
bevy_rapier2d = { version = "0.14.1", features = ["debug-render"] }
iyes_loopless = "0.6.1"
Expand All @@ -22,7 +23,7 @@ getrandom = { version = "0.2", features = ["js"] }
bevy_mod_debugdump = { version = "0.4", optional = true }
bevy-inspector-egui = { version = "0.11", optional = true }
bevy-inspector-egui-rapier = { version = "0.4", optional = true, features = ["rapier2d"] }
leafwing_input_manager = { git = "https://github.com/Leafwing-Studios/leafwing-input-manager.git", rev = "e8bd6e0" }
leafwing_input_manager = { git = "https://github.com/zicklag/leafwing-input-manager.git", branch = "backport-leafwing-dev-to-bevy-0.7" }
Copy link
Member Author

@zicklag zicklag Jul 17, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Note: Because I had to make a fix to leafwing, and they've already migrated to the pending bevy 0.8, there's no way around using my temporary fork for this anymore. I think we'll just have to wait 'till we migrate to Bevy 0.8 to switch this to a more permanent release.

To get my fix in, I had to apply it to their latest dev branch, then backport the dev branch to Bevy 0.7.

unic-langid = "0.9.0"
bevy_fluent = { git = "https://github.com/kgv/bevy_fluent", rev = "d41f514" }
sys-locale = "0.2.1"
Expand Down
Loading