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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Paulb23
|
c4ffe89204
|
Changed indent type settings
|
2017-04-26 12:14:03 +01:00 |
|
Rémi Verschelde
|
02c041904f
|
Merge pull request #8540 from RameshRavone/revert-8538-patch-7
Revert " 3.0 recompute_aabb on add_surface"
|
2017-04-26 09:54:28 +02:00 |
|
Ramesh Ravone
|
cc973b461b
|
Revert " 3.0 recompute_aabb on add_surface"
|
2017-04-26 13:18:01 +05:30 |
|
Rémi Verschelde
|
ffbe6660cf
|
Merge pull request #8538 from RameshRavone/patch-7
3.0 recompute_aabb on add_surface
|
2017-04-26 08:57:10 +02:00 |
|
Rémi Verschelde
|
5c7e6c9212
|
Merge pull request #8537 from volzhs/tr-fallback-master
Fix wrong fallback for locale
|
2017-04-26 08:15:05 +02:00 |
|
Rémi Verschelde
|
4856613109
|
Merge pull request #8535 from volzhs/android-obb-master
Fix error or download again if use obb for Android
|
2017-04-26 08:14:45 +02:00 |
|
Rémi Verschelde
|
88d362b232
|
Merge pull request #8531 from RameshRavone/patch-5
Settings: Moving Poly Editor into Editors category
|
2017-04-26 08:14:04 +02:00 |
|
Rémi Verschelde
|
1a47087a73
|
Merge pull request #8530 from volzhs/auto-accept-quit-master
Fix auto_accept_quit option to work
|
2017-04-26 08:13:52 +02:00 |
|
Rémi Verschelde
|
cdf0fbd8e8
|
Merge pull request #8522 from NNesh/mus
Fix AudioPlayer bugs with OGG
|
2017-04-26 08:13:30 +02:00 |
|
Rémi Verschelde
|
95683f051c
|
Merge pull request #8519 from Paulb23/change_case_issue_8079
Ability to Convert Case, issue 8079
|
2017-04-26 08:11:41 +02:00 |
|
Rémi Verschelde
|
692b99fa0c
|
Merge pull request #8539 from clayjohn/doc_surfacetool
Added documentation for SurfaceTool
|
2017-04-26 07:38:07 +02:00 |
|
clayjohn
|
478817abad
|
added documentation for SurfaceTool
|
2017-04-25 21:35:25 -06:00 |
|
Ramesh Ravone
|
930ad8fc8c
|
3.0 recompute_aabb on add_surface
|
2017-04-26 07:57:13 +05:30 |
|
volzhs
|
ec1c7ce6c3
|
Fix wrong fallback for locale
|
2017-04-26 04:48:03 +09:00 |
|
volzhs
|
889ce29fc2
|
Fix error or download again if use obb for Android
|
2017-04-26 04:06:45 +09:00 |
|
L. Krause
|
a99b6b2063
|
Reimplement HTML5 mouse input without GLUT
Fixes inverted scrolling on Chromium
|
2017-04-25 14:48:46 +02:00 |
|
Ramesh Ravone
|
ff282571c6
|
Settings: Moving Poly Editor into Editors category
|
2017-04-25 17:48:08 +05:30 |
|
NNesh
|
6cf0c62221
|
Fix AudioPlayer.get_pos() always returns 0
|
2017-04-25 17:02:45 +05:00 |
|