asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7071 commits 1 branch 0 tags 2.2 GiB
Commit graph

7071 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
volzhs
de4267fc99 Fix auto_accept_quit option to work 
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-25 20:05:22 +09:00
Paulb23
4b8152d599 Ability to Convert Case, issue 8079 2017-04-25 10:18:57 +01:00
Rémi Verschelde
7dba15b83f Merge pull request #8527 from RameshRavone/patch-3 
GDScript: Updating new script template with Indent settings
 2017-04-25 07:39:00 +02:00
Ramesh Ravone
924bccdbd1
Honoring the Indent setting for gdscript 2017-04-25 06:57:49 +05:30
Rémi Verschelde
d9eae920a9 Merge pull request #8518 from clayjohn/doc_worldenvironment 
Added descriptions for WorldEnvironment node in documentation

[ci skip]
 2017-04-24 23:48:08 +02:00
NNesh
0edc3d7208 Fix AudioPlayer.play() bug when music always starts from 0 pos 2017-04-25 01:57:05 +05:00
Rémi Verschelde
214222d37d Merge pull request #8516 from karroffel/gdscript-save-fix 
fixed a bug where saving a GDScript file crashed the editor
 2017-04-24 22:36:51 +02:00
Attilio Oliva
0af6c39f36 Right-clicking a folder in the FileSystem panel now gives the option Show in file manager 2017-04-24 22:18:24 +02:00
clayjohn
5fdc7ac88a added descriptions for WorldEnvironment node in documentation 2017-04-24 13:45:57 -06:00
Karroffel
67886bab1e 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
 2017-04-24 19:26:32 +02:00
Rémi Verschelde
b6e0eaf3ca Merge pull request #8509 from nunodonato/fixspatialmaterial 
Fixed #8102, by renaming FixedSpatialMaterial to SpatialMaterial
 2017-04-24 12:05:43 +02:00
Rémi Verschelde
1dc689b513 Merge pull request #8506 from iam13islucky/patch-1 
[3.0] Fix bug in Image::_get_pixelb
 2017-04-24 12:02:10 +02:00
Rémi Verschelde
8c4b7fcbb6 Merge pull request #8500 from Paulb23/space_indent_fixes 
Space indent fixes
 2017-04-24 12:01:29 +02:00
Rémi Verschelde
16f532a202 Merge pull request #8499 from Melix19/patch-3 
Fix "Save/Delete Layout" text field goes outside of the popup
 2017-04-24 12:01:00 +02:00
Rémi Verschelde
bd885ed704 Merge pull request #8469 from Melix19/patch-2 
Update snake_case splitting
 2017-04-24 11:38:36 +02:00