Commit Graph

3703 Commits

Author SHA1 Message Date
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
mrezai
c860574d8b Update OpenSSL to version 1.0.1s 2016-04-10 17:48:59 +04:30
Aleksandar Danilovic
7762e1afe6 Fixes 64 bit MSVC builds, disables bits parameter
Also Enables automatic detection of architecture for the MSVC compilers.
Builds without assembly optimisations for x64
Closes issue #3098

Signed-off-by: Aleksandar Danilovic <greatgames.alexandar@gmail.com>
2016-04-10 03:36:58 +02:00
Bojidar Marinov
f7c3d6329c Port collision and layer masks to 3D, fixes #1759
Raycasts now have type_mask and layer_mask. Areas - collision_mask and layer_mask. PhysicsBodies needed only collision_mask.
2016-04-09 22:11:12 +03:00
Saracen
d643a40f95 Subclasses can now extend from other subclasses contained in scripts derived from relative paths. 2016-04-09 03:23:33 +01:00
Paulb23
189b306722 Fixed undo redo interaction with find replace 2016-04-09 01:27:14 +01:00
Paulb23
8c328474f2 Setting to change line number color 2016-04-08 20:11:16 +01:00
Zher Huei Lee
6207d56b95 Updated nrex to v0.2
* Fixed capturing groups matching to invalid results
 * Fixed parents of recursive quantifiers not expanding properly
 * Fixed LookAhead sometimes adding to result
2016-04-08 13:29:37 +01:00
Rémi Verschelde
d454e64f42 Sync docs with source 2016-04-07 21:27:29 +02:00
Rémi Verschelde
473de561f8 Remove duplicate 2016-04-07 21:20:22 +02:00
Rémi Verschelde
b9ac3df29b Merge pull request #4259 from neikeq/pr-issue-4224
Fix RayCast not updating when debugging collissions
2016-04-07 14:13:48 +02:00
Rémi Verschelde
823e87baee Merge pull request #4258 from neikeq/pr-imp-canvas-select
Avoid selecting items from instanced scenes in CanvasItemEditorPlugin
2016-04-07 14:12:44 +02:00
Rémi Verschelde
33d63f42f5 Merge pull request #4257 from sanikoyes/Pr-gui-fix-warn
Fix warn print when hide an control does not inside_tree
2016-04-07 14:10:50 +02:00
Rémi Verschelde
e7b6994e24 Merge pull request #4256 from sanikoyes/Pr-fix-tween-crash
Fix crash when tween control object previous freed
2016-04-07 14:10:38 +02:00
Ignacio Etcheverry
6cf3bdcf76 Fix RayCast not updating when debugging collissions 2016-04-07 13:30:40 +02:00
Ignacio Etcheverry
fab57f2fbc CanvasItemEditorPlugin: Avoid selecting items from instanced scenes
- This behaviour is only applied to click selection. Rect selection and List selection can still select these items
2016-04-07 13:08:18 +02:00
Rémi Verschelde
7820e590ea Doc: fix type of stream object 2016-04-07 11:45:39 +02:00
sanikoyes
5ec7d3f264 Fix warn print when hide an control does not inside_tree 2016-04-07 15:46:38 +08:00
sanikoyes
da28a2f062 Fix crash when tween control object previous freed 2016-04-07 15:45:16 +08:00
Josh Grams
4f6b2152e2 AnimationTreePlayer (transition_node_set_current): fix by removing copy-paste duplication. 2016-04-06 15:09:00 -04:00
Josh Grams
1b95dca6bd AnimationTreePlayer (set_active, reset, constructor): seek all animations to start. 2016-04-06 15:07:58 -04:00
Josh Grams
5d6b58fea6 AnimationTreePlayer (_process_node): more robust oneshot termination condition. 2016-04-06 15:06:42 -04:00
Rémi Verschelde
3e3f16fefc Merge pull request #4251 from Paulb23/block_indent_issue_3803
Fixed block indent inconsistency, issue #3803
2016-04-06 19:39:07 +02:00
Rémi Verschelde
e26f3dc03a Merge pull request #4253 from Paulb23/toggle_syntax_highlighting
Option to toggle syntax highlighting
2016-04-06 19:38:46 +02:00
Paulb23
d78e98e2a4 Option to toggle syntax highlighting 2016-04-06 18:27:58 +01:00
Paulb23
93700676b5 Fixed block indent inconsistency, fixes issue 3803 2016-04-06 17:46:10 +01:00