Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022

This commit is contained in:
2022-12-10 09:38:24 +01:00
8 changed files with 7 additions and 115 deletions

2
.gitattributes vendored Normal file
View File

@@ -0,0 +1,2 @@
# Normalize EOL for all files that Git considers text files.
* text=auto eol=lf

21
LICENSE
View File

@@ -1,21 +0,0 @@
MIT License
Copyright (c) 2022 Nathan Hoad
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

2
README.md Normal file
View File

@@ -0,0 +1,2 @@
# SemesterGameJam2022
Repo for Winter Semester Game Jam 2022

View File

@@ -1,17 +0,0 @@
extends VBoxContainer
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta):
pass
func _on_up_pressed():
pass
#InputHelper.set_action_key(action: String, key: String, swap_if_taken: bool = true) -> void
#Replace with function body.

View File

@@ -1,21 +0,0 @@
extends HSlider
var master_bus = AudioServer.get_bus_index("Master")
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta):
pass
func _on_value_changed(value):
AudioServer.set_bus_volume_db(master_bus, value)
if value == -30:
AudioServer.set_bus_mute(master_bus, true)
else:
AudioServer.set_bus_mute(master_bus,false) # Replace with function body.

View File

@@ -1,20 +0,0 @@
extends HSlider
var master_bus = AudioServer.get_bus_index("Master")
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta):
pass
func _on_value_changed(value):
AudioServer.set_bus_volume_db(master_bus, value)
if value == -30:
AudioServer.set_bus_mute(master_bus, true)
else:
AudioServer.set_bus_mute(master_bus,false) # Replace with function body.

View File

@@ -1,36 +0,0 @@
[gd_scene format=3 uid="uid://c301ttbip7xm4"]
[node name="CreditsScreen" type="Control"]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
[node name="ColorRect" type="ColorRect" parent="."]
layout_mode = 0
offset_right = 40.0
offset_bottom = 40.0
color = Color(0.0784314, 0.243137, 0.552941, 1)
[node name="VBoxContainer" type="VBoxContainer" parent="."]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -20.0
offset_top = -20.0
offset_right = 20.0
offset_bottom = 20.0
grow_horizontal = 2
grow_vertical = 2
[node name="RichTextLabel" type="RichTextLabel" parent="VBoxContainer"]
layout_mode = 2
text = "Lukas
Jonas
Arthur
Lena
Albion
..."

View File

@@ -69,7 +69,10 @@ _global_script_class_icons={
[application] [application]
config/name="Semester Game Jam 2022" config/name="Semester Game Jam 2022"
<<<<<<< HEAD
run/main_scene="res://menu/main_menu.tscn" run/main_scene="res://menu/main_menu.tscn"
=======
>>>>>>> parent of 742e4e2... Auto stash before merge of "main" and "origin/main"
config/features=PackedStringArray("4.0", "Forward Plus") config/features=PackedStringArray("4.0", "Forward Plus")
config/icon="res://icon.svg" config/icon="res://icon.svg"