master
kaia 2024-03-26 17:32:05 -05:00
parent 17cdc19a56
commit 3173b21368
11 changed files with 427 additions and 321 deletions

View File

@ -8,7 +8,7 @@ custom_features=""
export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path=".export/release 1.4.2/windows/PNGTUBER PLUS 1.4.2 WINDOWS.exe"
export_path=".export/release 1.4.5/steam/PNGTUBER PLUS 1.4.5 STEAM.exe"
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
@ -70,7 +70,7 @@ custom_features=""
export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path=".export/release 1.4.2/LINUX/PNGTUBER PLUS 1.4.2 LINUX.x86_64"
export_path=".export/release 1.4.5/linux/PNGTUBER PLUS 1.4.5 LINUX.x86_64"
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
@ -110,7 +110,7 @@ custom_features=""
export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path=".export/release 1.4.2/mac/PNGTUBER PLUS 1.4.2 MAC.zip"
export_path=".export/release 1.4.5/mac/PNGTUBER PLUS 1.4.5 MAC.zip"
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
@ -128,8 +128,8 @@ application/icon_interpolation=4
application/bundle_identifier="com.kaiakairos.game"
application/signature=""
application/app_category="Productivity"
application/short_version="1.4.2"
application/version="1.4.2"
application/short_version="1.4.5"
application/version="1.4.5"
application/copyright=""
application/copyright_localized={}
application/min_macos_version="10.12"

View File

@ -25,6 +25,7 @@ var editMode = true
@onready var shadow = $shadowSprite
#Scene Reference
@onready var spriteObject = preload("res://ui_scenes/selectedSprite/spriteObject.tscn")
@ -51,7 +52,8 @@ var fileSystemOpen = false
signal emptiedCapture
signal pressedKey
var costumeKeys = ["1","2","3","4","5","6","7","8","9","0"]
signal spriteVisToggles(keysPressed:Array)
signal fatfuckingballs
func _ready():
Global.main = self
@ -352,6 +354,8 @@ func _on_load_dialog_file_selected(path):
sprite.loadedImageData = data[item]["imageData"]
if data[item].has("clipped"):
sprite.clipped = data[item]["clipped"]
if data[item].has("toggle"):
sprite.toggle = data[item]["toggle"]
origin.add_child(sprite)
sprite.position = str_to_var(data[item]["pos"])
@ -409,6 +413,8 @@ func _on_save_dialog_file_selected(path):
data[id]["clipped"] = child.clipped
data[id]["toggle"] = child.toggle
id += 1
Saving.settings["lastAvatar"] = path
@ -529,7 +535,7 @@ func moveSpriteMenu(delta):
var size = get_viewport().get_visible_rect().size
var windowLength = 1187
var windowLength = 1250 #1187
$ViewerArrows/Arrows.position.y = size.y - 25
@ -610,3 +616,19 @@ func _on_background_input_capture_bg_key_pressed(node, keys_pressed):
if i >= 0:
changeCostume(i+1)
func bgInputSprite(node, keys_pressed):
if fileSystemOpen:
return
var keyStrings = []
for i in keys_pressed:
if keys_pressed[i]:
keyStrings.append(OS.get_keycode_string(i) if !OS.get_keycode_string(i).strip_edges().is_empty() else "Keycode" + str(i))
if keyStrings.size() <= 0:
emit_signal("fatfuckingballs")
return
spriteVisToggles.emit(keyStrings)

File diff suppressed because one or more lines are too long

View File

@ -79,8 +79,13 @@ var clipped = false
var tick = 0
#Vis toggle
var toggle = "null"
func _ready():
Global.main.spriteVisToggles.connect(visToggle)
var img = Image.new()
var err = img.load(path)
if err != OK:
@ -389,3 +394,10 @@ func getAllLinkedSprites():
if node.parentId == id:
linkedSprites.append(node)
return linkedSprites
func visToggle(keys):
if keys.has(toggle):
$WobbleOrigin/DragOrigin.visible = !$WobbleOrigin/DragOrigin.visible
func makeVis():
$WobbleOrigin/DragOrigin.visible = true

View File

@ -201,7 +201,8 @@ func _process(delta):
func deleteKey(label,id):
Global.main.costumeKeys[id-1] = "null"
label.text = "costume " + str(id) + " key: \"" + Global.main.costumeKeys[id-1] + "\""
Global.pushUpdate("Deleted costume hotkey " + str(id) + ".")
func _on_delete_1_pressed():
var label = $CostumeInputs/ScrollContainer/VBoxContainer/costumeButton1/Label
deleteKey(label,1)

File diff suppressed because one or more lines are too long

View File

@ -67,6 +67,7 @@ func setImage():
$Animation/animFramesLabel.text = "sprite frames: " + str(Global.heldSprite.frames)
$Animation/animFrames.value = Global.heldSprite.frames
$VisToggle/setToggle/Label.text = "toggle: \"" + Global.heldSprite.toggle + "\""
changeRotLimit()
@ -338,3 +339,18 @@ func _on_anim_frames_value_changed(value):
func _on_clip_linked_toggled(button_pressed):
Global.heldSprite.setClip(button_pressed)
func _on_delete_pressed():
Global.heldSprite.toggle = "null"
$VisToggle/setToggle/Label.text = "toggle: \"" + Global.heldSprite.toggle + "\""
Global.heldSprite.makeVis()
func _on_set_toggle_pressed():
$VisToggle/setToggle/Label.text = "toggle: AWAITING INPUT"
await Global.main.fatfuckingballs
var keys = await Global.main.spriteVisToggles
var key = keys[0]
Global.heldSprite.toggle = key
$VisToggle/setToggle/Label.text = "toggle: \"" + Global.heldSprite.toggle + "\""

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -60,3 +60,4 @@ func _on_toggle_visibility_pressed():
$Eyes.position = Vector2(-21,12)
else:
$Eyes.position = Vector2(209,12)
$Area2D2/CollisionShape2D.disabled = !$NinePatchRect.visible

File diff suppressed because one or more lines are too long