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

6807 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Rémi Verschelde
1bf7242bb2
Merge pull request #18718 from guilhermefelipecgs/fix_crash_for_invalid_reference 
[2.1] Prevent crash for invalid reference
 2018-05-11 14:23:49 +02:00
Rémi Verschelde
772bd11eaf
Merge pull request #18725 from volzhs/remove-legacy-2.1 
Remove android compatibility under API 16 (2.1)
 2018-05-08 23:49:47 +02:00
volzhs
ede27690c3 Remove android compatibility under API 16 2018-05-09 05:43:53 +09:00
volzhs
b21872cba7 Update min API version to 18 to match 4ad02579 2018-05-09 05:06:40 +09:00
Guilherme Felipe
2f823eb6a7 Prevent crash for invalid reference 2018-05-08 15:13:32 +00:00
Rémi Verschelde
326fd3503a
Merge pull request #18626 from RameshRavone/2.1 
Fix: JAR files signed with the MD5 algorithm as unsigned (godot 2)
 2018-05-08 15:26:02 +02:00
RameshRavone
4ad02579e6
Android: Raise min API version to 18 2018-05-08 16:18:52 +05:30
Rémi Verschelde
2f0d502919
Merge pull request #18696 from xsellier/bugfix/purchase-check-is-connected 
Add a check to the PurchaseTask.purchase method to prevent NullPointe…
 2018-05-08 11:17:12 +02:00
Rémi Verschelde
d72c6c04f7
Merge pull request #18426 from xsellier/feature/64-bits-android 
Add support for ARMv8 (64-bit) on Android
 2018-05-08 10:52:30 +02:00
Xavier Sellier
9efd5de872 Add a check to the PurchaseTask.purchase method to prevent NullPointerException 2018-05-07 20:54:52 -04:00
RameshRavone
38b5679c49
Fix JAR files signed with the MD5 algorithm are not supported 2018-05-07 21:17:59 +05:30
Juan Linietsky
356c1381b5
Merge pull request #18644 from xsellier/bugfix/no-stacktract-on-android 
Android - Crash log misses file name, function name, line number and details
 2018-05-07 12:12:40 -03:00
Juan Linietsky
6cdaa2c6c7
Merge pull request #18623 from xsellier/bugfix/unbind-service-crash 
Closing the app might lead to a crash due to an IllegalArgumentException
 2018-05-07 11:57:17 -03:00
Xavier Sellier
d832a5bfbb Add a stacktrace when there is a script error or an error from godot engine 2018-05-05 15:18:52 -04:00
Xavier Sellier
b6a2d5f508 Closing the app might lead to a crash due to an IllegalArgumentException 2018-05-04 23:11:16 -04:00
Rémi Verschelde
f8c36e2266
Merge pull request #18585 from avril-gh/fixes---18539---compile-under-windows 
Fixes - 18539 - compile under windows
 2018-05-03 13:23:42 +02:00
Avril
e6fd214131 fixes 18539 compile under windows 2018-05-03 13:00:30 +02:00
Rémi Verschelde
d156b635af
Merge pull request #18487 from xsellier/bugfix/refactor-payments-manager 
Refactor PaymentsManager according to Google's guidelines
 2018-05-02 09:08:34 +02:00
Rémi Verschelde
7cb027d071
Merge pull request #18362 from guilhermefelipecgs/support_for_atlas_tex_on_cursor 
Add support for atlas texture on set_custom_mouse_cursor
 2018-05-01 10:01:25 +02:00