asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16824 commits 1 branch 0 tags 2.2 GiB
Commit graph

4031 commits

Author SHA1 Message Date
Rémi Verschelde
099f74584a Bind ItemList's item_custom_fg_color methods 
Fixes #21086.
 2018-08-17 13:46:33 +02:00
Natrim
6ad0f4ebe8 Particles2D: fix editing Visibility Rect from inspector 
+ renamed generate_aabb to generate_visibility_rect to prevent future confusions
 2018-08-17 12:25:48 +02:00
Rémi Verschelde
68676c774d
Merge pull request #21091 from hpvb/fix-removing-popup-menu-item 
Call minimum_size_changed() in PopupMenu::remove_item()
 2018-08-17 02:27:16 +02:00
Hein-Pieter van Braam
2d032c1562 Call minimum_size_changed() in PopupMenu::remove_item() 
When removing an item from a PopupMenu we need to update the control's
size cache otherwise the size of the PopupMenu itself lags behind by 1
item size. Meaning the PopupMenu will remain too large.
 2018-08-16 21:51:41 +02:00
Hein-Pieter van Braam
fa7eac8a0d Delay emitting pressed signals in PopupMenu 
When processing items we may actually delete the item we're processing
in the callback for the signal. To avoid this, call the signal after
we're done processing the items. But before hiding the popupmenu itself.

Thanks to @reduz for writing the whole solution.

This fixes #19842
 2018-08-16 21:44:18 +02:00
Rémi Verschelde
17b2d808de Change PhysicsMaterial extension to phymat 
All other binary extensions are lowercase.
 2018-08-16 19:19:23 +02:00
Rémi Verschelde
a2abe760c8
Merge pull request #21047 from gotnospirit/fix_tween_reversed_duration 
Tween: Always remove the desired InterpolateData when finished
 2018-08-16 18:30:41 +02:00
Tristan Porteries
e5bfa98d0f Expose bullet shape margin to UI. 
The margin value is exposed into the UI for shape ressource.
This value can be modified through set_margin and get from get_margin
or by using the property margin. Each time the margin is modified
the associated collision shape is recreated and the margin value is
used in ShapeBullet::prepare.
 2018-08-16 16:58:15 +02:00
James
4c2f9c19b8 Tween: Add a unique identifier to InterpolateData to be able to remove the right one when finished 2018-08-16 15:59:35 +02:00
Rémi Verschelde
9e4d1512db
Merge pull request #21075 from akien-mga/rotation_degrees_range 
Lift 1440 limit in rotation_degrees hint range
 2018-08-16 15:23:03 +02:00
Rémi Verschelde
968886768b Lift 1440 limit in rotation_degrees hint range 
Fixes #15947.
 2018-08-16 14:36:38 +02:00
Rémi Verschelde
c78bbfa669 Fix type of Range allow_greater/allow_lesser properties 2018-08-16 14:24:17 +02:00
Andrea Catania
b5480634c3 Added possibility to create joints with only one body 2018-08-16 08:23:08 +02:00
Ovnuniarchos
9d0de7d417 PopupMenu item_pressed is sent before checking hide flags. 2018-08-16 07:22:18 +02:00
Juan Linietsky
c627f3a707 Attempting to workaround the problem present in #20904, let me know if it works. 2018-08-15 13:24:52 -03:00
volzhs
4e9795aa99 Fix not to show configuration warning on every node has script 2018-08-15 21:35:06 +09:00
Juan Linietsky
d7a9a224fd
Revert "Fix border artifacts at the edge of deep parallax." 2018-08-14 20:33:50 -03:00
Juan Linietsky
4e55835e48
Merge pull request #18096 from aaronfranke/master 
[Core] Split up math_2d.h
 2018-08-14 18:58:32 -03:00
Rémi Verschelde
d6058b967d
Merge pull request #20906 from Chaosus/rrect_fix 
Fix ReferenceRect border
 2018-08-14 23:31:48 +02:00
Alexander Holland
6d684aae8a text_edit auto_completion 
replaced "similarity filter" with "sequential checks" this give more control over the desired filtering.
 2018-08-14 22:45:10 +02:00
Juan Linietsky
ef5095720b -Deprecate ImageTexture::load 
-Add warning to Image::load when loading resources
-Add script binding for get_configuration_warning
 2018-08-14 16:53:20 -03:00
Rémi Verschelde
c0137db762
Merge pull request #20665 from SaracenOne/animation_tree_control 
Add method to manually advance AnimationTree and manual process mode.
 2018-08-14 15:54:20 +02:00
Rémi Verschelde
2ae7c67322
Merge pull request #20844 from gotnospirit/fix_tween_memory_leak 
interpolation was not removed because of id mismatch
 2018-08-14 15:44:26 +02:00
Rémi Verschelde
a3d0b89892
Merge pull request #20876 from ttencate/cursor_blink 
Reset caret blink when Ctrl+moving the cursor
 2018-08-14 15:42:19 +02:00
Rémi Verschelde
ccf5a50250 Fix comments indentation 2018-08-14 14:30:15 +02:00
Rémi Verschelde
e651102b6f
Merge pull request #20860 from guilhermefelipecgs/fix_border_artifact 
Fix border artifacts at the edge of deep parallax.
 2018-08-14 09:45:38 +02:00
Rémi Verschelde
98da0df894
Merge pull request #20982 from hpvb/fix-19842 
Emit pressed events after processing items
 2018-08-14 09:37:54 +02:00
Rémi Verschelde
ac2add26a1
Merge pull request #20981 from gotnospirit/case_aware_autocomplete 
Case-aware autocomplete: prefer same case candidates
 2018-08-14 09:37:15 +02:00
Rémi Verschelde
e6b8963aae
Merge pull request #20947 from oisincar/get_bone_ix 
Expose PhysicalBone::get_bone_id() to c#/gdscript
 2018-08-14 09:32:18 +02:00
Hein-Pieter van Braam
868efb8184 Emit pressed events after processing items 
When processing items we may actually delete the item we're processing
in the callback for the signal. To avoid this, call the signal after
we're done processing the items.

This fixes #19842
 2018-08-13 21:55:26 +02:00
James
109028f52b Editor autocomplete: prefer same case candidates 2018-08-13 20:45:33 +02:00
Rémi Verschelde
68ab428d4d
Merge pull request #20155 from Tunous/line-edit-clear 
Add clear button to search fields
 2018-08-13 12:54:57 +02:00
