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
06deee7b0b
Merge branch 'dev' into Hub-level-blockout
2023-02-28 15:34:49 +00:00
e8c20e2d67
Merge branch 'dev' into Turn-Based-Combat
...
# Conflicts:
# Content/Blueprints/Combat_UI/CombatCharacter.uasset
# Content/BungeeMan/Mat_BungeeMan_Rubber.uasset
# Content/Dialogue/NPCTest.uasset
# Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
2023-02-28 15:29:35 +00:00
8e5416e3a9
Merge branch 'dev' into Modular-Kit
...
# Conflicts:
# Content/Levels/Top_layer_level.umap
# Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
2023-02-28 15:25:47 +00:00
Charlie Seymour
216275cb53
Implemented modular kit for tutorial level
2023-02-28 11:43:42 +00:00
Charlie Seymour
4e11a3a63f
Added tutorial modular kit for first level
2023-02-27 18:14:51 +00:00
Kacper Szelest
70d0c545ed
Moddeled hub level blockout
...
I created the hub level blockout to be used as a showcase and inspiration for a final design creation
2023-02-27 15:31:06 +00:00
Kacper Szelest
26c6885e86
Created platform blockout asset
...
I created a temporary asset blockout for the big science building platform asset to use as a showcase
2023-02-27 15:28:53 +00:00
76043108b1
Merge pull request #10 from Games-Academy-Student-Work-22-23/Stealth-Mechanics-v1.0.2
...
Stealth mechanics v1.0.2
2023-02-23 16:04:33 +00:00
MARCEL HARA
ce4f3aff1f
Added SneakMechanicTesting level
...
Added new level for sneak mechanic testing
2023-02-23 16:03:10 +00:00
ROWLAND ROWLAND
69f4b8e603
Merge branch 'dev' into Level-1-bloackout
2023-02-23 15:49:45 +00:00
fb0bd09bb2
Merge remote-tracking branch 'origin/dev' into Level-Design
2023-02-23 15:06:57 +00:00
56b61bd1d2
Added Temp Status Icons and Font for Status Testing
2023-02-23 03:02:49 +00:00
3b1f33006a
Added Combat Test Level for New Combat Features
2023-02-23 01:29:01 +00:00
Charlie Seymour
f378d4a4fd
Added modular kit test for tutorial
2023-02-20 15:16:26 +00:00
Kacper Szelest
a67d96943c
Added file level
...
I added a new level file named level 1, to house the blockout of level one and the future first level
2023-02-20 14:47:52 +00:00
MH261677
618a9509ca
Updated EatableItems to add ammo {UNSTABLE}
...
Added functionality to the ammo count currently unstable as need to wait for other programmer to understand why it crashes.
2023-02-19 15:29:16 +00:00
MH261677
43ef8e2110
Updated TempCharacter to sneak functionality
...
Added sneak functionality which makes the sphere radius smaller near enemies.
2023-02-17 13:12:28 +00:00
MARCEL HARA
77c43ab3d1
Updated TempCharacter to find AI Sphere
2023-02-16 15:02:58 +00:00
Rowland Rowland
f032ac91c9
Cleaning Level
...
Using booleans to remove excess assets
2023-02-09 17:02:47 +00:00
MH261677
324f062cc7
Updated EatableItems for AmmoFunctionality
...
Added ammo base functionality for using the ammo item in game
2023-02-07 00:11:00 +00:00
MH261677
797c447d47
Added Ammo Icon to Images
2023-02-06 23:51:45 +00:00
Rowland Rowland
30d22975b7
Updated Level
...
Added textures and began experimenting with curves. Planning to investigate Splines
2023-02-06 17:24:41 +00:00
MARCEL HARA
36c18382a2
Updated TempCharacter for sneaking vignette effect
...
Added a Vignette effect when crouching
2023-02-06 15:55:12 +00:00
d36fe6fed0
Added Breakable Walls BP
...
Using Particles at the moment
2023-02-01 23:37:17 +00:00
e2f91a11b5
Bugfix Platform Too High to Get Across
2023-01-31 03:29:35 +00:00
8cf4d1d52e
Built Lighting for Build
2023-01-31 02:45:23 +00:00
326e64e7ed
Merge remote-tracking branch 'origin/Level-Design' into dev
2023-01-31 02:19:42 +00:00
64f5d652ff
Merge remote-tracking branch 'origin/Enviroment-Art' into dev
2023-01-31 02:19:30 +00:00
75f373e0c4
Updated Beta Level Map for Temp Jelly Assets
2023-01-31 02:15:07 +00:00
a15054656e
Merge branch 'dev' into Shaders
...
# Conflicts:
# Content/Levels/Top_layer_level.umap
2023-01-31 02:04:48 +00:00
d18c547632
Bugfix Cursor Not Hiding After Combat
2023-01-31 00:56:53 +00:00
7e81387247
Merge remote-tracking branch 'origin/merchant-system-v4' into Turn-Based-Combat
...
# Conflicts:
# Content/Blueprints/Combat_UI/CombatCharacter.uasset
2023-01-31 00:50:59 +00:00
0de2753dff
Bugfix Clicking Instantly Activates Combat
2023-01-31 00:30:45 +00:00
cd17363421
Removed Legacy Source Code to Reduce Compilation
2023-01-30 23:03:20 +00:00
Rowland Rowland
1d02d5b3a3
Updated Level-Design. Hub Town 'finished'
...
Grey box 'finished'. Need to tidy up values. Likely need to update Abyss walls. Further discussion needed in regard to abyss structure.
2023-01-30 17:29:28 +00:00
ecae96081d
Added Geometry Collection for Destructable Components
2023-01-26 17:54:56 +00:00
Kacper Szelest
6297531eba
Updated world space
...
I moved a few objects in the world space
2023-01-26 17:43:43 +00:00
MARCEL HARA
2f22ec811f
Updated Merchant_UI
...
Removed things being removed from parent and transferred it from code to fix many bugs, Also fixed text being instantly displayed once you talk to the merchant again
2023-01-26 17:41:51 +00:00
Kacper Szelest
8e71181328
Added outline shader
...
I added a shader that adds a black outline to each object in the world to add a stylized effect to our game
2023-01-26 16:20:46 +00:00
Rowland Rowland
914b7cbc96
Forgot to save
2023-01-23 17:25:24 +00:00
Rowland Rowland
949607aa23
Hub names
...
Named level assets and started wall
2023-01-23 17:24:41 +00:00
Rowland Rowland
469b585bc2
Hub area
...
Made most of the basic structure of the hub area, still need to add Town Hall and finalise abyss walls
2023-01-23 17:09:49 +00:00
MARCEL HARA
3f4cdf5bfa
Updated Interaction.cpp
...
Optimized some functions and variables by storing them in beginplay
2023-01-23 16:14:15 +00:00
15b56b3598
Updated Engine Version to 5.1
2023-01-23 13:35:24 +00:00
MH261677
b9d87ee07b
Updated Unreal version to 5.1
2023-01-21 14:19:49 +00:00
82c65b3fc4
Fix for Version Conflict
2023-01-17 08:46:31 +00:00
e4709f35e7
Bugfix Collision on Large Section
2023-01-17 06:34:22 +00:00
51c7bd6628
Updated Player Start Location in Tutorial
2023-01-17 05:18:44 +00:00
