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

7104 Commits

Author SHA1 Message Date
Rémi Verschelde 6034eae95e Merge pull request #8637 from noshyaar/pr-lineedit 
LineEdit: fix placeholder text affected by secret
 2017-05-04 12:13:42 +02:00
Poommetee Ketson e64c473bc9 LineEdit: fix placeholder text affected by secret 2017-05-03 19:23:36 +07:00
Rémi Verschelde f527a69462 Merge pull request #8589 from tagcup/dxt1_fix 
Use correct mode for DXT1 textures.
 2017-05-02 23:31:42 +02:00
Rémi Verschelde 5a6ccce97d Merge pull request #8612 from magyar123/pr-show-dict-contents 
Make property editor display dictionaries (read only)
 2017-05-02 11:33:05 +02:00
Rémi Verschelde acaa01dfa7 Merge pull request #8610 from akien-mga/project-file-extension 
Rename project file to "project.godot"
 2017-05-02 11:32:48 +02:00
Rémi Verschelde 8e64b27585 Merge pull request #8592 from hikari-no-yume/scene_import_rigidonly_flag_master 
Scene importer: add -rigidonly flag for empties [master]
 2017-05-02 11:32:25 +02:00
Rémi Verschelde 9bdc498f90 Merge pull request #8574 from eska014/html5-noglut 
Remove GLUT usage in HTML5 platform
 2017-05-02 11:30:01 +02:00
Rémi Verschelde 9a40b92b8a Merge pull request #8571 from tagcup/squish_sse 
Detect SSE/SSE2 for libsquish.
 2017-05-02 11:29:16 +02:00
Rémi Verschelde a37364620f Merge pull request #8569 from volzhs/editor-theme-1 
Fix to use editor theme instead of handling each UI
 2017-05-02 11:28:52 +02:00
Rémi Verschelde 6b769ac625 Merge pull request #8559 from Paulb23/script_recent_files 
Added recent scripts to script editor
 2017-05-02 11:27:57 +02:00
Rémi Verschelde 82fa41bce3 Merge pull request #8541 from RandomShaper/opt-out-capitalization 
Add setting to opt-out of capitalization in property inspectors
 2017-05-02 11:25:27 +02:00
Rémi Verschelde 28173ad35d Merge pull request #8620 from Zylann/issue8617_window_dialog_stylebox 
Fix #8617 WindowDialog with custom panel background crashes godot
 2017-05-02 11:24:41 +02:00
Rémi Verschelde ab9d7241d9 Merge pull request #8622 from mcanders/mcanders/issue8314_get_shader_type_index 
Fix get_shader_type index upper bound
 2017-05-02 11:22:04 +02:00
Carter Anderson 212c6306a8 Fix get_shader_type index upper bound 2017-05-01 23:41:44 -07:00
Rémi Verschelde 64c31a3a9f Merge pull request #8576 from eska014/html5-mousemodes 
HTML5: Implement mouse lock/capture and hiding
 2017-05-02 07:34:52 +02:00
L. Krause 101c542b77 Implement mouse capture and hiding in HTML5 export 
MOUSE_MODE_CONFINED cannot be implemented.
 2017-05-02 04:01:34 +02:00
Marc Gilleron d78efddbf5 Fix #8617 WindowDialog with custom panel background crashes godot 2017-05-02 02:18:50 +02:00
Rémi Verschelde 4dd291cecb Merge pull request #8586 from vnen/uwp-3 
Fix compilation for UWP
 2017-05-01 22:48:01 +02:00
Rémi Verschelde 7ce8342ac5 Rename project file to "project.godot" 
Slimmed down variant from the reverted #8375.
The rationale behind the name change is to give Godot's project file a unique
extension (".godot") that can be registered on the OS to be associated with
the Godot binary (OS registration not implemented here).

This PR also adds the possibility to start the game or editor if launched
with the project.godot passed as argument, which paves the way for allowing
a similar behaviour on a double-click in the OS file manager (code originally
by @Hinsbart).

Closes #6915.
 2017-05-01 17:50:19 +02:00
