mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-09 10:09:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,102 Commits 15 Branches 59 Tags 8.1 GiB
eb8d181cb2
Commit Graph

23102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Verschelde
eb8d181cb2 Android: Sync Google billing library with upstream, unmodified 
Synced with 7a94c6905a.
 2019-08-27 15:15:37 +02:00
Rémi Verschelde
bd9f6c23cb Style: Don't apply clang-format to platform/android/java/src/com 2019-08-27 14:33:41 +02:00
Rémi Verschelde
472d10a0ad Android: Reapply custom changes to Google expansion.downloader lib 
I don't know why they're needed, but readding for now to keep things
working as they were.
 2019-08-27 14:30:14 +02:00
Rémi Verschelde
ee5898f58a Android: Resync Google expansion.downloader library with upstream, unmodified 
Synced with 9ecf54e5ce.
 2019-08-27 14:10:31 +02:00
Rémi Verschelde
ce60217894 Android: Reapply changes to Google licensing lib from #24145 
But document them better this time.
 2019-08-27 14:10:30 +02:00
Rémi Verschelde
6f0367052a Android: Resync Google licensing lib with upstream, unmodified 
It had been synced with style changes (spaces -> tabs), not sure why
I accepted to merge it this way back then...

Synced with eb57657f66,
same as before.

Custom-changes will be reapplied in the next commit, if relevant.
 2019-08-27 13:44:16 +02:00
Rémi Verschelde
071ebb1e48 Android: Fix another regression with Secure.ANDROID_ID 
Regression from #24145, which was missed in #28146.
 2019-08-27 13:44:07 +02:00
Rémi Verschelde
6cd00432c3
Merge pull request #31702 from akien-mga/android-gradle-5.1.1 
Android: Bump gradle version to 5.1.1
 2019-08-27 11:15:59 +02:00
Rémi Verschelde
70047745f1
Merge pull request #31701 from akien-mga/sdl-controllerdb 
Sync controller mappings DB with SDL2 community repo
 2019-08-27 11:15:46 +02:00
Rémi Verschelde
1afd77e375 Android: Bump gradle version to 5.1.1 
Matching changes made in #31521 and #31547 but only in the Jetbrains
IDE config.
 2019-08-27 10:22:05 +02:00
Rémi Verschelde
9ceab52892 Sync controller mappings DB with SDL2 community repo 
Synced with gabomdq/SDL_GameControllerDB@ef8542c9f3.
 2019-08-27 10:13:05 +02:00
Rémi Verschelde
6b7117ce3f
Merge pull request #31662 from profan/perf/astar-reserve 
Allow to reserve space for nodes in A* and elements in OAHashMap explicitly.
 2019-08-27 10:09:08 +02:00
Rémi Verschelde
839590302f
Merge pull request #31700 from akien-mga/mono-osx-fix-build 
Mono: Fix OSX build due to invalid function call
 2019-08-27 10:06:12 +02:00
Rémi Verschelde
92ead83913 Mono: Fix OSX build due to invalid function call 2019-08-27 09:48:54 +02:00
Rémi Verschelde
9650531bc5
Merge pull request #31685 from merumelu/referencerect-with-advanced-gui-disabled 
Register ReferenceRect when building with ADVANCED_GUI_DISABLED
 2019-08-27 08:22:49 +02:00
Rémi Verschelde
91cfe7a227
Merge pull request #31691 from m4gr3d/fix_oculus_mobile_input_mapping 
Update the fallback input mapping for the Oculus mobile devices.
 2019-08-27 08:16:19 +02:00
fhuya
5eaaabceaf Update the fallback input mapping for the Oculus mobile devices. 2019-08-26 18:48:54 -07:00
Robin Hübner
1031833fb0
allow to reserve space in OAHashMap explicitly and also in AStar. 
* also handle overflow occurring in _get_probe_length
 2019-08-27 00:38:35 +02:00
Rémi Verschelde
2f63811c9a
Merge pull request #25656 from bruvzg/macos_multi_instances 
[macOS] Add ability to open multiple editor instances and global/dock menu access
 2019-08-26 22:04:37 +02:00
Rémi Verschelde
2b202f3dd0
Merge pull request #31659 from Klesomik/master 
Fix memory leak in Find in Files
 2019-08-26 22:03:44 +02:00
Rémi Verschelde
5883f912b3
Merge pull request #31676 from KoBeWi/this_shader_is_a_history 
Clear undo history on shader load
 2019-08-26 22:02:53 +02:00
Rémi Verschelde
1919a5cb83
Merge pull request #31684 from YeldhamDev/multiline_text_array_fix 
Fix Multiline texts not updating correcly inside arrays
 2019-08-26 22:00:53 +02:00
Rémi Verschelde
6185976372
Merge pull request #31681 from Xrayez/image-indexed-outdated 
Modify outdated comments and error messages regarding indexed images
 2019-08-26 21:59:07 +02:00
Rémi Verschelde
1cea44de19
Merge pull request #31607 from Calinou/improve-gdscript-messages 
Improve writing style in GDScript error/warning messages
 2019-08-26 21:58:33 +02:00
