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

6187 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ferenc Arn c2c1d2076c GDScript bindings for various missing Mesh functions. 
Fixes #8041.

(cherry picked from commit f2a335d0c1)
 2017-05-27 00:42:59 +02:00
Andreas Haas 1033250001 Editor: Make "open 2d/3d/script editor" shortcuts configurable. 
Also adds shortcuts for opening the AssetLib and for switching to the next/prev editor.

(cherry picked from commit 3be8a94868)
 2017-05-27 00:42:59 +02:00
yanorax 06ca73c6f8 Add column_title_pressed signal to Tree node 
The Tree node column/table form is missing the ability to
capture column title clicks easily.

Adding this functionality will give us the ability to
create functions such as sort by column, which is a common
table manipulation ability in games/apps.

https://godotengine.org/qa/7699
(cherry picked from commit 7b00ad22b9)
 2017-05-27 00:42:58 +02:00
Bojidar Marinov 3bc2d95149 Add trim_trailing_whitespace to .editorconfig 
(cherry picked from commit 3288ce63d3)
 2017-05-27 00:42:58 +02:00
Christian Winter bd32b67ab6 fixed typo 'one short connection' to 'one shot' 
(cherry picked from commit 25776dbf76)
 2017-05-27 00:42:58 +02:00
AlexHoratio 3cd1185b25 Fixed #8526, popup menu width now responds to submenu icon 
(cherry picked from commit 69359f2220)
 2017-05-27 00:42:58 +02:00
honix 43b0aa612f docs: ERR_EOF -> ERR_FILE_EOF 
(cherry picked from commit 78c7847d1d)
 2017-05-27 00:42:58 +02:00
Rémi Verschelde 971b2b2aee Document exhaustive licensing info of all files 
Uses the machine-readable debian/copyright standard to be explicit
about both the licenses and the corresponding copyright attributions
for Godot source files and thirdparty libraries bundled in the source
repository.

(cherry picked from commit e776a1ebb2)
 2017-05-27 00:19:43 +02:00
Andreas Haas 4d9d3819f0 Project Settings: Use capitalized properties. 
There's been some inconsistency between the ProjectSettings and EditorSettings:
One would use "snake_case_properties", the other "Capitalized Properties".

