Movement and Dialougue (#12 )

Merge pull request 'master' (#5 ) from master into main
Reviewed-on: #5
2024-09-07 14:46:58 -07:00 · 2024-09-07 10:14:33 -07:00 · 2024-09-04 10:54:10 -07:00 · 2024-09-04 13:34:11 -04:00 · 2024-09-04 13:33:16 -04:00 · 2024-09-04 10:14:31 -07:00
1 changed files with 3 additions and 0 deletions
--- a/project.godot
+++ b/project.godot
@ -11,7 +11,10 @@ config_version=5
 [application]

 config/name="lakewood"
+<<<<<<< HEAD
+=======
 run/main_scene="res://world.tscn"
+>>>>>>> f25b89aa52bc76423cd04483e3b0644fe3df1dc6
 config/features=PackedStringArray("4.3", "Forward Plus")
 config/icon="res://icon.svg"
Author	SHA1	Message	Date
eggman20339	e895a6256e	Movement and Dialougue (#12 )	2024-09-07 14:46:58 -07:00
eggman20339	a30b7119ad	Merge pull request 'master' (#5 ) from master into main Reviewed-on: #5	2024-09-07 10:14:33 -07:00
eggman20339	3b49a1f948	Merge pull request 'nothing much added' (#4 ) from master into main Reviewed-on: #4	2024-09-04 10:54:10 -07:00
Egg Man	116d900cb8	Merge branch 'main' of https://gitea.eggtech.net/eggman20339/lakewood	2024-09-04 13:34:11 -04:00
Egg Man	ceac23fb00	win	2024-09-04 13:33:16 -04:00
eggman20339	f25b89aa52	Merge pull request 'added tellick and basic movement on world boundry' (#3 ) from master into main Reviewed-on: #3	2024-09-04 10:14:31 -07:00
eggman20339	574c18499c	Merge pull request 'added assets' (#2 ) from master into main Reviewed-on: #2	2024-09-04 09:28:46 -07:00
eggman20339	4d48ebc46a	Merge pull request 'init' (#1 ) from master into main Reviewed-on: #1	2024-09-04 08:56:32 -07:00