mirror of
https://github.com/Relintai/broken_seals_roguelike.git
synced 2024-11-10 21:52:09 +01:00
Updated the engine.
This commit is contained in:
parent
482e914e93
commit
755fb3227f
2
HEADS
2
HEADS
@ -1 +1 @@
|
||||
{"engine": {"3.2": "f15f5b45781eb3de8e5811400f654e3e49580149", "3.x": "a76316c0f06ef63f9b818d1ee8fd8771f73e4f3f"}, "world_generator": {"master": "d12ab222a2387e20164b3e7c6236983223ca88ef"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}, "pandemonium_engine": {"master": "cdbcabc96b7571e16c5c16bf2021474cda7af3f9"}}
|
||||
{"engine": {"3.2": "f15f5b45781eb3de8e5811400f654e3e49580149", "3.x": "a76316c0f06ef63f9b818d1ee8fd8771f73e4f3f"}, "world_generator": {"master": "d12ab222a2387e20164b3e7c6236983223ca88ef"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}, "pandemonium_engine": {"master": "a1865fd1af9a019b504bfeb64de856d412b78cb4"}}
|
@ -3,7 +3,6 @@
|
||||
[ext_resource path="res://characters/char_t1_outline_split.png" type="Texture" id=1]
|
||||
[ext_resource path="res://player/HumanoidCharacterBones2D.gd" type="Script" id=2]
|
||||
|
||||
|
||||
[sub_resource type="Animation" id=1]
|
||||
resource_name = "casting"
|
||||
length = 2.0
|
||||
@ -1882,10 +1881,10 @@ tracks/37/keys = {
|
||||
[sub_resource type="AnimationNodeTimeScale" id=5]
|
||||
|
||||
[sub_resource type="AnimationNodeAnimation" id=6]
|
||||
animation = "idle"
|
||||
animation = @"idle"
|
||||
|
||||
[sub_resource type="AnimationNodeAnimation" id=7]
|
||||
animation = "run"
|
||||
animation = @"run"
|
||||
|
||||
[sub_resource type="AnimationNodeBlend2" id=8]
|
||||
|
||||
@ -1900,7 +1899,7 @@ nodes/run/node = SubResource( 7 )
|
||||
nodes/run/position = Vector2( -280, 500 )
|
||||
nodes/walking/node = SubResource( 8 )
|
||||
nodes/walking/position = Vector2( 140, 320 )
|
||||
node_connections = [ "walking", 0, "idle", "walking", 1, "RunScale", "RunScale", 0, "run", "output", 0, "walking" ]
|
||||
node_connections = [ @"output", 0, @"walking", @"RunScale", 0, @"run", @"walking", 0, @"idle", @"walking", 1, @"RunScale" ]
|
||||
|
||||
[node name="CharacterSideModel" type="CharacterBones"]
|
||||
rotation = 0.000121465
|
||||
@ -1934,14 +1933,14 @@ region_enabled = true
|
||||
region_rect = Rect2( 49, 21, 13, 37 )
|
||||
|
||||
[node name="arm_r" type="Sprite" parent="."]
|
||||
position = Vector2( -3.50003, -24.5128 )
|
||||
position = Vector2( -3.5, -24.3088 )
|
||||
texture = ExtResource( 1 )
|
||||
offset = Vector2( 0, 3 )
|
||||
region_enabled = true
|
||||
region_rect = Rect2( 1, 11, 4, 9 )
|
||||
|
||||
[node name="hand_r" type="Sprite" parent="."]
|
||||
position = Vector2( -3.50003, -19.0128 )
|
||||
position = Vector2( -3.5, -18.8088 )
|
||||
texture = ExtResource( 1 )
|
||||
offset = Vector2( 0, 3 )
|
||||
region_enabled = true
|
||||
@ -2010,13 +2009,13 @@ __meta__ = {
|
||||
|
||||
[node name="Position2D" type="Position2D" parent="Hip/leg_l/foot_l"]
|
||||
position = Vector2( -0.297693, 7.79954 )
|
||||
rotation = -0.0026232
|
||||
rotation = -0.00262319
|
||||
__meta__ = {
|
||||
"_edit_bone_": true
|
||||
}
|
||||
|
||||
[node name="Torso" type="Sprite" parent="Hip"]
|
||||
position = Vector2( 1.24679e-05, -1.89734 )
|
||||
position = Vector2( 3.72457e-05, -1.69332 )
|
||||
texture = ExtResource( 1 )
|
||||
offset = Vector2( 0, -5 )
|
||||
region_enabled = true
|
||||
@ -2136,7 +2135,7 @@ anims/casting = SubResource( 1 )
|
||||
anims/idle = SubResource( 2 )
|
||||
anims/rest = SubResource( 3 )
|
||||
anims/run = SubResource( 4 )
|
||||
blend_times = [ "casting", "run", 1.0, "run", "idle", 1.0, "run", "rest", 1.0 ]
|
||||
blend_times = [ @"casting", @"run", 1.0, @"run", @"idle", 1.0, @"run", @"rest", 1.0 ]
|
||||
|
||||
[node name="AnimationTree" type="AnimationTree" parent="."]
|
||||
tree_root = SubResource( 9 )
|
||||
|
@ -2,7 +2,6 @@
|
||||
|
||||
[ext_resource path="res://characters/char_t1_outline_split.png" type="Texture" id=1]
|
||||
|
||||
|
||||
[node name="CharacterTest1" type="Node2D"]
|
||||
|
||||
[node name="model" type="Sprite" parent="."]
|
||||
|
@ -63,6 +63,10 @@ var init : bool = false
|
||||
var touches : Array = Array()
|
||||
var touch_zoom : bool = false
|
||||
|
||||
func _ready():
|
||||
rpc_config("sset_position", MultiplayerAPI.RPC_MODE_REMOTE)
|
||||
rpc_config("cset_position", MultiplayerAPI.RPC_MODE_REMOTE)
|
||||
|
||||
func _enter_tree() -> void:
|
||||
world = get_node(world_path) as Node2D
|
||||
tile_size = get_node("/root/Main").get_tile_size()
|
||||
@ -71,6 +75,9 @@ func _enter_tree() -> void:
|
||||
return
|
||||
|
||||
camera = get_node_or_null("Camera") as Camera2D
|
||||
|
||||
if camera:
|
||||
camera.current = true
|
||||
|
||||
set_process_input(false)
|
||||
set_process_unhandled_input(false)
|
||||
@ -391,11 +398,11 @@ func on_c_controlled_changed():
|
||||
if _controlled:
|
||||
if _nameplate:
|
||||
_nameplate.queue_free()
|
||||
|
||||
|
||||
camera = Camera2D.new()
|
||||
camera.zoom = get_node("/root/Main").get_world_scale()
|
||||
add_child(camera)
|
||||
camera.current = true
|
||||
add_child(camera)
|
||||
|
||||
#var uiscn : PackedScene = ResourceLoader.load("res://ui/player_ui/player_ui.tscn")
|
||||
#var ui = uiscn.instance()
|
||||
@ -420,14 +427,14 @@ func on_c_controlled_changed():
|
||||
set_visibility(false)
|
||||
|
||||
|
||||
remote func sset_position(pposition : Vector2) -> void:
|
||||
func sset_position(pposition : Vector2) -> void:
|
||||
if multiplayer.network_peer and multiplayer.is_network_server():
|
||||
entity.vrpc("cset_position", position)
|
||||
|
||||
if _controlled:
|
||||
cset_position(position)
|
||||
|
||||
remote func cset_position(pposition : Vector2) -> void:
|
||||
func cset_position(pposition : Vector2) -> void:
|
||||
pposition = pposition
|
||||
|
||||
func on_diesd(entity):
|
||||
|
@ -10,9 +10,7 @@
|
||||
|
||||
[sub_resource type="EntityResourceSpeed" id=4]
|
||||
|
||||
[node name="DisplayPlayer" type="Entity" groups=[
|
||||
"players",
|
||||
]]
|
||||
[node name="DisplayPlayer" type="Entity" groups=["players"]]
|
||||
body_path = NodePath("KinematicBody2D")
|
||||
character_skeleton_path = NodePath("KinematicBody2D/Rotation_Helper/Model")
|
||||
sseed = 9240987
|
||||
|
@ -44,7 +44,11 @@ func _ready():
|
||||
# get_tree().connect("connected_to_server", self, "_connected_ok")
|
||||
# get_tree().connect("connection_failed", self, "_connected_fail")
|
||||
# get_tree().connect("server_disconnected", self, "_server_disconnected")
|
||||
pass
|
||||
|
||||
rpc_config("creceive_spawn_for", MultiplayerAPI.RPC_MODE_REMOTE)
|
||||
rpc_config("creceive_despawn_for", MultiplayerAPI.RPC_MODE_REMOTE)
|
||||
rpc_config("spawn_owned_player", MultiplayerAPI.RPC_MODE_PUPPET)
|
||||
rpc_config("register_player", MultiplayerAPI.RPC_MODE_REMOTE)
|
||||
|
||||
func on_network_peer_packet(id : int, packet : PoolByteArray) ->void:
|
||||
#todo
|
||||
@ -58,7 +62,7 @@ func despawn_for(player : Entity, target: Entity) -> void:
|
||||
print("despawnfor " + target.name)
|
||||
# rpc_id(player.get_network_master(), "creceive_despawn_for", target.get_path())
|
||||
|
||||
remote func creceive_spawn_for(data: String, global_name : String, position: Vector3) -> Entity:
|
||||
func creceive_spawn_for(data: String, global_name : String, position: Vector3) -> Entity:
|
||||
var createinfo : EntityCreateInfo = EntityCreateInfo.new()
|
||||
|
||||
createinfo.player_name = global_name
|
||||
@ -73,14 +77,14 @@ remote func creceive_spawn_for(data: String, global_name : String, position: Vec
|
||||
|
||||
return createinfo.created_entity
|
||||
|
||||
remote func creceive_despawn_for(path : NodePath) -> void:
|
||||
func creceive_despawn_for(path : NodePath) -> void:
|
||||
# print("recdespawnfor " + path)
|
||||
var ent = get_tree().root.get_node_or_null(path)
|
||||
|
||||
if ent:
|
||||
ent.queue_free()
|
||||
|
||||
puppet func spawn_owned_player(data : String, position : Vector3) -> Entity:
|
||||
func spawn_owned_player(data : String, position : Vector3) -> Entity:
|
||||
var createinfo : EntityCreateInfo = EntityCreateInfo.new()
|
||||
|
||||
createinfo.guid = get_tree().multiplayer.get_network_unique_id()
|
||||
@ -295,7 +299,7 @@ func _server_disconnected():
|
||||
func _connected_fail():
|
||||
pass # Could not even connect to server; abort.
|
||||
|
||||
remote func register_player(id, info):
|
||||
func register_player(id, info):
|
||||
# Store the info
|
||||
# player_info[id] = info
|
||||
# If I'm the server, let the new guy know about existing players.
|
||||
|
@ -190,7 +190,6 @@ EntitySpawner="*res://player/bs_entity_spawner.tscn"
|
||||
gdscript/completion/autocomplete_setters_and_getters=true
|
||||
gdscript/warnings/unused_argument=false
|
||||
gdscript/warnings/unused_signal=false
|
||||
gdscript/warnings/return_value_discarded=false
|
||||
gdscript/warnings/integer_division=false
|
||||
|
||||
[display]
|
||||
|
@ -52,7 +52,7 @@ func setup(pos : Vector2, color : Color, value : int, crit : bool) -> void:
|
||||
world_position = pos
|
||||
|
||||
text = str(value)
|
||||
add_color_override("font_color", color)
|
||||
add_theme_color_override("font_color", color)
|
||||
|
||||
if crit:
|
||||
animation_player.play("crit")
|
||||
|
Loading…
Reference in New Issue
Block a user