Marcel Hara 688a724a62 Merge branch 'dev' into UI-Implementation ...

# Conflicts:
#	Content/Blueprints/Player/BP_MyTempCharacter.uasset
#	Content/Levels/Top_layer_level.umap

2023-03-13 17:13:56 +00:00

..

_GENERATED

Moddeled hub level blockout

2023-02-27 15:31:06 +00:00

Assets

Change AIBruh to actual model

2023-03-13 15:54:30 +00:00

BlueprintAI/AI

Changed AIBruh hitbox

2023-03-13 15:57:48 +00:00

Blueprints

Merge branch 'dev' into UI-Implementation

2023-03-13 17:13:56 +00:00

BungeeMan

Added tutorial modular kit for first level

2023-02-27 18:14:51 +00:00

Dialogue

Merge branch 'dev' into Turn-Based-Combat

2023-02-28 15:29:35 +00:00

Environment

Implemented modular kit for tutorial level

2023-02-28 11:43:42 +00:00

Fonts

Imported Font to replace all ui fonts

2023-03-13 15:55:34 +00:00

Images

Added Temp Status Icons and Font for Status Testing

2023-02-23 03:02:49 +00:00

Levels

Merge pull request #13 from Games-Academy-Student-Work-22-23/Extra-ammoTypes

2023-03-13 17:11:33 +00:00

MainMenu

Updated Action Mapping from Right to Left Click

2022-11-29 17:38:39 +00:00

Materials

Added Merchant Shop assets

2023-03-06 15:31:55 +00:00

Megascans/3D_Assets/Mossy_Forest_Boulder_wjwtbb3

Added place holder enemy

2023-01-03 14:38:26 +00:00

Merchant

Updated BP_ShopSelector

2023-01-15 16:14:03 +00:00

MSPresets

Added Rock Megascan Temp Mesh

2022-11-17 03:03:32 +00:00

Music

Added Merchant Shop assets

2023-03-06 15:31:55 +00:00

Particles

Added Breakable Walls BP

2023-02-01 23:37:17 +00:00