aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix compile error when use "android_add_jni_dir"volzhs2017-05-121-0/+1
|
* Merge pull request #8612 from magyar123/pr-show-dict-contentsRémi Verschelde2017-05-021-0/+7
|\ | | | | Make property editor display dictionaries (read only)
| * Make property editor display dictionaries (read only)mbalint122017-05-011-0/+7
| |
* | Merge pull request #8610 from akien-mga/project-file-extensionRémi Verschelde2017-05-0211-45/+62
|\ \ | | | | | | Rename project file to "project.godot"
| * | Rename project file to "project.godot"Rémi Verschelde2017-05-0111-45/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #8592 from hikari-no-yume/scene_import_rigidonly_flag_masterRémi Verschelde2017-05-021-11/+19
|\ \ \ | | | | | | | | Scene importer: add -rigidonly flag for empties [master]
| * | | Scene importer: add -rigidonly flag for empties (fixes #8430)Andrea Faulds2017-04-301-11/+19
| |/ /
* | | Merge pull request #8574 from eska014/html5-noglutRémi Verschelde2017-05-023-75/+27
|\ \ \ | | | | | | | | Remove GLUT usage in HTML5 platform
| * | | Remove GLUT usage in HTML5 platformL. Krause2017-04-283-75/+27
| | | |
* | | | Merge pull request #8571 from tagcup/squish_sseRémi Verschelde2017-05-021-0/+6
|\ \ \ \ | | | | | | | | | | Detect SSE/SSE2 for libsquish.
| * | | | Detect SSE/SSE2 for libsquish.Ferenc Arn2017-04-281-0/+6
| | | | |
* | | | | Merge pull request #8569 from volzhs/editor-theme-1Rémi Verschelde2017-05-025-14/+9
|\ \ \ \ \ | | | | | | | | | | | | Fix to use editor theme instead of handling each UI
| * | | | | Fix to use editor theme instead of handling each UIvolzhs2017-04-285-14/+9
| | | | | |
* | | | | | Merge pull request #8559 from Paulb23/script_recent_filesRémi Verschelde2017-05-023-0/+101
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added recent scripts to script editor
| * | | | | | Added recent scripts to script editorPaulb232017-04-273-0/+101
| | | | | | |
* | | | | | | Merge pull request #8541 from RandomShaper/opt-out-capitalizationRémi Verschelde2017-05-025-8/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add setting to opt-out of capitalization in property inspectors
| * | | | | | | Add setting to opt-out of capitalization in the property inspectorPedro J. Estébanez2017-04-275-8/+14
| | | | | | | |
* | | | | | | | Merge pull request #8620 from Zylann/issue8617_window_dialog_styleboxRémi Verschelde2017-05-021-12/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix #8617 WindowDialog with custom panel background crashes godot
| * | | | | | | | Fix #8617 WindowDialog with custom panel background crashes godotMarc Gilleron2017-05-021-12/+16
| | | | | | | | |
* | | | | | | | | Merge pull request #8622 from mcanders/mcanders/issue8314_get_shader_type_indexRémi Verschelde2017-05-021-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix get_shader_type index upper bound
| * | | | | | | | | Fix get_shader_type index upper boundCarter Anderson2017-05-011-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #8576 from eska014/html5-mousemodesRémi Verschelde2017-05-022-10/+54
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | HTML5: Implement mouse lock/capture and hiding
| * | | | | | | | Implement mouse capture and hiding in HTML5 exportL. Krause2017-05-022-10/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MOUSE_MODE_CONFINED cannot be implemented.
* | | | | | | | | Merge pull request #8586 from vnen/uwp-3Rémi Verschelde2017-05-018-50/+161
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Fix compilation for UWP
| * | | | | | | | Fix compilation for UWPGeorge Marques2017-04-298-50/+161
| |/ / / / / / /
* | | | | | | | Merge pull request #8572 from akien-mga/thirdpartyRémi Verschelde2017-04-2977-265/+647
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Moving more thirdparty stuff (minizip, some single-file external libs) to the thirdparty directory
| * | | | | | | | Move other lone thirdparty files to thirdparty/miscRémi Verschelde2017-04-2827-16/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also move Box2D ConvexDecomposition contrib code to thirdparty/b2d_convexdecomp.
| * | | | | | | | Split thirdparty smaz.c out of compressed_translation.cppRémi Verschelde2017-04-285-209/+235
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code comes from https://github.com/antirez/smaz/blob/150e125cbae2e8fd20dd332432776ce13395d4d4/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 ```
| * | | | | | | | Move core thirdparty files to thirdparty/{minizip,misc}Rémi Verschelde2017-04-2843-38/+145
| | | | | | | | |
| * | | | | | | | Add a few missing copyright headersRémi Verschelde2017-04-286-4/+179
| | | | | | | | |
* | | | | | | | | Merge pull request #8579 from godotengine/revert-8375-project_extensionJuan Linietsky2017-04-297-148/+45
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Revert "Use .godot as file extension for project files."
| * | | | | | | | Revert "Use .godot as file extension for project files."Juan Linietsky2017-04-297-148/+45
|/ / / / / / / /
* / / / / / / / Fix HTML5 key eventsL. Krause2017-04-291-3/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Regression from 86f5ac3
* | | | | | | Merge pull request #8562 from neikeq/ame-ame-ameIgnacio Etcheverry2017-04-281-0/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | AudioServer: Set singleton to NULL when destructed
| * | | | | | AudioServer: Set singleton to NULL when destructedIgnacio Etcheverry2017-04-271-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #8564 from volzhs/editor-themeRémi Verschelde2017-04-289-3/+90
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Update editor theme
| * | | | | Update editor themevolzhs2017-04-289-3/+90
|/ / / / /
* | | | | Fix theme_data.h formatting via make_header.pyRémi Verschelde2017-04-272-352/+232
| | | | | | | | | | | | | | | | | | | | Should make clang-format happy.
* | | | | Merge pull request #8515 from attilix/folder-file-managerRémi Verschelde2017-04-272-1/+10
|\ \ \ \ \ | | | | | | | | | | | | Right-clicking a folder now gives the option Show in file manager
| * | | | | Right-clicking a folder in the FileSystem panel now gives the option Show in ↵Attilio Oliva2017-04-242-1/+10
| | |/ / / | |/| | | | | | | | | | | | | file manager
* | | | | Merge pull request #8520 from Hinsbart/tree_tooltipsRémi Verschelde2017-04-274-22/+38
|\ \ \ \ \ | | | | | | | | | | | | Tree: Ability to add tooltips to TreeItem buttons.
| * | | | | Tree: Ability to add tooltips to TreeItem buttons.Andreas Haas2017-04-264-22/+38
| | |_|_|/ | |/| | | | | | | | | | | | | Adds a tooltip parameter to `TreeItem::add_button()` and set a few tooltips in the Project settings and SceneTree dock.
* | | | | Merge pull request #8553 from Hinsbart/vs_fixRémi Verschelde2017-04-272-2/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix recognition of resource extensions.
| * | | | | Fix recognition of resource extensions.Andreas Haas2017-04-262-2/+1
| |/ / / / | | | | | | | | | | | | | | | Also removes a related debug print.
* | | | / Add new editor and default theme (WIP)Daniel J. Ramirez2017-04-27354-938/+8669
| |_|_|/ |/| | |
* | | | Merge pull request #8544 from Paulb23/indent_type_settingRémi Verschelde2017-04-265-5/+5
|\ \ \ \ | | | | | | | | | | Changed indent type settings
| * | | | Changed indent type settingsPaulb232017-04-265-5/+5
| |/ / /
* | | | Merge pull request #8547 from eska014/html5-pointer-inputRémi Verschelde2017-04-263-289/+212
|\ \ \ \ | |/ / / |/| | | HTML5: Add (multi-)touch events, fix inverted scrolling
| * | | Implement HTML5 touch eventsL. Krause2017-04-262-206/+109
| | | |
| * | | Reimplement HTML5 mouse input without GLUTL. Krause2017-04-253-93/+113
| | | | | | | | | | | | | | | | Fixes inverted scrolling on Chromium
generated by cgit v1.2.3-70-g09d2 (git 2.51.2) at 2025-11-10 22:33:09 +0000