.

chosencharacters · Dec 3, 2024 · 7312797 · 7312797
1 parent 3b559db
commit 7312797
Show file tree

Hide file tree

Showing 21 changed files with 3 additions and 1 deletion.
diff --git a/Project.xml b/Project.xml
@@ -16,7 +16,7 @@
 	<!-- ____________________________ Window Settings ___________________________ -->
 
 	<!--These window settings apply to all targets-->
-	<window width="960" height="540" fps="60" background="#000000" hardware="false" vsync="false" />
+	<window width="960" height="540" fps="60" background="#000000" hardware="true" vsync="false" />
 
 	<!--HTML5-specific-->
 	<window if="html5" resizable="true" />

diff --git a/assets/images/bonfire/bonfire.aseprite → ...ables/activities/bonfire/bonfire.aseprite b/assets/images/bonfire/bonfire.aseprite → ...ables/activities/bonfire/bonfire.aseprite
diff --git a/assets/images/bonfire/golden-marshmallow.png → ...activities/bonfire/golden-marshmallow.png b/assets/images/bonfire/golden-marshmallow.png → ...activities/bonfire/golden-marshmallow.png
diff --git a/assets/images/bonfire/grill_stick.aseprite → ...s/activities/bonfire/grill_stick.aseprite b/assets/images/bonfire/grill_stick.aseprite → ...s/activities/bonfire/grill_stick.aseprite
diff --git a/assets/images/bonfire/grill_stick.json → ...ables/activities/bonfire/grill_stick.json b/assets/images/bonfire/grill_stick.json → ...ables/activities/bonfire/grill_stick.json
diff --git a/assets/images/bonfire/grill_stick.png → ...tables/activities/bonfire/grill_stick.png b/assets/images/bonfire/grill_stick.png → ...tables/activities/bonfire/grill_stick.png
diff --git a/assets/images/bonfire/marshmallow.aseprite → ...s/activities/bonfire/marshmallow.aseprite b/assets/images/bonfire/marshmallow.aseprite → ...s/activities/bonfire/marshmallow.aseprite
diff --git a/assets/images/bonfire/marshmallow.json → ...ables/activities/bonfire/marshmallow.json b/assets/images/bonfire/marshmallow.json → ...ables/activities/bonfire/marshmallow.json
diff --git a/assets/images/bonfire/marshmallow.png → ...tables/activities/bonfire/marshmallow.png b/assets/images/bonfire/marshmallow.png → ...tables/activities/bonfire/marshmallow.png
diff --git a/...s/bonfire/outside-bonfire-spritesheet.png → ...s/bonfire/outside-bonfire-spritesheet.png b/...s/bonfire/outside-bonfire-spritesheet.png → ...s/bonfire/outside-bonfire-spritesheet.png
diff --git a/...s/images/bonfire/outside-bonfire.aseprite → ...tivities/bonfire/outside-bonfire.aseprite b/...s/images/bonfire/outside-bonfire.aseprite → ...tivities/bonfire/outside-bonfire.aseprite
diff --git a/assets/images/bonfire/outside-bonfire.png → ...es/activities/bonfire/outside-bonfire.png b/assets/images/bonfire/outside-bonfire.png → ...es/activities/bonfire/outside-bonfire.png
diff --git a/assets/images/bgs/concierge.png → ...s/images/interactables/npcs/concierge.png b/assets/images/bgs/concierge.png → ...s/images/interactables/npcs/concierge.png
diff --git a/assets/images/interactables/npcs/desktop.ini b/assets/images/interactables/npcs/desktop.ini
@@ -0,0 +1,2 @@
+[LocalizedFileNames]
+concierge.png[email protected],0
diff --git a/assets/images/interactables/npcs/tombstone.png b/assets/images/interactables/npcs/tombstone.png
diff --git a/...ts/images/presents/present-cymbourine.png → ...ractables/presents/present-cymbourine.png b/...ts/images/presents/present-cymbourine.png → ...ractables/presents/present-cymbourine.png
diff --git a/...images/presents/present-midgetsausage.png → ...tables/presents/present-midgetsausage.png b/...images/presents/present-midgetsausage.png → ...tables/presents/present-midgetsausage.png
diff --git a/assets/images/presents/present-sevi.png → ...s/interactables/presents/present-sevi.png b/assets/images/presents/present-sevi.png → ...s/interactables/presents/present-sevi.png
diff --git a/...ts/images/presents/present-sirlenward.png → ...ractables/presents/present-sirlenward.png b/...ts/images/presents/present-sirlenward.png → ...ractables/presents/present-sirlenward.png
diff --git a/...s/images/presents/present-thedyingsun.png → ...actables/presents/present-thedyingsun.png b/...s/images/presents/present-thedyingsun.png → ...actables/presents/present-thedyingsun.png
diff --git a/assets/images/medals/golden-marshmallow.png b/assets/images/medals/golden-marshmallow.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[LocalizedFileNames]
		concierge.png[email protected],0