|
|
9845639e8c
|
Merge branch 'dev' into ui-art-replacement
|
2023-02-28 15:26:27 +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 |
|
Emily Taylor
|
2a4300066c
|
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss
|
2023-02-28 13:18:35 +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 |
|
Charlie Seymour
|
216275cb53
|
Implemented modular kit for tutorial level
|
2023-02-28 11:43:42 +00:00 |
|
Charlie Seymour
|
7a36b200ca
|
Merge branch 'Modular-Kit' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into Modular-Kit
|
2023-02-27 18:15:11 +00:00 |
|
Charlie Seymour
|
4e11a3a63f
|
Added tutorial modular kit for first level
|
2023-02-27 18:14:51 +00:00 |
|
MARCEL HARA
|
1ead32f0c8
|
Added InventoryImage to Inventory UI
|
2023-02-27 17:45:58 +00:00 |
|
KACPER SZELEST
|
4b1f3538af
|
Updated readme.ne
I added a link to the google drive file of the bestiary lore book so that anyone can access and edit it if need be.
|
2023-02-27 17:43:46 +00:00 |
|
MARCEL HARA
|
73dc65a3d4
|
Merge remote-tracking branch 'origin/UI-designs' into ui-art-replacement
|
2023-02-27 16:59:31 +00:00 |
|
Emily Taylor
|
fed1705f91
|
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
|
2023-02-27 16:31:09 +00:00 |
|
PHOEBE HARRIS-WILSON
|
8c54380e01
|
The first gun elements
the first ui gun element outlines
|
2023-02-27 16:12:59 +00:00 |
|
George Taylor
|
37dad4c873
|
Imported Beam Assets into Unreal
i Imported the beam assets from maya into the unreal engine 5
|
2023-02-27 16:12:18 +00:00 |
|
Emily Taylor
|
c9148973ca
|
Added Character Folder
FBX and Textures for Merchant Character
|
2023-02-27 15:57:14 +00:00 |
|
Blue Probert
|
4d1edea71d
|
Added links to additional meterial about combat and enemys
Added a link to the enemy spread sheet and updated the ones for the combat google doc and the combat google sheet
|
2023-02-27 15:51:03 +00:00 |
|
George Taylor
|
f2c69dfe3a
|
Added the assets for the Tutorial Level to Unreal
|
2023-02-27 15:44:19 +00:00 |
|
George Taylor
|
a43ed3a626
|
Added the Wooden Texture for the Tutorial Assets
|
2023-02-27 15:43:18 +00:00 |
|
PHOEBE HARRIS-WILSON
|
dfb3e203d7
|
UI symbols
|
2023-02-27 15:42:38 +00:00 |
|
|
|
a6ef9f76cd
|
Merge branch 'Dialogue-System' into dev
|
2023-02-25 02:27:38 +00:00 |
|
|
|
671ab8e3d7
|
Merge remote-tracking branch 'origin/UI-designs' into dev
|
2023-02-25 02:27:07 +00:00 |
|
Charlie Seymour
|
c7760f042b
|
Added Maya file for Tutorial level
|
2023-02-23 17:55:36 +00:00 |
|
George Taylor
|
4b886518fd
|
Imported Modular Planks into Unreal
Imported the Modular Planks for the Tutorial Level into Unreal from Maya
|
2023-02-23 17:40:57 +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 |
|
MARCEL HARA
|
119b5a141a
|
Updated TempCharacter to remove unused Ulogs
|
2023-02-23 15:19:32 +00:00 |
|
|
|
fb0bd09bb2
|
Merge remote-tracking branch 'origin/dev' into Level-Design
|
2023-02-23 15:06:57 +00:00 |
|
|
|
5dae3b2691
|
Merge pull request #9 from Games-Academy-Student-Work-22-23/Fix-UI-Scaling
Fix UI scaling
|
2023-02-20 16:04:44 +00:00 |
|
MARCEL HARA
|
5e448c897d
|
Updated Widgets to fix scaling issue
Fixed scaling issue on all widgets to fit all monitor types
|
2023-02-20 16:03:25 +00:00 |
|
Phoebe Harris-Wilson
|
0d135251df
|
update book
|
2023-02-20 15:31:49 +00:00 |
|
Phoebe Harris-Wilson
|
06fa5cc09d
|
added ui designs for icons and book
|
2023-02-20 15:24:00 +00:00 |
|
Charlie Seymour
|
f378d4a4fd
|
Added modular kit test for tutorial
|
2023-02-20 15:16:26 +00:00 |
|
MARCEL HARA
|
cc8eee9727
|
Merge pull request #8 from Games-Academy-Student-Work-22-23/resource-mining
Resource mining
|
2023-02-20 15:11:43 +00:00 |
|
MARCEL HARA
|
e9af8b713f
|
Updated EatableItems to fix Ammo Consuming
Fixed ammo consuming crashing the client
|
2023-02-20 14:49:05 +00:00 |
|
Kacper Szelest
|
177a4f685f
|
Added and made Level 1 Blockout assets
I added and put implamented the level 1 blockout assets and created the blockout level for it.
|
2023-02-20 14:48:45 +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 |
|
|
|
26f21a9136
|
Updated DialogueNPC to use Ranged For Loops
|
2023-02-20 09:50:09 +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
|
3c2d057951
|
Updated TempCharacter to destory ammo ore
destroys ammo ore when the player presses e on it
|
2023-02-19 15:28:34 +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 |
|
Thomas Jacob Rowland
|
e678bcb0bb
|
Fixed Build Issues for personal PC
Couldn't open without building from source. Fixed that hopefully this push means I won't have to do so again
|
2023-02-11 16:19:14 +00:00 |
|
Rowland Rowland
|
f032ac91c9
|
Cleaning Level
Using booleans to remove excess assets
|
2023-02-09 17:02:47 +00:00 |
|
|
|
9bfb07fbba
|
Updated DialogueNPC to Add Ids for Dialogue Paths
|
2023-02-09 17:01:03 +00:00 |
|
|
|
d1fab9f9a1
|
Updated DialogueNPC for Structs and Dialogue Paths
|
2023-02-09 03:12:27 +00:00 |
|
MH261677
|
a6436c9110
|
Added BP_AmmoItem
Added Ammo into the game for the player to find
|
2023-02-07 00:11:19 +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 |
|
|
|
73262b425e
|
Merge pull request #7 from Games-Academy-Student-Work-22-23/additional-movement
Additional movement
|
2023-02-06 15:57:36 +00:00 |
|