Klesomik
d3c879fe1b Memory leak fixed 
In some functions in editor/find_in_files.cpp was detected a memory leak
DirAccess* and FileAccess* were replaced by DirAccessRef and FileAccessRef
DirAccessRef and FileAccessRef are just wrappers for DirAccess* and FileAccess*

Fixes for issue #31659
 2019-08-26 20:48:10 +03:00
merumelu
32ae896eef Register ReferenceRect when building with ADVANCED_GUI_DISABLED 2019-08-26 19:47:24 +02:00
Michael Alexsander Silva Dias
9c36d893e3 Fix Multiline texts not updating correcly inside arrays 2019-08-26 13:47:33 -03:00
Ignacio Roldán Etcheverry
be99e7b68f
Merge pull request #31680 from neikeq/fix-android-gen-sources 
Fix 'android_mono_config.gen.cpp' not compiled first time it's generated
 2019-08-26 18:28:12 +02:00
Ignacio Etcheverry
aa805e2699 Fix 'android_mono_config.gen.cpp' not compiled first time it's generated 2019-08-26 17:46:57 +02:00
Andrii Doroshenko (Xrayez)
c362527cb5 Modify outdated comments and error messages regarding indexed images 
Godot doesn't support indexed images anymore (FORMAT_INDEXED),
so those are removed to avoid any confusion.
 2019-08-26 18:21:19 +03:00
Rémi Verschelde
bf8322376c
Merge pull request #31674 from dankan1890/drag&drop_tileset 
Added drag and drop to the tileset plugin.
 2019-08-26 15:50:25 +02:00
bruvzg
db6d4352ea
[macOS] Add methods to modify global and dock menus. Add ability to open multiple editor/project manager instances, recent/favourite project list to project manager dock menu and opened scene list to editor dock menu. 2019-08-26 16:45:49 +03:00
Tomasz Chabora
766b27662a Clear undo history on shader load 2019-08-26 15:15:29 +02:00
Rémi Verschelde
4b53fdb25d
Merge pull request #31481 from Calinou/generate-gdnative-use-gles2 
Always use the GLES2 backend when generating the GDNative API JSON
 2019-08-26 14:05:20 +02:00
Rémi Verschelde
816ddd7817
Merge pull request #31556 from Chaosus/gles2_inverse 
Implemented inverse shader function to GLES2
 2019-08-26 13:52:03 +02:00
Rémi Verschelde
1222df0ad0
Merge pull request #31585 from 2shady4u/removeguides 
Added button/shortcut for removing all guides
 2019-08-26 13:51:10 +02:00
Rémi Verschelde
f6984e8058
Merge pull request #31615 from Calinou/assetlib-improve-loading 
Improve loading UX in the asset library
 2019-08-26 12:05:11 +02:00
dankan1890
1f560c4679 Added drag and drop to the tileset plugin. 2019-08-26 11:15:19 +02:00
Rémi Verschelde
57afa90f0c
Merge pull request #31652 from Calinou/csharp-alpha-dialog-android 
Mention Android support in the C# alpha dialog message
 2019-08-26 10:18:27 +02:00
Rémi Verschelde
0985d5fa99
Merge pull request #31496 from nekomatata/fix-text-edit-insert-selection 
Update TextEdit selection when inserting line
 2019-08-25 22:33:23 +02:00
Rémi Verschelde
41b5c62952
Merge pull request #31654 from Paulb23/minimap_fixes 
Viewport highlight, colour cache and minimap scrolling fixes.
 2019-08-25 22:32:05 +02:00
Ignacio Roldán Etcheverry
6d6d437146
Merge pull request #31653 from neikeq/enforce-cs7.0-in-csproj 
Set C# 7 as LangVersion for GodotTools and Godot API projects
 2019-08-25 16:58:36 +02:00
Ignacio Etcheverry
3af8bd071e Set C# 7 as LangVersion for GodotTools and Godot API projects 
This will make it harder for someone to accidentally commit code that requires a newer version.
 2019-08-25 15:53:47 +02:00
Paulb23
32d5427f55 Refactor TextEdit control height calculations 2019-08-25 14:49:13 +01:00
PouleyKetchoupp
bc839ed3f3 Update TextEdit selection & cursor when inserting line 
Fixes #31458
 2019-08-25 15:43:45 +02:00
Paulb23
c5b5c6b49b Minimap scroll now acts similar to scrollbar 2019-08-25 14:43:11 +01:00
Hugo Locurcio
27f5ab2d7b
Mention Android support in the C# alpha dialog message 2019-08-25 15:08:32 +02:00
Rémi Verschelde
360d0bb6a3
Merge pull request #31649 from exts/revert_notifyawaiter 
reverted NotifyAwaiter<T> Reset() to support c#7.0
 2019-08-25 14:26:30 +02:00
Yuri Roubinsky
14b173d0d9
Merge pull request #31650 from Chaosus/fix_shader_hint_range 
Fix hint range step for integer in shaders
 2019-08-25 15:21:56 +03:00
Yuri Roubinski
982becfa39 Fix hint range step for integer in shaders 2019-08-25 15:11:04 +03:00