Rémi Verschelde
9ce33978db
Merge pull request #20666 from Calinou/script-editor-underline-hidpi 
Scale underlines in the script editor with the editor scale
 2018-08-13 12:21:23 +02:00
Rémi Verschelde
2062d6126d
Merge pull request #20587 from groud/fix_2deditor_scrollable_zone 
Fixes bugs on the 2D editor scrollable area
 2018-08-13 09:03:34 +02:00
oisincar
b684116b60 Expose PhysicalBone::get_bone_id() to c#/gdscript 2018-08-12 19:29:51 +01:00
Łukasz Rutkowski
81fb81de9d Do not use theme to set LineEdit right_icon 2018-08-11 12:04:26 +02:00
Łukasz Rutkowski
e8a435c8cd Add clear text button to LineEdit 
- Add pressed state to clear button
- Enable clear button on all inputs with search icon
- Remove duplicate clear buttons
- Fix rendering of icon for center and right alignments
- Add clear button to more search fields
- Add clear icon to default theme
- Add method to control enabled state of clear button
- Add property to enable clear button from inspector
 2018-08-11 12:04:26 +02:00
Aaron Franke
cf136a91d6 [Core] Completely kill math_2d.h, change includes 2018-08-11 03:08:34 -05:00
Chaosus
aaf62fcecc Fix ReferenceRect border 2018-08-11 10:37:03 +03:00
Juan Linietsky
0fc1c4eda8
Merge pull request #20149 from Overblob/shader_float_typing 
Shader language - Add optional float typings
 2018-08-10 18:21:28 -03:00
Aaron Franke
28fc195339 [Core] Change math_2d includes to vector2 includes where relevant 2018-08-10 14:59:29 -05:00
Juan Linietsky
52e6f1f25c
Merge pull request #20072 from RandomShaper/fix-camera-offsets 
Fix camera offsets not applied always
 2018-08-10 16:24:39 -03:00
Juan Linietsky
7e33b2085c
Merge pull request #20861 from RandomShaper/improve-bitmap 
Improve BitMap: expose methods + prevent stack overflow
 2018-08-10 15:58:53 -03:00
Pedro J. Estébanez
b48d421ca0 Transform fill_bits from recursive to iterative 
Avoids crashes when generating polygons from big bitmaps.
 2018-08-10 18:57:44 +02:00
Pedro J. Estébanez
42bf5cd790 Expose additional BitMap methods 
Bonus: Restrict debug prints to debug builds
 2018-08-10 18:57:44 +02:00
Juan Linietsky
b9730a6956 Make line edit always vertically aligned, makes no sense otherwise. Fixes #17188 2018-08-10 13:15:26 -03:00
Juan Linietsky
c02fb271fd apply a threshold for floor angle, fixes #16037, fixes #15632 2018-08-10 13:07:52 -03:00
Thomas ten Cate
44d761e55c Reset caret blink when Ctrl+moving the cursor 
There was a hardcoded exception to never reset caret blinking if Ctrl
(`command`) was pressed. This broke on Ctrl+arrows,
Ctrl+Home/End/PgUp/PgDn, Ctrl+C, Ctrl+V, Ctrl+Backspace and Ctrl+Delete.

Resetting blink only for those Ctrl operations that actually touch the
cursor somehow would clutter the code a lot, so I removed the check
entirely. That means we now also reset blinking on unrelated operations
like Ctrl+O, but that seems pretty harmless. I actually like the
additional bit of feedback even in that case (most of these will
immediately defocus the editor anyway, so you never see it).

Fixes #18100
 2018-08-10 11:23:13 +02:00
MAriano Javier Suligoy
ce87a30e45 New TileSet Editor 2018-08-09 20:38:02 -03:00
Guilherme Felipe
85f4d33276 Fix border artifacts at the edge of deep parallax. 2018-08-09 20:24:52 -03:00
Juan Linietsky
fbb5ca4d97
Merge pull request #20584 from JFonS/gizmo_enabling 
New gizmo structure and gizmo disabling menu
 2018-08-09 16:27:59 -03:00
JFonS
59fd18ab1a New gizmo structure and new gizmo disabling menu 2018-08-09 20:58:39 +02:00
James
796088a911 interpolation was not removed because of id mismatch 2018-08-09 14:48:56 +02:00
Juan Linietsky
913a7dbd8f
Merge pull request #20787 from Calinou/tweak-default-material-properties 
Tweak the default SpatialMaterial properties
 2018-08-08 09:44:31 -03:00
Juan Linietsky
9bd5315d30
Merge pull request #20786 from groud/skybox_default_change 
Changes the default skybox to avoid the blue shade
 2018-08-07 15:35:04 -03:00
Juan Linietsky
14fd797c53
Merge pull request #20381 from AndreaCatania/phymat_2 
Improved Physics material
 2018-08-07 15:31:26 -03:00
Andrea Catania
5e65e28eed Removed physics material combination mode. Added rough and absorbent parameter to material. Fixed 'change' signal connection 2018-08-07 19:38:04 +02:00
Juan Linietsky
254eb46de3 Several improvements to inspector. 
-Added optional horizontal/vertical modes for vector editing (default false for vec2, true for vec3)
-Some clean ups with fonts and styles
 2018-08-07 12:22:46 -03:00
Hugo Locurcio
31c12f05c4
Tweak the default SpatialMaterial properties 
Roughness is now set to 1 by default and albedo is now white,
even on meshes that do not have any materials defined.

This means there is no longer a visual difference between a
mesh with no materials defined and a mesh with a default
SpatialMaterial defined.
 2018-08-07 17:04:30 +02:00
groud
8af2047966 Changes the default skybox to avoid the blue shade 2018-08-07 14:47:59 +02:00
Juan Linietsky
5b70ad9d34 Respect process order for out of order skeleton bones (fixes GLTF2 import issues). 2018-08-06 22:35:09 -03:00
Juan Linietsky
edde52c8de Added proper import support for 3D and Array textures 2018-08-06 14:56:06 -03:00
Juan Linietsky
07a982e614
Merge pull request #20597 from karroffel/tex3d 
add 3D textures
 2018-08-06 07:20:00 -03:00
