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

7191 commits

This branch
This branch
All branches
Author SHA1 Message Date
volzhs
209f61b6d4 Fix android payment logical error 
getting sku detail runs only if mod != 0 which means querying 20*n will not get sku details.
referenced from https://github.com/googlesamples/android-play-billing/blob/master/TrivialDrive/app/src/main/java/com/example/android/trivialdrivesample/util/IabHelper.java#L1029-L1062
 2017-05-19 12:20:51 +09:00
Rémi Verschelde
d801ff2b3d Merge pull request #8778 from honix/master 
Particles potential crash fix 2
 2017-05-16 16:34:37 +02:00
honix
73385e362b Particles potential crash fix 2 2017-05-16 16:24:33 +03:00
Rémi Verschelde
ce2077262a Merge pull request #8784 from bojidar-bg/editorconfig-trim-whitespace 
Add trim_trailing_whitespace to .editorconfig

[ci skip]
 2017-05-16 13:11:41 +02:00
Bojidar Marinov
3288ce63d3
Add trim_trailing_whitespace to .editorconfig 2017-05-16 14:04:26 +03:00
Rémi Verschelde
a4560c1e97 Merge pull request #8780 from RandomShaper/updgrade-android-build-tools 
Upgrade Android build tools to the latest
 2017-05-16 07:26:53 +02:00
Pedro J. Estébanez
78f44831f6 Upgrade Android build tools to the latest 2017-05-16 00:57:50 +02:00
Andreas Haas
9fa4f1c54c Merge pull request #8775 from godotengine/revert-8772-master 
Revert "Particles potential crash fix"
 2017-05-15 20:18:54 +02:00
Andreas Haas
c3e43c6d5f Revert "Particles potential crash fix" 2017-05-15 20:11:42 +02:00
Andreas Haas
aecab985b5 Merge pull request #8772 from honix/master 
Particles potential crash fix
 2017-05-15 20:05:33 +02:00
honix
9d7d24682d Particles potential crash fix 2017-05-15 20:49:20 +03:00
Rémi Verschelde
76289b5d5a Merge pull request #8761 from noshyaar/pr2 
AssetInstaller: fix toggling dir bug, scan after install
 2017-05-15 08:01:32 +02:00
Rémi Verschelde
27dd415196 Merge pull request #8759 from AlexHoratio/master 
Fixed #8526, popup menu width now responds to submenu icon
 2017-05-15 08:00:50 +02:00
Rémi Verschelde
4c3568e77c Merge pull request #8732 from akien-mga/exhaustive-copyright 
Document exhaustive licensing info of all files
 2017-05-15 07:54:21 +02:00
Rémi Verschelde
2065d30414 Merge pull request #8717 from damianday/master 
Fix natural sorting order in EditorFileDialog, FileDialog and EditorFileSystemDirectory
 2017-05-15 07:54:02 +02:00
Rémi Verschelde
1b5c579166 Merge pull request #8762 from honix/master 
Docs: ERR_EOF -> ERR_FILE_EOF
 2017-05-14 20:02:19 +02:00
Rémi Verschelde
1b3fad7edd Merge pull request #8764 from BeayemX/fix-typo 
Fixed typo 'one short connection' to 'one shot'
 2017-05-14 20:01:41 +02:00
Christian Winter
25776dbf76 fixed typo 'one short connection' to 'one shot' 2017-05-14 19:56:58 +02:00
AlexHoratio
69359f2220 Fixed #8526, popup menu width now responds to submenu icon 2017-05-14 18:55:55 +01:00
honix
78c7847d1d docs: ERR_EOF -> ERR_FILE_EOF 2017-05-14 20:35:40 +03:00
Juan Linietsky
4db79346bb New logo, in SVG format 2017-05-14 12:41:30 -03:00
Poommetee Ketson
3ee1952e39 AssetInstaller: fix toggling dir bug, scan after install 2017-05-14 20:23:28 +07:00
Thomas Herzog
f9fc2ef83b Merge pull request #8743 from karroffel/gdnative-reload-fixes 
[GDNative] fixed a reload bug
 2017-05-13 13:24:44 +00:00
Karroffel
11e496d99a [GDNative] fixed a reload bug 
When there was no terminate function defined in the library the exported variables would not update.
This fixes that.
 2017-05-13 14:37:57 +02:00
Rémi Verschelde
e776a1ebb2 Document exhaustive licensing info of all files 
Uses the machine-readable debian/copyright standard to be explicit
about both the licenses and the corresponding copyright attributions
for Godot source files and thirdparty libraries bundled in the source
repository.
 2017-05-12 19:33:15 +02:00
Rémi Verschelde
e883cdafa6 Merge pull request #8719 from Hinsbart/settings_case 
Project Settings: Use capitalized properties.
 2017-05-12 18:23:45 +02:00
Rémi Verschelde
14989caf14 Merge pull request #8702 from josempans/bug_fixing 
Fix click area for bool parameter
 2017-05-12 18:19:43 +02:00
