Skip to content
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.

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

[CI] Merge patch-atomic-adding-static-background-02-21-2025-1740114362 into dev #4046

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://b5a5g0gqvormg"
path="res://.godot/imported/battlecruiser.png-fa404bf0d548509aeb9af09f428bdb7c.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/frostwindz/battlecruiser.png"
dest_files=["res://.godot/imported/battlecruiser.png-fa404bf0d548509aeb9af09f428bdb7c.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://cj16mbdine6mk"
path="res://.godot/imported/battlecruiser_engine.png-ee217aef6848a3180e04481f9ed2acac.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/frostwindz/battlecruiser_engine.png"
dest_files=["res://.godot/imported/battlecruiser_engine.png-ee217aef6848a3180e04481f9ed2acac.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/gamejam/brackeys/13/assets/kbve/png/universe/object2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/gamejam/brackeys/13/assets/kbve/png/universe/object3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://c3ugpxqaf4oud"
path="res://.godot/imported/timespace_bg.png-15c7ee9b98957523650924aa41d65dbf.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/kbve/png/universe/timespace_bg.png"
dest_files=["res://.godot/imported/timespace_bg.png-15c7ee9b98957523650924aa41d65dbf.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
6 changes: 5 additions & 1 deletion apps/gamejam/brackeys/13/scenes/game.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=19 format=3 uid="uid://cbrda40vq26pj"]
[gd_scene load_steps=20 format=3 uid="uid://cbrda40vq26pj"]

[ext_resource type="Script" path="res://scripts/game.gd" id="1_oyaqx"]
[ext_resource type="PackedScene" uid="uid://1s5v0llrjq3" path="res://scenes/spaceship.tscn" id="1_rlyye"]
Expand All @@ -17,6 +17,7 @@
[ext_resource type="Script" path="res://scripts/entity.gd" id="10_1liq3"]
[ext_resource type="Script" path="res://scripts/hud.gd" id="11_e1u8f"]
[ext_resource type="Theme" uid="uid://bkt3waoihtb6j" path="res://theme/Theme.tres" id="11_je1f8"]
[ext_resource type="Texture2D" uid="uid://c3ugpxqaf4oud" path="res://assets/kbve/png/universe/timespace_bg.png" id="14_72ru8"]

[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_ekd6t"]
texture = ExtResource("4_e6jc8")
Expand Down Expand Up @@ -164,6 +165,9 @@ script = ExtResource("5_jsdqu")
offset_right = 40.0
offset_bottom = 40.0

[node name="BackgroundSprite" type="Sprite2D" parent="Background/TimespaceLayer"]
texture = ExtResource("14_72ru8")

[node name="UniverseLayer" type="Parallax2D" parent="Background"]
script = ExtResource("6_1rkq4")

Expand Down
113 changes: 106 additions & 7 deletions apps/gamejam/brackeys/13/scenes/spaceship.tscn
Original file line number Diff line number Diff line change
@@ -1,24 +1,123 @@
[gd_scene load_steps=4 format=3 uid="uid://1s5v0llrjq3"]
[gd_scene load_steps=18 format=3 uid="uid://1s5v0llrjq3"]

[ext_resource type="Texture2D" uid="uid://c0kmvkwygg0ox" path="res://assets/kenny/space-shooter-redux/png/playerShip3_red.png" id="1_8hcjj"]
[ext_resource type="Script" path="res://scripts/spaceship.gd" id="1_uejed"]
[ext_resource type="Texture2D" uid="uid://b5a5g0gqvormg" path="res://assets/frostwindz/battlecruiser.png" id="2_kvtre"]
[ext_resource type="Texture2D" uid="uid://cj16mbdine6mk" path="res://assets/frostwindz/battlecruiser_engine.png" id="3_mwphh"]

[sub_resource type="CircleShape2D" id="CircleShape2D_s734v"]
radius = 20.91
radius = 36.0139

[sub_resource type="AtlasTexture" id="AtlasTexture_i8esx"]
atlas = ExtResource("3_mwphh")
region = Rect2(0, 0, 128, 128)

[sub_resource type="AtlasTexture" id="AtlasTexture_xxjg1"]
atlas = ExtResource("3_mwphh")
region = Rect2(128, 0, 128, 128)

[sub_resource type="AtlasTexture" id="AtlasTexture_e38ga"]
atlas = ExtResource("3_mwphh")
region = Rect2(256, 0, 128, 128)

[sub_resource type="AtlasTexture" id="AtlasTexture_arb2s"]
atlas = ExtResource("3_mwphh")
region = Rect2(384, 0, 128, 128)

[sub_resource type="AtlasTexture" id="AtlasTexture_kmfdv"]
atlas = ExtResource("3_mwphh")
region = Rect2(512, 0, 128, 128)

[sub_resource type="AtlasTexture" id="AtlasTexture_myowg"]
atlas = ExtResource("3_mwphh")
region = Rect2(640, 0, 128, 128)

[sub_resource type="AtlasTexture" id="AtlasTexture_cfde1"]
atlas = ExtResource("3_mwphh")
region = Rect2(768, 0, 128, 128)

[sub_resource type="AtlasTexture" id="AtlasTexture_x611k"]
atlas = ExtResource("3_mwphh")
region = Rect2(896, 0, 128, 128)

[sub_resource type="AtlasTexture" id="AtlasTexture_e4egj"]
atlas = ExtResource("3_mwphh")
region = Rect2(1024, 0, 128, 128)

[sub_resource type="AtlasTexture" id="AtlasTexture_bjncr"]
atlas = ExtResource("3_mwphh")
region = Rect2(1152, 0, 128, 128)

[sub_resource type="AtlasTexture" id="AtlasTexture_pj545"]
atlas = ExtResource("3_mwphh")
region = Rect2(1280, 0, 128, 128)

[sub_resource type="AtlasTexture" id="AtlasTexture_h15yl"]
atlas = ExtResource("3_mwphh")
region = Rect2(1408, 0, 128, 128)

[sub_resource type="SpriteFrames" id="SpriteFrames_0gnt7"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_i8esx")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_xxjg1")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_e38ga")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_arb2s")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_kmfdv")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_myowg")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_cfde1")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_x611k")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_e4egj")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_bjncr")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_pj545")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_h15yl")
}],
"loop": true,
"name": &"engine",
"speed": 5.0
}]

