3 Commits

Author	SHA1	Message	Date
PHILIP White	c5409fcaa7	Removed Merchant Soft Lock for Build ... Merchant SEVERELY BUGGY FUNCTIONALITY HAS BEEN DISABLED	2023-03-14 04:01:09 +00:00
Emily Taylor	3982712189	Uploaded MerchantCharacter, Merchant Shop assets and Goat into engine ... Goat enemy fbx and material, merchant character and material and merchant shop untextured meshes in engine.	2023-03-06 16:28:04 +00:00
Emily Taylor	c4a668c2e9	Added Merchant Shop assets ... Added Merchant shop FBX	2023-03-06 15:31:55 +00:00