Skip to content

Commit

Permalink
fix flower boss in editor
Browse files Browse the repository at this point in the history
  • Loading branch information
Phil564 committed Jan 4, 2024
1 parent cd71e23 commit 169903c
Show file tree
Hide file tree
Showing 63 changed files with 2,551 additions and 1,952 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
# Whenever a tag push matching pattern "v*" then run the job
on:
push:
tags:
- "v*"

jobs:
# job id, can be anything
export_game:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
[editor_states]

Anim={
"visible": false
}
2D={
"grid_offset": Vector2(0, 0),
"grid_snap_active": false,
Expand Down Expand Up @@ -170,4 +173,4 @@
"zfar": 4000.01,
"znear": 0.05
}
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17142/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/hc_ruins_main/event/seed_done/spawn_shard/shard")])
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17142/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/hc_ruins_main/event/seed_done/spawn_shard")])
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[folding]

node_unfolds=[NodePath("base"), PackedStringArray("Transform", "Skeleton"), NodePath("stem"), PackedStringArray("Transform", "Skeleton")]
resource_unfolds=["res://asset/entity/bomb/bomb.blend.scn::ArrayMesh_mpp0m", PackedStringArray("Resource"), "res://asset/entity/bomb/bomb.blend.scn::ArrayMesh_44q4k", PackedStringArray("Resource")]
nodes_folded=[]
Original file line number Diff line number Diff line change
Expand Up @@ -173,4 +173,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17142/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/flower_boss")])
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17142/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/bomb/fsm")])
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[folding]

node_unfolds=[NodePath("Sphere"), PackedStringArray("Skeleton"), NodePath("Sun"), PackedStringArray("Transform", "Light"), NodePath("Sun_001"), PackedStringArray("Transform", "Light"), NodePath("Camera"), PackedStringArray("Transform")]
resource_unfolds=["res://asset/entity/bomb/bomb_texrend.blend.scn::ArrayMesh_4r2vp", PackedStringArray("Resource")]
nodes_folded=[]
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
[editor_states]

