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

5784 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pedro J. Estébanez
7e90b98db2 Add process mode option to Particles2D 2017-02-27 10:45:06 +01:00
Rémi Verschelde
f67881bada Merge pull request #7873 from volzhs/issue-7820 
Fix crash when click icon while editing node name (2.1)
 2017-02-26 20:27:53 +01:00
Rémi Verschelde
6490e9ae5b Merge pull request #7868 from RandomShaper/fix-touchbutton-crash-2.1 
Fix crash if TouchScreenButton is pressed while exiting the tree (2.1)
 2017-02-26 20:27:35 +01:00
Rémi Verschelde
902288cc8c Merge pull request #7855 from RandomShaper/add-duplicate-flags-2.1 
Add flags parameter to Node.duplicate()
 2017-02-26 20:23:55 +01:00
Rémi Verschelde
02a3d08d93 Merge pull request #7829 from volzhs/libwebp-0.6.0-2.1 
Update libwebp to 0.6.0 (for 2.1)
 2017-02-26 20:14:44 +01:00
volzhs
3d817ac73a Fix crash when click icon while editing node name 2017-02-23 02:16:49 +09:00
volzhs
71a5b0885b Cache DynamicFont resource for Android 2017-02-22 22:54:19 +09:00
Pedro J. Estébanez
5b8d5766f4 Fix crash if TouchScreenButton is pressed while exiting the tree 2017-02-22 01:36:31 +01:00
Pedro J. Estébanez
bbbc3a91c9 Add flags parameter to Node.duplicate() 
to decide whether signals, groups and/or scripts should be set in the copied nodes or not; it's default value makes the method work as usual, that is, including everything
 2017-02-20 19:43:26 +01:00
volzhs
f7ef78c998 Update libwebp to 0.6.0 2017-02-18 00:05:06 +09:00
Juan Linietsky
d5c2a6b76b Godot 2.1 to 3.0 conversion should be more or less final 2017-02-15 08:29:11 -03:00
geequlim
a7ec7dcd12 Add scale property back for backwards compatibility 
now we have a choice
Fix textureframe modulate doesn't work with STRETCH_KEEP_ASPECT_CENTERED and STRETCH_KEEP_ASPECT
 2017-02-13 20:04:21 +08:00
Juan Linietsky
ebb7d2cdb7 -WIP Exporter to Godot 3.0, only text scenes (no .scn) and still kind of buggy 2017-02-12 23:13:14 -03:00
Rémi Verschelde
6abe141579 Merge pull request #7756 from volzhs/str-format 
Fix zero padding formatting
 2017-02-12 23:20:13 +01:00
Rémi Verschelde
f50b4f5cb2 Merge pull request #7754 from volzhs/tr-buttonarray 
Translate ButtonArray text
 2017-02-12 23:19:52 +01:00
Rémi Verschelde
eff8fc4dfb Merge pull request #7751 from bojidar-bg/sort-scripts-by-path-2.1 
Sort settings for scripts in the editor (2.1)
 2017-02-12 23:19:28 +01:00
Rémi Verschelde
11b95cda45 Merge pull request #7750 from Faless/2.1.x_fix_7697 
HTTPClient properly handle partial data in non-blocking mode
 2017-02-12 23:19:10 +01:00
Rémi Verschelde
331ff9db77 Merge pull request #7742 from karroffel/json_parsing 
JSON::parse reports errors on open-ended objects
 2017-02-12 23:17:11 +01:00
Rémi Verschelde
3b09d77208 Merge pull request #7721 from RandomShaper/improve-touch-button-2.1 
Fix touch button issues (2.1)
 2017-02-12 23:12:14 +01:00
Rémi Verschelde
4e9f88b649 Merge pull request #7719 from RandomShaper/backport-code-edit-goodies-2.1 
Backport goodies for the code editors (2.1)
 2017-02-12 23:11:31 +01:00
Pedro J. Estébanez
c0f7b80b89 Solve TouchScreenButtons issues 
Fix touch button needing double tap after pause (applies to those not set to pass-by)
Fix error when a pressed TouchScreenButton with no associated action exits the tree
(with some refactoring of duplicate code)
 2017-02-10 20:53:35 +01:00
Nuno Donato
7496b2f862 Added "Scots" locale name, fixing #7630 
(cherry picked from commit 6b5c595e40)
 2017-02-08 16:18:59 +01:00
Rémi Verschelde
9e3f063e99 Revert "Fixes #7630 Hint was be appending for every language. Changed to only fill hint with the matching language." 
This reverts commit b6468db118,
the bug will be properly fixed by the cherry-pick of 6b5c595.
 2017-02-08 16:18:22 +01:00
volzhs
7ebb356a31 Fix zero padding formatting 2017-02-08 10:40:35 +09:00
volzhs
e0f00a549c Translate ButtonArray text 2017-02-08 08:38:36 +09:00
Bojidar Marinov
9fa3713d76
Sort settings for scripts in the editor 2017-02-07 18:57:49 +02:00
Rémi Verschelde
be0350704f Merge pull request #7711 from williamd1k0/cherrypick-colorframe 
Add ColorFrame control (2.1)
 2017-02-07 14:16:47 +01:00