mbalint12 a542372642 Make property editor display dictionaries (read only) 2017-05-01 14:25:47 +02:00
Andrea Faulds dd100374c1 Scene importer: add -rigidonly flag for empties (fixes #8430) 2017-04-30 16:26:23 +01:00
Ferenc Arn 2f84731177 Use correct mode for DXT1 textures. 
libsquish, which is used to generate all S3TC textures, works only with RGBA textures.

Fixes #8550.
 2017-04-29 20:01:12 -05:00
George Marques f7bd21a022
Fix compilation for UWP 2017-04-29 20:15:59 -03:00
Rémi Verschelde de7eba887e Merge pull request #8572 from akien-mga/thirdparty 
Moving more thirdparty stuff (minizip, some single-file external libs) to the thirdparty directory
 2017-04-29 22:57:49 +02:00
Juan Linietsky ea9dd6c0c1 Merge pull request #8579 from godotengine/revert-8375-project_extension 
Revert "Use .godot as file extension for project files."
 2017-04-29 12:57:20 -03:00
Juan Linietsky 6d2f985db4 Revert "Use .godot as file extension for project files." 2017-04-29 17:56:51 +02:00
L. Krause abe09919bf Fix HTML5 key events 
Regression from 86f5ac3
 2017-04-29 04:42:50 +02:00
L. Krause 847bd33fdf Remove GLUT usage in HTML5 platform 2017-04-28 21:54:44 +02:00
Rémi Verschelde d4029aa51a Move other lone thirdparty files to thirdparty/misc 
Also move Box2D ConvexDecomposition contrib code to
thirdparty/b2d_convexdecomp.
 2017-04-28 21:19:25 +02:00
Rémi Verschelde c5f830d6b9 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
```
 2017-04-28 21:19:24 +02:00
Rémi Verschelde 2398eb6ed4 Move core thirdparty files to thirdparty/{minizip,misc} 2017-04-28 21:19:23 +02:00
Rémi Verschelde 0a613ff970 Add a few missing copyright headers 2017-04-28 20:16:30 +02:00
Ferenc Arn b6259661ce Detect SSE/SSE2 for libsquish. 2017-04-28 12:47:35 -05:00
Ignacio Etcheverry 65c5dde560 Merge pull request #8562 from neikeq/ame-ame-ame 
AudioServer: Set singleton to NULL when destructed
 2017-04-28 18:25:21 +02:00
volzhs 3223305e5a Fix to use editor theme instead of handling each UI 2017-04-28 22:42:52 +09:00
Rémi Verschelde 2153feb6fd Merge pull request #8564 from volzhs/editor-theme 
Update editor theme
 2017-04-28 10:01:04 +02:00
volzhs be454ba2d6 Update editor theme 2017-04-28 11:01:17 +09:00
Ignacio Etcheverry 231fa92201 AudioServer: Set singleton to NULL when destructed 2017-04-27 21:36:35 +02:00
Paulb23 e37928bb50 Added recent scripts to script editor 2017-04-27 16:07:39 +01:00
Rémi Verschelde 5f15f03d38 Fix theme_data.h formatting via make_header.py 
Should make clang-format happy.
 2017-04-27 08:58:11 +02:00
Pedro J. Estébanez 7b315dc666 Add setting to opt-out of capitalization in the property inspector 2017-04-27 08:46:16 +02:00
Rémi Verschelde d730ee66a4 Merge pull request #8515 from attilix/folder-file-manager 
Right-clicking a folder now gives the option Show in file manager
 2017-04-27 08:11:05 +02:00
Rémi Verschelde 2feb24953c Merge pull request #8520 from Hinsbart/tree_tooltips 
Tree: Ability to add tooltips to TreeItem buttons.
 2017-04-27 08:10:11 +02:00
Rémi Verschelde ed583ffa30 Merge pull request #8553 from Hinsbart/vs_fix 
Fix recognition of resource extensions.
 2017-04-27 08:09:01 +02:00
Daniel J. Ramirez f045efe007 Add new editor and default theme (WIP) 2017-04-27 08:04:57 +02:00
Andreas Haas c530d8f43c
Fix recognition of resource extensions. 
Also removes a related debug print.
 2017-04-26 23:07:23 +02:00
Rémi Verschelde 5993a5fac9 Merge pull request #8544 from Paulb23/indent_type_setting 
Changed indent type settings
 2017-04-26 19:31:36 +02:00
Rémi Verschelde 4759be3c4b Merge pull request #8547 from eska014/html5-pointer-input 
HTML5: Add (multi-)touch events, fix inverted scrolling
 2017-04-26 19:28:17 +02:00
Andreas Haas 29999942a2
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.
 2017-04-26 19:14:35 +02:00
L. Krause 86f5ac3d74 Implement HTML5 touch events 2017-04-26 16:30:22 +02:00