Anim={
"visible": false
}
2D={
"grid_offset": Vector2(0, 0),
"grid_snap_active": false,
"grid_step": Vector2(8, 8),
"grid_visibility": 1,
"ofs": Vector2(-161.25, -106.25),
"primary_grid_step": Vector2i(8, 8),
"show_edit_locks": true,
"show_guides": true,
"show_helpers": false,
"show_origin": true,
"show_rulers": true,
"show_transformation_gizmos": true,
"show_viewport": true,
"show_zoom_control": true,
"smart_snap_active": false,
"snap_guides": true,
"snap_node_anchors": true,
"snap_node_center": true,
"snap_node_parent": true,
"snap_node_sides": true,
"snap_other_nodes": true,
"snap_pixel": true,
"snap_relative": false,
"snap_rotation": false,
"snap_rotation_offset": 0.0,
"snap_rotation_step": 0.261799,
"snap_scale": false,
"snap_scale_step": 0.1,
"zoom": 1.0
}
3D={
"fov": 70.01,
"gizmos_status": {
"AudioListener3D": 0,
"AudioStreamPlayer3D": 0,
"CPUParticles3D": 0,
"CSGShape3D": 0,
"Camera3D": 0,
"CollisionObject3D": 0,
"CollisionPolygon3D": 0,
"CollisionShape3D": 0,
"Decal": 0,
"FogVolume": 0,
"GPUParticles3D": 0,
"GPUParticlesCollision3D": 0,
"Joint3D": 0,
"JoltJoint3D": 0,
"Light3D": 0,
"LightmapGI": 0,
"LightmapProbe": 0,
"Marker3D": 0,
"NavigationLink3D": 0,
"NavigationRegion3D": 0,
"OccluderInstance3D": 0,
"Path3D": 0,
"PhysicalBone3D": 0,
"RayCast3D": 0,
"ReflectionProbe": 0,
"ShapeCast3D": 0,
"Skeleton3D": 0,
"SoftBody3D": 0,
"SpringArm3D": 0,
"VehicleWheel3D": 0,
"VisibleOnScreenNotifier3D": 0,
"VoxelGI": 0
},
"local_coords": false,
"preview_sun_env": {
"environ_ao_enabled": false,
"environ_enabled": true,
"environ_energy": 1.0,
"environ_gi_enabled": false,
"environ_glow_enabled": true,
"environ_ground_color": Color(0.2, 0.169, 0.133, 1),
"environ_sky_color": Color(0.385, 0.454, 0.55, 1),
"environ_tonemap_enabled": true,
"sun_color": Color(1, 1, 1, 1),
"sun_enabled": true,
"sun_energy": 1.0,
"sun_max_distance": 100.0,
"sun_rotation": Vector2(-1.0472, 2.61799)
},
"rotate_snap": 15.0,
"scale_snap": 10.0,
"show_grid": true,
"show_origin": true,
"snap_enabled": false,
"translate_snap": 1.0,
"viewport_mode": 1,
"viewports": [{
"auto_orthogonal": false,
"auto_orthogonal_enabled": true,
"cinematic_preview": false,
"display_mode": 20,
"distance": 4.0,
"doppler": false,
"frame_time": false,
"gizmos": true,
"half_res": false,
"information": false,
"listener": true,
"lock_rotation": false,
"orthogonal": false,
"position": Vector3(0, 0, 0),
"use_environment": false,
"view_type": 0,
"x_rotation": 0.5,
"y_rotation": -0.5
}, {
"auto_orthogonal": false,
"auto_orthogonal_enabled": true,
"cinematic_preview": false,
"display_mode": 20,
"distance": 4.0,
"doppler": false,
"frame_time": false,
"gizmos": true,
"half_res": false,
"information": false,
"listener": false,
"lock_rotation": false,
"orthogonal": false,
"position": Vector3(0, 0, 0),
"use_environment": false,
"view_type": 0,
"x_rotation": 0.5,
"y_rotation": -0.5
}, {
"auto_orthogonal": false,
"auto_orthogonal_enabled": true,
"cinematic_preview": false,
"display_mode": 20,
"distance": 4.0,
"doppler": false,
"frame_time": false,
"gizmos": true,
"half_res": false,
"information": false,
"listener": false,
"lock_rotation": false,
"orthogonal": false,
"position": Vector3(0, 0, 0),
"use_environment": false,
"view_type": 0,
"x_rotation": 0.5,
"y_rotation": -0.5
}, {
"auto_orthogonal": false,
"auto_orthogonal_enabled": true,
"cinematic_preview": false,
"display_mode": 20,
"distance": 4.0,
"doppler": false,
"frame_time": false,
"gizmos": true,
"half_res": false,
"information": false,
"listener": false,
"lock_rotation": false,
"orthogonal": false,
"position": Vector3(0, 0, 0),
"use_environment": false,
"view_type": 0,
"x_rotation": 0.5,
"y_rotation": -0.5
}],
"zfar": 4000.01,
"znear": 0.05
}
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17142/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/debris_dirt")])
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[folding]

node_unfolds=[NodePath("."), PackedStringArray("Collision"), NodePath("vis/sprite"), PackedStringArray("Transform", "Flags"), NodePath("floor"), PackedStringArray("Debug Shape"), NodePath("col"), PackedStringArray("Transform")]
resource_unfolds=["res://scenes/prefab/debris_dirt.tscn::1", PackedStringArray("Resource"), "res://scenes/prefab/debris_dirt.tscn::2", PackedStringArray("Resource"), "res://scenes/prefab/debris_dirt.tscn::3", PackedStringArray("Resource"), "res://scenes/prefab/debris_dirt.tscn::4", PackedStringArray("Resource"), "res://scenes/prefab/debris_dirt.tscn::13", PackedStringArray("Resource"), "res://scenes/prefab/debris_dirt.tscn::14", PackedStringArray("Resource")]
nodes_folded=[]
18 changes: 9 additions & 9 deletions .godot/editor/editor_layout.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,35 @@ dock_floating={}
dock_split_2=0
dock_split_3=0
dock_hsplit_1=0
dock_hsplit_2=270
dock_hsplit_3=-322
dock_hsplit_2=244
dock_hsplit_3=-282
dock_hsplit_4=0
dock_filesystem_split=0
dock_filesystem_display_mode=0
dock_filesystem_file_sort=0
dock_filesystem_file_list_display_mode=1
<<<<<<<Updatedupstreamdock_filesystem_selected_paths=PackedStringArray()
dock_filesystem_uncollapsed_paths=PackedStringArray("res://", "res://scripts/", "res://scenes/", "res://scenes/prefab/", "res://data/", "res://data/props/", "res://data/props/history_channel/", "res://asset/", "res://asset/entity/", "res://asset/entity/seed/", "res://asset/entity/flower_prince/", "res://asset/entity/flower_prince/mesh/")
dock_filesystem_selected_paths=PackedStringArray()
dock_filesystem_uncollapsed_paths=PackedStringArray("res://", "res://scripts/", "res://scenes/", "res://scenes/prefab/", "res://scenes/level/", "res://scenes/level/vslice_demo/", "res://scenes/level/vslice_demo/history/", "res://data/", "res://data/props/", "res://data/props/history_channel/", "res://audio/", "res://audio/sfx/", "res://asset/", "res://asset/entity/", "res://asset/entity/bomb/")
dock_filesystem_selected_paths=PackedStringArray("res://scenes/level/vslice_demo/history/area_hc_ruins_main.tscn")
dock_3="Scene,Import"
dock_4="FileSystem"
dock_5="Inspector,Node,History"