Juan Linietsky
d5d83b754d Ensure index is only saved when scene is inherited, or parent node is not from the edited scene. Closes #17562. 2018-08-05 11:58:13 -03:00
Andrea Catania
4073e44332
Fixed typo in SkeletonIK 2018-08-04 19:35:53 +02:00
Juan Linietsky
7c712a25bc
Merge pull request #18699 from AndreaCatania/ik 
Inverse kinematic
 2018-08-04 10:45:14 -03:00
Andrea Catania
c1860fe88b Fixed process priority 2018-08-04 14:51:44 +02:00
AndreaCatania
b7e66188df Implemented IK 2018-08-04 11:25:07 +02:00
Andrea Catania
b469267d94 Fixed SoftBody pinned point offset calculation 2018-08-03 17:44:09 +02:00
Hugo Locurcio
501fc98c63
Scale underlines in the script editor with the editor scale 2018-08-02 09:38:56 +02:00
Saracen
c55e269bfa Add method to manually advance AnimationTree and manual process mode. 2018-08-02 08:29:51 +01:00
Max Hilbrunner
3f01f40e91
Merge pull request #20550 from AndreaCatania/soft_fix 
Soft Body - Pin Point fix, Material fix
 2018-07-30 17:01:25 +02:00
Thomas Herzog
b4d3f541e7 add 3D textures 2018-07-30 12:20:27 +02:00
Juan Linietsky
15db793ef2 Ensure process notification is received only if really enabled, fixes #7894 2018-07-29 21:20:41 -03:00
Juan Linietsky
aff57a613b Add extra functions to toggle bits in visualinstance and camera, same as physics. Helps with #6685 2018-07-29 20:05:16 -03:00
groud
eb7f4ddcce Fixes bugs on the 2D editor scrollable area 2018-07-30 01:05:13 +02:00
Juan Linietsky
200c6cf630 Perform a name check when loading scenes and running on editor, fixes #6152 2018-07-29 17:39:45 -03:00
Andrea Catania
7949ba771b SoftBody add MeshInstance Material correctly 2018-07-29 19:36:32 +02:00
Juan Linietsky
c752c26427 Expose _clips_input as a virtual function, closes #15358 2018-07-29 12:48:17 -03:00
Juan Linietsky
0fcc28b6f3
Merge pull request #15269 from ianb96/context_menu_improvements 
Context Menu Improvements
 2018-07-29 12:31:20 -03:00
Andrea Catania
45160f0c0d Fixed Softbody pin point 2018-07-28 20:38:20 +02:00
Ibrahn Sahir
1626ae6421 fixed uninitialised variable that was causing menu crash. 2018-07-28 18:09:47 +01:00
Bastiaan Olij
d41a4089c6 Added a method to find the index for a surface with a given name 2018-07-28 19:14:41 +10:00
Rémi Verschelde
12254594ac Fix PhysicsBody build with deprecated=no 
Fixes #20483.
 2018-07-27 15:34:58 +02:00
Juan Linietsky
6a5aec3644 Rename flag to better name 2018-07-27 08:59:18 -03:00
Rémi Verschelde
7056dc6011
Merge pull request #20498 from Calinou/caret-width-hidpi 
Make the caret thicker in TextEdit and scale it with the editor scale
 2018-07-27 09:01:58 +02:00
Hugo Locurcio
f8a2cb3e15
Multiply TextEdit line spacing by the editor scale 
This makes sure the default line spacing in the script editor
is consistent with the editor scale in use.
 2018-07-26 23:50:16 +02:00
Hugo Locurcio
8d05f89bc1
Make the caret thicker in TextEdit and scale it with the editor scale 
The caret in LineEdit is still 1 pixel thick, but it will become
2 pixels thick at editor scales higher than or equal to 150%.
 2018-07-26 23:43:43 +02:00
Rémi Verschelde
91d6fa817e
Merge pull request #15967 from Gamblify/AudioRecordingModule 
Audio Recording from godot
 2018-07-26 15:37:19 +02:00
Ian
1bb13e95a8 context menu improvements 2018-07-26 08:58:35 -04:00
Gustav Lund
adb43b6976 AudioStreamSample can now be saved to a WAV file 
8 and 16 bit sample saving has been implemented.
 2018-07-26 14:14:39 +02:00
Gustav Lund
cd2070c684 Audio Recording module 
Implements an Audio bus effect that outputs the audio from the bus into a wav file

Now channels audio recording into an AudioStreamSample instead of saving to wav
 2018-07-26 14:14:29 +02:00
Rémi Verschelde
391e46830f doc: Sync classref with current source 
Fix various missing arguments in bindings.
 2018-07-26 11:56:21 +02:00
Rémi Verschelde
5c8919aac6
Merge pull request #18955 from tagcup/fix_set_scale 
Removed incorrect Basis::set_scale().
 2018-07-26 10:37:03 +02:00
Rémi Verschelde
39168f125e
Merge pull request #19464 from bojidar-bg/19448-fix-subproperty-handling 
Fix bug in animationplayer editor not using subproperties properly
 2018-07-26 10:31:05 +02:00
JFonS
0052ee70d2 Added keep scale flag to billboard materials 2018-07-26 09:34:12 +02:00
Hein-Pieter van Braam
0e29f7974b Reduce unnecessary COW on Vector by make writing explicit 
This commit makes operator[] on Vector const and adds a write proxy to it.  From
now on writes to Vectors need to happen through the .write proxy. So for
instance:

Vector<int> vec;
vec.push_back(10);
std::cout << vec[0] << std::endl;
vec.write[0] = 20;

Failing to use the .write proxy will cause a compilation error.

In addition COWable datatypes can now embed a CowData pointer to their data.
This means that String, CharString, and VMap no longer use or derive from
Vector.

_ALWAYS_INLINE_ and _FORCE_INLINE_ are now equivalent for debug and non-debug
builds. This is a lot faster for Vector in the editor and while running tests.
The reason why this difference used to exist is because force-inlined methods
used to give a bad debugging experience. After extensive testing with modern
compilers this is no longer the case.
 2018-07-26 00:54:16 +02:00
Max Hilbrunner
46985ae075
Merge pull request #20440 from Chaosus/fixtexturecrash 
Fix game crash when you pass invalid or null parameter to ImageTexture.set_data
 2018-07-25 12:00:49 +02:00
Chaosus
bde962dbdd Fix crash when you pass invalid parameter to ImageTexture.set_data 2018-07-25 12:23:34 +03:00
Rémi Verschelde
f778bd8e69
Merge pull request #20404 from TigerCaldwell/master 
Ensured consistency between RigidBody, PhysicsDirectBodyState, PhysicsServers and their 2D counterparts
 2018-07-25 08:25:34 +02:00
