From: Clyne Sullivan <tullivan99@gmail.com>
Date: Tue, 24 Nov 2015 12:33:45 +0000 (-0500)
Subject: merge
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=4bf3665158e71e9b20a2231428d42d400da8332f;p=clyne%2Fgamedev.git

merge
---

diff --git a/assets/invUI.png b/assets/invUI.png
new file mode 100644
index 0000000..8647e38
Binary files /dev/null and b/assets/invUI.png differ
diff --git a/config/items.h b/config/items.h
new file mode 100644
index 0000000..a3ec683
--- /dev/null
+++ b/config/items.h
@@ -0,0 +1,44 @@
+ID DEBUG_ITEM
+	NAME "Debug"
+	TYPE TOOL 
+	WIDTH 1 
+	HEIGHT 1 
+	STACKSIZE 1 
+	TEX "assets/items/ITEM_TEST.png"
+	ENI
+
+ID TEST_ITEM	
+	NAME "Dank MayMay" 
+	TYPE TOOL 
+	WIDTH HLINE 
+	HEIGHT HLINE 
+	STACKSIZE 420 
+	TEX "assets/items/ITEM_TEST.png"
+	ENI
+
+ID PLAYER_BAG	
+	NAME "Your Bag" 
+	TYPE EQUIP 
+	WIDTH HLINE*5 
+	HEIGHT HLINE*5 
+	STACKSIZE 1 
+	TEX "assets/items/ITEM_TEST.png"
+	ENI
+
+ID FLASHLIGHT 	
+	NAME "Flashlight" 
+	TYPE TOOL 
+	WIDTH HLINE*2 
+	HEIGHT HLINE*4 
+	STACKSIZE 1 
+	TEX "assets/items/ITEM_TEST.png" 
+	ENI
+
+ID SWORD_WOOD 	
+	NAME "Wood Sword" 
+	TYPE SWORD 
+	WIDTH HLINE*4 
+	HEIGHT HLINE*10 
+	STACKSIZE 1 
+	TEX "assets/items/ITEM_SWORD.png" 
+	STOP
\ No newline at end of file