godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,123 Commits 15 Branches 59 Tags 2.2 GiB
Commit Graph

6123 Commits

Author SHA1 Message Date
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
Jon Ross 4ed2722589 Fix #8819. Adds _import_node() that, when used in conjunction with _import_scene, recurses through the scene tree and exports all available nodes. 2017-05-19 14:01:28 -07:00
Zireael07 307c5c1afc GDScript can now tell if the wheel is in contact with the ground; change roll influence of the wheel in editor 2017-05-19 11:50:23 +02:00
volzhs d4ef6216d3 Fix android payment logical error 
getting sku detail runs only if mod != 0 which means querying 20*n will not get sku details.
referenced from https://github.com/googlesamples/android-play-billing/blob/master/TrivialDrive/app/src/main/java/com/example/android/trivialdrivesample/util/IabHelper.java#L1029-L1062
 2017-05-19 12:11:59 +09:00
Rémi Verschelde 06f77f941b Merge pull request #8797 from RandomShaper/gdfs-ext-check-2.1 
Add extended check option to GDFunctionState::is_valid() (2.1)
 2017-05-18 18:51:13 +02:00
Rémi Verschelde 23fb7d29c2 Merge pull request #8808 from RandomShaper/mq-flush-reentrant-2.1 
Make MessageQueue::flush() reentrant (2.1)
 2017-05-18 18:49:41 +02:00
Pedro J. Estébanez fa4b09f63d Make MessageQueue::flush() reentrant 2017-05-18 13:01:12 +02:00
Pedro J. Estébanez 7b192313b3 Add extended check option to GDFunctionState::is_valid() 2017-05-17 14:47:17 +02:00
Rémi Verschelde 21bf3778d5 Merge pull request #8776 from RandomShaper/fix-sample-priority-2.1 
Fix priority in sample players (2.1)
 2017-05-16 08:12:52 +02:00
Rémi Verschelde 5436543122 Merge pull request #8779 from RandomShaper/updgrade-android-build-tools-2.1 
Upgrade Android build tools to the latest (2.1)
 2017-05-16 07:26:56 +02:00
Pedro J. Estébanez deda04faff Upgrade Android build tools to the latest 2017-05-16 00:54:54 +02:00
Pedro J. Estébanez 40e7f1c3d5 Fix priority in sample players 2017-05-15 20:24:38 +02:00
Rémi Verschelde aa046a85dc Merge pull request #8740 from pixelpicosean/scrollingWithFactor 
Implemented scrolling factor for precision trackpads for 2.1
 2017-05-15 07:57:05 +02:00
Rémi Verschelde caeee17846 Merge pull request #8734 from Faless/various_2.1_cherries 
Various 2.1 cherry picks
 2017-05-15 07:55:27 +02:00
Sean Bohan ee670f3724 Implemented scrolling factor for smooth trackpad scrolling 
Working platforms platform: OSX, Windows.
Support for almost all ui elements, including project list.

Ported from 304a1f5b5a (#7864).
Fixes #492 and #3913.
 2017-05-15 06:44:00 +08:00