Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2024-11-13 20:47:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated ESS to get the Entity controller property rework.

Browse Source
This commit is contained in:
Relintai 2021-08-30 20:18:29 +02:00
parent e6d21cbb8a
commit 288eaabe18
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "17e61fa0aff88f843b89e9769b81861c1954ef8a"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3ed59d11ec803570fee577d41d3804b483cf6116"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "a0786956813a85b5a82093a081b90c2f8a000e6c"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "4830687056297c432bfbfd1a2c1572546daf8e7d"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "mesh_utils": {"master": "92b6066d026ba8bfec62282063c372f5ec76dea4"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}, "thread_pool": {"master": "b2e8c815392052947e7386f722913a12eea543a4"}, "terraman": {"master": "86de26c2c7a15185658680ae79c39a0c8bb159ce"}}
{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "17e61fa0aff88f843b89e9769b81861c1954ef8a"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "71dc15650adaeac2df0e113e398abb253c6d4926"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "a0786956813a85b5a82093a081b90c2f8a000e6c"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "4830687056297c432bfbfd1a2c1572546daf8e7d"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "mesh_utils": {"master": "92b6066d026ba8bfec62282063c372f5ec76dea4"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}, "thread_pool": {"master": "b2e8c815392052947e7386f722913a12eea543a4"}, "terraman": {"master": "86de26c2c7a15185658680ae79c39a0c8bb159ce"}}

12
game/player/Body.gd
View File

@ -126,10 +126,10 @@ func _ready() -> void:
entity.set_character_skeleton(character_skeleton)
entity.connect("notification_ccast", self, "on_notification_ccast")
entity.connect("diesd", self, "on_diesd")
entity.connect("isc_controlled_changed", self, "on_c_controlled_changed")
entity.connect("onc_entity_controller_changed", self, "on_c_controlled_changed")
owner = entity
on_c_controlled_changed(entity.c_is_controlled)
on_c_controlled_changed()
transform = entity.get_transform_3d(true)
@ -227,7 +227,7 @@ func _physics_process(delta : float) -> void:
return
if entity.c_is_controlled:
if entity.getc_is_controlled():
process_input(delta)
process_movement_player(delta)
else:
@ -766,11 +766,11 @@ func on_notification_ccast(what : int, info : SpellCastInfo) -> void:
anim_node_state_machine.travel("run-loop")
func on_c_controlled_changed(val):
func on_c_controlled_changed():
#create camera and pivot if true
_controlled = val
_controlled = entity.getc_is_controlled()
if val:
if _controlled:
if _nameplate:
_nameplate.queue_free()

1
game/player/bs_entity_spawner.gd
View File

@ -97,7 +97,6 @@ remote func spawn_owned_player(data : String, position : Vector3) -> Entity:
ESS.request_entity_spawn(createinfo)
var e : Entity = createinfo.created_entity
e.set_network_master(createinfo.network_owner)
e.c_is_controlled = true
Logger.info("Player spawned ")