maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6776 commits 10 branches 35 tags 1.1 GiB
Commit graph

6776 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rémi Verschelde 9f0e38cca8 openssl: Update to pristine 1.0.2o (security update) 2018-07-27 16:39:39 +02:00
Rémi Verschelde 96e5d9430b libogg: Update to pristine version 1.3.3 
(cherry picked from commit de0b31edd5)
 2018-07-27 16:04:34 +02:00
Rémi Verschelde 849ff42496 Add check to clang 6.0 compiler bug workaround 
Extending on b68222e4e7 to ensure that it still
has the exact same behaviour as the previous code, as discussed with @hpvb.

(cherry picked from commit 03e11c13bf)
 2018-07-26 17:25:55 +02:00
Rémi Verschelde 077f28b146 Travis: Fix clang-format version 2018-07-19 09:59:30 +02:00
Rémi Verschelde bb13fa896e Style: Format code with clang-format 6.0.1 2018-07-18 17:56:12 +02:00
Rémi Verschelde 792a0cdb53 Travis: Update style checks to clang-format 6.0.1 2018-07-18 17:48:28 +02:00
Rémi Verschelde a533dd99e6
Merge pull request #20239 from bojidar-bg/18216-fix-color-crash-2.1 
Fix crash when deallocating named colors map
 2018-07-18 11:07:48 +02:00
Rémi Verschelde 67f1113ba4 doc: Sync classref with current source 2018-07-18 11:04:13 +02:00
Bojidar Marinov 7a4b8c82f9
Fix crash when deallocating named colors map 
Fixes #18216
 2018-07-18 11:36:43 +03:00
Rémi Verschelde 8e4836f1e3 Update AUTHORS and DONORS list 
New contributor added to AUTHORS:
@JFonS
Also updated alphabetically sorting with `sort -d`.

Thanks to all contributors and donors for making Godot possible!

[ci skip]

(cherry picked from commit b631306de1)
 2018-07-18 10:32:32 +02:00
Rémi Verschelde d67894f664 Update AUTHORS and DONORS list 
New contributors added to AUTHORS:
@Nallebeorn, @ibrahn, @KellyThomas, @ShyRed

Thanks to all contributors and donors for making Godot possible!

[ci skip]

(cherry picked from commit a18fe06773)
 2018-07-18 10:32:27 +02:00
Rémi Verschelde b812d6e182
Merge pull request #18039 from allkhor/2.1 
Added support for exclude folders from export [2.1]
 2018-07-17 13:50:52 +02:00
Rémi Verschelde 08f824243e
Merge pull request #20182 from allkhor/cherry_from_dcf5be92 
Make BaseButton not emit press when container is scrolled [2.1]
 2018-07-17 13:33:05 +02:00
allkhor 37c43154fe Make BaseButton not emit press when container is scrolled [2.1] 
This fixes the problem described in #13996 in a proper way.
This also adds "deadzone" property to ScrollContainer.
It can be usedon mobile, where taps are not as precise as mouse clicks.
Player couldslightly move their finger when tapping, in which case we still wantthe button to be pressed rather than the container to be scrolled.
(cherry picked from commit dcf5be9)
 2018-07-16 04:41:01 +06:00
Rémi Verschelde 241ca9624e
Merge pull request #20082 from hpvb/fix-android-export-2.1 
Write new permissions to the AndroidManifest.xml (2.1 version)
 2018-07-10 19:18:33 +02:00
Hein-Pieter van Braam a2cdc82b78 Write new permissions to the AndroidManifest.xml 
Instead of editing the placeholder permissions actually write new ones.
This should solve the privacy statement problems for the Play store.
This means we also no longer need to placeholder permissions in the
template.
 2018-07-10 14:24:12 +02:00
George Marques 2f3d1c8c8e
Fix WinRT build with recent Windows SDK 2018-07-10 02:49:39 -03:00
bruvzg d1869b37a3 Workaround for clang 6 bug. 
(cherry picked from commit b68222e4e7)
 2018-07-02 15:05:45 +02:00
Rémi Verschelde e3339862f2 iphone: Link against SDK version 11.4 
Fixes #18995.
 2018-06-28 11:31:02 +02:00
Rémi Verschelde ea0c33eb53
Merge pull request #19810 from eska014/2.1-fixbuild 
Explicitly disable WebAssembly in HTML5 builds
 2018-06-27 20:30:12 +02:00
Leon Krause aff7a92efa Explicitly disable WebAssembly in HTML5 builds 
Emscripten enables WebAssembly by default since version 1.38.1
 2018-06-27 20:06:11 +02:00
Rémi Verschelde 853c8e8110
Merge pull request #19697 from rraallvv/nocache_gen_2.1 
Add NoCache wrapper to Command (2.1)
 2018-06-22 09:45:08 +02:00
Rhody Lugo 57ae75876f add NoCache wrapper to Command 2018-06-21 03:40:24 -04:00
Rémi Verschelde 43f62a2c2a
Merge pull request #19557 from akien-mga/2to3-exporter 
2to3 exporter: Fixes to InputEvent conversion and reduce log spam
 2018-06-14 13:12:57 +02:00
