diff --git a/HEADS b/HEADS index b7d47ed6..efea1993 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": "ad95424dbace10d0ea1770e22bb1cd85463d18ab", "world_generator": "290d973ea9580f748881a54502850ae5fecfb586", "entity_spell_system": "964110c125559e4e8db4f5909e0b7fb782d811f0", "ui_extensions": "271dcf89e9afe5cb6350de2f2433c8ebf8aba785", "voxelman": "2b369f5be8efc5fe0ef13da57afa46317c413f47", "texture_packer": "604c330188e220c15d10ea5bd545a6fc5aab0132", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "367b2318da45726710c27fd3ac1d23e8a5a8f1f7"} \ No newline at end of file +{"engine": "e64a663c59141f972345852f0bce613e3f13dd3a", "world_generator": "290d973ea9580f748881a54502850ae5fecfb586", "entity_spell_system": "69cde94cebeb977a4bcd128e82e65c4aef887622", "ui_extensions": "271dcf89e9afe5cb6350de2f2433c8ebf8aba785", "voxelman": "2b369f5be8efc5fe0ef13da57afa46317c413f47", "texture_packer": "604c330188e220c15d10ea5bd545a6fc5aab0132", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "367b2318da45726710c27fd3ac1d23e8a5a8f1f7"} \ No newline at end of file diff --git a/game/autoload/PhysicsQuery.gd b/game/autoload/PhysicsQuery.gd index 3c8d7bf7..04645fd5 100644 --- a/game/autoload/PhysicsQuery.gd +++ b/game/autoload/PhysicsQuery.gd @@ -1,14 +1,30 @@ -extends Spatial +extends Node -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at https://mozilla.org/MPL/2.0/. +# Copyright (c) 2019 Péter Magyar -func _ready(): - set_physics_process(true) +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. -func _physics_process(delta): - pass +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +#func _ready(): +# set_physics_process(true) +# +#func _physics_process(delta): +# pass #func queue_raycast(): # var space_state : PhysicsDirectSpaceState = get_world().direct_space_state diff --git a/game/autoload/PhysicsQuery.tscn b/game/autoload/PhysicsQuery.tscn index 0dd35824..53ceaebf 100644 --- a/game/autoload/PhysicsQuery.tscn +++ b/game/autoload/PhysicsQuery.tscn @@ -2,5 +2,5 @@ [ext_resource path="res://autoload/PhysicsQuery.gd" type="Script" id=1] -[node name="PhysicsQuery" type="Spatial"] +[node name="PhysicsQuery" type="ESSPhysicsQuery"] script = ExtResource( 1 )