Rémi Verschelde
f8e8ac2c66
Merge pull request #20133 from ibrahn/fix-tree-uninit-branch 
fixed a branch on uninitialised data in gui/tree
 2018-07-25 01:18:39 +02:00
Rémi Verschelde
3ecb25a283
Merge pull request #19726 from guilhermefelipecgs/feature_add_menu_hover 
Opens the menu with the same parent on mouse focus
 2018-07-25 01:05:37 +02:00
Guilherme Felipe
d1f5deabd8 Opens the menu with the same parent on mouse focus 2018-07-24 19:59:40 -03:00
Juan Linietsky
2e67fc57e6
Merge pull request #18867 from fire/better_vx_us_rebase_02 
Improve VisualScript UX
 2018-07-24 18:02:10 -03:00
K. S. Ernest (iFire) Lee
85670726fd Improve VisualScript UX 
* Prototype faster function call ux.
* Work on general search ux.
* Able to create nodes from search.
* Show class for variables but not methods.
* Get actions search working.
* Descriptions now show for both methods and properties.
* Enable zooming on mouse wheel up and down.
* Make the drag trigger on right mouse button.
* Search now shows for action visual script nodes.
* Able to search visual node names.
* Search works better.
* Change zooming scale to hide artifacts better.
* Remove zoom changes
* Select from base should check properties too like the other functions.
* Seq_connect flag is needed to set sequence lines correctly.
* Remove comment
* Code cleanup with function names and arguments.
* Use brief description for search descriptions.
* Clean and fix bug with input nodes connecting with sequence lines.
* Add a warning and fix some edge conditions with sequence into data lines and vice versa.
* Don't search functions when pulling from a sequence node.
* Don't show actions when pulling from a data line.
* Set set and get properties.
* Convert visual script operators to the correct type
* Create a function preset finds only functions.
* Singletons can now find functions.
* Add shift-a for generic search.
* Add brief descriptions for Visual Script nodes.
* Search boxes can now filter names.
* Add bigger hit zones to node connect.
* For the drop zones, make all the rect2 areas the same size.
* Function names in visual script node should be lower case so that search works better.
* Use the convention of capitalize() for set, set, visual script nodes and methods.
* Make search more general. Ignore "_" and make case-insensitive. Also made the search window smaller and remove extra info from search
* Make type_cast use the connecting node's type and remove use of found variable.
* Fix case where you call an instance's call function where it becomes an invalid call.
* Make get_visual_node_names use a set of filters, move action creations and fix bug with sequence node connections.
* Make the window bigger.
* Make connect_data and connect_seq more robust.
* Add icons to search items.
* Add vs constructors in shift-a menu.
* Operators, builtins and constructors show type name. Fix several problems with port connections.
* In shift-a mode search everything.
* Code cleanup
* Work on autocompleting the type.
  * Use type guess in action creation.
  * Check if type hint string exists in object variables when generating the visual script search.
  * Add the hint to SceneTree.
  * Add original type detection.
  * Make type casting great again. This puts the type casted base type as the data output type string hint.
  * Pass the type in a VisualScriptFunctionCall too.
  * Set the base type correctly in VisualScriptFunctionGet and VisualScriptFunctionSet using hint string.
  * Make sure the instance is passed in VisualScriptPropertySet.
  * Restore search on the node's type.
* Remove dependencies from graph_edit.
* Remove dependencies from property_selector and name the class visual_script_property_selector.
* Extract hot zones into a function.
* Move hot_zones constants into default theme.
* Bigger capture zones.
* Clean messy port_grab_distance variables.
* Remove RMB functionality.
* Remove memory leak on showing visual script descriptions.
* Read the port_grab_distance constants on enter tree and theme changed.
 2018-07-24 13:59:28 -07:00
Rémi Verschelde
62f2a8aadb
Merge pull request #20252 from RandomShaper/fix-canvas-search 
Fix CanvasItem's search for a CanvasLayer
 2018-07-24 22:45:24 +02:00
Rémi Verschelde
fda6b78bae
Merge pull request #18806 from Calinou/bilinear-textureprogress 
Add support for bilinear bars in TextureProgress
 2018-07-24 22:31:24 +02:00
Max Hilbrunner
b92c432313
Merge pull request #19225 from Paulb23/open_all_files_in_script_editor 
Open all files in script editor
 2018-07-24 21:52:11 +02:00
Rémi Verschelde
15c6adcd5b
Merge pull request #19781 from razcore-art/fix-tween 
Fix and make Tween node less confusing
 2018-07-24 21:24:38 +02:00
Tiger Caldwell
40c7716586 Modified RigidBody, PhysicsDirectBodyState, PhysicsServer, and their respective 2D counterparts to be more consistent and to include more useful methods. 
RigidBody:
- Added add_central_force
- Added add_force
- Added add_torque
- Added apply_central_impulse

RigidBody2D:
- Added add_central_force
- Added add_torque
- Added apply_central_impulse
- Added apply_torque_impulse

PhysicsDirectBodyState:
- Added apply_central_impulse

Physics2DDirectBodyState:
- Added add_central_force
- Added add_force
- Added add_torque
- Added apply_central_impulse
- Added apply_impulse
- Added apply_torque_impulse

PhysicsServer:
- Added body_add_force
- Added body_add_torque
- Added body_add_central_force
- Added body_apply_central_impulse

Physics2DServer:
- Added body_add_torque
- Added body_add_central_force
- Added body_apply_central_impulse
- Added body_apply_torque_impulse

Also fixed some small bugs along the way
 2018-07-24 05:00:56 -04:00
Rémi Verschelde
bfe52fc30a
Merge pull request #20391 from YeldhamDev/expose_tileset_modulate 
Expose 'modulate' set/get in TileSet resource
 2018-07-24 09:59:23 +02:00
Wilson E. Alvarez
a22e746bc3 Removed unnecessary assignments 2018-07-24 09:51:03 +02:00
Michael Alexsander Silva Dias
dc0c75ce68 Expose 'modulate' set/get in TileSet resource 2018-07-23 18:35:52 -03:00
Juan Linietsky
dc976cac57
Merge pull request #12678 from AndreaCatania/soft 
Soft body
 2018-07-23 16:04:32 -03:00
