Merge branch 'main' into #7-Display-Player-Hands

Noisyninja703 · Jan 10, 2024 · ea6da0f · ea6da0f
2 parents 88dc353 + 341f39f
commit ea6da0f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 1 deletion.
diff --git a/Assets/Cards/ARCHER.png b/Assets/Cards/ARCHER.png
diff --git a/Assets/Cards/BARBARIAN.aseprite b/Assets/Cards/BARBARIAN.aseprite
diff --git a/Assets/Cards/BARBARIAN.png b/Assets/Cards/BARBARIAN.png
diff --git a/Assets/Cards/KNIGHT.png b/Assets/Cards/KNIGHT.png
diff --git a/Assets/Cards/tempdatabase.gd b/Assets/Cards/tempdatabase.gd
@@ -0,0 +1,11 @@
+extends Node
+
+
+# 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
diff --git a/README.md b/README.md
@@ -7,13 +7,15 @@ A basic card game made in Godot 4.2
 -     Deal from deck to player hand
 -     Print player's current hand
 -     Run start of game
+-     Game Logic Controller Node
 -     Display player hands
 
+
+
 ## In Planning
 -     Basic card GUI
 -     Basic playing field GUI
 -     Player turns and phases
 -     Resource cards
 -     Card combat
 -     Card abilities
-