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

7428 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zaven Muradyan
f460f82ec1 Fix moving path controls in edit mode. 
The previous code would never trigger the subsequent conditionals (for
moving the control points) when in EDIT_MODE because the point
conditionals were nested instead of being a conjunction.
 2017-05-27 18:47:45 -07:00
Pedro J. Estébanez
854b3cc158 Improve/harmonize mobile builds 2017-05-27 23:26:59 +02:00
Rémi Verschelde
1525071c28 Merge pull request #8960 from akien-mga/openssl-1.0.2l 
OpenSSL: Cleanup and document update process from upstream sources + 1.0.2l
 2017-05-27 19:51:04 +02:00
Rémi Verschelde
67305d1b0a openssl: Sync with upstream 1.0.2l 2017-05-27 19:08:07 +02:00
Rémi Verschelde
996f1ae29e openssl: Reapply necessary UWP changes from patch 2017-05-27 19:08:07 +02:00
Rémi Verschelde
c1b0662b40 openssl: Define WIN32_LEAN_AND_MEAN on Windows 
This avoids namespace collisions with things such as X509_NAME.
Also force include of necessary definitions in `crypto/o_str.c`
which seem missing on MSVC (but work on MinGW).
 2017-05-27 19:08:03 +02:00
Rémi Verschelde
cb0f771aaa openssl: Sync with pristine upstream 1.0.2h 
Our necessary custom changes will be reapplied in later commits for clarity,
and saved as patches for future updates.
 2017-05-27 15:45:25 +02:00
Rémi Verschelde
022541d917 openssl: Document update process and delete unused files 2017-05-27 15:22:49 +02:00
Rémi Verschelde
ce8bf1592a TinyEXR: Document licensing and copyright 2017-05-27 13:41:18 +02:00
Rémi Verschelde
37f5e1dcd9 Fix MinGW-w64 build of TinyEXR for old toolchains 
MinGW-w64 is at version 2.0.1 on our current Travis CI toolchain, and seems
not to like fopen_s.
 2017-05-27 13:13:31 +02:00
Geequlim
b93fce1c18 Fix text warp in color blocks with CJK 
(cherry picked from commit cd778e00dc)
 2017-05-27 11:37:33 +02:00
Sean Bohan
cba62864c8 Fix item list scroll speed. 
Remove the extra `set_val` action after the proper one, so the right scroll value won’t get overrided any more.

(cherry picked from commit 064dce7a4c)
 2017-05-27 11:37:33 +02:00
Rémi Verschelde
d8381ef28f Merge pull request #8956 from mcanders/mcanders/ProfilerInputFix 
Fix incorrect input event reference in editor_profiler.cpp
 2017-05-27 11:36:54 +02:00
Rémi Verschelde
9130f0a89f Merge pull request #8955 from mcanders/mcanders/AnimationEditorInputFix 
Fix incorrect input event reference in animation_editor.cpp
 2017-05-27 11:35:48 +02:00
Rémi Verschelde
6a08833516 Merge pull request #8933 from Hinsbart/is_keyword 
GDScript: Use "is" keyword for type checking.
 2017-05-27 11:30:30 +02:00
Rémi Verschelde
168d8a57da Merge pull request #8942 from RandomShaper/warn-levels 
Rework warning levels
 2017-05-27 11:30:14 +02:00
Rémi Verschelde
378ebffb23 Merge pull request #8936 from Hinsbart/fix_action 
Fix InputEvent actions.
 2017-05-27 11:29:05 +02:00
Rémi Verschelde
96be464952 Merge pull request #8935 from volzhs/get-locale-master 
Make OS.get_locale() returns same value
 2017-05-27 11:27:39 +02:00
Rémi Verschelde
94edf16272 Merge pull request #8929 from nunodonato/themecolors 
Added color presets for easy theme switching
 2017-05-27 11:25:43 +02:00
Rémi Verschelde
2b25147450 Merge pull request #8928 from nunodonato/helpmenu 
Added an help menu
 2017-05-27 11:25:09 +02:00
Carter Anderson
49c00bd19b Fix incorrect input event reference in editor_profiler.cpp 2017-05-27 04:17:05 -05:00
Carter Anderson
3b05f2c74f Fix incorrect input event reference in animation_editor.cpp 2017-05-27 04:05:15 -05:00
Andreas Haas
015d36d18b
GDScript: Use "is" keyword for type checking. 
Replaces the `extends` keyword with `is` in the context of testing for type compatibility.
`extends` is still used for declaring class inheritance.

Example:

```gdscript
extends Node2D

func _input(ev):
	if ev is InputEventKey:
		print("yay, key event")
```
 2017-05-27 10:59:59 +02:00
Andreas Haas
3204befd1e
Fix InputEvent actions. 
The `InputEvent::is_action(pressed|released)` methods weren't implemented yet.
Also fixed a typo in `InputDefault` that prevented `Input.is_action(pressed|released)` from working.
 2017-05-27 10:52:57 +02:00
Juan Linietsky
f89641907f -Added EXR supprot for HDR (no BC6 compression yet though) 
-Improvements to texture importer
-Proper detection of S3TC compression modes, and added all modes to Image
-Fixes to non-power of 2 compressed textures, which should all be supported by GLES3
 2017-05-26 22:31:32 -03:00