AndreaCatania
17ebbfb56d Implemented Soft body 
- Soft Body Physics node
- Soft Body Rendering
- Soft body Editor
- Soft body importer
 2018-07-23 20:50:23 +02:00
Juan Linietsky
ec85fd554b Fix issues with CPUParticles and related conversion from Particles. Closes #20126 2018-07-23 12:28:50 -03:00
Juan Linietsky
1ad20dc2f1
Merge pull request #12403 from AndreaCatania/phymat 
Physics material
 2018-07-23 07:37:03 -03:00
Juan Linietsky
172f652dc0
Merge pull request #19888 from AndreaCatania/pry 
Implemented proceses priority
 2018-07-23 07:21:38 -03:00
Andrea Catania
51dfa10ac7 Implemented proceses priority 2018-07-23 12:19:38 +02:00
Pieter-Jan Briers
b2c797c584 Defer TileMap::update_dirty_quadrants once again. 
This fixes #20323.

#11077 is now technically re-broken,
but you can now call update_dirty_quadrants as workaround.
 2018-07-22 15:26:14 +02:00
Paulb23
8ff747171f Allow opening and editing of any utf_8 file in script editor 2018-07-22 11:55:56 +01:00
Rémi Verschelde
92415365c8
Merge pull request #19264 from vnen/typed-gdscript-final 
Typed GDScript
 2018-07-21 23:13:51 +02:00
Juan Linietsky
2b9902db06 -Fix disable_3d flag 
-Add extra flag optimize=[size,speed] to be able to prioritize size
 2018-07-21 17:26:49 -03:00
George Marques
03746da73f
Add editor highlight for type-safe lines 
The line number is hightlighted to indicate that the line contains only
type-safe code.
 2018-07-20 21:55:18 -03:00
Juan Linietsky
336db8bcd1 -Fix tooltips in inspector, now they show as rich text. 2018-07-20 18:16:19 -03:00
Marcelo Fernandez
9b9949de39 Print an error when calling an invalid method on an Animation 2018-07-18 22:26:01 -03:00
Juan Linietsky
43dc050947 Several improvements to editor inspector usability and style 2018-07-18 19:37:41 -03:00
Pedro J. Estébanez
49d0af3c8e Fix CanvasItem search for a CanvasLayer 
This fixes the situation where a `CanvasItem` descendant of a `Viewport` which in turn is a descendant of a `CanvasLayer` prefers the more outer `CanvasLayer` rather than the `Vierport`'s.

Because of that, `CanvasItem`s inside a `Viewport` inside a `CanvasLayer` were being rendered to the main `Viewport` instead of the render target of the innermost one.
 2018-07-18 20:34:21 +02:00
Juan Linietsky
d1550b4a9b Ability to disable scale in nodes, closes #19927 2018-07-18 13:48:09 -03:00
Rémi Verschelde
7c9f7452f4 Style: Format code with clang-format 6.0.1 2018-07-18 16:27:03 +02:00
Rémi Verschelde
13239cd4cc Export: Properly reload preset when opening dialog 
Fixes #20119 where newly installed templates were not detected.

Also fix a bug with preset deletion where it would attempt to
edit an already removed preset. For this I made it so that
ItemList::deselect_all() also resets `current` to -1, as a manual
ItemList::deselect(idx) already does.
 2018-07-18 13:49:34 +02:00
Rémi Verschelde
bd9b8098fe
Merge pull request #20140 from EIREXE/ambient_light_disable_shader 
Add disable ambient light flag to shaders and materials
 2018-07-18 10:39:20 +02:00
Rémi Verschelde
5b7ebf4d04
Merge pull request #20232 from marcelofg55/fix_enums_vs 
Fix some missing BIND_ENUM_CONSTANT for visual_shader_nodes.cpp
 2018-07-18 09:01:03 +02:00
Marcelo Fernandez
e4db15471b Fix some missing BIND_ENUM_CONSTANT for visual_shader_nodes.cpp 2018-07-17 18:31:22 -03:00
Alex Roman
2ce1118faa Add disable ambient light flag to shaders and materials 2018-07-17 21:30:43 +02:00
volzhs
adb179154a Fix Label autowrap clips text 2018-07-18 02:19:05 +09:00
Max Hilbrunner
707175eda8
Merge pull request #19044 from Mintormo/make_header_fix 
Added support of Python 3 in make_header.py
 2018-07-17 15:12:49 +02:00
Max Hilbrunner
b64bf118f1
Merge pull request #19087 from danvalho/master 
SpriteFrames: expose method to get array containing animation names
 2018-07-17 14:54:06 +02:00
Rémi Verschelde
f71ffa9724
Merge pull request #20146 from dodgyville/bezier_fixes_19777 
fix issue with bezier tracks using incorrect duration for interpolating values
 2018-07-17 14:43:47 +02:00
Juan Linietsky
13a801430b Further fixes to KinematicBody2D API, support for sync motion in moving objects 2018-07-17 08:58:04 -03:00
Rémi Verschelde
95d99cb2ac
Merge pull request #20176 from Chaosus/vs_namefixes 
Several name fixes for visual shaders
 2018-07-17 13:54:22 +02:00
Max Hilbrunner
adec9c3168
Merge pull request #20150 from ibrahn/fix-scrollbar-atlas 
fix scrollbar icons with atlas texture.
 2018-07-17 12:15:22 +02:00
Max Hilbrunner
1f1b45c7ec
Merge pull request #20191 from jvdnbus/line2d-stretch 
Line2D texture stretch mode
 2018-07-17 12:12:29 +02:00
Juan Linietsky
e1f2feec2e Changes to how snap works (I think this makes more sense now) 2018-07-16 21:30:44 -03:00
Juan Linietsky
063a22851a -Added support for raycast in KinematicBody2D 
-Added support for snapping in KinematicBody2D
 2018-07-16 20:04:07 -03:00
Jorn Van denbussche
d7aa3e33c8 Line2D texture stretch mode 
Prototype for stretching the texture across the whole line.
Fixed end cap tile mode.
 2018-07-16 23:16:58 +02:00
Juan Linietsky
de910f8c26 Finally figured out how to implement AnimatedTexture properly. 2018-07-16 11:43:49 -03:00
Thomas Herzog
9eb082004d
Merge pull request #20034 from Faless/master_fixes 
Fix server and GDNative in master branch
 2018-07-16 15:50:30 +02:00
