Geequlim
dde995a513
Make dialogs translatable
2016-05-30 22:23:53 +08:00
Juan Linietsky
9b1f8230ec
-Some fixes to OSX retina scaling for window functions
...
-Implemented HiDPI detection and support for Godot Editor!
2016-05-30 00:28:29 -03:00
Rémi Verschelde
c2b1315689
Merge pull request #4847 from Hinsbart/fix_icon_scale_new
...
Proper alignment and fixed scaling for TileMapEditor tile icons.
2016-05-29 18:39:05 +02:00
Rémi Verschelde
e8d5ff5169
Merge pull request #4823 from Paulb23/fix_backspace_selection_redo_crash
...
Fix crash when redoing backspace to clear selection
2016-05-29 18:34:31 +02:00
Rémi Verschelde
d3b46b6bf2
Merge pull request #4822 from Paulb23/breakpoint_marker_issue_4750
...
Added breakpoint markers, issue 4750
2016-05-29 18:34:13 +02:00
Rémi Verschelde
6a7530c718
Merge pull request #4812 from neikeq/pr-search-bar
...
ScriptEditor/ShaderEditor: Replace find/replace dialog with a bar
2016-05-29 18:32:06 +02:00
Juan Linietsky
3e8eb396d7
Finalized DynamicFont implementation
...
-DynamicFont uses Freetype by default
-Editor fonts are now scalable thanks to this
-Cleaned up documentation browser and added fonts for this
2016-05-29 11:37:52 -03:00
Ignacio Etcheverry
51be9beec9
ScriptEditor/ShaderEditor: Replace find/replace dialog with a bar
2016-05-29 14:26:19 +02:00
Ignacio Etcheverry
aba972238e
TextEdit: Improve search method to avoid overlapping results
2016-05-28 18:23:49 +02:00
Ignacio Etcheverry
65fa8f91ca
TextEdit: Avoid capturing KEY_ESCAPE when there is no completion hint
2016-05-28 18:22:54 +02:00
Bojidar Marinov
ab97718d8a
Reorder tiles into nice columns
2016-05-27 22:42:51 +03:00
Juan Linietsky
8be2fabbe5
Changed import workflow
...
-Rearrange favorites in fs dock with drag and drop
-Removed import -> sub-scene, moved to scenetree contextual menu
-Removed import -> re-import , moved and integrated to FS dock
-Added ability in FS dock to re-import more than one resource
simultaneously
-Added ability to drag from native filesystem explorer to Godot, only
works on Windows though
-Removed scene reimport merge options, never worked well. Eventually
merging materials should be re-added
-Added ability to set custom root node type when importing scenes
-Re-Import is now automatic, can be configured back to manual in editor
settings
-Added resource previews in property list for many resource types
2016-05-27 14:19:11 -03:00
Andreas Haas
7c1594ee5a
Use scalar to scale TileMap icons
2016-05-27 18:54:46 +02:00
Paulb23
4a5997ec1c
Fix crash when redoing backspace to clear selection
2016-05-26 14:45:11 +01:00
Paulb23
72fda444d1
Added breakpoint markers, issue 4750
2016-05-26 14:17:14 +01:00
Andreas Haas
677b77036a
Allow ItemList icons to stretch to max size.
2016-05-24 20:36:46 +02:00
Rémi Verschelde
15e9f66a1a
Merge pull request #4798 from Paulb23/caret_color_not_setting
...
Fixed caret colour not changing though properties
2016-05-24 17:09:46 +02:00
Paulb23
6dd538a7ae
Fixed caret color not changing though properties
2016-05-24 15:21:34 +01:00
Rémi Verschelde
98e73429af
Merge pull request #4792 from djrm/better_property_ranges
...
Better property ranges
2016-05-24 07:35:42 +02:00
Juan Linietsky
e843e74d39
General docks clean up
...
-Moved path box above in fs dock
-Remove up/down button and added reordering with DND of favorites
-Changed zoom icon to be centered vertically
-Made filter for files always visible
-Added some options to TextureFrame for better alignment/stretching
2016-05-23 23:24:32 -03:00
Daniel J. Ramirez
ba0baa3ca7
Modified damp ranges
2016-05-23 18:23:51 -05:00
Daniel J. Ramirez
c9350d7897
Clamped some light2D ranges
2016-05-23 17:56:10 -05:00
Juan Linietsky
d3495b128a
-Improve resource previews
...
-Also fixed draw_texture_rect() tile parameter
2016-05-23 17:11:49 -03:00
Zher Huei Lee
0ccf153a15
GUI Focus mode improvements
...
Exposed `get_focus_mode()` to the script
Added `focus_mode` to the property panels for line-edit and sliders
Added `enabled_focus_mode` to the property panels for buttons
enabled_focus_mode is used when button is enabled/disabled
2016-05-23 15:08:50 +01:00
Ovnuniarchos
0d20ceeb61
Polygon2D now exposes vertex colors.
2016-05-23 03:40:45 +02:00
Juan Linietsky
b2a4908e9c
Real-Time Remote Inspector support
2016-05-22 19:29:06 -03:00
Juan Linietsky
eacb8f04c4
Merge remote-tracking branch 'origin/master'
2016-05-21 22:34:55 -03:00
Juan Linietsky
a75f896338
First version of Profiler
...
It is now possible to profile GDScript as well as some parts of Godot
internals.
2016-05-21 21:18:16 -03:00
Hubert Jarosz
33403d91f7
remove trailing whitespace
2016-05-21 15:29:25 +02:00
Rémi Verschelde
da24bc8f3f
VehicleBody: Cosmetic fixes to previous commit
2016-05-21 11:52:21 +02:00
Agustin Benavidez
97da9f14ab
Add get_linear_velocity() method to VehicleBody class
...
Doc added also.
2016-05-21 11:35:55 +02:00
Rémi Verschelde
94c34ff890
i18n: Proofreading of all strings
...
Done to ensure that no important identifiers are translatable,
to fix compound strings using the new vformat() function, and
some general English proofreading here and there.
2016-05-21 00:21:57 +02:00
captainwasabi
4b80895082
Fix for tooltip blinking ( #4713 )
...
Moved where active tooltips are canceled to wait until the mouse actually moves off the control.
2016-05-20 13:56:42 +02:00
Christian Dannie Storgaard
8884b8f519
Added toggle for loop interpolation based on adolson's code
2016-05-20 13:13:32 +03:00
volzhs
ebcf04ff1f
fix compile failure when tools=no
2016-05-18 14:29:53 +09:00
Rémi Verschelde
be4d95c19a
CanvasModulate: fix build issue with GCC
...
Bug from c195c0d
.
2016-05-17 23:47:26 +02:00
Juan Linietsky
c195c0df6b
-Added configuration warning system for nodes
...
-Added a new "add" and "instance" buttons for scene tree
-Added a vformat() function to ease translation work
2016-05-17 18:28:44 -03:00
volzhs
d6ccea541d
remove old bind for add_frame of SpriteFrames
...
it causes ``ERROR: Method already bound: SpriteFrames::add_frame``
2016-05-17 22:48:36 +09:00
Rémi Verschelde
02f3e7e766
Merge pull request #4659 from Paulb23/hex_notation_highlighting
...
Fixed hex notation highlighting
2016-05-17 09:33:44 +02:00
Rémi Verschelde
68dc685f1f
Merge pull request #4652 from Paulb23/node_duplication_position
...
Node duplication positions under duplicated node, issue #964
2016-05-17 09:14:23 +02:00
Juan Linietsky
f93aaa9b78
Default editing popup for LineEdit and TextEdit
2016-05-16 20:25:17 -03:00
Juan Linietsky
f9d615ee87
Contextualized Scene Tree menu
...
-Added context menu to Scene Tree Dock
-Removed Buttons
-Added a filter to search for nods more easily in the dock
2016-05-16 12:23:58 -03:00
Juan Linietsky
a2c4c17085
Experimental Right Mouse Button menu for SceneTree
...
Will eventually replace the buttons of that dock, so please test it!
2016-05-15 23:41:48 -03:00
Juan Linietsky
8b47e26f59
Changes to FileSystem Dock
...
-Replaced buttons for file actions fo RMB menu
-Added a split mode, if the dock is not sharing vertical space with
anything else
-imroved drag and drop support
2016-05-15 20:25:51 -03:00
Juan Linietsky
bed3efb17e
New reworked AnimatedSprite!
...
-New SpriteFrames editor, with support for drag&drop, multiple animation
sets, animation speed and loop.
-New AnimatedSprite, with support for all the new features!
AnimatedSprite3D has not been updated yet.
-Added support for drag&drop to other editors, such as resourcepreload,
sample library, etc.
2016-05-14 23:48:45 -03:00
Paulb23
b2bf266ddc
Fixed hex notation highlighting
2016-05-15 01:32:43 +01:00
Paulb23
aee156dc02
Node duplication positions under duplicated node, issue 964
2016-05-13 20:05:52 +01:00
Juan Linietsky
da7a9aae27
Merge pull request #4096 from neikeq/pr-margin-cont-imp
...
MarginContainer improvements
2016-05-13 13:13:12 -03:00
volzhs
81b4d38fa7
open directory or file when double click
...
fixes #4607
2016-05-13 01:22:19 +09:00
MattUV
91c85ff1f5
classref: Fixed return types in Area and Area2D ( #4635 )
2016-05-12 17:03:15 +02:00
Juan Linietsky
0c57a58056
ability to drag scenes from filesystem to tree for instancing
2016-05-11 20:57:52 -03:00
Rémi Verschelde
b42c4cce0f
Merge pull request #4627 from Paulb23/caret_blink_binds
...
Exposed caret blink to gdscript and properties
2016-05-11 19:05:55 +02:00
Paulb23
dc90cba42e
Bind caret blink to gdscript and properties
2016-05-11 17:41:57 +01:00
Rémi Verschelde
7b471068cf
Merge pull request #4612 from bojidar-bg/fix-anchor-builds
...
Fix #4588 (crash in Control::_set_anchor)
2016-05-11 17:46:29 +02:00
Juan Linietsky
d7318f6965
-begun implementing drag & drop editor wide
...
-filesystem dock dnd support
-property list dnd support
-scene tree dnd support
2016-05-11 11:59:03 -03:00
Rémi Verschelde
b9b423c1ee
Merge pull request #4598 from Paulb23/caret_blink
...
Added caret blink to the text editor
2016-05-11 09:33:12 +02:00
Bojidar Marinov
0b572b35c2
Fix #4588 (crash Control::_set_anchor)
...
Thanks to @vnen for testing this
2016-05-10 20:23:58 +03:00
Rémi Verschelde
bc31be9812
Sync classes.xml with current sources
...
Also fix a typo in the binding of Control::set_drag_forwarding.
2016-05-09 22:20:35 +02:00
Paulb23
e03e7deb1b
Added caret blink in text editor
2016-05-09 19:22:11 +01:00
Rémi Verschelde
0dfc4a2029
Merge pull request #4571 from akien-mga/pr-rot-deg
...
Rotation APIs: Better exposure for degrees methods
2016-05-09 19:08:06 +02:00
Paulb23
9e6234201b
Fixed autocomlete strings not appearing for function arguments
2016-05-08 13:18:50 +01:00
Rémi Verschelde
59e68ae6d0
Merge pull request #4557 from Paulb23/autocomplete_truncate_issue_4554
...
Fixed autocomplete truncate, issue 4554
2016-05-07 20:19:40 +02:00
Paulb23
488495852b
Fixed animation player auto-queue duplication and undo/redo
2016-05-07 17:27:52 +01:00
Paulb23
0a2b341d0a
Fixed code completion after opening bracket, issue 3977
2016-05-07 12:01:56 +01:00
Rémi Verschelde
4eab767a6f
Rotation APIs: Better exposure for degrees methods
...
Made public the various set/getters for rotations in degrees.
For consistency, renamed the exposed method names to remove the leading
underscore, and kept the old names with a deprecation warning.
Fixes #4511 .
2016-05-06 23:38:08 +02:00
Paulb23
accc2a195b
Fixed autocomplete truncate, issue 4554
2016-05-05 16:27:05 +01:00
Rémi Verschelde
99e31e1005
Merge pull request #4547 from neikeq/pr-wrong-debug-methods
...
Fix wrong return and argument types in documentation
2016-05-05 09:27:14 +02:00
Juan Linietsky
f909634832
-make sure single select after multi select works better
...
-fixed some warnings for OSX
2016-05-04 17:41:58 -03:00
Ignacio Etcheverry
1e752c0120
Fix wrong return and argument types in documentation
2016-05-04 15:35:09 +02:00
Rémi Verschelde
6a4b62e720
Merge pull request #4535 from sanikoyes/Pr-crash-dynamic-font
...
Fix crash in dynamic font
2016-05-04 08:35:16 +02:00
Juan Linietsky
dd69aeceac
Merge remote-tracking branch 'origin/master'
2016-05-03 22:32:38 -03:00
Paulb23
084d0bef96
Autocomplete no longer shows duplicates, issue 1824
2016-05-03 19:48:35 +01:00
Juan Linietsky
c7e8def446
Add ability to send drag events to another object
...
will be documented/tested later
2016-05-03 11:10:28 -03:00
sanikoyes
c824781e98
Fix crash in dynamic font
2016-05-03 17:25:33 +08:00
Juan Linietsky
78eccd61f8
Revert "added name parameter on animationplayer finished"
2016-05-02 14:22:27 -03:00
Rémi Verschelde
479cfb1d36
Merge pull request #4518 from AlexHolly/animationplayer-finished-name
...
added name parameter on animationplayer finished
2016-05-02 11:37:40 +02:00
Juan Linietsky
5bb7cef836
Support for dynamic fonts (TTF)
...
Added support for DynamicFont, which can load a TTF of any size to use
as a font. No import required.
2016-05-01 23:13:06 -03:00
Alexander Holland
f9fafb75dc
added name parameter on animationplayer finished
2016-05-02 01:48:00 +02:00
Rémi Verschelde
21c181bd3c
Tabs: Fix align issue with right/close buttons
...
The stylebox around the close button was badly centered.
There were also bad margins applied when using right buttons.
2016-05-01 16:48:55 +02:00
Rémi Verschelde
8b32c80529
Tabs: cleanup code, no functional change
...
Some dead code removed, a few cosmetic changes.
2016-05-01 16:27:33 +02:00
Rémi Verschelde
8574489dd2
Tabs: Fix navigation buttons overlap when resizing
...
It was not taking into account the minimum width of the stylebox.
Fixed by factorizing some duplicate code.
2016-05-01 15:29:07 +02:00
Rémi Verschelde
bbaf296948
Tabs: Fix icon size not taken into account for offset
...
Fixes #4107 .
2016-05-01 14:54:45 +02:00
Rémi Verschelde
ab7886ffc4
FileDialog: reset mkdir label after use ( #4500 )
...
Closes #1686 .
2016-05-01 11:38:24 +02:00
Rémi Verschelde
6883325f92
math: Fix rounding error for 0 in Math::round ( #4495 )
...
Thus revert the previous workaround in commit b123bc4a2a
.
Fixes #3221 .
2016-05-01 11:37:46 +02:00
Franco Eusébio Garcia
a735573327
Add math/script expression evaluation in editor ( #3620 )
...
Rebase of #453
2016-05-01 10:33:32 +02:00
Rémi Verschelde
a0dce1e66f
Merge pull request #4482 from Geequlim/master
...
Add more documentations and fix AcceptDialog::add_cancel
2016-04-29 10:43:50 +02:00
Geequlim
5c61e17c10
Add more documentations and fix AcceptDialog::add_cancel
2016-04-29 16:34:07 +08:00
Rémi Verschelde
c97cc362e3
Merge pull request #4387 from JoshuaGrams/rigidbody2d-torque
...
Hooked up RigidBody2D torque methods
2016-04-29 10:29:12 +02:00
Juan Linietsky
0fa588a830
move Font to BitmapFont
...
so we can add DynamicFont later..
2016-04-28 22:21:36 -03:00
Rémi Verschelde
45ffc053b5
Merge pull request #4462 from Paulb23/scroll_lines
...
Added scroll lines, issue #4243
2016-04-28 20:53:41 +02:00
Rémi Verschelde
0485c9eaba
Merge pull request #4451 from JoshuaGrams/anim-tree-filter
...
Anim tree: add filters on Animation nodes
2016-04-28 20:48:38 +02:00
Rémi Verschelde
3a4ec88b37
Classref: Document Button and ButtonArray
...
Also bind relevant constants and define some object types and better
argument names for the docs.
2016-04-28 00:10:17 +02:00
Paulb23
54244e0e1d
Added scroll lines, issue 4243
2016-04-27 18:32:14 +01:00
Josh Grams
a7b4127481
RigidBody2D (add_force, set_inertia): new methods.
2016-04-26 08:15:15 -04:00
Josh Grams
bd95e18ae4
AnimationTree: add filters to Animation nodes.
2016-04-26 06:49:06 -04:00
Josh Grams
2272824ee2
AnimationTree: set value track property per frame, not per track.
2016-04-24 04:39:32 -04:00
Josh Grams
ffaced87a6
RigidBody2D: rename apply_impulse(pos) to offset.
2016-04-24 04:36:51 -04:00
Bojidar Marinov
b2e0cedbf0
Fix continious update with Camera2D
...
Closes #4406
2016-04-23 15:27:32 +03:00
Aren Villanueva
d75856146c
Adds a remove class item option in the theme editor.
...
I've also added a get_stylebox_types helper function to the theme class in order to figure out exactly what types are available to a theme.
2016-04-21 11:58:53 +10:00
Josh Grams
f7d31cec38
RigidBody2D: add and bind get_inertia() method.
...
You can't set this value very well, since it's automatically computed
from the mass and the collision shapes. But since the values are higher
than many people might suspect, so being able to read it helps estimate
the amount of torque you might need to apply.
2016-04-20 20:49:37 -04:00
Josh Grams
dbabe4c07c
RigidBody2D: add and bind get/set_applied_torque.
2016-04-20 19:49:35 -04:00
Rémi Verschelde
c0ec7e933a
Merge pull request #4302 from Anarchid/gridmap-navmesh
...
Navmesh support for GridMaps
2016-04-20 21:12:35 +02:00
Anarchid
73ca831848
Implement GridMap support for navigation meshes
2016-04-20 21:19:05 +03:00
Rémi Verschelde
30e5df6e21
Merge pull request #4365 from bojidar-bg/surfacetool-add-quad
...
Add an add_triangle_fan method to SurfaceTool
2016-04-19 22:40:22 +02:00
Rémi Verschelde
6da39ce18d
Merge pull request #4380 from bojidar-bg/camera2d-fix-zoom
...
Fix Camera2D ignoring zoom when checking limits
2016-04-19 20:48:59 +02:00
Bojidar Marinov
7a8aea0be9
Fix Camera2D ignoring zoom when checking limits
...
Closes #1912
2016-04-19 21:35:02 +03:00
Bojidar Marinov
e7f66a88d6
Add preview of the Camera2D's screen boundaries
...
Closes #3365
2016-04-19 16:07:06 +03:00
Bojidar Marinov
325a02e4af
Add a add_triangle_fan method to SurfaceTool
...
Closes #4298
2016-04-18 20:33:54 +03: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
Saracen
bc5ee6c98f
BoneAttachments now position themselves instantly during bind.
2016-04-15 11:32:10 +01: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
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
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
Josh Grams
aabb0d9cbc
AnimationTreePlayer: allow animating resource properties.
...
e.g. Particles2D config and param values.
2016-04-11 20:10:35 -04: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
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
Paulb23
8c328474f2
Setting to change line number color
2016-04-08 20:11:16 +01: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
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
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
Paulb23
93700676b5
Fixed block indent inconsistency, fixes issue 3803
2016-04-06 17:46:10 +01:00
Rémi Verschelde
d5191a610b
Merge pull request #4248 from bojidar-bg/fix-launchmedia-for-bones
...
Fix Ctrl+LaunchMedia showing up as a shortcut for "Make Bones"
2016-04-06 18:43:15 +02:00
Rémi Verschelde
44446cf58b
Merge pull request #4238 from Paulb23/caret_color
...
Ability to change the caret color
2016-04-06 18:42:32 +02:00
Rémi Verschelde
d6871ee847
Merge pull request #4234 from Paulb23/member_variable_syntax_highlighting
...
Member variable syntax highlighting
2016-04-06 18:42:13 +02:00
Bojidar Marinov
6dcd1354c2
Add a `sleeping_state_changed` signal to RigidBody and RigidBody2D classes
...
Closes #3911
2016-04-06 17:14:38 +03:00
Bojidar Marinov
b7d79c93f4
Fix PopupMenu and MenuButton not activating items with shortcut inside submenus
2016-04-06 15:42:50 +03:00
Paul Batty
646e089782
Fixed text edit undo and redo operation interaction
2016-04-06 08:36:29 +02:00
Paulb23
c7519f091d
Ability to change the caret color
2016-04-05 17:06:56 +01:00
Paulb23
fc9f9adcb2
Member variable syntax highlighting
2016-04-05 15:50:54 +01:00
Paulb23
971c3be52d
Fixed 'complex' typo in method name
2016-04-05 14:30:00 +01:00
Paulb23
15f43149e1
Fixed undoing twice when removing selection
2016-04-05 13:52:18 +01:00
Rémi Verschelde
72825ecdca
Merge pull request #4191 from leezh/progressbar_minsize
...
Progress bar minsize now checks percent_visible
2016-04-04 07:31:03 +02:00
Paulb23
a984adb5a6
Fixed insert mode interaction with auto complete
2016-04-03 15:21:16 +01:00
Paulb23
fe779d4386
Fixed insert mode removing first unselected character
2016-04-03 14:54:54 +01:00
Paul Batty
50aa78210c
Function syntax highlighting
2016-04-02 21:46:42 +02:00
Rémi Verschelde
48f057ea81
Merge pull request #4193 from Paulb23/text_edit_insert_mode
...
Added insert mode to text editor
2016-04-02 20:25:24 +02:00
Paulb23
2b57cb94da
Added insert mode to text editor
2016-04-01 13:48:38 +01:00
Hearto Lazor
995890d5b2
Now the timer could be paused
...
pause with: set_active(true/false)
is paused with: is_active()
2016-03-31 18:23:16 -03:00
Josh Grams
0a9c8a9f36
AnimationTreePlayer (_process_node:TIMESEEK): allow auto-advance with 0 xfade.
2016-03-31 12:12:05 -04:00
Josh Grams
7fe28d4168
AnimationTreePlayer (_process_node:TIMESEEK): give p_seek precedence over tsn->seek_pos.
2016-03-31 10:06:38 -04:00
Zher Huei Lee
0bba09c4cb
Progress bar minsize now checks percent_visible
...
Allows for really thin progress bars such as for pixel-art styles.
2016-03-31 12:58:07 +01:00
Josh Grams
8920ab0fbf
* AnimationTreePlayer (_process_node): remove `switched` argument.
...
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.
2016-03-27 07:19:05 -04:00
Paulb23
cd07badee3
Fixed numbers not highlighting after space
2016-03-26 22:03:27 +00:00
Rémi Verschelde
15d1fca061
Merge pull request #4102 from SaracenOne/dynamic_margin_properties
...
Dynamic property list for control margins
2016-03-23 09:36:18 +01:00
Rémi Verschelde
e8ee4f7973
Merge pull request #4115 from Paulb23/number_syntax_highlighting
...
Syntax highlighting for numbers
2016-03-22 07:34:08 +01:00
sanikoyes
0c6f089ce4
Fix GDScript crash when call show/hide in func _exit_tree
2016-03-22 12:46:33 +08:00
Paulb23
c844c2d604
Syntax highlighting for numbers
2016-03-21 15:45:38 +00:00
Ignacio Etcheverry
d38454b967
MarginContainer: Add top, right and bottom margins
2016-03-21 00:53:47 +01:00
Saracen
d8392dd117
Dynamic property list for control margins allowing floating point properties to be used with ratio anchors.
2016-03-20 05:59:18 +00:00
Saracen
3741bc70fe
Added listener spatial node.
2016-03-20 02:10:04 +00:00
Rémi Verschelde
b8daa7e6e6
Merge pull request #4095 from neikeq/pr-bind-add_spacer
...
BoxContainer: Bind method add_spacer(bool)
2016-03-19 13:55:04 +01:00
Rémi Verschelde
bf13f29b15
Merge pull request #4094 from neikeq/pr-fix-4062
...
TextEdit: Fix Shift+Delete shortcut not calling cut()
2016-03-19 13:54:02 +01:00
Ignacio Etcheverry
0571f961a8
BoxContainer: Bind method add_spacer(bool)
2016-03-19 13:37:07 +01:00
Ignacio Etcheverry
abb720438f
TextEdit: Fix Shift+Delete shortcut not calling cut()
2016-03-19 13:22:44 +01:00
Bojidar Marinov
2a581835ca
Fix issues with tilemap covering child nodes and old quadrants
...
Closes #4070
2016-03-18 18:57:26 +02:00
Saracen
44fe74bfc3
Fix cursor getting locked on tree control if tree is cleared while modifying numerical element.
2016-03-17 23:10:09 +00:00
Paulb23
9c0e1524e5
Fixed highlighting when word occurs as substring first
2016-03-17 20:35:04 +00:00
Paulb23
4cc3fbeaff
Fixed highliting with shift and mouse
2016-03-17 19:37:19 +00:00
Paulb23
b0488cacf2
Highlight all occurrences of selected word
2016-03-16 21:20:42 +00:00
Ignacio Etcheverry
fac027cb14
LineEdit/TextEdit: Add Shift+Delete shortcut for cut
2016-03-15 13:03:38 +01:00
Ignacio Etcheverry
4dfd0c1863
TextEdit: Fix inconsistent copy, cut and paste behaviour
2016-03-15 13:02:38 +01:00
Rémi Verschelde
aec4f57f95
Merge pull request #3528 from SaracenOne/baked_light_realtime_colourize
...
Ability to colourize baked lighting in real time.
2016-03-15 10:22:09 +01:00
Rémi Verschelde
c1a1adae28
Merge pull request #4051 from AlexHolly/fileeditor-open-any
...
(editor)filedialog open file and dir MODE_OPEN_ANY
2016-03-15 08:45:01 +01:00
Rémi Verschelde
86c6a4a8f6
Merge pull request #4056 from TheHX/issue-1423
...
Automatically create input node when creating a ShaderGraph
2016-03-14 20:08:44 +01:00
Franklin Sobrinho
5ee67ba498
Automatically create input node when creating a ShaderGraph
2016-03-14 15:24:12 -03:00
Rémi Verschelde
c30bebd1d3
Merge pull request #4017 from Paulb23/set_tab_size
...
Added configurable tab size in the text editor.
2016-03-14 17:12:15 +01:00
Paulb23
9234bd3ff9
Added configuable tab size
2016-03-14 15:13:45 +00:00
Alexander Holland
751c1deef1
(editor)filedialog mode open any
2016-03-14 16:03:18 +01:00
Rémi Verschelde
8b9596b7bf
Merge pull request #4035 from TheHX/item-list
...
Add icon region support for ItemList
2016-03-13 23:52:27 +01:00
Saracen
b2e471fd7c
Undo and redo commands on text editor now affect internal version which fixes inconsistent file saving validation.
2016-03-13 20:08:12 +00:00
Franklin Sobrinho
1f07fe5502
Add icon region support for ItemList
2016-03-13 12:51:19 -03:00
Juan Linietsky
8b1dcbfe4d
-Made editor support SSL certs by default (embedded them)
...
-Made asset sharing support https
-Many fixes to HTTPRequest
-Added an asset installer dialog
-Visual cleanups to asset sharing tab
-Fixed some issues in ScrollContainer, hope it does not break things
-Asset sharing tab is not visible (hidden on purpose) for now.
2016-03-12 10:46:38 -03:00
Rémi Verschelde
6e86a05350
Merge pull request #4012 from sanikoyes/Pr-linke-fail-disable-3d
...
Fix link error when disable_3d=yes
2016-03-11 07:11:23 +01:00
sanikoyes
a638af886e
Fix link error when disable_3d=yes
2016-03-11 10:01:56 +08:00
Bojidar Marinov
bac875be66
Fix a crash when running a game with Controls with a tools build
...
Regression from #3997
TOOLS_ENABLED is defined, even when running from editor, but EDITOR_DEF SEGFAULTs
2016-03-10 21:01:49 +02:00
Rémi Verschelde
aaad24e6fb
Merge pull request #3865 from Marqin/coverity
...
[Coverity] fixed 11 of 537 potential bugs found by Coverity
2016-03-10 16:15:49 +01:00
Rémi Verschelde
6ef3c3b645
Merge pull request #3980 from JoshuaGrams/timescale-remainder
...
TimeScale node: scale return value (time remaining).
2016-03-09 20:17:13 +01:00
Bojidar Marinov
0e8a8d2cb1
Add option to keep margins when changing anchors, closes #3979
...
Amend: Fixed an issue for non-tool builds
Amend2: Same, just fixed doing nothing at some times
2016-03-09 21:14:17 +02:00
Josh Grams
65b7791263
TimeScale node: return +inf remaining for 0 scale.
2016-03-09 06:57:28 -05:00
Hubert Jarosz
7b07bcaf44
fix six possible "divide by zero"
2016-03-09 00:18:23 +01:00
Hubert Jarosz
bf7f9244a9
fix two reading uninitialized pointers
...
fixed in:
tools/editor/project_settings.cpp
scene/gui/graph_edit.cpp
2016-03-09 00:16:56 +01:00
Hubert Jarosz
4a4f247914
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Rémi Verschelde
1dad6eca81
Merge pull request #3991 from JoshuaGrams/issue-3711
...
Issue 3711
2016-03-08 23:54:46 +01:00
Josh Grams
2fa200ff53
AnimationTreePlayer: distinguish value tracks.
...
If the node had a 3D Transform, the transform would always get written,
even if the tracks on that node were supposed to be value tracks.
2016-03-08 17:23:32 -05:00
Juan Linietsky
9157a13aef
Merge pull request #3969 from Paulb23/scroll_past_end_of_file
...
Enabled scrolling past end of file in text editor.
2016-03-08 15:34:21 -03:00
Saracen
7fecebd8a8
Added extra controls to GeometryInstances to control how they should cast shadows: double-sided and shadows only.
...
Conflicts:
servers/visual/visual_server_raster.h
2016-03-07 23:14:14 +00:00
Josh Grams
2e1b1234a3
TimeScale node: scale return value (time remaining).
2016-03-07 17:21:07 -05:00
Rémi Verschelde
20308c0475
Merge pull request #3919 from chuckeles/open-lines-below-above
...
Open line below and above
2016-03-07 20:33:05 +01:00
Paulb23
f19eea2f2d
Enabled scrolling past end of file
2016-03-07 02:32:51 +00:00
Franklin Sobrinho
1d188c1c7b
Fix Sprite doesn't updating region_rect value in certain conditions
2016-03-05 12:30:09 -03:00
Martin Chuckeles
bd7f2590f1
Add special new line opening
2016-03-04 20:10:31 +01:00
Juan Linietsky
5a9b18b665
-Work on addon editor plugin (disabled by default)
...
-New HTTPRequest node, to make HTTP requests simpler.
2016-03-04 11:10:48 -03:00
Martin Chuckeles
47206b409d
Add editor settings for call hint placement
...
Added settings: text_editor/put_callhint_tooltip_below_current_line
and text_editor/callhint_tooltip_offset
2016-03-04 12:10:15 +01:00
Martin Chuckeles
26cc14e839
Hide hint if completion is active
2016-03-03 20:31:25 +01:00
Martin Chuckeles
03025f60b6
Move the call hint under the current line
2016-03-03 20:26:50 +01:00
Rémi Verschelde
46bfcd3507
Merge pull request #3858 from JoshuaGrams/blend3
...
AnimationTreePlayer (Blend3): process all inputs.
2016-03-01 14:02:11 +01:00
Josh Grams
391ce81c5e
AnimationTreePlayer: blend value tracks ( closes #2299 )
...
Variant:
- zero() sets a Variant to the appropriate type of zero value
- blend() blends part of one Variant on top of another.
2016-03-01 07:37:36 -05:00
Josh Grams
b79351aa45
AnimationTreePlayer (Blend3): process all inputs.
...
Always call _process_node on all three inputs so that looped animations
don't get out of sync.
2016-02-28 06:55:53 -05:00
Juan Linietsky
08e0e64a19
fix transform localization event in mouse motion
2016-02-27 09:47:39 -03:00
eska
104e008b56
Fix missing dependency resolver in Windows
2016-02-21 22:51:19 +01:00
Juan Linietsky
b91b89cf60
Add support for placeholders in tscn, which was missing. Closes #3652
2016-02-21 11:18:31 -03:00
Juan Linietsky
c04a9ff751
-Fixed bug with event player crashing, closes #3687
2016-02-20 21:00:08 -03:00
Juan Linietsky
70cdfa681a
-Change link to new documentation
...
-fixed bug in tilemap collision debug
2016-02-20 10:02:14 -03:00
Rémi Verschelde
281236280e
Fix NavigationPolygon references in _bind_method
...
Also sync the doc accordingly
2016-02-17 18:46:31 +01:00
Nuno Donato
2d1de83434
refix particles3d issue, bringing down the amount limit to 1024
2016-02-16 08:56:31 +00:00
Rémi Verschelde
5439937899
Bind method is_cell_transposed
2016-02-15 23:30:52 +01:00
Juan Linietsky
db43e94175
-Made some icon data types smaller so they take up less space
...
-Fixed sample import plugin, makes samples sound strange in smp when limited hz
2016-02-11 00:01:35 -03:00
Juan Linietsky
61f03c98c8
-Added missing functions to the doc, fixes #3583
2016-02-09 16:58:03 -03:00
Juan Linietsky
595de75641
-Allow renaming root node of inherited scene
2016-02-09 16:30:50 -03:00
Juan Linietsky
34c022a0a2
-Cleaned up GraphEdit, also fixes #3568
2016-02-08 16:28:12 -03:00
Juan Linietsky
9109e41a20
Property handle rotated controls in 2D editor, fixes #3613
2016-02-08 11:29:32 -03:00
Rémi Verschelde
f5433dc60d
Merge pull request #3627 from lordadamson/master
...
renamed function get_video_texutre to get_video_texture
2016-02-08 11:21:58 +01:00
Adham Zahran
6be6d02daf
renamed function get_video_texutre to get_video_texture
2016-02-08 12:11:26 +02:00
Rémi Verschelde
84fbe2d4cb
Merge pull request #3409 from akien-mga/pr-script-tab-colour
...
Make custom_bg fit the whole "selected" area in ItemLists
2016-02-08 07:39:40 +01:00
Saracen
de5281c398
Ability to colourize baked lighting in real time.
2016-02-06 18:03:20 +00:00
Johan Manuel
a634fc7a4a
Added get_cellv() method to TileMap
2016-02-06 13:48:41 +01:00
MarianoGNU
11b3b68c3f
Stop ColorPicker's narcissism ( fixes #3592 )
...
Also prevent alpha in guidelines.
2016-02-06 00:26:54 -03:00
MarianoGNU
614cf481ce
ColorPicker: Prevent regenerating hsv values every time. Fixes #3492
2016-02-05 23:35:15 -03:00
hondres
df4faf8f33
support horizontal mouse wheel, use in text editor
2016-02-04 17:16:22 +01:00
Juan Linietsky
bdfac2806f
-Fix mouse coordinates not being affected by canvas transform
2016-02-03 09:31:55 -03:00
Juan Linietsky
6d63dda72b
Merge pull request #3534 from Biliogadafr/pickable2d
...
Physics2D: Allow to use 'intersect_point' with not 'Pickable' objects
2016-02-03 08:56:49 -03:00
Juan Linietsky
259bd73cae
-make stream player and time restore state properly if removed, fixes #1949
2016-02-02 23:27:10 -03:00
Juan Linietsky
6349c50f5a
-Add some offset to spinboxes in tree, so revert icon does not annoy much when pops up, fixes #3415
2016-02-02 20:44:42 -03:00
Juan Linietsky
857edbea1c
-make animationplayer thinner, also toolbuttons too. fixes #3526
2016-02-02 18:22:37 -03:00
Juan Linietsky
ddf21735ba
-remove the !inside_tree error, fixes grab focus error, closes #3521
2016-02-01 21:32:47 -03:00
Juan Linietsky
b587614653
Make sure variant parser recognizes "nil" for compatibility with old engine.cfg style cofig. Closes #3531
2016-02-01 19:01:06 -03:00
Juan Linietsky
11933811ee
store animation names in alphabetical order, fixes #3423
2016-02-01 00:31:13 -03:00
Biliogadafr
e8c5b41dd8
Physics2D: Allow to use 'intersect_point' with objects which is not 'pickable'
2016-02-01 04:30:16 +03:00
Juan Linietsky
dbcca7bea2
-Removed bizarre code introduced in a 2 years old PR, fixes #3483
2016-01-31 18:09:45 -03:00
Juan Linietsky
53e237dfe4
-Fix crash opening and closing the scene, closes #3491
2016-01-31 15:10:33 -03:00
Juan Linietsky
8341038bbe
-Increment resources total in scene format text, fixes #3506
2016-01-29 08:51:51 -03:00
Rémi Verschelde
0c7e7e2c28
Merge pull request #3470 from MarianoGnu/master
...
Get color constructor from ColorPicker
2016-01-27 19:08:22 +01:00
Franklin Sobrinho
05a85894da
Fix Tree Slider disappearing when clicking on it
2016-01-27 12:24:49 -03:00
George Marques
38c557114b
Remove strand debug print, fix #3473
2016-01-26 22:39:20 -02:00
MarianoGNU
c927409f25
Get color constructor from ColorPicker
2016-01-26 19:10:56 -03:00
Rémi Verschelde
600411b433
Merge pull request #3467 from MarianoGnu/master
...
Focus and select line edit every time color is changed. Fixes #2586
2016-01-26 21:48:53 +01:00
MarianoGNU
5d3fb49826
Focus and select line edit every time color is changed. Fixes #2586
2016-01-26 17:24:58 -03:00
Franklin Sobrinho
66eb28b945
Fix wrong position of LineEdit in Scene editor
2016-01-26 16:03:28 -03:00
Juan Linietsky
094f0767d8
-Fix input bug on window ordering due to foretting to sort root items
2016-01-25 10:39:55 -03:00
Juan Linietsky
5245adcf81
Merge branch 'master' of https://github.com/godotengine/godot
2016-01-25 10:30:47 -03:00
Juan Linietsky
07e7909480
-Changed how popups work in Viewport to make them a lot less invasive to the scene tree
2016-01-25 10:30:03 -03:00
Rémi Verschelde
6ceb1c3a9f
Merge pull request #3440 from TheHX/issue-2946
...
Fixed small inconsistencies with the text format
2016-01-25 10:58:50 +01:00
Juan Linietsky
75537c661f
Merge pull request #3434 from TheHX/pr-tscn-dependency
...
Fix .tscn not raising dependency error
2016-01-24 20:07:23 -03:00
Franklin Sobrinho
1cfe20562d
Fix .tscn not raising dependency error
2016-01-24 19:05:32 -03:00
Franklin Sobrinho
41ae83e415
Fixed small inconsistencies with the text format
2016-01-24 18:38:37 -03:00
Juan Linietsky
021fc47434
Merge pull request #3431 from TheHX/pr-tscn-groups
...
Fix .tscn format not loading groups
2016-01-24 15:34:44 -03:00
Juan Linietsky
35a28f3442
-Take in consideration canvas layers for GUI input
2016-01-24 10:57:42 -03:00
Franklin Sobrinho
2493cb1e26
Fix .tscn format not loading groups
2016-01-24 10:32:46 -03:00
Juan Linietsky
d01f55a78e
Merge pull request #2698 from Faless/add_area_fix
...
Fix bug in Body(2D)SW::add_area
2016-01-23 23:07:23 -03:00
Juan Linietsky
a74138a0dc
-Some changes to how scenes and scripts are overriden in scene instance and inheritance
...
-Fixes #3127 and also properly fixes #2958
2016-01-23 21:42:15 -03:00
Juan Linietsky
a2992d5955
-Forgot to add clips input to graphedit, fixes #3420
2016-01-23 18:49:26 -03:00
Juan Linietsky
0c6ffcf7b0
-Added ability to remap dependencies in tscn (forgot to do it..), fixes #3368
2016-01-23 14:09:55 -03:00
Juan Linietsky
d59733bd67
-Ability to retrieve state data from PackedScene, closes #3413
2016-01-23 12:01:42 -03:00
Juan Linietsky
5a1593951b
-Added a "modal_close" signal for controls
...
-Used it to keep changes on lineedit when focused out
2016-01-23 11:45:36 -03:00
Juan Linietsky
579ec65d36
Revert "Tree and PropertyEditor confirm value change on focus loss"
2016-01-23 11:20:54 -03:00
Juan Linietsky
dfbc2dce17
-Improved tab visibility, fixes #3314
2016-01-22 20:19:57 -03:00
Juan Linietsky
fe46f0d2b2
-leftover debug code was causing a crash in navigation 2d, removed it and fixes #3374
2016-01-22 19:49:05 -03:00
Juan Linietsky
b30839fb08
-make sure instance placeholder works with duplicate(), fixes #3378
2016-01-22 19:36:40 -03:00
Juan Linietsky
84d7a559e5
Merge branch 'master' of https://github.com/godotengine/godot
2016-01-22 19:17:24 -03:00
Juan Linietsky
9d571d8eac
-Fix viewport converting the scren in grayness, fixes #3406
2016-01-22 18:54:43 -03:00
Rémi Verschelde
1120b6ae0d
Make custom_bg fit the whole "selected" area in ItemLists
...
Closes #3096
2016-01-22 00:22:27 +01:00
Rémi Verschelde
23be1d8639
Merge pull request #3407 from TheHX/pr-issue-1717
...
Tree and PropertyEditor confirm value change on focus loss
2016-01-21 19:33:50 +01:00
Franklin Sobrinho
06cafeac0a
Tree and PropertyEditor confirm value change on focus loss
2016-01-21 13:03:06 -03:00
Rémi Verschelde
432e7bf839
Merge pull request #3403 from neikeq/spinbox_hold_imp
...
Fix and improved Spinbox behaviour
2016-01-21 14:18:58 +01:00
Ignacio Etcheverry
bd6f7a411c
Fix wrong local mouse pos when holding spinbox and improve behaviour
2016-01-21 14:09:30 +01:00
Ovnuniarchos
37ee43fd5a
Documented AudioServserSW, EventPlayer and EventStream*. Corrections on AudioServer and Sample.
2016-01-21 01:17:17 +01:00
Rémi Verschelde
f2a397375e
Merge pull request #3381 from MarianoGnu/graph_zoom
...
Add zoom to GraphEdit
2016-01-20 08:00:28 +01:00
Rémi Verschelde
a6b7e8c24e
Merge pull request #3390 from Hinsbart/duplicate_fix
...
duplicate groups and signals
2016-01-20 07:25:34 +01:00
Juan Linietsky
891e31b139
-Some fixes to drag and drop and canvas offset for GUI that were introduced after rewrite
2016-01-19 20:28:20 -03:00
hondres
4c753f60b1
duplicate groups and signals
2016-01-20 00:08:04 +01:00
Rémi Verschelde
5d84589e42
Fix build with tools=no
...
Fixes #3384 .
2016-01-19 10:45:12 +01:00
MarianoGNU
76ee2035b6
Add a slider to handle zoom
2016-01-18 22:10:44 -03:00
MarianoGNU
c2aaeaaf5a
Add zoom to GraphEdit
...
Also fix some responsiveness issues:
-Box selection no longer visible when connecting.
-Allow cancel connection with mouse's right button.
2016-01-18 20:41:37 -03:00
Juan Linietsky
d1bb868a19
-fixed bug related to mouse cursor changes, fixes #3366
2016-01-18 19:49:54 -03:00
Ovnuniarchos
ded1acc33e
New shader nodes are now created under (more or less) the cursor.
2016-01-18 16:02:42 +01:00
Rémi Verschelde
4481e8af5c
Merge pull request #3358 from neikeq/issue_1123
...
F5 hotkey to refresh FileDialog/EditorFileDialog
2016-01-18 14:46:17 +01:00
Rémi Verschelde
c0b9634235
Merge pull request #2854 from MarianoGnu/color_picker
...
new ColorPicker
2016-01-18 13:52:51 +01:00
Juan Linietsky
74a48a0140
-Massive editor dialog cleanup
...
-Added a bottom menu list
2016-01-17 20:03:57 -03:00
Juan Linietsky
72fcb8a35b
-Moved all the "root" input handling for GUI from individual Controls to Viewport.
...
-Should fix several reported bugs when controls don't have a common parent
This may have added new bugs, so please report if so!
2016-01-16 22:41:10 -03:00
MarianoGNU
e730d4b3d9
Add guide lines to visual editor.
2016-01-15 17:32:10 -03:00
MarianoGNU
d1ee2ab893
add screen color picking
2016-01-15 17:23:19 -03:00
MarianoGNU
ad2387f0be
Add presets.
...
Also fix some bugs.
Fix a crash and a minor bug
2016-01-15 17:23:19 -03:00
MarianoGNU
1f3d6824c8
Move shaders to default theme and add shader_override related methods to Control class
2016-01-15 17:23:19 -03:00
MarianoGNU
dc7755ffcd
Add a visual editor to color picker.
2016-01-15 17:23:19 -03:00
Ignacio Etcheverry
e80e450ee8
F5 hotkey to refresh FileDialog/EditorFileDialog
2016-01-15 21:19:16 +01:00
Rémi Verschelde
3c6dd5749d
Merge pull request #3204 from neikeq/fix_3153
...
Consider texture offset when rotating tiles
2016-01-15 16:53:16 +01:00
Rémi Verschelde
698b338bc8
Merge pull request #3351 from neikeq/issue_3348
...
Fix LineEdit not capturing text input events
2016-01-14 16:36:31 +01:00
Ignacio Etcheverry
ccbf8b42f4
Fix LineEdit not capturing text input events
2016-01-14 16:26:22 +01:00
Juan Linietsky
4248c84e20
-Make sure scenes properly update when switching tabs, even if sub-instances changed. Fixes #3201
2016-01-14 11:06:20 -03:00
Juan Linietsky
c4cee22510
Properly fix tab scrolling, fixes #3128 , fixes #3314
2016-01-13 07:39:31 -03:00
Juan Linietsky
f2ae6f87a4
Fix situation where TSCN format might crash, closes #3062
2016-01-12 07:07:36 -03:00
Juan Linietsky
a625f7d073
-Properly lock and and warn about switching off contact monitoring, fixes #3041
2016-01-12 06:14:15 -03:00
Rémi Verschelde
cbdcd99b85
Merge pull request #3257 from TheHX/pr-range-properties
...
Fix error caused by dragging a Range property
2016-01-11 11:50:50 +01:00
Rémi Verschelde
90e5fba1c1
Merge pull request #3300 from MarianoGnu/bug_fixing
...
fix: TouchScreenButton should stop propagating action when button is …
2016-01-11 08:47:37 +01:00
Juan Linietsky
d7015613b1
It seems everyone misses the polygon decomposer output, fixes #3069
2016-01-10 23:09:05 -03:00
Juan Linietsky
6eb742d49f
-Make a rare corner case where disabling/reenabling mipmaps causes invalid texture state. Fixes #3102
2016-01-10 21:45:58 -03:00
Juan Linietsky
5b088b41b3
make path update when curve changes, fixes #3144
2016-01-10 18:01:16 -03:00
Juan Linietsky
1aaf507ffb
change intersect_ray function to discriminate pickable objects, fixes #3203
2016-01-10 15:54:57 -03:00
MarianoGNU
3169b66d15
fix: TouchScreenButton should stop propagating action when button is removed from scene
2016-01-10 10:36:43 -03:00
Juan Linietsky
3a3ce982b0
removed this fix, which brought more problems than solutions
2016-01-10 00:26:35 -03:00
Ariel Manzur
d199ed344d
removed prints
2016-01-09 19:51:05 -03:00
Rémi Verschelde
3ad263eafe
Merge pull request #3279 from neikeq/issue_3259
...
Fix TextEdit caret being drawn when outside the visible region
2016-01-08 17:42:02 +01:00
Ignacio Etcheverry
02d1ef8ca6
Fix TextEdit caret drawn when outside the visible region
2016-01-08 17:33:42 +01:00
Richard Nespithal
b123bc4a2a
do not return zero with minus-sign within range value, fixes #3221
2016-01-08 15:57:03 +01:00
Ignacio Etcheverry
6541f6418e
TextEdit/LineEdit: Handle numpad PageUp, PageDown, Home and End
2016-01-07 22:59:23 +01:00
Ignacio Etcheverry
a825cfd932
TextEdit/LineEdit: Handle numpad arrows if NumLock is disabled
2016-01-07 21:51:47 +01:00
Rémi Verschelde
a0c39a4b33
Merge pull request #3191 from neikeq/filedialog_hotkeys
...
Add keyboard shortcut to toggle "show hidden files" in FileDialog
2016-01-07 07:50:26 +01:00
Rémi Verschelde
c8849c0b79
Merge pull request #3136 from MarianoGnu/bug_fixing
...
Fix RGBA Uniform autogeneration in ShaderGraph
2016-01-06 21:10:48 +01:00
Franklin Sobrinho
a906bce9a0
Fix error caused by dragging a Range property
2016-01-06 09:58:22 -03:00
Franklin Sobrinho
69240aa243
Fix .tscn format not loading signal binds
2016-01-06 08:56:06 -03:00
Rémi Verschelde
52e18accf2
Merge pull request #3159 from neikeq/tab_close_icon
...
Add tab close icon to the default theme
2016-01-06 11:58:52 +01:00
Rémi Verschelde
78e5bc8e9a
Merge pull request #3211 from SaracenOne/audio_stream_pause_fix
...
Fix delay on audio stream pause
2016-01-06 11:54:03 +01:00
Rémi Verschelde
e0b91c701c
Fix is_node_being_edited() when not building tools
...
Fixes #3213 .
Superseded #3242 .
2016-01-05 16:02:59 +01:00
Ignacio Etcheverry
a9dbe83155
TileMap: Properly flip/rotate tiles with non-square region
2016-01-04 15:28:11 +01:00
Juan Linietsky
a501ee355b
properly specify metadata in KB function
2016-01-03 20:25:27 -03:00
Juan Linietsky
e8fbf39f88
-Replaced tinyjpg for jpgd (public domain), fixes progressive encoded jpgs and speeds up. Closes #2040
...
-Removed support of loading BitMap as image, now it must be load as a pnm, also closes #2040
2016-01-03 17:14:28 -03:00
Juan Linietsky
b988f016fd
forgot to bind NOTIFICATION_INSTANCED, closes #2261
2016-01-03 12:57:19 -03:00
Saracen
53b2b0ccbe
Fix delay on audio stream pause
2016-01-03 01:24:30 +00:00
Juan Linietsky
939c5f5c9e
-Fix global transform cache not being cleared in 2D nodes, fixes many editor bugs, closes #2115
2016-01-02 20:32:19 -03:00
Juan Linietsky
2db78e8f87
Properly clear/restore current camera when switching scenes. Fixes #2137
2016-01-02 17:18:45 -03:00
Juan Linietsky
b0b1da6950
Make buttons properly obey stylebox content marins, closes #2156
2016-01-02 15:51:41 -03:00
Ignacio Etcheverry
e22e0cecf7
TileMap: Consider texture offset for rotated tiles
2016-01-02 18:17:20 +01:00
Juan Linietsky
757b8c4206
-Restore mouse on X11 when debugger break happens, closes #2232
2016-01-02 12:58:59 -03:00
Juan Linietsky
9ed3d6d007
added a finished signal to StreamPlayer, closes #2249
2016-01-02 12:24:04 -03:00
Juan Linietsky
d069c44a7f
-Fix TouchScreenButton to work with stretch and viewport canvas transform, closes #2286
2016-01-02 11:23:30 -03:00
Ignacio Etcheverry
3ca800226e
FileDialog: keyboard shortcut to toggle "show hidden files"
2016-01-02 12:58:38 +01:00
Juan Linietsky
df5fa62ab9
remove the invalid id error when freeing a 3D joint, fixes #2383
2016-01-02 08:37:27 -03:00
Juan Linietsky
199a29b353
Merge pull request #3184 from vnen/update-copyright-2016
...
Update copyright to 2016 in headers
2016-01-01 11:03:29 -03:00
George Marques
5be9ff7b67
Update copyright to 2016 in headers
2016-01-01 11:50:53 -02:00
Juan Linietsky
7879efc50b
Make both lights and occluders stop working if hidden, fixes #2437
2016-01-01 10:45:24 -03:00
Juan Linietsky
b78c1e52c2
Make CanvasModulate deactivate when hidden, fixes #2437
2016-01-01 10:33:02 -03:00
Juan Linietsky
7d0894e925
-Improved convex decomposer for CollisionPolygon2D, fixes #2336
2015-12-31 20:23:34 -03:00
Juan Linietsky
d1a799f744
-fix range limit issue in Particles2D, closes #2411
2015-12-31 15:18:03 -03:00
Juan Linietsky
1e65c3c701
remove error print in area collision, should be a valid situation, closes #2463
2015-12-31 11:15:49 -03:00
Juan Linietsky
335c52ba03
Merge branch 'master' of https://github.com/godotengine/godot
2015-12-31 00:33:07 -03:00
Juan Linietsky
fd836cad27
-Ensure .tscn and .tres always save in a deterministic way, fixes #2495
...
-Scene edit state is saved outside the scene now, to avoid changes .tscn files when nothing really changed
-Created a VariantWriter helper to unify all variant to text writing
-Moved SceneFormatText writing to VariantWriter
-Moved ConfigFile to use VariantWriter and VariantParser, added compatibility mode for old .cfg files that use engine.cfg format
2015-12-31 00:31:00 -03:00
reduz
b8f18cd73c
add 2d paths and joints to collision/navigation debug, fixes #2439
2015-12-29 19:07:37 -03:00
reduz
408a67193e
Added a reset() function to Particles2D, fixes #2472 , fixes #2468
2015-12-29 18:53:45 -03:00
reduz
196b3e03fc
Fix CanvasItem.draw_set_transform to act according to docs, fixes #2487
2015-12-29 18:27:20 -03:00
reduz
875bff2c4e
-fix loading of samples in mod, s3m and xm. Fixes #2553
2015-12-29 16:06:45 -03:00
reduz
5063cd7757
-Make tilemap able to change light mask, fixes #2557
2015-12-29 14:47:13 -03:00
reduz
974e5362bc
-forgot a check for tools enabled, closes #3166
2015-12-29 12:14:02 -03:00
reduz
2f19260fb7
-restrict gui root from being removed while performing input, fixes #2578
2015-12-29 10:01:29 -03:00
reduz
45ad1024e1
make it easy to edit popupmenus, fixes #2595
2015-12-29 09:26:17 -03:00
reduz
0c6a4b47a6
-Allow negative texture scale in TextureButton, fixes #2956
2015-12-29 08:47:13 -03:00
Ignacio Etcheverry
563c761c8c
Add tab close icon to the default theme
2015-12-29 12:09:41 +01:00
reduz
f7b64a62d1
-renamed function get_relative_transform() to get_relative_transform_to_parent(), makes more sense
...
-fixed newly introduced bug in onready keyword, fixes #3155
2015-12-28 21:05:57 -03:00
reduz
496cb49771
Fix proper ordering of project settings properties, also fixes inability to change order of autoloads
2015-12-28 18:04:22 -03:00
reduz
e0d21d2158
Ability to set autoloads as singleton global variables
2015-12-28 15:59:20 -03:00
Rémi Verschelde
bfbde4dfd1
Merge pull request #3146 from akien-mga/pr-argument-names
...
Add missing argument names in GDScript bindings + related fixes
2015-12-28 12:26:36 +01:00
reduz
37cb0faedb
Merge branch 'master' of https://github.com/okamstudio/godot
2015-12-28 01:41:12 -03:00
reduz
f613d546ed
-fixed rich text label fill alignment, always works now
...
-made also sure it doesn't crash, fixes #2688
2015-12-28 01:40:23 -03:00
Rémi Verschelde
d4993b74fc
Add missing argument names in GDScript bindings
...
All classes were reviewed apart from VisualServer for which no argument name is documented at all.
While doing this review, I found quite a few bugs that were fixed either in earlier commits or this one (mostly documentation bugs though, i.e. some arguments were listed at the wrong place).
2015-12-28 02:13:05 +01:00
Rémi Verschelde
fe46b2ac0c
Fix wrong getters in ShaderGraph
2015-12-28 01:42:22 +01:00
Rémi Verschelde
9fddc69769
Style fix for rounded_values methods in Range
2015-12-28 00:12:13 +01:00
Juan Linietsky
4dba503fc3
Merge pull request #3140 from neikeq/fix_refresh_icon
...
Add reload icon to FileDialog's default theme
2015-12-26 15:37:00 -03:00
Ariel Manzur
6387a8e01f
fixes crash/deadlock when video is paused and unpaused, might affect audio sync tho
2015-12-26 15:39:49 -03:00
reduz
ddd66c8904
small optimization improvement to rich text label tables
2015-12-26 15:18:01 -03:00
Ignacio Etcheverry
84c5585afe
Added reload icon to FileDialog's default theme
2015-12-26 19:15:22 +01:00
MarianoGNU
df5c92c66e
Fix RGBA Uniform autogeneration in ShaderGraph ( fixes #2606 )
2015-12-26 10:44:54 -03:00
reduz
9d9520f227
Merge branch 'master' of https://github.com/okamstudio/godot
2015-12-26 10:27:04 -03:00
reduz
13964f59c1
-Added table support to RichTextLabel
...
-Made help more readable, closes #2851
2015-12-26 10:25:17 -03:00
Juan Linietsky
acc9db1695
Merge pull request #3071 from Ovnuniarchos/NewAreaCombiners
...
New and corrected area override modes.
2015-12-22 10:57:39 -03:00
Juan Linietsky
9bf7adfc1f
-another approach to solving the deadlock problem :|
2015-12-21 10:51:27 -03:00
Juan Linietsky
49a19f85b8
-different attempt to avod deadlock problem
2015-12-21 10:25:46 -03:00
Juan Linietsky
81f62fb78c
-Fix to progress dialog, speding it up
...
-Fix potential deadlock in stream player
-Fix collada to support broken files from ColladaMaya
2015-12-21 09:05:49 -03:00
Juan Linietsky
f65eb470ae
-fix function calls in animationtree, closes #2789
2015-12-16 08:34:57 -03:00
Juan Linietsky
a1142225bf
-split view of property editor and editor settings
2015-12-15 23:39:36 -03:00
Juan Linietsky
035bb03331
Merge branch 'master' of https://github.com/godotengine/godot
2015-12-15 09:19:00 -03:00
Juan Linietsky
b12a2f456c
-fixes to theora video ending sooner than expected, fixes #3066
2015-12-15 09:17:32 -03:00
Rémi Verschelde
566f8da3cc
Merge pull request #3036 from slapin/animation-tree-player
...
Fix non-looping animations not being reset properly in AnimationTreePlayer
2015-12-14 20:02:01 +01:00
Juan Linietsky
83e0e97214
-implement arrows on tabs, when too many tabs are present, fixes #2806
2015-12-14 10:24:28 -03:00
Juan Linietsky
1312df7fdc
implement point cloud function using convex hull for ConvexPolygonShape2D, fixes #2848
2015-12-14 09:06:53 -03:00
Juan Linietsky
f2183a5e09
replaced :var by :Variant in documentation, fixes #2897
2015-12-14 08:28:01 -03:00
Ovnuniarchos
89efebbf56
New and corrected are override modes.
2015-12-14 02:56:49 +01:00
Juan Linietsky
7f96f0603e
-scenes are properly reloaded when a dependency changes, fixes #2896
...
(it's clevery done so local changes to scenes are kept even if unsaved)
2015-12-13 20:39:01 -03:00
Rémi Verschelde
4018ea63c7
Merge pull request #3050 from eska014/fix-tree-cell-slider
...
Fix editor for TreeItem cells in range mode
2015-12-13 10:10:33 +01:00
Rémi Verschelde
75e88b8b9e
Merge pull request #3049 from eska014/fix-exp-slider
...
Fix setting Sliders in exponential mode
2015-12-13 10:10:25 +01:00
Juan Linietsky
709de124c1
ability to export scene to zip
2015-12-13 01:08:36 -03:00
Juan Linietsky
11eaf019b3
ability to get video player texture
2015-12-12 20:05:26 -03:00
Juan Linietsky
97fe073f33
Merge pull request #2933 from TheHX/pr-shader-loader
...
Fix shader loading, making possible load .shd and .sgp from editor
2015-12-12 17:36:52 -03:00
Juan Linietsky
101049518a
-force exporting of original script exported variables on overriden scripts
...
-this works around the problem of scripts being reloaded and their properties lost
-fixes #2958
2015-12-12 16:46:25 -03:00
Juan Linietsky
890b462ffb
added rotation and scale support to gui controls
2015-12-12 13:54:26 -03:00
Juan Linietsky
ec8f0d7eb9
ability to set occluder mask in tilemap, fixes #3025
2015-12-12 10:45:31 -03:00
Juan Linietsky
e2e6f3ec00
added proper functions to ColorRamp, fixes #3034
2015-12-12 09:45:17 -03:00
Juan Linietsky
29ea399234
-make smoothing respect camera limits, fixes #3037
2015-12-12 09:26:13 -03:00
Juan Linietsky
9a7ff65751
make popup emit index when id is not defined
2015-12-12 09:07:43 -03:00
Juan Linietsky
9251298f46
-collision debug is shown above all else, fixes #2985
2015-12-12 08:11:36 -03:00
Juan Linietsky
990690f9f5
Merge branch 'master' of https://github.com/godotengine/godot
2015-12-11 09:38:41 -03:00
Juan Linietsky
46497c4508
added fallbacks proprty to fonts
2015-12-10 23:02:40 -03:00
eska
a028840ea5
Fix editing TreeItem cells in range mode
...
- Show slider when editing range mode tree cells per mouse input
- Hide slider after using keyboard controls to edit range mode tree cells
2015-12-10 23:53:19 +01:00
eska
5b03af6b73
Fix exponential sliders
2015-12-10 23:48:03 +01:00
Rémi Verschelde
3b68f0d051
Merge pull request #2306 from dbsGen/patch-1
...
Fixed the mouse position for control when it is in a canvas_layer.
2015-12-10 17:06:27 +01:00
Rémi Verschelde
5f3c87691e
Merge pull request #3019 from neikeq/spinbox_timer
...
Spinbox update range on mouse held
2015-12-10 15:48:23 +01:00
neikeq
d4051e6eb9
Spinbox: increase/decrease with mouse held
2015-12-10 15:44:16 +01:00
Sergey Lapin
8eff61ca87
This fixes long standing animation bug
...
When AnimationTreePlayer switches to new animation it never
seeks it to 0 which leads to problems with non-looping animations being
played just once.
This patch is direct approach fixing this problem.
It handles most common cases of occurance.
Closes #2199
2015-12-10 16:39:57 +03:00
Rémi Verschelde
8a94297105
Merge pull request #3029 from neikeq/textedit_select_imp
...
TextEdit: Scroll while selecting with mouse idle
2015-12-10 11:36:30 +01:00
neikeq
5f739a2660
TextEdit: Scroll while selecting with mouse idle
2015-12-09 19:56:47 +01:00
Franklin Sobrinho
afb41b283c
Fix tscn format not being recongnized by EditorFileSystem
2015-12-09 13:56:14 -03:00
Juan Linietsky
428984ec0c
-New mask mode for lights, makes using masks MUCH easier.
2015-12-08 20:25:08 -03:00
Juan Linietsky
c650d4e19c
Merge branch 'master' of https://github.com/godotengine/godot
2015-12-08 17:48:03 -03:00
Juan Linietsky
09ff457185
made the exclusion of nodes from joints optional, fixes #3015
2015-12-08 17:47:12 -03:00
Juan Linietsky
ff936c6b2e
Merge pull request #2868 from akien-mga/pr-fix-can-move-to
...
Fix can_move_to and rename it for more clarity
2015-12-08 17:09:47 -03:00
Juan Linietsky
b6d6c2220f
Merge pull request #2922 from romulox-x/set_hidden
...
Added set_hidden method to Spatial and CanvasItem
2015-12-08 17:06:45 -03:00
Juan Linietsky
ecad3a285f
better unique name resolution, as suggested i #3017
2015-12-08 11:33:30 -03:00
Juan Linietsky
9637460331
Merge branch 'master' of https://github.com/godotengine/godot
2015-12-08 11:23:23 -03:00
Juan Linietsky
3c33b705d1
added option to add_child, to use the same deduplication convention as in the editor, closes #3017
2015-12-08 11:21:12 -03:00
Rémi Verschelde
2cc60386d8
Merge pull request #3005 from TheHX/pr-file-dialog
...
Better hidden folders display preferences for editor file dialogs
2015-12-07 20:40:58 +01:00
Rémi Verschelde
c667bde183
Merge pull request #3007 from neikeq/fix_line_edit
...
Fix LineEdit cursor
2015-12-07 20:39:43 +01:00
neikeq
f499fb6fcf
Fix LineEdit cursor
2015-12-07 20:31:21 +01:00
Franklin Sobrinho
42eef3cdc6
Better hidden folders display preferences for editor file dialogs
2015-12-06 19:35:31 -03:00
Juan Linietsky
3ecc9e07b7
Merge branch 'master' of https://github.com/godotengine/godot
2015-12-05 14:19:19 -03:00
Juan Linietsky
200b7bb87c
-Display on animation editor which keys are invalid and which tracks are unresolved
...
-Added a tool to clean up unresolved tracks and unused keys
2015-12-05 14:18:22 -03:00
neikeq
71eaa2d547
Add refresh button to file dialogs
2015-12-04 19:33:30 +01:00
Juan Linietsky
35fa048af5
missing pngs
2015-12-04 10:22:45 -03:00
Rémi Verschelde
68d3438a93
Merge pull request #2975 from neikeq/help_scroll_top
...
Fix help view not scrolling to the top
2015-12-02 16:16:18 +01:00
Juan Linietsky
064fd762fa
Merge branch 'master' of https://github.com/godotengine/godot
2015-12-02 11:17:01 -03:00
Juan Linietsky
4b1f0afb01
-several fixes to Android to work better on Tegra 3/4 devices, uses 16 bits FBOs so all 2D shader effects should now work in every single Android device.
2015-12-02 11:15:48 -03:00
neikeq
11b560d6d4
Fix help view not scrolling to the top
2015-12-02 14:01:46 +01:00
Fabio Alessandrelli
3eba84e1d7
Properly update node after clearing shapes in _update_shapes_from_children()
...
(fix bug causing eg. CircleShape2D.set_radius to generate multiple shapes)
2015-12-02 11:30:48 +01:00
neikeq
c5698fc28e
Fix RichTextLabel copy never called
2015-12-02 08:19:33 +01:00
koalefant
c93a005fb6
Script Editor: automatic indentation after a colon
2015-11-29 17:13:29 +01:00
Juan Linietsky
68aaa0f813
Merge branch 'master' of https://github.com/godotengine/godot
2015-11-28 20:57:23 -03:00
Juan Linietsky
7aa39b7cae
-Fixed bug with scene inheritance, should work again
...
-Proper .tscn and .tres parsing, should work, please test well!
2015-11-28 20:56:14 -03:00
Franklin Sobrinho
43e1b879d0
Add container automatic update when moving a child node
2015-11-28 13:05:39 -03:00
Franklin Sobrinho
1138103c63
Fix shader loading, making possible load .shd and .sgp from editor
2015-11-27 21:11:20 -03:00
Franklin Sobrinho
493d3c22ca
Fix editor help scroll to result
2015-11-27 20:11:49 -03:00
romulox_x
0b4830f3be
Added set_hidden method to Spatial and CanvasItem
2015-11-26 13:44:06 -08:00
Juan Linietsky
b987d2113b
0theora compilation fixes
2015-11-25 00:28:03 -03:00
Juan Linietsky
082e3fbb29
Merge branch 'master' of https://github.com/okamstudio/godot
...
Conflicts:
main/main.cpp
2015-11-24 10:52:41 -03:00
Juan Linietsky
ccd40f76e8
-work in progress resourceparser and .tscn parser. Still non-functional
...
-fixed theora so it can compile theoralib but not theora
-fixed generation of windows icon in .rc, which didn't previously work in 32 bits
2015-11-24 10:42:05 -03:00
Rémi Verschelde
2fbc1445a5
Merge pull request #2870 from neikeq/submenu_pos_fix
...
Popup submenu position enhancement
2015-11-23 11:53:30 +01:00
Rémi Verschelde
aa30e01f26
Merge pull request #2752 from SaracenOne/shadow_color
...
New shader feature: change the colour of shadows on a per-material basis
2015-11-23 11:40:52 +01:00
neikeq
9797b6374b
Popup submenu position enhancement
2015-11-22 15:53:22 +01:00