diff --git a/client/autoloads/gamestate.gd b/client/autoloads/gamestate.gd index 1f9791388be9c2aa4075fb76a8b0284092810c57..c1a09033c5c1cf9f78e9b437377128782f2dd8f7 100644 --- a/client/autoloads/gamestate.gd +++ b/client/autoloads/gamestate.gd @@ -167,7 +167,8 @@ func kickedFromServer(message:String): func setPlayerPosition(playerId, playerPosition): - get_node("/root/game/"+str(playerId)).set_translation(playerPosition) + if get_node("/root").has_node("game"): + get_node("/root/game/"+str(playerId)).set_translation(playerPosition) func hurtPlayer(networkId, hpNow): get_node("/root/game/"+str(networkId)).hurt(hpNow) @@ -179,7 +180,8 @@ func rotatePlayerOnHit(networkId, angle): get_node("/root/game/"+str(networkId)).rotatePlayerOnHit(angle) func animatePlayer(networkId, animationType): - get_node("/root/game/"+str(networkId)).getAnimationTypePlay(animationType) + if get_node("/root").has_node("game"): + get_node("/root/game/"+str(networkId)).getAnimationTypePlay(animationType) func startZoning(centerX, centerY): get_node("/root/game/").startZoning(centerX, centerY) diff --git a/client/levels/mainMenu/assets/charaHome2.png.import b/client/levels/mainMenu/assets/charaHome2.png.import new file mode 100644 index 0000000000000000000000000000000000000000..a045230cf73cb641168921cc9b312db3b02dbb36 --- /dev/null +++ b/client/levels/mainMenu/assets/charaHome2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/charaHome2.png-8a95936119314df90dbe70ba1a440337.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://levels/mainMenu/assets/charaHome2.png" +dest_files=[ "res://.import/charaHome2.png-8a95936119314df90dbe70ba1a440337.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/client/project.godot b/client/project.godot index b93eebd92051af2769213209b453dcdb54d81ca3..95771b898db2445a935ccf64468bd156a4870aba 100644 --- a/client/project.godot +++ b/client/project.godot @@ -17,7 +17,7 @@ _global_script_class_icons={ config/name="client" run/main_scene="res://levels/login/Login.tscn" -config/icon="res://assets/icon.png" +config/icon="res://icon.png" [autoload]