Jorn Van denbussche
28aa9a1d6d More accurate UV round begin cap 2018-07-16 14:30:30 +02:00
Chaosus
3af81427a1 Several name fixes for visual shader 2018-07-15 17:28:06 +03:00
Overblob
e6ad5e23b4 * Small hex/float/integer parsing refactoring 
* Potential bug fix on hex (cannot be used atm)
* Added optional typing for floats, eg:
"1f" -> "1.0"
"1.f" -> "1.0"
"1.99f" -> "1.99"
"1." -> "1.0"
 2018-07-15 14:58:23 +02:00
Juan Linietsky
f6ce73f724 Visual Shaders are back. 2018-07-14 18:16:18 -03:00
Ibrahn Sahir
e51a94905d fix scrollbar icons with atlas texture. 
Draw scrollbar icons through their textures, rather than calling
directly to the server. Allows atlas textures to manipulate the source
rect as required.
 2018-07-14 14:02:08 +01:00
Luke Miller
7298a746ce fix issue with bezier tracks using incorrect duration for interpolating values 2018-07-14 11:48:40 +10:00
Ibrahn Sahir
fb32adfcf8 fixed a branch on uninitialised data in gui/tree 
I don't think it was really causing any harm, but this makes things a
little more explicit and helps clean up valgrind output.
 2018-07-13 14:00:10 +01:00
Max Hilbrunner
cc57b62ab3
Merge pull request #20068 from Xrayez/submenu-popup-delay 
Add ability to set submenu's popup delay time on mouse hovering
 2018-07-12 05:27:49 +02:00
Max Hilbrunner
118d4f3115
Merge pull request #19540 from muiroc/cylinder 
Cylinder resource and collision shape (bullet only)
 2018-07-12 05:09:37 +02:00
Marcelo Fernandez
0c78a58b64 Fix possible bug with AudioStreamPlayer2D audio position 2018-07-10 22:57:50 -03:00
Alexander Holland
bf3c81f20b fix ColorPickerButton.get_popup() 2018-07-10 15:06:36 +02:00
Max Hilbrunner
41ff975b8c
Merge pull request #20014 from Chaosus/scrollable 
Added scrollable property for sliders
 2018-07-10 13:31:09 +02:00
Marcelo Fernandez
087329074d Improved stream paused fade code 2018-07-09 21:58:33 -03:00
Pedro J. Estébanez
ec5c96dbe1 Fix camera offsets not applied always 
Specifically, project/unproject methods weren't taking them into account. Frustum computation may be affected as well.

This commit considers them for the camera matrix at all times.
 2018-07-09 21:07:15 +02:00
Andrii Doroshenko (Xrayez)
e3b77b24ac Add ability to set submenu's popup delay time on mouse hovering 
This allows to set delay time for the submenu to popup. Setting
this value low can increase responsiveness. If the popup menu is added
as a child of another (acting as a submenu), it will inherit the delay
time of the parent menu item.
 2018-07-09 18:37:41 +03:00
Fabio Alessandrelli
d4465fce43 Fix some enum export in new Animation editor. 2018-07-08 10:24:21 +02:00
Juan Linietsky
ea47359408 Add option to convert Particles to CPUParticles 2018-07-07 09:04:22 -03:00
Chaosus
dbd5afc498 Added scrollable property to Sliders 2018-07-07 13:48:34 +03:00
Juan Linietsky
7dcaabaf19 Support for CPU based particles, which aids compatibility with OpenGL ES 2.0 2018-07-06 20:21:42 -03:00
Max Hilbrunner
9f82368d40
Merge pull request #19475 from YeldhamDev/animplayer_cosmetic 
Minor changes to the AnimationPlayer editor
 2018-07-05 04:25:04 +02:00
Max Hilbrunner
c488a74e0c
Merge pull request #19498 from guilhermefelipecgs/fix_regression 
Fix "find and replace" initializing with wrong size
 2018-07-05 04:23:18 +02:00
Max Hilbrunner
ed61bdd2ae
Merge pull request #19646 from chanon/fix-audiostream-cant-set-null-stream 
Fix can't set AudioStreamPlayer stream to null
 2018-07-05 04:16:47 +02:00
Max Hilbrunner
16f1a77319
Merge pull request #19735 from Paulb23/text_offset_issue_15688 
Fixed text drawing too high in TextEdit, issue 15688
 2018-07-05 04:04:39 +02:00
Max Hilbrunner
43748f67be
Merge pull request #19351 from guilhermefelipecgs/fix_reversed_text 
Fixes to the new inspector
 2018-07-05 03:50:31 +02:00
Max Hilbrunner
e3c8ac43c6
Merge pull request #19187 from Zirak/editor-autocomplete-quote 
Editor autocomplete won't insert unnecessary quotes
 2018-07-05 02:33:33 +02:00
Max Hilbrunner
edc63a2f60
Merge pull request #18028 from gabrii/18026 
Fix #18026. Expose TextEdit::set_draw_breakpoint_gutter.
 2018-07-05 02:30:18 +02:00
Guilherme Felipe
709948aa5a Fixes to the new inspector 
- Fix inspector dock not updating tree for main resource;
- Fixes the inspector input text reverted during typing;
- Add method bind for "refresh" used by MultiNodeEdit;
 2018-07-04 20:08:45 -03:00
Max Hilbrunner
a8a318161b
Merge pull request #19015 from toger5/fixed_scrolling_with_trackpad_in_new_inspector 
fixed scrolling in new ispector when using trackpad pan gesture
 2018-07-05 00:22:06 +02:00
Max Hilbrunner
9986b64b76
Merge pull request #19960 from groud/fix_control_size 
Fixes control nodes size not updated when outside the tree
 2018-07-04 23:32:29 +02:00
Max Hilbrunner
293a96c22d
Merge pull request #19947 from GagaPete/html5-http-fix 
Fix CORS problems due to added headers on JS target
 2018-07-04 22:37:47 +02:00
groud
560deda207 Fixes control nodes size not updated when outside the tree 2018-07-04 15:14:42 +02:00
Rémi Verschelde
3724f1562b
Merge pull request #19782 from Calinou/fix-control-pixel-snap-rounding 
Fix control pixel snap rounding using floor() instead of round()
 2018-07-04 15:11:08 +02:00
Rémi Verschelde
92bfde531c
Merge pull request #19786 from JFonS/correct_normal_scaling 
Add render mode to ensure correct normals when using non-uniform scaling
 2018-07-04 15:09:59 +02:00
