Commit Graph

3778 Commits

Author SHA1 Message Date
volzhs e94e710893 remove unused resources and add korean locale for android
- remove unused resources in platform/android/java/res/values/strings.xml
- add korean language resource for apk expansion download screen
2016-04-19 11:10:55 +09:00
Bojidar Marinov 325a02e4af Add a add_triangle_fan method to SurfaceTool
Closes #4298
2016-04-18 20:33:54 +03:00
Rémi Verschelde 206895afae Merge pull request #4329 from mrezai/openssl-1.0.2g
Update OpenSSL to version 1.0.2g
2016-04-18 19:21:46 +02:00
Rémi Verschelde 336cbfa7b6 Merge pull request #4364 from leezh/master
Fixed SEGFAULT in zero-reserved arrays in nrex. Fixes #4346
2016-04-18 13:50:52 +02:00
Rémi Verschelde fd07ef07fa Merge pull request #4345 from mownier/add/getter/http-client-connection
Added getter method for the connection property in HTTPClient.
2016-04-18 13:50:09 +02:00
Mounir Ybanez 0ca7e19242 Added getter method for the connection property in HTTPClient. (#4336)
- Exposed a getter method for the private property named `connection` in HTTPClient class.
2016-04-18 17:16:15 +08:00
Zher Huei Lee 48b2dfab9f Fixed zero-length arrays in nrex. Fixes #4346 2016-04-18 10:06:47 +01:00
Rémi Verschelde df13fdf0e9 Merge pull request #4360 from AlexHolly/string-ends_with
string ends_with
2016-04-18 08:18:52 +02:00
Rémi Verschelde 3348dea78b Merge pull request #4359 from neikeq/pr-issue-4351
Fix 'Quit to Project Manager' not stopping the running application
2016-04-18 08:17:30 +02:00
Alex e566b17f91 tiny fix to loop restart (#4358)
Closes #4355
2016-04-18 08:16:46 +02:00
Rémi Verschelde 6b41544a39 Merge pull request #4319 from kubecz3k/played_signal
animation_started signal for AnimationPlayer
2016-04-18 08:12:40 +02:00
Rémi Verschelde f124b5e0ac Merge pull request #4299 from neikeq/pr-issue-4297
Keep editable instances data when replacing tree root node
2016-04-18 08:09:53 +02:00
Alexander Holland a379ed56ea string ends_with 2016-04-17 23:49:21 +02:00
Ignacio Etcheverry e48c07750f Fix 'Quit to Project Manager' not stopping the running application 2016-04-17 23:13:45 +02:00
Rémi Verschelde c04b3edac4 Merge pull request #4337 from bojidar-bg/translation-csv-newlines
Fix File.get_csv_line not including quoted newlines in the output
2016-04-16 14:45:50 +02:00
Bojidar Marinov 7a18bb8ace Fix File.get_csv_line not including quoted newlines in the output
Close #1232
2016-04-16 15:12:29 +03:00
Rémi Verschelde bf0f914140 Merge pull request #4325 from SaracenOne/bone_attachment_reposition
BoneAttachments now position themselves instantly during bind.
2016-04-16 11:50:18 +02:00
eska 0ee8b74101 Always set default clear color 2016-04-15 19:20:50 +02:00
Rémi Verschelde 37f84c47aa Merge pull request #4328 from mrezai/travisci
Add openssl=builtin to build command in .travis.yml
2016-04-15 17:39:27 +02:00
mrezai 1db2759f5e Add openssl=builtin to build command in .travis.yml 2016-04-15 19:10:56 +04:30
mrezai e97922f220 Update OpenSSL to version 1.0.2g 2016-04-15 19:03:35 +04:30
Saracen bc5ee6c98f BoneAttachments now position themselves instantly during bind. 2016-04-15 11:32:10 +01:00
Rémi Verschelde 880f4abda4 Merge pull request #4324 from HeartoLazor/path_2d_fix
Fixed curve baking, now always start at origin point
2016-04-15 08:13:37 +02:00
Hearto Lazor 08b93da28a Fixed curve baking, now always start at origin point 2016-04-15 00:13:17 -03:00
Jakub Grzesik fd9b82a082 animation_started signal to AnimationPlayer 2016-04-14 17:19:20 +02:00
Rémi Verschelde c0576c64da Merge pull request #4317 from volzhs/typo-overwrite
correct typo "overwrite"
2016-04-14 14:03:26 +02:00
volzhs 86c6326057 correct typo "overwrite" 2016-04-14 20:52:30 +09:00
Rémi Verschelde 20f62dd958 Merge pull request #4308 from JoshuaGrams/atp-resources
AnimationTreePlayer: fix discrete value tracks.
2016-04-14 12:39:08 +02:00
Ignacio Etcheverry 3029f5ee02 Keep editable instances data when replacing tree root node 2016-04-12 20:49:43 +02:00
Josh Grams ee59b2053f AnimationTreePlayer: fix discrete value tracks.
Discrete value tracks don't update every frame (only when a new key is
reached).  So we can't use the actual property value as an accumulator:
it will end up being zero most of the time.
2016-04-12 11:54:17 -04:00
Rémi Verschelde 67682b35b0 Merge pull request #4295 from neikeq/pr-issue-2232
x11: Flush the X output buffer after changing mouse mode
2016-04-12 17:02:00 +02:00
Ignacio Etcheverry 5907a007dc x11: Flush the X output buffer after changing mouse mode 2016-04-12 16:20:28 +02:00
Rémi Verschelde 08aaff21f3 Merge pull request #4286 from JoshuaGrams/atp-resources
AnimationTreePlayer: allow animating resource properties.
2016-04-12 13:18:47 +02:00
Rémi Verschelde e07266f6c1 Merge pull request #4273 from bojidar-bg/add-layers-and-masks-to-3d
Port collision and layer masks to 3D
2016-04-12 13:17:26 +02:00
Rémi Verschelde 29ed58eab6 Merge pull request #4284 from JoshuaGrams/atp-process-mode
AnimationTreePlayer: constructor now sets processing mode.
2016-04-12 08:56:48 +02:00
Rémi Verschelde 15de5b0a2c Merge pull request #4289 from Zylann/issue4265_trackpad_option
Made trackpad behaviour optional in 3D mode (issue #4265)
2016-04-12 08:52:54 +02:00
Rémi Verschelde 16edce0cc2 Merge pull request #4287 from Zylann/fix_4163
Fixed #4163 (intersect_shape crashes on results limit)
2016-04-12 08:50:54 +02:00
mrezai 2cbd850979 Fix OpenSSL compilation on Windows
Fixes #4285.
2016-04-12 07:58:56 +02:00
Marc Gilleron 84d706cb35 Made trackpad behaviour optional in 3D mode (issue #4265) 2016-04-12 03:37:35 +02:00
Marc Gilleron d239e6bc0e Fixed #4163 (intersect_shape crashes on results limit) 2016-04-12 02:18:41 +02:00
Josh Grams aabb0d9cbc AnimationTreePlayer: allow animating resource properties.
e.g. Particles2D config and param values.
2016-04-11 20:10:35 -04:00
Rémi Verschelde 925aa086a2 Merge pull request #4275 from mrezai/openssl-1.0.1s
Update OpenSSL to version 1.0.1s
2016-04-11 23:16:31 +02:00
Rémi Verschelde 89fcd529f3 Merge pull request #4223 from AlexHolly/dictionary-has-all
dictionary has_all
2016-04-11 20:59:35 +02:00
Josh Grams ed497cb153 AnimationTreePlayer: constructor now sets processing mode. 2016-04-11 11:54:32 -04:00
Rémi Verschelde 7d1b4567b0 Merge pull request #4155 from JoshuaGrams/anim_tree_switched
AnimationTreePlayer: Various processing improvements
2016-04-11 13:02:21 +02:00
Rémi Verschelde a7e37586f3 Merge pull request #4264 from leezh/nrex-0.2
Updated nrex to v0.2
2016-04-11 11:18:40 +02:00
Rémi Verschelde 9d754247d9 Merge pull request #4266 from Paulb23/line_number_color
Added a setting to change the line number color
2016-04-11 11:17:52 +02:00
Rémi Verschelde 57cddf3811 Merge pull request #4269 from SaracenOne/subclass_extend
Subclasses can now extend from other subclasses in relative scripts.
2016-04-11 09:55:22 +02:00
Rémi Verschelde b6a2459870 Merge pull request #4268 from Paulb23/find_replace_undo_redo_fix
Fixed undo redo interaction with find replace
2016-04-11 09:53:11 +02:00
punto- e8a0b2462b Use non-templated nearest_power_of_2
Works around #4262 and likely #4190.

(cherry picked from commit 3a390e9b44)
2016-04-11 08:49:44 +02:00