This fixes that by also using capitalized properties for the project settings.
(It's actually the default, so the line setting it to false was just removed..)

Was there a strong reason for using snake_case here in the first place?

(cherry picked from commit 162068640b)
 2017-05-26 23:59:03 +02:00
Marcelo Fernandez 645636e27c Fixed the IP resolver code blocking the main thread, it uses a Mutex now to lock its own thread. 
(cherry picked from commit bba8f1db30)
 2017-05-26 23:56:31 +02:00
Poommetee Ketson 85e6a38c0b RayCast2D: fix detached arrow tip 
(cherry picked from commit 64879e592b)
 2017-05-26 23:54:34 +02:00
Rémi Verschelde d8ae6e5815 Fix license formatting breaking GH detection 
(cherry picked from commit f2d126809f)
 2017-05-26 23:53:40 +02:00
Rémi Verschelde d432ad1e17 Improve documentation of thirdparty code snippets 
(cherry picked from commit c8aea60324)
 2017-05-26 23:53:14 +02:00
Andreas Haas 4a1c9de869 Tree: Clear search string on selection. 
The Tree node has the ability to jump to a specific item by typing the first few chars of it's name.
But on selection ('item_activated' signal), it didn't clear the search string used for that. It was especially annoying in `FileDialog`s and has been bugging me for
ages :P

With this, you can traverse a directory structure in a FileDiag quickly with the keyboard (like you'd expect from pretty much any modern file browser) :)

(cherry picked from commit def41b9856)
 2017-05-26 23:45:11 +02:00
Poommetee Ketson e06fa5a089 LineEdit: fix placeholder text affected by secret 
(cherry picked from commit e64c473bc9)
 2017-05-26 23:44:24 +02:00
mbalint12 1ca67fd484 Make script debugger display all kinds of objects 
(cherry picked from commit be5e02708d)
 2017-05-26 23:43:09 +02:00
mbalint12 8eba737992 Make property editor display dictionaries (read only) 
(cherry picked from commit a542372642)
 2017-05-26 23:42:34 +02:00
Rémi Verschelde 6cf507f004 Move other lone thirdparty files to thirdparty/misc 
Also move Box2D ConvexDecomposition contrib code to
thirdparty/b2d_convexdecomp.

(cherry picked from commit d4029aa51a)
 2017-05-26 23:39:47 +02:00
Rémi Verschelde 86724ba1c6 Split thirdparty smaz.c out of compressed_translation.cpp 
Code comes from 150e125cba/smaz.c

With a small modification to match Godot expectations:
```
diff --git a/thirdparty/core/smaz.c b/thirdparty/core/smaz.c
index 9b1ebc2..555dfea 100644
--- a/thirdparty/core/smaz.c
+++ b/thirdparty/core/smaz.c
@@ -14,7 +14,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 #include <string.h>

 /* Our compression codebook, used for compression */
-static char *Smaz_cb[241] = {
+static const char *Smaz_cb[241] = {
 "\002s,\266", "\003had\232\002leW", "\003on \216", "", "\001yS",
 "\002ma\255\002li\227", "\003or \260", "", "\002ll\230\003s t\277",
 "\004fromg\002mel", "", "\003its\332", "\001z\333", "\003ingF", "\001>\336",
@@ -89,7 +89,7 @@ static char *Smaz_rcb[254] = {
 "e, ", " it", "whi", " ma", "ge", "x", "e c", "men", ".com"
 };

-int smaz_compress(char *in, int inlen, char *out, int outlen) {
+int smaz_compress(const char *in, int inlen, char *out, int outlen) {
     unsigned int h1,h2,h3=0;
     int verblen = 0, _outlen = outlen;
     char verb[256], *_out = out;
@@ -167,7 +167,7 @@ out:
     return out-_out;
 }

-int smaz_decompress(char *in, int inlen, char *out, int outlen) {
+int smaz_decompress(const char *in, int inlen, char *out, int outlen) {
     unsigned char *c = (unsigned char*) in;
     char *_out = out;
     int _outlen = outlen;
@@ -192,7 +192,7 @@ int smaz_decompress(char *in, int inlen, char *out, int outlen) {
             inlen -= 2+len;
         } else {
             /* Codebook entry */
-            char *s = Smaz_rcb[*c];
+            const char *s = Smaz_rcb[*c];
             int len = strlen(s);

             if (outlen < len) return _outlen+1;
diff --git a/thirdparty/core/smaz.h b/thirdparty/core/smaz.h
index a547d89..a9d8a33 100644
--- a/thirdparty/core/smaz.h
+++ b/thirdparty/core/smaz.h
@@ -14,7 +14,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 #ifndef _SMAZ_H
 #define _SMAZ_H

-int smaz_compress(char *in, int inlen, char *out, int outlen);
-int smaz_decompress(char *in, int inlen, char *out, int outlen);
+int smaz_compress(const char *in, int inlen, char *out, int outlen);
+int smaz_decompress(const char *in, int inlen, char *out, int outlen);

 #endif
```

(cherry picked from commit c5f830d6b9)
 2017-05-26 23:35:15 +02:00
Rémi Verschelde 8312d421c6 Move core thirdparty files to thirdparty/{minizip,misc} 
(cherry picked from commit 2398eb6ed4)
 2017-05-26 23:29:26 +02:00
Pedro J. Estébanez f6c50a6289 Allow custom CCFLAGS for iPhone builds 
and disable exceptions by default
 2017-05-26 22:35:09 +02:00
volzhs a495feae3e Make OS.get_locale() returns same value 2017-05-27 03:42:28 +09:00
Ferenc Arn 1b25762c3d Detect SSE/SSE2 for libsquish. 
(cherry picked from commit b6259661ce)
 2017-05-26 19:12:40 +02:00
Rémi Verschelde e43e7a414a Fix theme_data.h formatting via make_header.py 
Should make clang-format happy.

(cherry picked from commit 5f15f03d38)
 2017-05-26 19:11:43 +02:00
Andreas Haas 66a1e049b0 Tree: Ability to add tooltips to TreeItem buttons. 
Adds a tooltip parameter to `TreeItem::add_button()` and set a few tooltips in the Project settings and SceneTree dock.

(cherry picked from commit 29999942a2)
 2017-05-26 19:05:09 +02:00
clayjohn 831c8cb325 added documentation for SurfaceTool 
(cherry picked from commit 478817abad)
 2017-05-26 18:56:14 +02:00
clayjohn c5db548d2a added descriptions for WorldEnvironment node in documentation 
(cherry picked from commit 5fdc7ac88a)
 2017-05-26 18:54:22 +02:00
Karroffel e151b66127 fixed a bug where saving a GDScript file crashed the editor 
I changed the loop in #8502, turns out it fixed the error I was facing but introduced a new one. This fixes both

(cherry picked from commit 67886bab1e)
 2017-05-26 18:53:28 +02:00
Marco Melorio 3d7756df8e Added a container to EditorNameDialog 
(cherry picked from commit d4082a8d92)
 2017-05-26 18:47:32 +02:00
Marco Melorio b0d2b46efb Update snake_case splitting 
(cherry picked from commit 4677c0fbb8)
 2017-05-26 18:47:23 +02:00
Rémi Verschelde fec8e2549c Fix a few property warnings on Globals access 
Hand-picked from 515f92d03b.
 2017-05-26 18:46:59 +02:00
Rémi Verschelde 9b1ee4cd66 i18n: Add more assetlib strings to translate 
Fixes #8463.

(cherry picked from commit b474646de0)
 2017-05-26 18:41:46 +02:00
Ramesh Ravone 22c174bb71 Android: avoiding duplicates in build.gradle 
(cherry picked from commit f8309f86c2)
 2017-05-26 18:08:59 +02:00
Ramesh Ravone 9028a75452 Android: Support to change minSdkVersion (#8313) 
(cherry picked from commit 93b417fe17)
 2017-05-26 18:08:26 +02:00
Ray Koopa 134d87a338 Ignore .vs folder, fix .vscode comment 
(cherry picked from commit ac6ef54500)
 2017-05-26 18:08:02 +02:00
Andreas Haas 18f2b96186 Fix warning message when EditorPlugin script is not in tool mode. 
(cherry picked from commit 0029440955)
 2017-05-26 18:07:25 +02:00
supaiku fda4911b6e Fix highlight typo 
(cherry picked from commit d51fe99a8b)
 2017-05-26 17:43:18 +02:00
Andreas Haas a46dcfe12f Core: fix possible memory leaks. 
(cherry picked from commit a2734df7ed)
 2017-05-26 17:38:05 +02:00
curtisxk38 5a1bcae6c2 Fix typo in Parser Error message 
(cherry picked from commit d35fab7382)
 2017-05-26 17:37:46 +02:00
Rémi Verschelde 9391641356 Fix URLs to moved docs pages 
Closes #8266.

(cherry picked from commit 4989cc3617)
 2017-05-26 17:36:43 +02:00
Rémi Verschelde 99f65fcb4f Merge pull request #8922 from volzhs/fix-android-build 
Fix android build regression by 69c4c4a
 2017-05-26 16:00:50 +02:00
volzhs c6ebb6a40c Fix android build regression by 69c4c4a 2017-05-26 20:42:36 +09:00
Sean Bohan e3f10f3e93 Add settings to pan canvas item editor instead of zoom with mouse/touchpad scrolling. 
This feature is mainly designed for developers who uses touchpad instead of mouse, and want to scroll instead of zoom. Every macOS developers will like it since it feels intuitive.

2 new settings are added to `2d_editor`:

1. `scroll_to_pan`: turn on to use mouse/touchpad scroll to pan canvas item editor view instead of zoom
2. `pan_speed`: use this value to change scroll speed
 2017-05-26 18:35:39 +08:00
Sean Bohan 064dce7a4c 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.
 2017-05-26 17:25:44 +08:00
Geequlim 166d4cb40c Expose constants of TextureButton 2017-05-26 17:07:38 +08:00
Rémi Verschelde 29c7118f32 Merge pull request #8913 from RandomShaper/ios-alert-2.1 
Implement OS.alert() for iOS (2.1)
 2017-05-26 07:56:24 +02:00
Pedro J. Estébanez b870ff6940 Implement OS.alert() for iOS 2017-05-25 17:30:36 +02:00
Rémi Verschelde e65d7a0df7 Merge pull request #8787 from Zireael07/vehicle-improvements 
Expose wheel's contact to GDScript and set roll influence in editor [2.1]
 2017-05-22 07:50:37 +02:00
Rémi Verschelde bd1c3b31a5 Merge pull request #8820 from zlsa/2.1 
Export nested nodes in TileSet scenes; resolves #8819.
 2017-05-20 09:50:37 +02:00
Rémi Verschelde 2c5a4534f9 Merge pull request #8823 from volzhs/android-payment 
Fix android payment logical error
 2017-05-20 09:49:13 +02:00