Fabio Alessandrelli
1f08d17a98 HTTPClient properly handle partial data in non-blocking mode 
Use block to send DVector::Write out of scope in
HTTPClient::read_response_body_chunk()

(cherry picked from commit 833994b294)
 2017-02-07 11:05:14 +01:00
Karroffel
85793ccc4a JSON::parse reports errors on open-ended objects 2017-02-06 19:22:42 +00:00
Pedro J. Estébanez
0dbfb864ad Backport goodies for the code editors 
Refactor duplicated code (from 0159e4f969)
Add line length guideline to code editors (from d9c1729a8f)
Allow turning off zero-padding for line numbers (from 00b3af246b)
(In 3.0 zero-padding is off by default, but for 2.1 I'm setting the default to be on because it's how it always worked.)
Fixed line lenght guideline drawing with color option (from @Paulb23's 6b42cd5fe6)
 2017-02-04 16:24:33 +01:00
geequlim
58a700e43e Make same resize behavior for TextureButton with TextureFrame. 
Remove property 'scale' of TextureButton which is not required any more.
 2017-02-04 14:56:26 +08:00
geequlim
0c1c34ef22 Add Keep Covered texture resize mode 2017-02-04 14:26:50 +08:00
William Tumeo
f3bc5d443c Add ColorFrame control (2.1) 
- cherry-pick from 95eb7466df
 2017-02-02 18:22:03 -02:00
Rémi Verschelde
34b6caa433 Merge pull request #7678 from volzhs/fix-save-branch 
Fix crash when saving root node by "Save Branch as Scene" with unsaved scene
 2017-02-02 08:15:28 +01:00
Rémi Verschelde
6a01cf96b2 Merge pull request #7671 from RandomShaper/load-placeholder-dup-2.1 
Replicate load-as-placeholder state on node duplication (2.1)
 2017-02-02 08:14:02 +01:00
Rémi Verschelde
1d0997b01e Merge pull request #7660 from zombieCraig/translationfix 
Fixes #7630  Editor Translation Import Crash fix
 2017-02-02 08:11:39 +01:00
Rémi Verschelde
bd71020354 Merge pull request #7651 from leezh/collada_import_tweaks 
Re-Implemented Texture Actions for Scene Import (2.1 Branch)
 2017-02-02 08:10:10 +01:00
Rémi Verschelde
6b1d33ec71 Merge pull request #7650 from pkowal1982/fix_7011 
Fix #7011 ScrollContainer takes into account child's EXPAND flag when scrolling is enabled
 2017-02-02 08:09:09 +01:00
Rémi Verschelde
4a73e74ccb Merge pull request #7641 from RandomShaper/touch-button-shape 
Touch button shape (2.1)
 2017-02-02 08:05:26 +01:00
volzhs
43a2599801 Fix crash when saving root node by "Save Branch as Scene" with unsaved scene 
Fix #7667
 2017-01-30 07:00:03 +09:00
Pedro J. Estébanez
936f2e3b4e Replicate load-as-placeholder state on node duplication (2.1) 2017-01-29 11:50:42 +01:00
Craig Smith
b6468db118 Fixes #7630 Hint was be appending for every language. Changed to only fill hint with the matching language. 2017-01-27 22:43:44 -08:00
Pawel Kowal
e9316a009e Fix #7011 ScrollContainer takes into account child's EXPAND flag when scrolling is enabled 2017-01-26 10:02:19 +01:00
Zher Huei Lee
f3b32746de Re-Implemented Texture Actions for Scene Import 
Moved the shared_textures config to the editor category so that it would
be visible in the project settings window again. Fixes #7579

Added option to import textures to the same folder as the source
textures, or to reuse the files without re-importing (flags may need to
be applied manually).
 2017-01-26 16:44:27 +08:00
Rémi Verschelde
cdb0be8eed Merge pull request #7646 from RandomShaper/vcs-friendliness-2.1 
Improve .tscn VCS (2.1)
 2017-01-25 20:56:17 +01:00
Rémi Verschelde
ad899a0dd9 Merge pull request #7639 from volzhs/fix-scrollbar-2d-editor-2.1 
Fix weird scrollbar appearance on 2D editor (2.1)
 2017-01-25 20:39:45 +01:00
Pedro J. Estébanez
888f8b31e7 Improve .tscn VCS 
Serialize dictionaries adding newlines between key-value pairs
Serialize group lists also with newlines in between
Serialize string properties escaping only " and \ (needed for a good diff experience with built-in scripts and shaders)

Bonus:
Make AnimationPlayer serialize its blend times always sorted so their order is predictable in the .tscn file.

This PR is back-compat; won't break the load of existing files.

Cherry-picked from 7dbb1c0571
 2017-01-25 20:11:10 +01:00
Pedro J. Estébanez
67a0da34a2 Add shape property to TouchScreenButton 2017-01-25 17:06:06 +01:00
volzhs
5b2c31a18a Fix weird scrollbar appearance on 2D editor (2.1) 2017-01-25 23:34:41 +09:00
Rémi Verschelde
9038a96e49 Merge pull request #7632 from RandomShaper/hide-lock-icons-2.1 
2D Editor: Don't show lock icons for hidden nodes (2.1)
 2017-01-25 07:38:16 +01:00