Merge upstream at v1.60 #4
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # imgui.cpp
Examples: Apple: Fix iOS code; fixes entire XCode build for Apple example
# Conflicts: # imgui.cpp
…), messed up original commit badly.
# Conflicts: # imgui.cpp
… little agressive but probably the best default and also a good way to get feedback. Added ImGuiNavFlags_NoCaptureKeyboard to disable this behavior. Comments. (ocornut#787)
…iently use along with NavActivateDownId.
… to cross Cross/Space. (ocornut#787)
…yboard weirdness.
…Frequency() to handle framerate over 1000 fps properly. Noticed bad inputs artefacts in Nav branch at 2000 fps without this. (ocornut#996)
… to warn against explicit C-style casts now.
…od behavior. Unfortunately the old stb_ decompress code is a little const clunky. + warning fix in stb_textedit which is already in master afaik.
…imply it could be -1. Tweaked comments.
…fixes SetNextWindowPos() given a non-zero pivot. (ocornut#1694)
…CursorChange. Followup to 75c3793 two weeks ago. (ocornut#787, ocornut#1495, ocornut#1202) + comments
…. Moved settings saving higher up in the function so it is next to its peers.
…ureFlags() which can be of use with touch-based inputs systems.
…hat was left in DX10 example but removed in 1.47 (Nov 2015) in every other back-ends. (fixes 6cee2fc) (ocornut#1733, ~ocornut#1731) + assert
|
Does this need to be coordinated with engineers-nightmare#585 or can it land early? |
|
ehhh, it can go early if you don't update your submodules. So, probably no. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.