Skip to content

Unit deselect click #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Unit deselect click #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d847356
Godot 3.1 conversion
DaveAxiom Oct 1, 2019
5f2e53f
Deselect click added
DaveAxiom Oct 1, 2019
9d044e7
Remove conflicting selection setting
DaveAxiom Oct 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Scripts/CameraMovement.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,12 @@ onready var rectd = $'../UI/Base/draw_rect'

signal area_selected
signal start_move_selection
signal deselect_all

func _ready():
connect("area_selected", get_parent(), "area_selected", [self])
connect("start_move_selection", get_parent(), "start_move_selection", [self])
connect("deselect_all", get_parent(), "deselect_all")


func _process(delta):
Expand Down Expand Up @@ -112,6 +114,8 @@ func _input(event):
if event is InputEventMouseButton:
if event.is_pressed():
zooming = true
if event.button_index == BUTTON_LEFT:
emit_signal("deselect_all")
if event.button_index == BUTTON_WHEEL_UP:
zoomfactor -= 0.01 * zoomspeed
if event.button_index == BUTTON_WHEEL_DOWN:
Expand Down
2 changes: 1 addition & 1 deletion Scripts/Unit.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@ func _on_unit_input_event(viewport, event, shape_idx):
if event is InputEventMouseButton:
if event.is_pressed():
if event.button_index == BUTTON_LEFT:
set_selected(not selected)
set_selected(true)

5 changes: 5 additions & 0 deletions Sprites/Environment/medievalEnvironment_01.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/medievalEnvironment_01.png-95765276d5755cb6fa0b6af026377014.stex"
metadata={
"vram_texture": false
}

[deps]

