MARCEL HARA 62f8aac468 Merge remote-tracking branch 'origin/Set-Dressing' into dev ... # Conflicts: # Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_004.uasset # Content/Levels/Build.umap		2023-05-11 14:19:49 +01:00
..
_GENERATED	Updated Uv's on Start Area Objects	2023-05-11 00:21:51 +01:00
Testing	Merge pull request #31 from Games-Academy-Student-Work-22-23/MainMenu-Creation	2023-05-04 18:00:19 +01:00
Build1.umap	Duplicated current build for new merges	2023-05-11 14:12:12 +01:00
Build.umap	Fixed Merchant asset merge to dev	2023-05-11 14:11:08 +01:00
C2Plane.uasset	Fixed collisions. Fixed bug of respawn. Added maze	2023-05-04 17:58:13 +01:00
Enemy_Test.umap	Updated Boss Character to Trigger Animations	2023-05-09 04:29:19 +01:00
EscapeToMenu.uasset	Added EscapeToMenu Component for Escaping to Menu	2022-11-29 00:42:03 +00:00
Hub_2.umap	Moddeled hub level blockout	2023-02-27 15:31:06 +00:00
Hub_platform.umap	Created platform blockout asset	2023-02-27 15:28:53 +00:00
Hub.umap	Cleaning Level	2023-02-09 17:02:47 +00:00
Level_1.umap	Added Merchant Shop assets	2023-03-06 15:31:55 +00:00
Main.umap	LineTrace works and is detecting objects.	2022-11-11 20:21:44 +00:00
MerchantPrototype.umap	Added All Item ammo types	2023-03-13 17:00:08 +00:00
PageOpenerPrototype.umap	Added TutorialText to game	2023-04-17 17:33:40 +01:00
Prototype.umap	Implamented Soft wind	2022-12-01 18:02:09 +00:00
Top_layer_level.umap	Bugfix Larger Health Values Break Health UI	2023-04-28 04:47:34 +01:00
Tutorial.umap	Bugfix Larger Health Values Break Health UI	2023-04-28 04:47:34 +01:00