Add support for building menu to toolbar
This commit is contained in:
parent
0d11abfe23
commit
7a8225240b
BIN
local_player.scn (Stored with Git LFS)
BIN
local_player.scn (Stored with Git LFS)
Binary file not shown.
BIN
map_editor.scn (Stored with Git LFS)
BIN
map_editor.scn (Stored with Git LFS)
Binary file not shown.
BIN
map_editor/paint_selector_button_group.res (Stored with Git LFS)
BIN
map_editor/paint_selector_button_group.res (Stored with Git LFS)
Binary file not shown.
Binary file not shown.
|
@ -8,76 +8,6 @@
|
||||||
|
|
||||||
config_version=5
|
config_version=5
|
||||||
|
|
||||||
_global_script_classes=[{
|
|
||||||
"base": "Control",
|
|
||||||
"class": &"ActionPrompt",
|
|
||||||
"language": &"GDScript",
|
|
||||||
"path": "res://user_interface/action_prompt.gd"
|
|
||||||
}, {
|
|
||||||
"base": "HFlowContainer",
|
|
||||||
"class": &"ItemSelection",
|
|
||||||
"language": &"GDScript",
|
|
||||||
"path": "res://user_interface/button_selection.gd"
|
|
||||||
}, {
|
|
||||||
"base": "VBoxContainer",
|
|
||||||
"class": &"MapEditorMenu",
|
|
||||||
"language": &"GDScript",
|
|
||||||
"path": "res://map_editor/map_editor_menu.gd"
|
|
||||||
}, {
|
|
||||||
"base": "Node3D",
|
|
||||||
"class": &"MeshGrid",
|
|
||||||
"language": &"GDScript",
|
|
||||||
"path": "res://mesh_grid.gd"
|
|
||||||
}, {
|
|
||||||
"base": "Node3D",
|
|
||||||
"class": &"PlayerController",
|
|
||||||
"language": &"GDScript",
|
|
||||||
"path": "res://player_controller.gd"
|
|
||||||
}, {
|
|
||||||
"base": "Control",
|
|
||||||
"class": &"SelectionPrompt",
|
|
||||||
"language": &"GDScript",
|
|
||||||
"path": "res://user_interface/selection_prompt.gd"
|
|
||||||
}, {
|
|
||||||
"base": "Node",
|
|
||||||
"class": &"Settings",
|
|
||||||
"language": &"GDScript",
|
|
||||||
"path": "res://settings.gd"
|
|
||||||
}, {
|
|
||||||
"base": "GeometryInstance3D",
|
|
||||||
"class": &"TerrainInstance3D",
|
|
||||||
"language": &"GDScript",
|
|
||||||
"path": "res://terrain/terrain_instance_3d.gd"
|
|
||||||
}, {
|
|
||||||
"base": "Node",
|
|
||||||
"class": &"TerrainMapCanvas",
|
|
||||||
"language": &"GDScript",
|
|
||||||
"path": "res://terrain/terrain_map_canvas.gd"
|
|
||||||
}, {
|
|
||||||
"base": "Resource",
|
|
||||||
"class": &"TerrainPaint",
|
|
||||||
"language": &"GDScript",
|
|
||||||
"path": "res://terrain/paints/terrain_paint.gd"
|
|
||||||
}, {
|
|
||||||
"base": "Control",
|
|
||||||
"class": &"WorkerPrompt",
|
|
||||||
"language": &"GDScript",
|
|
||||||
"path": "res://user_interface/worker_prompt.gd"
|
|
||||||
}]
|
|
||||||
_global_script_class_icons={
|
|
||||||
"ActionPrompt": "",
|
|
||||||
"ItemSelection": "",
|
|
||||||
"MapEditorMenu": "",
|
|
||||||
"MeshGrid": "",
|
|
||||||
"PlayerController": "",
|
|
||||||
"SelectionPrompt": "",
|
|
||||||
"Settings": "",
|
|
||||||
"TerrainInstance3D": "",
|
|
||||||
"TerrainMapCanvas": "",
|
|
||||||
"TerrainPaint": "",
|
|
||||||
"WorkerPrompt": ""
|
|
||||||
}
|
|
||||||
|
|
||||||
[application]
|
[application]
|
||||||
|
|
||||||
config/name="Protectorate"
|
config/name="Protectorate"
|
||||||
|
@ -116,32 +46,32 @@ enabled=PackedStringArray()
|
||||||
|
|
||||||
player_controller_left={
|
player_controller_left={
|
||||||
"deadzone": 0.5,
|
"deadzone": 0.5,
|
||||||
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"unicode":0,"echo":false,"script":null)
|
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":0,"echo":false,"script":null)
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
player_controller_right={
|
player_controller_right={
|
||||||
"deadzone": 0.5,
|
"deadzone": 0.5,
|
||||||
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"unicode":0,"echo":false,"script":null)
|
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":0,"echo":false,"script":null)
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
player_controller_forward={
|
player_controller_forward={
|
||||||
"deadzone": 0.5,
|
"deadzone": 0.5,
|
||||||
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"unicode":0,"echo":false,"script":null)
|
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":0,"echo":false,"script":null)
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
player_controller_backward={
|
player_controller_backward={
|
||||||
"deadzone": 0.5,
|
"deadzone": 0.5,
|
||||||
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"unicode":0,"echo":false,"script":null)
|
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":0,"echo":false,"script":null)
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
player_controller_rotate_cw={
|
player_controller_rotate_cw={
|
||||||
"deadzone": 0.5,
|
"deadzone": 0.5,
|
||||||
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"unicode":0,"echo":false,"script":null)
|
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":0,"echo":false,"script":null)
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
player_controller_rotate_ccw={
|
player_controller_rotate_ccw={
|
||||||
"deadzone": 0.5,
|
"deadzone": 0.5,
|
||||||
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":81,"unicode":0,"echo":false,"script":null)
|
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":81,"key_label":0,"unicode":0,"echo":false,"script":null)
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
editor_paint={
|
editor_paint={
|
||||||
|
|
BIN
terrain/paints/default_terrain_paint.res (Stored with Git LFS)
BIN
terrain/paints/default_terrain_paint.res (Stored with Git LFS)
Binary file not shown.
BIN
terrain/paints/desert_sand_terrain_paint.res (Stored with Git LFS)
BIN
terrain/paints/desert_sand_terrain_paint.res (Stored with Git LFS)
Binary file not shown.
BIN
terrain/paints/dry_mud_terrain_paint.res (Stored with Git LFS)
BIN
terrain/paints/dry_mud_terrain_paint.res (Stored with Git LFS)
Binary file not shown.
|
@ -36,6 +36,7 @@ func _ready() -> void:
|
||||||
##
|
##
|
||||||
##
|
##
|
||||||
func prompt() -> void:
|
func prompt() -> void:
|
||||||
|
LocalPlayer.override_controls(hidden)
|
||||||
show()
|
show()
|
||||||
prompted.emit()
|
prompted.emit()
|
||||||
|
|
||||||
|
|
|
@ -57,6 +57,7 @@ func get_button_group() -> ButtonGroup:
|
||||||
## [member get_button_group]
|
## [member get_button_group]
|
||||||
##
|
##
|
||||||
func prompt(initial_selection: int) -> void:
|
func prompt(initial_selection: int) -> void:
|
||||||
|
LocalPlayer.override_controls(hidden)
|
||||||
assert(_button_group != null, "button group cannot be null")
|
assert(_button_group != null, "button group cannot be null")
|
||||||
|
|
||||||
var selected_button := _button_group.get_buttons()[initial_selection]
|
var selected_button := _button_group.get_buttons()[initial_selection]
|
||||||
|
|
|
@ -23,6 +23,7 @@ var progress: Range = null
|
||||||
##
|
##
|
||||||
##
|
##
|
||||||
func prompt(display_message: String, steps: Array) -> void:
|
func prompt(display_message: String, steps: Array) -> void:
|
||||||
|
LocalPlayer.override_controls(hidden)
|
||||||
show()
|
show()
|
||||||
prompted.emit()
|
prompted.emit()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue