summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-05-01Rename project file to "project.godot"Rémi Verschelde
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-04-29Merge pull request #8572 from akien-mga/thirdpartyRémi Verschelde
Moving more thirdparty stuff (minizip, some single-file external libs) to the thirdparty directory
2017-04-29Merge pull request #8579 from godotengine/revert-8375-project_extensionJuan Linietsky
Revert "Use .godot as file extension for project files."
2017-04-29Revert "Use .godot as file extension for project files."Juan Linietsky
2017-04-29Fix HTML5 key eventsL. Krause
Regression from 86f5ac3
2017-04-28Move other lone thirdparty files to thirdparty/miscRémi Verschelde
Also move Box2D ConvexDecomposition contrib code to thirdparty/b2d_convexdecomp.
2017-04-28Split thirdparty smaz.c out of compressed_translation.cppRémi Verschelde
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 ```
2017-04-28Move core thirdparty files to thirdparty/{minizip,misc}Rémi Verschelde
2017-04-28Add a few missing copyright headersRémi Verschelde
2017-04-28Merge pull request #8562 from neikeq/ame-ame-ameIgnacio Etcheverry
AudioServer: Set singleton to NULL when destructed
2017-04-28Merge pull request #8564 from volzhs/editor-themeRémi Verschelde
Update editor theme
2017-04-28Update editor themevolzhs
2017-04-27AudioServer: Set singleton to NULL when destructedIgnacio Etcheverry
2017-04-27Fix theme_data.h formatting via make_header.pyRémi Verschelde
Should make clang-format happy.
2017-04-27Merge pull request #8515 from attilix/folder-file-managerRémi Verschelde
Right-clicking a folder now gives the option Show in file manager
2017-04-27Merge pull request #8520 from Hinsbart/tree_tooltipsRémi Verschelde
Tree: Ability to add tooltips to TreeItem buttons.
2017-04-27Merge pull request #8553 from Hinsbart/vs_fixRémi Verschelde
Fix recognition of resource extensions.
2017-04-27Add new editor and default theme (WIP)Daniel J. Ramirez
2017-04-26Fix recognition of resource extensions.Andreas Haas
Also removes a related debug print.
2017-04-26Merge pull request #8544 from Paulb23/indent_type_settingRémi Verschelde
Changed indent type settings
2017-04-26Merge pull request #8547 from eska014/html5-pointer-inputRémi Verschelde
HTML5: Add (multi-)touch events, fix inverted scrolling
2017-04-26Tree: Ability to add tooltips to TreeItem buttons.Andreas Haas
Adds a tooltip parameter to `TreeItem::add_button()` and set a few tooltips in the Project settings and SceneTree dock.
2017-04-26Implement HTML5 touch eventsL. Krause
2017-04-26Changed indent type settingsPaulb23
2017-04-26Merge pull request #8540 from RameshRavone/revert-8538-patch-7Rémi Verschelde
Revert " 3.0 recompute_aabb on add_surface"
2017-04-26Revert " 3.0 recompute_aabb on add_surface"Ramesh Ravone
2017-04-26Merge pull request #8538 from RameshRavone/patch-7Rémi Verschelde
3.0 recompute_aabb on add_surface
2017-04-26Merge pull request #8537 from volzhs/tr-fallback-masterRémi Verschelde
Fix wrong fallback for locale
2017-04-26Merge pull request #8535 from volzhs/android-obb-masterRémi Verschelde
Fix error or download again if use obb for Android
2017-04-26Merge pull request #8531 from RameshRavone/patch-5Rémi Verschelde
Settings: Moving Poly Editor into Editors category
2017-04-26Merge pull request #8530 from volzhs/auto-accept-quit-masterRémi Verschelde
Fix auto_accept_quit option to work
2017-04-26Merge pull request #8522 from NNesh/musRémi Verschelde
Fix AudioPlayer bugs with OGG
2017-04-26Merge pull request #8519 from Paulb23/change_case_issue_8079Rémi Verschelde
Ability to Convert Case, issue 8079
2017-04-26Merge pull request #8539 from clayjohn/doc_surfacetoolRémi Verschelde
Added documentation for SurfaceTool
2017-04-25added documentation for SurfaceToolclayjohn
2017-04-26 3.0 recompute_aabb on add_surfaceRamesh Ravone
2017-04-26Fix wrong fallback for localevolzhs
2017-04-26Fix error or download again if use obb for Androidvolzhs
2017-04-25Reimplement HTML5 mouse input without GLUTL. Krause
Fixes inverted scrolling on Chromium
2017-04-25Settings: Moving Poly Editor into Editors categoryRamesh Ravone
2017-04-25Fix AudioPlayer.get_pos() always returns 0NNesh
2017-04-25Fix auto_accept_quit option to workvolzhs
auto_accept_quit value is set first properly with GLOBAL_DEF("application/auto_accept_quit", true) in main.cpp after that it's reset to true in SceneTree:init() whatever value was.
2017-04-25Ability to Convert Case, issue 8079Paulb23
2017-04-25Merge pull request #8527 from RameshRavone/patch-3Rémi Verschelde
GDScript: Updating new script template with Indent settings
2017-04-25Honoring the Indent setting for gdscriptRamesh Ravone
2017-04-24Merge pull request #8518 from clayjohn/doc_worldenvironmentRémi Verschelde
Added descriptions for WorldEnvironment node in documentation [ci skip]
2017-04-25Fix AudioPlayer.play() bug when music always starts from 0 posNNesh
2017-04-24Merge pull request #8516 from karroffel/gdscript-save-fixRémi Verschelde
fixed a bug where saving a GDScript file crashed the editor
2017-04-24Right-clicking a folder in the FileSystem panel now gives the option Show in ↵Attilio Oliva
file manager
2017-04-24added descriptions for WorldEnvironment node in documentationclayjohn