[EditorNode]

open_scenes=PackedStringArray("res://scenes/root.tscn", "res://scenes/prefab/flower_boss.tscn", "res://scenes/level/vslice_demo/history/area_hc_ruins_main.tscn", "res://scenes/level/vslice_demo/history/area_hc_ruins_arena.tscn", "res://scenes/level/test/event/tevent_golden_jack.tscn")
open_scenes=PackedStringArray("res://scenes/level/vslice_demo/history/area_hc_ruins_main.tscn")
current_scene="res://scenes/level/vslice_demo/history/area_hc_ruins_main.tscn"
center_split_offset=0
center_split_offset=-216
selected_default_debugger_tab_idx=0
selected_main_editor_idx=2
selected_bottom_panel_item=1

[ScriptEditor]

open_scripts=["res://scripts/button.gd", "res://scripts/entity.gd", "res://scripts/event_move.gd", "res://scripts/event_shard.gd", "res://scripts/level_script.gd", "res://scripts/lut_shard.gd", "res://scripts/root.gd", "res://scripts/subarea.gd"]
selected_script="res://scripts/lut_shard.gd"
open_scripts=["res://scripts/activation_group.gd", "res://scripts/bomb.gd", "res://scripts/button.gd", "res://scripts/cage.gd", "res://scripts/cluster_spawner.gd", "res://scripts/crate.gd", "res://scripts/demo_menu.gd", "res://addons/dialogue_manager/dialogue_label.gd", "res://scripts/entity.gd", "res://scripts/equipment_state_machine.gd", "res://scripts/event_shard.gd", "res://export_presets.cfg", "res://scripts/gj_ball.gd", "res://scripts/golden_jack.gd", "res://scripts/grabbable.gd", "res://scripts/grabbable_crate.gd", "res://scripts/hurtbox.gd", "res://scripts/interactable.gd", "res://scripts/level_manager.gd", "res://scripts/level_script.gd", "res://scripts/level_selector.gd", "res://scripts/lut_shard.gd", "res://scripts/moving_platform.gd", "res://scripts/pause_manager.gd", "res://scripts/pcam_springarm.gd", "res://scripts/player.gd", "res://scripts/playerinteractradius.gd", "res://scripts/player_data_manager.gd", "res://scripts/player_equipment_manager.gd", "res://scripts/player_visual_managergd.gd", "res://addons/dialogue_manager/plugin.gd", "res://scripts/prop.gd", "res://scripts/prop_logger.gd", "res://res_inputprompt.gd", "res://scripts/root.gd", "res://scripts/shadow.gd", "res://scripts/soda.gd", "res://scripts/splash_manager.gd", "res://scripts/state_machine.gd", "res://scripts/subarea.gd", "res://scripts/textbox.gd", "res://scripts/trampoline.gd", "res://scripts/ui_customization.gd", "res://scripts/ui_manager.gd", "res://scripts/ui_options.gd"]
selected_script="res://scripts/subarea.gd"
open_help=[]
script_split_offset=70
script_split_offset=52
list_split_offset=0

[ShaderEditor]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[folding]

sections_unfolded=PackedStringArray()
Loading

0 comments on commit 169903c

Please sign in to comment.