Commit Graph

27 Commits

Author SHA1 Message Date
85394b0b72 Rebuilt All Images as Some Were Corrupted Failing Build 2023-05-13 22:35:50 +01:00
MarcelHara
e241c76d89 Changed Item tooltips to look better and overhauled item logic 2023-05-13 17:10:36 +01:00
c2e3ef5168 Updated UI for New Designs 2023-05-13 01:02:47 +01:00
22c5f8163b Merge remote-tracking branch 'origin/Set-Dressing-2' into dev 2023-05-13 00:00:31 +01:00
3aca076981 Updated Sisters Quest & Wrapped Text on Selections 2023-05-12 13:08:00 +01:00
Rowland Rowland
0c40d58104 Rebuilt lighting
Rebuilt the lighting which allegedly changed a bunch of things that needed saving.
2023-05-12 11:22:41 +01:00
MARCEL HARA
a3d232726e Fixed Merging to Dev 2023-05-11 14:37:24 +01:00
MARCEL HARA
5bf8d73d21 Fixed UI not being interactable 2023-05-11 11:56:03 +01:00
902163d4fe Updated Merchant for Pendant Quest & Attempted to Replace Open Dialogue 2023-05-11 08:52:30 +01:00
e0130ffff5 Merged Boss Character Static Meshes for Animation 2023-05-08 21:59:40 +01:00
EMILY TAYLOR
c542a23f0e Added Statue and Boss Character
Created and put in content drawer:
- Statue mesh and material
- Boss Character mesh and material
2023-05-04 16:13:51 +01:00
9ecbd9c52d Updated GoatAI to Trigger Attack Animations 2023-04-28 03:40:41 +01:00
825e2a7631 Added Movement Animation to Goats 2023-04-28 02:40:18 +01:00
9199db00df Bugfix Merchant Unable to Interact 2023-04-28 01:40:49 +01:00
bc171eba80 Added Idle Merchant Animations 2023-04-28 01:23:18 +01:00
EMILY TAYLOR
58730a8573 Added Civilian Material in content drawer
Created material for Civilian Character for side quest, re-use Merchant Mesh from Merchant folder
2023-04-24 16:06:45 +01:00
985fdfa3af Updated Goat Textures 2023-04-17 17:21:45 +01:00
24d0f2b334 Added Wooden Sign to Direct Players 2023-03-28 03:11:41 +01:00
Marcel Hara
6f9f95ab9d Attempted fix widget to merchant system 2023-03-14 13:04:33 +00:00
c5409fcaa7 Removed Merchant Soft Lock for Build
Merchant SEVERELY BUGGY FUNCTIONALITY HAS BEEN DISABLED
2023-03-14 04:01:09 +00:00
b7a5d974ac Updated Build Map to Stop Goats from Colliding 2023-03-13 22:17:44 +00:00
Charlie Seymour
2f2ecc2d76 Change AIBruh to actual model
Mesh and material changed.
2023-03-13 15:54:30 +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
Emily Taylor
1958eabc3d Added Goat Enemy for Tutorial Level
Goat FBX and materials ready for rigging and importing to engine
2023-02-28 13:18:14 +00:00
KACPER Szelest
d78abda469 Added Sheep model
I added the sheep model and saved it in the correct folder, adding it in the enemy character folder
2023-01-10 16:02:43 +00:00
KACPER Szelest
1061fb0f84 Added place holder enemy
I created some new folders to organize assets, whilst also adding the enemy placeholder character
2023-01-03 14:38:26 +00:00