Pedro J. Estébanez
d46e246d0f Rework warning levels 
Now you have: extra, all (the default), moderate, no.
The old 'yes' option is still supported, but a warning will be printed and 'all' will be assumed.

The different options will translate to the following:

MSVC:
extra -> /Wall (implies /W4)
all -> /W3 + disable non-essential (*)
moderate -> /W2 + disable non-essential (*)
no -> /w

GCC/Clang:
extra -> -Wall -Wextra
all -> -Wall
moderate -> -Wall -Wno-unused
no -> -w

* = Truncations, narrowing conversions...: /wd4267 /wd4244 /wd4305 /wd4800
 2017-05-27 02:30:27 +02:00
Rémi Verschelde
41918f328a Merge pull request #8939 from RandomShaper/ccflags-iphone 
Allow custom CCFLAGS for iPhone builds
 2017-05-27 00:48:57 +02:00
Pedro J. Estébanez
2a52e2b2f5 Allow custom CCFLAGS for iPhone builds 
plus disable exceptions by default
 2017-05-27 00:31:00 +02:00
volzhs
0627445863 Make OS.get_locale() returns same value 2017-05-27 03:50:22 +09:00
Nuno Donato
fa5aa11898 Added color presets for easy theme switching 
Also tweaked the default colors (darker and less satured)
 2017-05-26 17:16:15 +01:00
Nuno Donato
7661cb5a62 Added an help menu 
Also renamed the "tutorials" button in the script editor to be consistent with the help menu entry.
Fixed #8921
 2017-05-26 16:20:33 +01:00
Rémi Verschelde
8d92065164 Merge pull request #8916 from sanikoyes/Pr-fix_audio_stoped_iOS 
Fix audio can't resume in iOS platform
 2017-05-26 16:01:30 +02:00
Rémi Verschelde
755c07af19 Merge pull request #8923 from volzhs/fix-android-build-master 
Fix android build regression by be7ced4
 2017-05-26 16:00:53 +02:00
volzhs
781ca6773c Fix android build regression by be7ced4 2017-05-26 20:44:45 +09:00
sanikoyes
7d374b5974 Fixed audio can not resume if it is interrupted cause by an incoming phone call 2017-05-26 15:29:00 +08:00
Rémi Verschelde
ef66f8451c Merge pull request #8901 from tagcup/path_editor_plugin 
Revive PathEditorPlugin.
 2017-05-26 07:58:13 +02:00
Rémi Verschelde
d197cd4705 Merge pull request #8912 from RandomShaper/ios-alert 
Implement OS.alert() for iOS
 2017-05-26 07:56:22 +02:00
Andreas Haas
dbba433b69
Fix echo key event handling. 2017-05-25 23:01:45 +02:00
Andreas Haas
3744d9fd55
Fix virtual methods in InputEventKey. 
This fixes a lot of problems with key input in the engine.
 2017-05-25 21:56:54 +02:00
Juan Linietsky
7c89e00d46 Merge pull request #8590 from tagcup/s3tc_stuff 
Use libsquish to decompress DXT textures.
 2017-05-25 16:29:04 -03:00
Juan Linietsky
bf6380ee70 Removed skybox support, added panorama support. Skybox support may come back eventually, but hope not. 2017-05-25 14:00:43 -03:00
Pedro J. Estébanez
50f152575d Implement OS.alert() for iOS 2017-05-25 17:33:40 +02:00
Ferenc Arn
42de893f9a Applied clang-format. 
Since PathEditorPlugin was commented out, it didn't get clang-format'ed.
 2017-05-25 10:12:05 -05:00
Rémi Verschelde
7592c2380d Merge pull request #8898 from vnen/screentouch-struct-class 
Change InputEventScreenTouch from struct to class
 2017-05-25 08:40:27 +02:00
Rémi Verschelde
6a332b3575 Merge pull request #8895 from nunodonato/newdefaultcolors 
Improved default colors for the new theme
 2017-05-25 08:40:11 +02:00
Rémi Verschelde
cda7ced681 Merge pull request #8891 from nunodonato/newmenu 
Join text menus on the top-left, move shortcut buttons to new locations (Preliminary work towards achieving the changes discussed in #8865.)
 2017-05-25 08:39:19 +02:00
Rémi Verschelde
aa6e3af497 Merge pull request #8885 from capnm/fix-2d-editor-zoom 
Fix 2D-editor mouse wheel zoom for x11.
 2017-05-25 08:38:35 +02:00
Rémi Verschelde
aadeaae0b9 Merge pull request #8878 from BastiaanOlij/ios_make_arm64_default 
Make arm64 the default option and set minimum to iOS 9
 2017-05-25 08:38:07 +02:00
Rémi Verschelde
6d0809b095 Merge pull request #8869 from Hinsbart/errors 
Fix errors on engine startup.
 2017-05-25 08:37:48 +02:00
Ferenc Arn
fdf301e78b Revive PathEditorPlugin. 
Adapted the plugin to recent changes in input classes and pool arrays.
Fixed an out-of-bounds bug in the process.
Doesn't display anything for a single point (existing issue).
 2017-05-24 17:09:53 -05:00