GagaPete
8a4dccc4ce Fix CORS problems due to added headers on JS target 
Before this change, missing User-Agent and Accept headers were automatically
added on all platforms. Setting the User-Agent header forces the browser to
do a CORS preflight (see 1) which fails if the HTTP endpoint is not
configured appropriate. It's not neccesary to set either header as the
browser sets them and so this commit disables that functionality on the JS
target.

1: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS#Simple_requests
 2018-07-04 01:56:44 +02:00
Juan Linietsky
085483e885 -Fix fullscreen on Windows with a HiDPI monitor but a non-HiDPI project 
-Replaced some viewport size calls to screen size, since viewport size should be deprecated at this point..
 2018-07-03 18:53:27 -03:00
Max Hilbrunner
465edbd2bc
Merge pull request #19853 from khairul169/duplicate_bug 
Fix duplicate method on instanced node generates duplicated children.
 2018-07-03 18:48:45 +02:00
Max Hilbrunner
2017119a3d
Merge pull request #19919 from marcelofg55/notif_crash 
Add a new notification to detect crashes on native scripts
 2018-07-03 18:42:49 +02:00
Max Hilbrunner
fbff1804d2
Merge pull request #17438 from Deluvi/get-word-pos-quote-fix 
get_word_at_pos considers simple and double quotes
 2018-07-03 18:28:47 +02:00
Max Hilbrunner
b21c1f64cd
Merge pull request #18634 from groud/fix_control_child_of_node2d 
Fixes the bad calculation of margin & anchors when child of Node2D
 2018-07-03 18:06:15 +02:00
Max Hilbrunner
6d0ade54c0
Merge pull request #19205 from marcelofg55/audio_stream_pause 
Pause AudioStreamPlayer when SceneTree pauses
 2018-07-03 17:23:53 +02:00
Max Hilbrunner
24ce1ace13
Merge pull request #19244 from Chaosus/settingsperformance_and_colordeferred 
Increases settings apply speed and added deferred color setting to ColorPicker
 2018-07-03 17:01:23 +02:00
Max Hilbrunner
585a185e89
Merge pull request #19246 from xemjeff/physics 
Hinge Joint Inspector - Change range for motor target velocity and params bias values
 2018-07-03 16:49:10 +02:00
Max Hilbrunner
23ad85c692
Merge pull request #19398 from godotengine/remove-left-margin 
Remove default non-zero left margin
 2018-07-03 16:41:04 +02:00
Max Hilbrunner
6efc1ba6e0
Merge pull request #19565 from robojumper/fixed_edge_scroll 
Re-enable scrolling via selecting code beyond edges in text_edit.cpp
 2018-07-03 16:11:19 +02:00
Juan Linietsky
e179bf0726 Ensure, if a texture meant for a normal map is imported and size limit exists, that it's renormalized after resize. 2018-07-03 10:56:31 -03:00
Max Hilbrunner
e29e4e56c1
Merge pull request #19843 from Calinou/fix-dynamicfont-hinting-setting 
Fix the DynamicFont hinting setting being ineffective
 2018-07-03 15:34:02 +02:00
Juan Linietsky
7fc2367508 Added ability for SSAO to affect AO textures too 2018-07-02 16:50:52 -03:00
Marcelo Fernandez
deebeb2742 Add a new notification to detect crashes on native scripts 2018-07-02 16:18:58 -03:00
Juan Linietsky
2dc738ce27 -Fixes to how hashing happened, now StringName and NodePath use default hasher, this was leading to some severe slowdown in scenarios 
-Fixes to some duplication scenarios for instanced scenes
 2018-07-02 15:08:35 -03:00
Andrea Catania
008e8266bb Removed two skeleton parameter from compilation width no 3d 2018-07-02 07:35:43 +02:00
George Marques
d56d7299e4
Merge pull request #19875 from willnationsdev/meta-underlined 
Fix underline_meta not working in RichTextLabel
 2018-07-01 23:13:46 -03:00
Juan Linietsky
896e250f2b -Fix in animationplayback, sound would be cut on loop 
-Fix on scene importer, keeping changes to animation tracks was not working
 2018-07-01 17:45:19 -03:00
Paulb23
8f390da422 Center text drawing in LineEdit 2018-07-01 15:46:33 +01:00
Rémi Verschelde
82e03b2066
Merge pull request #19871 from guilhermefelipecgs/fix_performance_ui 
Fix performance for godot's interface
 2018-07-01 15:14:31 +02:00
Guilherme Felipe
b2e78e117c Fix performance for godot's interface 2018-07-01 09:48:03 -03:00
Rémi Verschelde
05cc7020c0
Merge pull request #19886 from AndreaCatania/no3d 
Fixes #19845 no 3d Compilation issue
 2018-07-01 13:39:14 +02:00
Andrea Catania
08009c75a2 Fixes #19845 no 3d Compilation issue 2018-07-01 12:39:24 +02:00
Andrea Catania
16cf262e34 Fixes #19648 Kinematic body move_and_slide compatibility issue 2018-07-01 11:38:13 +02:00
muiroc
0a36e974da added cylinder shape support 2018-07-01 11:16:54 +02:00
Will Nations
a9ea06e73a Fix underline_meta not working in RichTextLabel 2018-07-01 00:15:27 -05:00
Juan Linietsky
b3627e29f0 -Fixes to OBJ importer, option to disable optimization 
-Fixes to script language, PlaceHolder can now get and check methods
 2018-06-30 19:59:16 -03:00
khairul169
8e03715a5c Fix duplicate bug 2018-06-30 17:35:51 +07:00
Michael Alexsander Silva Dias
02181292b8 Minor changes to the AnimationPlayer editor. 2018-06-30 00:12:05 -03:00
Hugo Locurcio
6deb1889d0
Fix the DynamicFont hinting setting being ineffective 2018-06-29 21:38:53 +02:00
Juan Linietsky
0ffec7daf7 Small fixes 2018-06-29 09:13:39 -03:00
Hugo Locurcio
53e94a1ce1
Optimize images losslessly using oxipng -o6 --strip all --zopfli 2018-06-28 19:17:41 +02:00
Juan Linietsky
eeab3502d5 Changes to how node paths are selected from property, allowing setting a hint. 2018-06-27 20:50:25 -03:00
Juan Linietsky
9bab5134cf The way multiple quaternions being slerped was not good, changed approach to one that seems to work better. 2018-06-27 16:30:48 -03:00
Răzvan C. Rădulescu
07874292d0 Check "done" state in original loop 
My first attepmt I added a second loop to check if processing should
stop. This attempts to optimize by using the original loop (one loop).

