From 400fdc8bb16b165f84ab0849ce7a7170146c856b Mon Sep 17 00:00:00 2001 From: osquallo Date: Sat, 22 Sep 2018 10:45:39 +0200 Subject: [PATCH] typo --- dispensaire_gridmap/dispensaire_gridmap.tscn | 4 ++-- dispensaire_scenes/dispensaire_scenes.tscn | 2 +- game_scene/Game/Game.tscn | 4 ++-- game_scene/game_scene.tscn | 2 +- global.tscn | 2 +- scenes/Game/{marker => markers}/arrow_z.gd | 0 scenes/Game/{marker => markers}/arrow_z.tscn | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename scenes/Game/{marker => markers}/arrow_z.gd (100%) rename scenes/Game/{marker => markers}/arrow_z.tscn (71%) diff --git a/dispensaire_gridmap/dispensaire_gridmap.tscn b/dispensaire_gridmap/dispensaire_gridmap.tscn index b554b4a..0aeb43b 100644 --- a/dispensaire_gridmap/dispensaire_gridmap.tscn +++ b/dispensaire_gridmap/dispensaire_gridmap.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://scenes/Game/marker/arrow_z.tscn" type="PackedScene" id=1] +[ext_resource path="res://scenes/Game/markers/arrow_z.tscn" type="PackedScene" id=1] [ext_resource path="res://assets/Game/basekits/Kit_dispensaire.meshlib" type="MeshLibrary" id=2] [ext_resource path="res://game_scene/Game/portail/portail.tscn" type="PackedScene" id=3] @@ -102,7 +102,7 @@ cell_scale = 1.0 collision_layer = 1 collision_mask = 1 data = { -"cells": PoolIntArray( 3, 0, 655361, 5, 0, 655361, 65535, 0, 1048579, 2, 65534, 1, 4, 65534, 1, 0, 65535, 1441797, 1, 65535, 1441797, 2, 65535, 1441798, 3, 65535, 1048582, 4, 65535, 1441798, 5, 65535, 1048582, 6, 65535, 1441793, 65535, 65535, 1048578 ) +"cells": PoolIntArray( 3, 0, 655361, 5, 0, 655361, 65535, 0, 1048579, 2, 65534, 1, 4, 65534, 1073741825, 0, 65535, 1075183621, 1, 65535, 1441797, 2, 65535, 1441798, 3, 65535, 1074790406, 4, 65535, 1441798, 5, 65535, 1048582, 6, 65535, 1441793, 65535, 65535, 1048578 ) } _sections_unfolded = [ "Cell" ] __meta__ = { diff --git a/dispensaire_scenes/dispensaire_scenes.tscn b/dispensaire_scenes/dispensaire_scenes.tscn index 5d8f90d..e4c06ae 100644 --- a/dispensaire_scenes/dispensaire_scenes.tscn +++ b/dispensaire_scenes/dispensaire_scenes.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://assets/Game/basekits/dispensaire_scenes/DisCor1wAA01.tscn" type="PackedScene" id=3] [ext_resource path="res://assets/Game/basekits/dispensaire_scenes/DisCor2wDoLRAA01.tscn" type="PackedScene" id=4] [ext_resource path="res://game_scene/Game/portail/portail.tscn" type="PackedScene" id=5] -[ext_resource path="res://scenes/Game/marker/arrow_z.tscn" type="PackedScene" id=6] +[ext_resource path="res://scenes/Game/markers/arrow_z.tscn" type="PackedScene" id=6] [sub_resource type="Environment" id=1] diff --git a/game_scene/Game/Game.tscn b/game_scene/Game/Game.tscn index 0af4f56..238af09 100644 --- a/game_scene/Game/Game.tscn +++ b/game_scene/Game/Game.tscn @@ -14,7 +14,7 @@ [ext_resource path="res://assets/Game/textures/fire_02.png" type="Texture" id=12] [ext_resource path="res://game_scene/Game/jukebox/jukebox.tscn" type="PackedScene" id=13] [ext_resource path="res://game_scene/Game/portail/portail.tscn" type="PackedScene" id=14] -[ext_resource path="res://scenes/Game/marker/arrow_z.tscn" type="PackedScene" id=15] +[ext_resource path="res://scenes/Game/markers/arrow_z.tscn" type="PackedScene" id=15] [sub_resource type="ProceduralSky" id=1] @@ -1013,7 +1013,7 @@ material = SubResource( 34 ) custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) size = Vector2( 0.4, 0.4 ) -[node name="Game" type="Spatial" index="0"] +[node name="Game" type="Spatial"] _sections_unfolded = [ "Transform" ] diff --git a/game_scene/game_scene.tscn b/game_scene/game_scene.tscn index ee52f7e..fdb3baf 100644 --- a/game_scene/game_scene.tscn +++ b/game_scene/game_scene.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://game_scene/game_scene.gd" type="Script" id=1] [ext_resource path="res://game_scene/Game/Game.tscn" type="PackedScene" id=2] -[ext_resource path="res://scenes/Game/marker/arrow_z.tscn" type="PackedScene" id=3] +[ext_resource path="res://scenes/Game/markers/arrow_z.tscn" type="PackedScene" id=3] [node name="game_scene" type="Node"] diff --git a/global.tscn b/global.tscn index 6e1eca4..218073e 100644 --- a/global.tscn +++ b/global.tscn @@ -4,7 +4,7 @@ [ext_resource path="res://background_loader_scene/background_loader.tscn" type="PackedScene" id=2] [ext_resource path="res://gui_scene/GUI/GUI.tscn" type="PackedScene" id=3] -[node name="global" type="Node"] +[node name="global" type="Node" index="0"] pause_mode = 2 script = ExtResource( 1 ) diff --git a/scenes/Game/marker/arrow_z.gd b/scenes/Game/markers/arrow_z.gd similarity index 100% rename from scenes/Game/marker/arrow_z.gd rename to scenes/Game/markers/arrow_z.gd diff --git a/scenes/Game/marker/arrow_z.tscn b/scenes/Game/markers/arrow_z.tscn similarity index 71% rename from scenes/Game/marker/arrow_z.tscn rename to scenes/Game/markers/arrow_z.tscn index 715dcb0..1390613 100644 --- a/scenes/Game/marker/arrow_z.tscn +++ b/scenes/Game/markers/arrow_z.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://assets/Game/markers/arrow_z.escn" type="PackedScene" id=1] -[ext_resource path="res://scenes/Game/marker/arrow_z.gd" type="Script" id=2] +[ext_resource path="res://scenes/Game/markers/arrow_z.gd" type="Script" id=2] [node name="arrow_z" instance=ExtResource( 1 )]