Commit Graph

6675 Commits

Author SHA1 Message Date
Rémi Verschelde 5b23d571b1 Bump version to 2.1.5-rc 2018-03-23 14:31:00 +01:00
Rémi Verschelde ddcea2a7dd
Merge pull request #17366 from xsellier/feature/add-encrypt-decrypt-string
Add encrypt_text/decrypt_text function using aes256 algorithm (2.1.5)
2018-03-23 11:35:07 +01:00
Rémi Verschelde 3e52b31218
Merge pull request #17678 from RandomShaper/fix-unilateral-joints-2.1
Fix any joint requiring two bodies
2018-03-21 21:55:16 +01:00
Rémi Verschelde 87636e1caa Style fixes 2018-03-21 21:47:17 +01:00
Pedro J. Estébanez 6c76b3447d Fix any joint requiring two bodies 2018-03-21 21:44:37 +01:00
Rémi Verschelde f6bf93c7c8 2to3 exporter: Better handling of anchors and margins + more fixes
- Properly handle anchors changing from enum-based to a float ratio
- Flip margins when needed to match the new anchoring system
- Reuse type renames in the script converter to fix more types and usages
- Convert .pos, _rot(, _speed( and set_hidden() in scripts
2018-03-21 21:33:06 +01:00
Rémi Verschelde 0b55481cea
Merge pull request #17663 from xsellier/bugfix/17654-split-screen
Android split screen
2018-03-21 14:02:37 +01:00
Xavier Sellier 7535698c8a Prevent android to split-screen
Add android:resizeableActivity='false' to the manifest.
2018-03-20 21:35:11 -04:00
Xavier Sellier 0332719b91 Add encrypt_text/decrypt_text function using aes256 algorithm 2018-03-20 10:38:51 -04:00
Rémi Verschelde 940bab2734
Merge pull request #17646 from volzhs/android-device-info-2.1
Fix getting Android device information (2.1)
2018-03-20 11:28:46 +01:00
volzhs 79f155a42e Fix getting Android device information 2018-03-20 14:18:38 +09:00
Rémi Verschelde 42ad56c95c 2to3 exporter: Fix recursion in Pool*Array conversions 2018-03-19 11:30:35 +01:00
Rémi Verschelde 87479177e7
Merge pull request #17560 from akien-mga/2to3-exporter
2 to 3 converter: More fixes to the property renames
2018-03-19 11:17:56 +01:00
Rémi Verschelde 8fd6543520 2to3 exporter: Bunch of improvements and fixes
- Fixed properties with different renames based on node type:
  * Convert Joint2D's "collision/exclude_nodes" to "disable_collision"
  * Convert TextureProgress' "mode" to "fill_mode"
  * Convert Sprite and Sprite3D's "region" to "region_enabled"
- Fixed swapping "Fill" and "Expand" in size_flags
- Handle converting [self_]opacity to [self_]modulate.a, including in animations
- Fixed signals:
  * Add a bunch of missed signal renames
  * Properly convert AnimationPlayer and AnimatedSprite's "finished" to
    "animation_finished"
- Reduce diff in signal connections for tscn
- Script converter:
  * Convert _input_event( to _gui_input(
  * Convert self_opacity to self_modulate.a
  * Convert ReferenceFrame to ReferenceRect
  * Add missing Pool*Array conversions
2018-03-19 10:33:18 +01:00
Rémi Verschelde cb8b9a7ee9 2to3 exporter: Document classes for each property rename 2018-03-19 10:33:18 +01:00
Rémi Verschelde 6d6013138e 2to3 exporter: Review all property renames
Fix some bugs with missing or incorrect renames in the process.
2018-03-19 10:33:18 +01:00
Rémi Verschelde 7e042474ea 2to3 exporter: Remove duplicate renames 2018-03-19 10:33:18 +01:00
Rémi Verschelde 5c81a4b072 2to3 exporter: Reorder rename mappings alphabetically 2018-03-19 10:33:18 +01:00
Rémi Verschelde 6b0cf3f3ef
Merge pull request #17616 from eska014/2.1-html5
2.1 HTML5 fixes
2018-03-19 06:20:24 +01:00
Leon Krause 6e549d41eb Fix inverted relative mouse motion in HTML5 export
(cherry picked from commit 640d8cc5d2)
2018-03-18 18:14:03 +01:00
Leon Krause c445ba29aa Fix HTML5 key events 2018-03-18 18:14:03 +01:00
Leon Krause 4e0643a51c Fix HTML5 start-up, remove godotfs.js 2018-03-18 18:13:55 +01:00
Rémi Verschelde f4373311e7
Merge pull request #17557 from akien-mga/2to3-exporter
Bugfix and improvements to the 2 to 3 converter
2018-03-16 14:23:15 +01:00
Rémi Verschelde 29e2182c41 2to3 exporter: Enable script conversion and option to mark changes 2018-03-16 11:48:39 +01:00
Rémi Verschelde ddeb4ff2b0 2to3 exporter: Improvements to script conversion
- Convert `move(` to `move_and_collide(`
- Convert `<identifier> extends <Node>` to `<identifier> is <Node>`
- Simplify existing regexps
2018-03-16 11:42:14 +01:00
Rémi Verschelde 7d4f5fc5c7 2to3 exporter: Fix bug converting NodePath animation tracks
All values were multiplied by -1 when only "transform/rot" values need to be.
2018-03-16 11:39:04 +01:00
Rémi Verschelde fb2c084d19 SCons: Fix running 'scons' without platform argument
The cache and progress logic assumed the 'env' to be defined,
but it is only when the selected platform is in the supported list.

Fixes #17497.

(cherry picked from commit a44f9ca545)
2018-03-15 10:45:55 +01:00
Hugo Locurcio 2055e84641 Disable colored output and progress bar when building outside of a TTY
This makes the output more readable if it is written to a file,
and more compact in continuous integration environments, keeping
the log sizes low.

(cherry picked from commit bf32d36230)
2018-03-15 10:42:21 +01:00
Rémi Verschelde 15aa6e2ce7
Merge pull request #17206 from Ranoller/patch-4
Backport FIX mouse notifications missings ->godot2
2018-03-06 10:16:27 +01:00
Rémi Verschelde b30c46bb9d
Merge pull request #17195 from RandomShaper/touch-to-mouse-x11-2.1
Generate mouse events from touch on X11 (2.1)
2018-03-06 10:14:20 +01:00
Ranoller 271e031d5f
Backport FIX mouse notifications missings ->godot2
Backport Fix to this issue #17202
2018-03-03 03:52:57 +01:00
Rémi Verschelde bc1e53e830
Merge pull request #17177 from akien-mga/2.1-prop-serialization
Fix serialization of identifiers with non printable ASCII characters
2018-03-02 14:44:26 +01:00
Rémi Verschelde 2caaaf3abf Fix serialization of identifiers with non printable ASCII characters
Fixes #6888.

Also apply the same logic in the 2 to 3 exporter, fixes #16850.
2018-03-02 13:32:33 +01:00
Rémi Verschelde f261f484b9
Merge pull request #17170 from rraallvv/scons_2.1
Prune cache at the beginning and end of build (2.1)
2018-03-02 11:08:15 +01:00
Rhody Lugo 06101cf012 prune cache only at the start and end of build 2018-03-02 01:27:13 -04:00
Rémi Verschelde 1c16fa3ff8
Merge pull request #17156 from akien-mga/2to3-exporter
2to3 exporter: Fix NodePath prop remaps in .scn
2018-03-01 23:07:45 +01:00
Rémi Verschelde b008b17df6 2to3 exporter: Fix NodePath prop remaps in .scn
The previous fix from 13d1df2e4b was applied when writing the NodePath
as text for .tscn/.tres, and thus not used for .scn. So we move the
conversion earlier, while processing all tracks.
2018-03-01 21:55:20 +01:00
Rémi Verschelde 1ae4d11c4f
Merge pull request #17152 from akien-mga/2to3-exporter
2to3 exporter: Add a hack to convert rotation values in Animation tracks
2018-03-01 21:27:53 +01:00
Rémi Verschelde 33e036b8c2 2to3 exporter: Add a hack to convert rotation values in Animation tracks
Fixes #16836.

Also fix the missing renames for "playback/active" and "playback/speed".
2018-03-01 21:04:59 +01:00
Pedro J. Estébanez 5571ada4f5 Generate mouse events from touch on X11
To match behavior on other platforms.
2018-02-26 21:19:57 +01:00
Rémi Verschelde 50eb6bca8c
Merge pull request #16967 from Ranoller/patch-2
Fix bindings project-settings godot exporter
2018-02-24 18:33:14 +01:00
Ranoller 0e69815503
Fix bindings project-settings godot exporter
Bad binded names and missings ones
2018-02-24 02:40:25 +01:00
Rémi Verschelde e98778f69e
Merge pull request #16931 from xsellier/bugfix/remove-commented-code-and-print
Improve android java support
2018-02-24 01:31:16 +01:00
Xavier Sellier 88e779cd5e Improve android java support
- Use Log.d/Log.w instead of System.printf
- Remove commented code
- Cherry-pick: Manual backport of d698814367
2018-02-22 13:36:34 -05:00
Rémi Verschelde f5e7135874
Merge pull request #16912 from xsellier/bugfix/improve-java-linting
Apply clang-format format to android java files (2.1.5)
2018-02-22 19:10:05 +01:00
Xavier Sellier 0af3f8e053 Backport of clang-format 7cb6e6b723 2018-02-22 13:00:36 -05:00
Rémi Verschelde 8c38cff4ec
Merge pull request #16873 from williamd1k0/frame2rect
2 to 3 exporter: Add Color and Reference Frame/Rect to type renames
2018-02-21 08:48:34 +01:00
William Tumeo 1105eea1c8 Add Color and Reference Frame/Rect to type renames 2018-02-20 23:35:07 -03:00
Rémi Verschelde ddcbdbd67c 2 to 3 exporter: Fix conversion to rotation_degrees 2018-02-19 16:56:59 +01:00
Rémi Verschelde f637578dbe Fix previous cherry-pick of 3.0-specific API 2018-02-19 11:42:47 +01:00