Also resets `elapsed` time on finish of tween which fixes `tell()`.
 2018-06-27 10:17:00 +02:00
Rémi Verschelde
be9731459a Style: Apply clang-format to animation_tree.cpp 
Fixes issues introduced in c633b77 and de1ff22.
 2018-06-27 08:36:26 +02:00
Juan Linietsky
de1ff22eae change node graph property and improved some bindings 2018-06-27 03:00:08 -03:00
Juan Linietsky
c633b770cb -Add root motion support in AnimationTree. 
-Add RootMotionView, to debug root motion in 3D (disabled in runtime)
 2018-06-26 19:06:16 -03:00
Rémi Verschelde
f036353b93
Merge pull request #19164 from marcelofg55/tilemap_undo2 
Improve TileMap undo operations, second try
 2018-06-26 20:57:39 +02:00
Răzvan C. Rădulescu
5c914e2d5b Fix and make Tween node less confusing 
I've made the following changes:
- make `is_active` the main way of keeping track of tween
  processing/activity, meaning that `is_active` will now return
  `false` if all tween actions have finished or if it isn't started
  or if it was stopped via `set_active(false)` or any other mode
- removed is_stopped because is redundand now

The above meant that we don't have to keep track of yet another variable
`available` since everything is based on `*processing_internal` so I
removed it, likewise it's own local `processing` variable was removed,
as well as the "double" `_set_process` which it feels more like a hack.

What wasn't changed:
- `tell()` still returns max value (i.e. `== get_runtime()` when all
  tweens `finish`)

*More testing is needed*. So far I've tested repeat on/off, delay,
`is_active()` working corretly, `set_active(true), set_active(false)`,
but probably more tests are necessary, all the resets, stops, resume
etc.
 2018-06-26 18:16:57 +02:00
Hugo Locurcio
88c23e243f
Fix control pixel snap rounding using floor() instead of round() 
This resulted in small leftwards/upwards movement of controls being
faster than it should be.

This closes #19763.
 2018-06-26 17:55:23 +02:00
Rémi Verschelde
c8617565d8
Merge pull request #19776 from marcelofg55/tilemap_quadrant_opt 
Optimize _recreate_quadrants
 2018-06-26 15:37:55 +02:00
Marcelo Fernandez
67a78e020a Optimize _recreate_quadrants 2018-06-26 00:07:48 -03:00
Thomas Herzog
0f45d0aa7d ensure BlendSpace1D syncs animations 2018-06-26 02:41:36 +02:00
Juan Linietsky
8c7da84e1e renamed AnimationGraphPlayer to AnimationTree 2018-06-25 18:40:24 -03:00
Juan Linietsky
87f48e7a3e
Merge pull request #19720 from karroffel/blendspace-1d 
add BlendSpace1D animation node
 2018-06-25 16:50:33 -03:00
Juan Linietsky
5b035107e3 removed print 2018-06-25 16:47:09 -03:00
Thomas Herzog
0f7c35f955 added BlendSpace1D editor plugin 
This commit also fixes a crash in the BlendSpace2D as well as correct
the drawing of the x-zero indicator in the BlendSpace2D editor plugin.
 2018-06-25 21:46:12 +02:00
Thomas Herzog
84252f2ec4 added AnimationBlendSpace1D 2018-06-25 21:36:53 +02:00
Thomas Herzog
1ff7aa4c9b rename BlendSpace to BlendSpace2D 2018-06-25 21:36:10 +02:00
Juan Linietsky
4f5a7ebaec State machine animation node 2018-06-25 16:22:41 -03:00
Paulb23
8a168637fe Fixed text drawing too high in TextEdit, issue 15688 2018-06-24 10:38:53 +01:00
Bastiaan Olij
c11735facf Fight off some error spam in the editor 2018-06-24 11:54:08 +10:00
chanon
2bdac0a5d9 fix can't set AudioStreamPlayer stream to null 2018-06-22 15:00:57 +07:00
Juan Linietsky
2365fe472b Added auto triangle generation in blend space, using Delaunay. 2018-06-21 22:48:47 -03:00
Juan Linietsky
b80946ee0d Fix crashes, ability to add blendpsace into blendtree, ability to delete with delete key 2018-06-21 18:08:11 -03:00
Juan Linietsky
a0719533bd Animation Blend Spaces 2018-06-21 15:46:11 -03:00
JFonS
c8cf71753c Add render mode to ensure correct normals when using non-uniform scaling 2018-06-21 00:12:12 +02:00
Marcelo Fernandez
8c1c7ff131 Add missing NULL checks for add_child_below_node 2018-06-19 22:47:34 -03:00
Juan Linietsky
0a1c1c660f -Added AnimationGraphPlayer (still missing features) 
-Added ability to edit resources from built-in inspector (wip, needs testing and feedback)
 2018-06-18 22:12:08 -03:00
Bojidar Marinov
7b107cb180
Fix bug in animationplayer editor not using subproperties properly 
Fixes  #19448
 2018-06-18 15:59:13 +03:00
Rémi Verschelde
2fabb81318 Fix property hint for ReflectionProbe extents 2018-06-16 09:28:54 +02:00
robojumper
4ba6755324 Re-enable scrolling via selecting code beyond edges in text_edit.cpp 2018-06-14 21:29:39 +02:00
Guilherme Felipe
5bae3693bf Fix "find and replace" initializing with wrong size 
Fix the code editor outside the allowed limits.
 2018-06-13 14:08:04 -03:00
Rémi Verschelde
ea5512fc25
Merge pull request #19541 from SaracenOne/ime2 
Make LineEdit IME position hook ignore placeholder text
 2018-06-13 18:52:43 +02:00
Rémi Verschelde
8efbe9ed3d
Merge pull request #19487 from JFonS/better_3d_select 
Improve 3D selection
 2018-06-13 18:49:35 +02:00
JFonS
9cd1c20f6a Polished 3D selection 2018-06-13 17:52:37 +02:00
Saracen
9d0bdf69c4 LineEdit IME position will now ignore placeholder text. 2018-06-13 16:42:36 +01:00