aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4360 from AlexHolly/string-ends_withRémi Verschelde2016-04-182-0/+194
|\ | | | | string ends_with
| * string ends_withAlexander Holland2016-04-172-0/+194
| |
* | Merge pull request #4359 from neikeq/pr-issue-4351Rémi Verschelde2016-04-181-0/+1
|\ \ | | | | | | Fix 'Quit to Project Manager' not stopping the running application
| * | Fix 'Quit to Project Manager' not stopping the running applicationIgnacio Etcheverry2016-04-171-0/+1
| |/
* | tiny fix to loop restart (#4358)Alex2016-04-181-1/+1
| | | | | | Closes #4355
* | Merge pull request #4319 from kubecz3k/played_signalRémi Verschelde2016-04-183-0/+5
|\ \ | | | | | | animation_started signal for AnimationPlayer
| * | animation_started signal to AnimationPlayerJakub Grzesik2016-04-143-0/+5
| | |
* | | Merge pull request #4299 from neikeq/pr-issue-4297Rémi Verschelde2016-04-183-0/+13
|\ \ \ | |_|/ |/| | Keep editable instances data when replacing tree root node
| * | Keep editable instances data when replacing tree root nodeIgnacio Etcheverry2016-04-123-0/+13
| | |
* | | Merge pull request #4337 from bojidar-bg/translation-csv-newlinesRémi Verschelde2016-04-161-1/+3
|\ \ \ | | | | | | | | Fix File.get_csv_line not including quoted newlines in the output
| * | | Fix File.get_csv_line not including quoted newlines in the outputBojidar Marinov2016-04-161-1/+3
|/ / / | | | | | | | | | Close #1232
* | | Merge pull request #4325 from SaracenOne/bone_attachment_repositionRémi Verschelde2016-04-161-0/+1
|\ \ \ | | | | | | | | BoneAttachments now position themselves instantly during bind.
| * | | BoneAttachments now position themselves instantly during bind.Saracen2016-04-151-0/+1
| | | |
* | | | Merge pull request #4328 from mrezai/travisciRémi Verschelde2016-04-151-1/+1
|\ \ \ \ | |/ / / |/| | | Add openssl=builtin to build command in .travis.yml
| * | | Add openssl=builtin to build command in .travis.ymlmrezai2016-04-151-1/+1
|/ / /
* | | Merge pull request #4324 from HeartoLazor/path_2d_fixRémi Verschelde2016-04-151-1/+2
|\ \ \ | |_|/ |/| | Fixed curve baking, now always start at origin point
| * | Fixed curve baking, now always start at origin pointHearto Lazor2016-04-151-1/+2
|/ /
* | Merge pull request #4317 from volzhs/typo-overwriteRémi Verschelde2016-04-141-2/+2
|\ \ | | | | | | correct typo "overwrite"
| * | correct typo "overwrite"volzhs2016-04-141-2/+2
|/ /
* | Merge pull request #4308 from JoshuaGrams/atp-resourcesRémi Verschelde2016-04-142-6/+7
|\ \ | | | | | | AnimationTreePlayer: fix discrete value tracks.
| * | AnimationTreePlayer: fix discrete value tracks.Josh Grams2016-04-122-6/+7
| | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #4295 from neikeq/pr-issue-2232Rémi Verschelde2016-04-121-0/+2
|\ \ \ | | | | | | | | x11: Flush the X output buffer after changing mouse mode
| * | | x11: Flush the X output buffer after changing mouse modeIgnacio Etcheverry2016-04-121-0/+2
| | |/ | |/|
* | | Merge pull request #4286 from JoshuaGrams/atp-resourcesRémi Verschelde2016-04-122-10/+11
|\ \ \ | | |/ | |/| AnimationTreePlayer: allow animating resource properties.
| * | AnimationTreePlayer: allow animating resource properties.Josh Grams2016-04-112-10/+11
| | | | | | | | | | | | e.g. Particles2D config and param values.
* | | Merge pull request #4273 from bojidar-bg/add-layers-and-masks-to-3dRémi Verschelde2016-04-1214-3/+283
|\ \ \ | | | | | | | | Port collision and layer masks to 3D
| * | | Port collision and layer masks to 3D, fixes #1759Bojidar Marinov2016-04-0914-3/+283
| | |/ | |/| | | | | | | Raycasts now have type_mask and layer_mask. Areas - collision_mask and layer_mask. PhysicsBodies needed only collision_mask.
* | | Merge pull request #4284 from JoshuaGrams/atp-process-modeRémi Verschelde2016-04-121-1/+0
|\ \ \ | | | | | | | | AnimationTreePlayer: constructor now sets processing mode.
| * | | AnimationTreePlayer: constructor now sets processing mode.Josh Grams2016-04-111-1/+0
| | | |
* | | | Merge pull request #4289 from Zylann/issue4265_trackpad_optionRémi Verschelde2016-04-122-1/+3
|\ \ \ \ | | | | | | | | | | Made trackpad behaviour optional in 3D mode (issue #4265)
| * | | | Made trackpad behaviour optional in 3D mode (issue #4265)Marc Gilleron2016-04-122-1/+3
| | |_|/ | |/| |
* | | | Merge pull request #4287 from Zylann/fix_4163Rémi Verschelde2016-04-121-1/+1
|\ \ \ \ | | | | | | | | | | Fixed #4163 (intersect_shape crashes on results limit)
| * | | | Fixed #4163 (intersect_shape crashes on results limit)Marc Gilleron2016-04-121-1/+1
| |/ / /
* | | | Fix OpenSSL compilation on Windowsmrezai2016-04-121-1/+5
| | | | | | | | | | | | Fixes #4285.
* | | | Merge pull request #4275 from mrezai/openssl-1.0.1sRémi Verschelde2016-04-11914-209161/+215798
|\ \ \ \ | | | | | | | | | | Update OpenSSL to version 1.0.1s
| * | | | Update OpenSSL to version 1.0.1smrezai2016-04-10914-209161/+215798
| | |_|/ | |/| |
* | | | Merge pull request #4223 from AlexHolly/dictionary-has-allRémi Verschelde2016-04-113-0/+14
|\ \ \ \ | |_|/ / |/| | | dictionary has_all
| * | | dictionary has_allAlexander Holland2016-04-043-0/+14
| | | |
* | | | Merge pull request #4155 from JoshuaGrams/anim_tree_switchedRémi Verschelde2016-04-112-71/+67
|\ \ \ \ | |_|_|/ |/| | | AnimationTreePlayer: Various processing improvements
| * | | AnimationTreePlayer (transition_node_set_current): fix by removing ↵Josh Grams2016-04-062-19/+16
| | | | | | | | | | | | | | | | copy-paste duplication.
| * | | AnimationTreePlayer (set_active, reset, constructor): seek all animations to ↵Josh Grams2016-04-061-2/+3
| | | | | | | | | | | | | | | | start.
| * | | AnimationTreePlayer (_process_node): more robust oneshot termination condition.Josh Grams2016-04-061-2/+2
| | | |
| * | | AnimationTreePlayer (_process_node:TIMESEEK): allow auto-advance with 0 xfade.Josh Grams2016-03-311-1/+1
| | | |
| * | | AnimationTreePlayer (_process_node:TIMESEEK): give p_seek precedence over ↵Josh Grams2016-03-311-6/+6
| | | | | | | | | | | | | | | | tsn->seek_pos.
| * | | * AnimationTreePlayer (_process_node): remove `switched` argument.Josh Grams2016-03-272-43/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The _process_node function (which recurses through the blend tree generating blend values and the active animation list) had an argument named `switched` which would loop an animation back to the beginning if it had reached the end (regardless of whether or not it was supposed to be a looping animation). This argument was only used in four places: two of them were overridden by a seek-to-zero, and I believe the other two are bugs. In OneShot, it was used to reset the oneshot animation to the beginning when fired. But this would fail if the oneshot node was fired before it had completed its previous run. While this *could* be a valid way for oneshot to work (firing does nothing if it's already running), the code currently resets the fade-in, so I believe that it is intended to reset. I replaced this usage with seek-to-0. In Transition, it was used on the previous (fading out) animation when seeking the Transition node, which I believe is incorrect: why would you want to loop a non-looping animation instead of simply fading out from the end? Also it will never happen unless you seek the Transition node twice during one cross-fade. The other two uses are in Transition and _process_animation, where it is used along with a seek-to-zero which overrides it.
* | | | Merge pull request #4264 from leezh/nrex-0.2Rémi Verschelde2016-04-113-43/+113
|\ \ \ \ | | | | | | | | | | Updated nrex to v0.2
| * | | | Updated nrex to v0.2Zher Huei Lee2016-04-083-43/+113
| | |_|/ | |/| | | | | | | | | | | | | | | | | | * Fixed capturing groups matching to invalid results * Fixed parents of recursive quantifiers not expanding properly * Fixed LookAhead sometimes adding to result
* | | | Merge pull request #4266 from Paulb23/line_number_colorRémi Verschelde2016-04-114-3/+5
|\ \ \ \ | | | | | | | | | | Added a setting to change the line number color
| * | | | Setting to change line number colorPaulb232016-04-084-3/+5
| |/ / /
* | | | Merge pull request #4269 from SaracenOne/subclass_extendRémi Verschelde2016-04-111-1/+16
|\ \ \ \ | | | | | | | | | | Subclasses can now extend from other subclasses in relative scripts.