Expand All @@ -14,6 +17,7 @@ dest_files=[ "res://.import/medievalEnvironment_01.png-95765276d5755cb6fa0b6af02
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
Expand All @@ -23,6 +27,7 @@ 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
Expand Down
5 changes: 5 additions & 0 deletions Sprites/Environment/medievalEnvironment_02.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/medievalEnvironment_02.png-7adbaba17ad41dd99de0cc9aa239e403.stex"
metadata={
"vram_texture": false
}

[deps]

Expand All @@ -14,6 +17,7 @@ dest_files=[ "res://.import/medievalEnvironment_02.png-7adbaba17ad41dd99de0cc9aa
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
Expand All @@ -23,6 +27,7 @@ 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
Expand Down
5 changes: 5 additions & 0 deletions Sprites/Environment/medievalEnvironment_03.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/medievalEnvironment_03.png-372549b86d29f3f9400bdcaa6bf8f767.stex"
metadata={
"vram_texture": false
}

[deps]

Expand All @@ -14,6 +17,7 @@ dest_files=[ "res://.import/medievalEnvironment_03.png-372549b86d29f3f9400bdcaa6
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
Expand All @@ -23,6 +27,7 @@ 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
Expand Down
5 changes: 5 additions & 0 deletions Sprites/Environment/medievalEnvironment_04.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/medievalEnvironment_04.png-6c0f4c8a548381e04c73d99d3240b0fe.stex"
metadata={
"vram_texture": false
}

[deps]

Expand All @@ -14,6 +17,7 @@ dest_files=[ "res://.import/medievalEnvironment_04.png-6c0f4c8a548381e04c73d99d3
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
Expand All @@ -23,6 +27,7 @@ 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
Expand Down
5 changes: 5 additions & 0 deletions Sprites/Environment/medievalEnvironment_05.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/medievalEnvironment_05.png-ec188a82c18206689e52a354cfc3e03f.stex"
metadata={
"vram_texture": false
}

[deps]

Expand All @@ -14,6 +17,7 @@ dest_files=[ "res://.import/medievalEnvironment_05.png-ec188a82c18206689e52a354c
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
Expand All @@ -23,6 +27,7 @@ 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
Expand Down
5 changes: 5 additions & 0 deletions Sprites/Environment/medievalEnvironment_06.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/medievalEnvironment_06.png-251b5aa931d4830c517efb5ab56fb1bd.stex"
metadata={
"vram_texture": false
}

[deps]

Expand All @@ -14,6 +17,7 @@ dest_files=[ "res://.import/medievalEnvironment_06.png-251b5aa931d4830c517efb5ab
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
Expand All @@ -23,6 +27,7 @@ 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
Expand Down
5 changes: 5 additions & 0 deletions Sprites/Environment/medievalEnvironment_07.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/medievalEnvironment_07.png-0e77add52c4e6be4eedb52c0956c40a8.stex"
metadata={
"vram_texture": false
}

[deps]

Expand All @@ -14,6 +17,7 @@ dest_files=[ "res://.import/medievalEnvironment_07.png-0e77add52c4e6be4eedb52c09
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
Expand All @@ -23,6 +27,7 @@ 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
Expand Down
5 changes: 5 additions & 0 deletions Sprites/Environment/medievalEnvironment_08.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/medievalEnvironment_08.png-c44522768137688332060850c408d2b2.stex"
metadata={
"vram_texture": false
}

[deps]

Expand All @@ -14,6 +17,7 @@ dest_files=[ "res://.import/medievalEnvironment_08.png-c44522768137688332060850c
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
Expand All @@ -23,6 +27,7 @@ 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
Expand Down
5 changes: 5 additions & 0 deletions Sprites/Environment/medievalEnvironment_09.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/medievalEnvironment_09.png-df975290c95871a0b8d7f7e01b717a33.stex"
metadata={
"vram_texture": false
}

[deps]

Expand All @@ -14,6 +17,7 @@ dest_files=[ "res://.import/medievalEnvironment_09.png-df975290c95871a0b8d7f7e01
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
Expand All @@ -23,6 +27,7 @@ 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
Expand Down
5 changes: 5 additions & 0 deletions Sprites/Environment/medievalEnvironment_10.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/medievalEnvironment_10.png-a2bcd22e8b19c07daebe89f0b0347d29.stex"
metadata={
"vram_texture": false
}

[deps]

Expand All @@ -14,6 +17,7 @@ dest_files=[ "res://.import/medievalEnvironment_10.png-a2bcd22e8b19c07daebe89f0b
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
Expand All @@ -23,6 +27,7 @@ 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
Expand Down
5 changes: 5 additions & 0 deletions Sprites/Environment/medievalEnvironment_11.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/medievalEnvironment_11.png-020d563f9720cea1a700564215189455.stex"
metadata={
"vram_texture": false
}

[deps]

Expand All @@ -14,6 +17,7 @@ dest_files=[ "res://.import/medievalEnvironment_11.png-020d563f9720cea1a70056421
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
Expand All @@ -23,6 +27,7 @@ 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
Expand Down
5 changes: 5 additions & 0 deletions Sprites/Environment/medievalEnvironment_12.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/medievalEnvironment_12.png-44a08fea9ea501d1499b359fb68ee5f7.stex"
metadata={
"vram_texture": false
}

[deps]

Expand All @@ -14,6 +17,7 @@ dest_files=[ "res://.import/medievalEnvironment_12.png-44a08fea9ea501d1499b359fb
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
Expand All @@ -23,6 +27,7 @@ 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
Expand Down
5 changes: 5 additions & 0 deletions Sprites/Environment/medievalEnvironment_13.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/medievalEnvironment_13.png-3791baa89901d83c7a4af2f39123ecb4.stex"
metadata={
"vram_texture": false
}

[deps]

Expand All @@ -14,6 +17,7 @@ dest_files=[ "res://.import/medievalEnvironment_13.png-3791baa89901d83c7a4af2f39
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
Expand All @@ -23,6 +27,7 @@ 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
Expand Down
5 changes: 5 additions & 0 deletions Sprites/Environment/medievalEnvironment_14.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/medievalEnvironment_14.png-dd7347526928c9e653c1b40a4936d824.stex"
metadata={
"vram_texture": false
}

[deps]

Expand All @@ -14,6 +17,7 @@ dest_files=[ "res://.import/medievalEnvironment_14.png-dd7347526928c9e653c1b40a4
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
Expand All @@ -23,6 +27,7 @@ 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
Expand Down
Loading