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

tracking master #5

Merged
merged 166 commits into from
Oct 14, 2017
Merged

tracking master #5

merged 166 commits into from
Oct 14, 2017

Conversation

hungrymonkey
Copy link
Collaborator

this pull request is just to track master.

there where decent fixes upstream.

AndreaCatania and others added 30 commits September 29, 2017 17:33
includes rebase and manual application 67a706f and 4537977
 - Dispatch input immediately as it comes, instead of delaying it to the
   next step().

 - Fix text box input handling when caret is at the middle of the text.

 - Minimize queueEvent calls on Java side.
RotatedFileLogger needs data_dir on iOS to be initialized, so setting
data_dir has been moved to initialize_core.
EditorProgress calls Main::iteration which calls MessageQueue::flush
which may result in _fs_changed being called again. This fixes the loop
Godot enters in such case.

Fixes godotengine#11189
Needed by properties that share set/get functions. Fixes godotengine#10329.
Fix exporting projects with custom input event actions
- Fix boolean never reset to false
- Fix IntPtr unboxing and cleanup
[GDnative] fix crash at cleanup time when singleton_gdnatives is not empty
BastiaanOlij and others added 29 commits October 13, 2017 21:54
…docs

Move GDNative docs into gdnative folder

[ci skip]
Prevent a possible crash at collision_object_2d_sw.h
...making it consistent with official docs
EditorHelp: use '<' to show inheritance

[ci skip]
…cript

removed GDNativeClass doc from GDNative module

[ci skip]
[DOCS] TabContainer class descriptions
Redoing the ARVR GDNative interface as module and tighter implementation
[DOCS] Small edits to ConfigFile docs.

[ci skip]
Added and improved some missing icons, plus some other visual fixes.
Added error dialog when failing to export project
…ck-ggx

Fix render mode specular schlick ggx
Previous code expected only one XML per module, which is not the case for
e.g. mono or gdnative.
Also add newline after signal description to fix rst warning, and make the
script Python 3-compatible.

[ci skip]
…awn_callback

Expose 'request_frame_drawn_callback' to script.
@hungrymonkey hungrymonkey merged commit 908d148 into jcalifornia:master Oct 14, 2017
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.