Rémi Verschelde
5e318493d1 Merge pull request #8699 from Faless/ipv6_disabled 
Fix Editor/Debugger connection problems.
 2017-05-12 18:19:24 +02:00
Rémi Verschelde
88d5c943e7 Merge pull request #8696 from bojidar-bg/fix-path-autocomplete 
Fix gdscript autocomplete showing only paths
 2017-05-12 18:17:20 +02:00
Rémi Verschelde
86ce51ce1d Merge pull request #8682 from akien-mga/master 
Fix license formatting breaking GH detection
 2017-05-12 18:14:42 +02:00
Damian Day
f2564ca97f Fix natural sorting order in EditorFileDialog, FileDialog and EditorFileSystemDirectory 
Make EditorFileDialog, FileDialog and EditorFileSystemDirectory alphanumerical sorting more natural

Added a new method 'naturalnocasecmp_to' and comparator 'NaturalNoCaseComparator' to String.

Fixes #8712.
 2017-05-12 13:02:25 +01:00
Rémi Verschelde
ed6baffc72 Merge pull request #8725 from volzhs/android-jni-master 
Fix compile error when use "android_add_jni_dir"
 2017-05-12 08:24:40 +02:00
Rémi Verschelde
413e68fced Merge pull request #8723 from volzhs/fix-android-master 
Fix possible memory leak for Android and update gradle
 2017-05-12 08:24:22 +02:00
volzhs
be7ced4826 Fix compile error when use "android_add_jni_dir" 2017-05-12 15:10:59 +09:00
volzhs
8be9b98b8e Update to latest gradle 2017-05-12 14:44:47 +09:00
volzhs
9d33f51066 Fix possible memory leak for Android 
/godot_dev/platform/android/java/src/com/google/android/vending/expansion/downloader/impl/DownloaderService.java:575: Error: The WIFI_SERVICE must be looked up on the Application context or memory will leak on devices < Android N. Try changing  to .getApplicationContext()  [WifiManagerLeak]
            mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

   Explanation for issues of type "WifiManagerLeak":
   On versions prior to Android N (24), initializing the WifiManager via
   Context#getSystemService can cause a memory leak if the context is not the
   application context. Change context.getSystemService(...) to
   context.getApplicationContext().getSystemService(...).

1 errors, 0 warnings
 2017-05-12 14:44:37 +09:00
Thomas Herzog
0f8a17b0cb Merge pull request #8720 from karroffel/gdnative-methodbind-varcall 
[GDNative] added varcall and print
 2017-05-11 23:53:46 +02:00
Karroffel
d137e83c60 [GDNative] added varcall and print 2017-05-11 23:06:11 +02:00
Andreas Haas
162068640b Project Settings: Use capitalized properties. 
There's been some inconsistency between the ProjectSettings and EditorSettings:
One would use "snake_case_properties", the other "Capitalized Properties".

This fixes that by also using capitalized properties for the project settings.
(It's actually the default, so the line setting it to false was just removed..)


Was there a strong reason for using snake_case here in the first place?
 2017-05-11 22:54:54 +02:00
Rémi Verschelde
a48b8bfab8 Merge pull request #8718 from karroffel/remove-multiscript 
removed multiscript
 2017-05-11 22:41:52 +02:00
Karroffel
15bce7f75f removed multiscript 
removes MultiScript which was re-added in #8502 (aka 4c14700).
This feature didn't turn out to be as useful as most expected. It causes more troubles than it does good.
 2017-05-11 21:23:19 +02:00
Thomas Herzog
6d0568d817 Merge pull request #8704 from sheepandshepherd/gdnative_error_printing 
Add error printing functions to GDNative
 2017-05-10 07:38:40 +02:00
sheepandshepherd
99e07448d1 Add error printing functions to GDNative 2017-05-10 00:19:38 +02:00
Jose M Pan
02f02972e8 Fix click area for bool parameter 
This fixes the issue #8551: VisualScript: can't change bool parameter in
function call
 2017-05-09 14:35:48 -03:00
Fabio Alessandrelli
3b123367a1 Display remote_host/port in network->debug settings 2017-05-09 15:05:47 +02:00
Fabio Alessandrelli
98eb58a93c Allow selecting editor debug host and port. 
Possibly fixes various editor<->debugger connection related problems.
 2017-05-09 15:05:45 +02:00
Fabio Alessandrelli
a1c41be569 Fix local ip addresses (interfaces) detection. 
Ignore non-IP addresses for both windows and unix
 2017-05-08 22:27:06 +02:00
Rémi Verschelde
32afcbc482 Put brave old bb10 platform to a well-deserved rest 
Add some 🔥 to appease @reduz. Fixes #8692.
 2017-05-08 22:22:20 +02:00
Fabio Alessandrelli
020f6a7f20 Socket helpers now fall back to ipv4 on systems where ipv6 is disabled. 2017-05-08 21:53:23 +02:00
Bojidar Marinov
837a667225
Fix #8674, and rename a few things for clarity 2017-05-08 22:39:27 +03:00