[node name="Spaceship" type="CharacterBody2D"]
collision_layer = 32
collision_mask = 472
script = ExtResource("1_uejed")

[node name="Sprite2D" type="Sprite2D" parent="."]
position = Vector2(0, -1)
scale = Vector2(0.4, 0.4)
texture = ExtResource("1_8hcjj")
position = Vector2(0, 1)
scale = Vector2(0.8, 0.8)
texture = ExtResource("2_kvtre")

[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2(0, 4)
rotation = -0.0497135
shape = SubResource("CircleShape2D_s734v")

[node name="OmniScope" type="Node2D" parent="."]
position = Vector2(0, -46)

[node name="Engine" type="AnimatedSprite2D" parent="."]
position = Vector2(0, -4)
scale = Vector2(0.804688, 0.9375)
sprite_frames = SubResource("SpriteFrames_0gnt7")
animation = &"engine"
4 changes: 4 additions & 0 deletions apps/gamejam/brackeys/13/scripts/spaceship.gd
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
class_name Spaceship extends CharacterBody2D


signal laser_shot(laser)

@onready var scope = $OmniScope
@onready var engine = $Engine


var laser_scene = preload("res://scenes/laser.tscn")

Expand All @@ -20,6 +23,7 @@ func _physics_process(delta):
var input_vector := Vector2(0, Input.get_axis("thrust", "reverse"))
velocity += input_vector.rotated(rotation) * acceleration
velocity = velocity.limit_length(max_speed)
engine.play("engine")

if Input.is_action_pressed("pan_right"):
rotate(deg_to_rad(rotation_speed*delta))
Expand Down
18 changes: 12 additions & 6 deletions apps/gamejam/brackeys/13/scripts/timespace_layer.gd
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
extends Node2D

@onready var color_rect := $ColorRect

@onready var background_sprite := $BackgroundSprite

func _ready() -> void:
color_rect.color = Color(0,0,0)
background_sprite.centered = false
update_background_size()
get_viewport().connect("size_changed", Callable(self, "_on_viewport_resized"))


func update_background_size():
color_rect.size = get_viewport_rect().size
var viewport_size: Vector2 = get_viewport().get_visible_rect().size

if background_sprite and background_sprite.texture:
var texture_size: Vector2 = background_sprite.texture.get_size()
var scale_x: float = viewport_size.x / texture_size.x
var scale_y: float = viewport_size.y / texture_size.y
background_sprite.scale = Vector2(scale_x, scale_y)
background_sprite.position = Vector2.ZERO

color_rect.size = viewport_size

func _on_viewport_resized():
update_background_size()

func _process(delta: float) -> void:
pass
13 changes: 13 additions & 0 deletions apps/kbve/kbve.com/src/content/docs/project/brackeys.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,19 @@ Credited to [email protected]

The first three objects for the universe layer were made by Iftikhar Alam from Vecteezy / IftiStock.com.

#### Pixel Space Background

The main background of the `timespace` layer comes from the [Space Backgorund Pixel Art Pack](https://norma-2d.itch.io/space-backgrounds-pack).

#### Void Fleet Pack

The spaceship will come from the [Void Fleet Pack 3](https://foozlecc.itch.io/void-fleet-pack-3) , which is released as a CC0 license.
Then there is the [Void Fleet Pack 1](https://foozlecc.itch.io/void-fleet-pack-1), that we will be using for the main ship.

#### Pixel Art Sci Fi Spaceships

This is the spaceship asset pack from FrostWindz, [Pixel Art Sci Fi Spacepack](https://frostwindz.itch.io/pixel-art-sci-fi-spaceships).

### Layers

These are the layers that I am thinking we will be operating in:
Expand Down