Rémi Verschelde d739e25650 2to3 exporter: Make conversion less spammy 
Also fix logic bug in transform/rot conversion.
In my tests it seems like it was not actually misbehaving,
but the logic was wrong for tracks with ID > 9.
 2018-06-14 12:37:38 +02:00
Rémi Verschelde 01ebe9ae65 2to3 exporter: Improve conversion of InputEvents in code 2018-06-14 12:37:38 +02:00
Rémi Verschelde 4f11c2bf1e
Merge pull request #19556 from Keetz/2to3Improvements 
2to3 exporter: Improved BaseButton and Focus Mode conversion
 2018-06-14 12:29:56 +02:00
Rasmus Ketelsen 7326c7f64b 2to3 exporter: Improved BaseButton and Focus Mode conversion 2018-06-14 12:22:24 +02:00
Rémi Verschelde 23a8f61096
Merge pull request #19215 from volzhs/fix-toggle-visibility-2.1 
Respect visibility change by Scene dock when using Sync Scene Changes (2.1)
 2018-05-28 12:35:39 +02:00
Rémi Verschelde ab52ebb326
Merge pull request #19184 from guilhermefelipecgs/fix_memory_leak_2.1 
[2.1] Fix memory leak in set_custom_mouse_cursor
 2018-05-28 11:21:15 +02:00
volzhs 4833cfd549 Respect visibility change by Scene dock when using Sync Scene Changes 2018-05-28 15:18:43 +09:00
Guilherme Felipe dda8937ef3 Fix memory leak in set_custom_mouse_cursor 2018-05-26 15:55:57 -03:00
Rémi Verschelde 2f56eb9bb8
Merge pull request #19155 from dlnsk/version_code_range 
Increase versionCode range
 2018-05-25 17:52:11 +02:00
Rémi Verschelde b00f8dc35b Travis: Sync with master branch 
(Re)adds builds for osx, iphone, server and X11 template.
 2018-05-25 12:25:32 +02:00
Rémi Verschelde 363497a30d iOS: Change min version to 9.0 as required by Apple 
Should fix #18995.
 2018-05-25 12:20:12 +02:00
Rémi Verschelde 2ea63bc581
Merge pull request #19083 from xsellier/bugfix/print-error-less-hardcore 
Allow users to catch errors for android platforms and prevent exception throwing
 2018-05-25 10:19:40 +02:00
Dmitry Pupinin 0f0b968d5d Increase versionCode range 2018-05-25 10:01:03 +07:00
Xavier Sellier 6fc89d0ce3 Allow users to catch errors for android platforms and prevent exception throwing 2018-05-21 11:39:40 -04:00
Rémi Verschelde 8ddf0c62ba
Merge pull request #18979 from xsellier/bugfix/payment-manager-query-sku 
Querying sku might lead to crash if 'mService' is null
 2018-05-17 23:19:17 +02:00
Xavier Sellier ac49392627 Querying sku might lead to crash if 'mService' is null 2018-05-17 14:06:50 -04:00
Rémi Verschelde 7c8849f4e9 Fix scons installation on AppVeyor 
Seems like AppVeyor just upgraded pip and finally removed the
deprecated --egg switch.

(cherry picked from commit 79e76d8329)
 2018-05-16 23:08:45 +02:00
Rémi Verschelde 4fade6fa00 Android: Bump ndk platform to android-18 as in manifest 2018-05-16 20:19:03 +02:00
Rémi Verschelde a3bceeee87 Sync AUTHORS and DONORS file with master branch 
The new authors were not necessarily involved in the maintenance
of the 2.1 branch, but they matter to the project nevertheless :)

The donors are added for the sake of documentation, but not listed
in the About dialog of the editor for now (the feature parsing that
file to generate this content was not backported to the 2.1 branch).
 2018-05-16 18:36:12 +02:00
Rémi Verschelde f197685753 Revert Parallax fixes from #12709 and #16795. 
This reverts commits f5b6bfbbd1 and afccc72be3.

Reason: These commits seem to have caused a regression (#17764), so reverting
for now to get back to the same state as in 2.1.4-stable until a better
variant can be worked on and merged for 2.1.6.

Fixes #17764.
 2018-05-16 18:22:33 +02:00
Rémi Verschelde e5c2f88541
Merge pull request #18902 from volzhs/minizip-1.2.11-2.1 
Update minizip to 1.2.11 (2.1)
 2018-05-16 18:13:24 +02:00
Rémi Verschelde b9d3926340
Merge pull request #18896 from volzhs/libwebp-1.0.0-2.1 
Update libwebp to 1.0.0 (2.1)
 2018-05-16 02:30:34 +02:00
volzhs 26e0dddb6c Update minizip to 1.2.11 2018-05-16 02:21:37 +09:00
volzhs cf4fdd70f1 Update libwebp to 1.0.0 2018-05-16 00:57:20 +09:00
Rémi Verschelde 40e24050c9
Merge pull request #18887 from dns/2.1 
Fix Godot-2.1 build error on VS2013, use integer as argument for set_input_buffer_max_size()
 2018-05-15 15:24:01 +02:00
dns fd55fd8961 return integer for set_output_buffer_max_size() & set_input_buffer_max_size(int) 2018-05-15 19:11:23 +07:00