MarcelHara
d538543fbc
Updated Selection,confirmation UI for merchant
2023-05-09 00:00:47 +01:00
Rowland Rowland
8008000522
Merge remote-tracking branch 'origin/dev' into side-area-2nd-gig
...
# Conflicts:
# Content/Levels/Build.umap
2023-05-04 18:01:54 +01:00
5b1abf1a70
Merge pull request #31 from Games-Academy-Student-Work-22-23/MainMenu-Creation
...
Main menu creation
2023-05-04 18:00:19 +01:00
Rowland Rowland
86f9810685
Fixed collisions. Fixed bug of respawn. Added maze
...
Side area and final area collisions fixed. Enemy falling no longer triggers respawn. Added maze for side area.
2023-05-04 17:58:13 +01:00
Phoebe Harris-Wilson
4c68c5e7ee
Elements for probertium, eis, azos and iroquid model and textures
...
you can find it in unreal under the assets folder and then the elements folder
2023-05-04 17:42:42 +01:00
MarcelHara
098aa0bb74
Gave buttons functionality
...
Play and quit works and gave settings placeholders
2023-05-04 13:56:42 +01:00
c7f7619e09
Bugfix Unknown Characters in Merchant Sisters Dialogue
2023-05-04 06:59:39 +01:00
daaa624dd9
Exposed Quest Flags to Dialogue System
2023-05-04 06:31:59 +01:00
fc9597ed33
Added Starter Quests
2023-05-04 05:12:43 +01:00
23c9c5b07a
Merge branch 'dev' into Quest
2023-05-04 05:05:40 +01:00
f24fcc2d25
Updated Quest System for UI
2023-05-04 05:04:37 +01:00
Rowland Rowland
cb1fcf7258
Added additional skeleton
...
Added a skeleton pointing towards side area
2023-05-02 11:47:19 +01:00
Rowland Rowland
d09c108b57
Changed side area and final area
...
Removed grey tunnel and blocked off unused area (didn't delete in case we need it later)
2023-05-02 11:21:27 +01:00
Rowland Rowland
b0d0852fbe
Removed grey block
...
Minor level clean up
2023-05-02 11:13:48 +01:00
Rowland Rowland
69f53aa61c
Added wooden bridge
...
Replaced white bridge with rope bridge
2023-05-02 11:13:05 +01:00
Rowland Rowland
c6669aebdb
Updated 2nd group of grey blocks
...
Added Blue_rocks texture and repositioned them so that the player can jump up and get to the top of the level
2023-05-02 10:48:09 +01:00
Rowland Rowland
df11877377
Added textures to grey blocks
...
Texture grey blocks with Blue_rocks material. Don't know if this will be permanent but figured it'd be good to do in case they never get addressed.
2023-05-02 10:43:12 +01:00
Rowland Rowland
372acb7302
Changed enemy health
...
Lowered enemy health pool to increase pace of combat
2023-05-02 10:25:01 +01:00
Rowland Rowland
6217026ee1
Moved sign onto wall
...
Moved shop sign onto wall as opposed to having it float midair
2023-05-02 10:14:34 +01:00
f7ab9a2cfb
Reorganised Build Level for Easy Searchability
2023-04-30 21:25:10 +01:00
393eea2250
Updated Map to Remove Rope on Model as Impossible to Align
...
Rope is curved
2023-04-30 20:11:16 +01:00
MarcelHara
c5990be70c
Updated MainMenu buttons to be more spaced out
...
Built lighting and updated mainmenu to be more spaced out
2023-04-30 15:18:58 +01:00
MarcelHara
fab7a72b84
Updated MainMenu Scene to have a background
...
Added new assets to the mainmenu to make it look better behind the book
2023-04-30 15:14:59 +01:00
MarcelHara
2a35dc1ea1
Fixed Merge issues to dev
2023-04-30 13:14:32 +01:00
MarcelHara
bef17b7f04
Merge branch 'volumetric-fog' into dev
...
# Conflicts:
# Content/Blueprints/Combat_UI/CombatCharacter.uasset
# Content/Levels/Build.umap
2023-04-30 13:06:51 +01:00
MarcelHara
06b9586fd3
Duplicated Build for merge
2023-04-30 13:04:19 +01:00
dcab1c483f
Updated Quest Text for Consistentcy
2023-04-28 05:44:07 +01:00
cf433291a9
Bugfix Larger Health Values Break Health UI
2023-04-28 04:47:34 +01:00
38ffd4f339
Bugfix Force Look Pitch Not Correctly Set
2023-04-28 03:59:03 +01:00
9ecbd9c52d
Updated GoatAI to Trigger Attack Animations
2023-04-28 03:40:41 +01:00
744b24c8c1
Bugfix Cell Shading
...
Disabled on some objects
2023-04-28 02:40:46 +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
Phoebe Harris-Wilson
e666ed28fb
Rope and talisman and textures
2023-04-27 18:00:30 +01:00
MARCEL HARA
b0615eafdd
Added Volumetric fog and fine tuned
2023-04-27 17:19:16 +01:00
MARCEL HARA
dd1ab03357
Changed UI to 2D to make it look 3D on the book
2023-04-27 17:18:46 +01:00
Kacper Szelest
f8e130f727
Fixed quest system
...
I fixed the quest system and made it interactable
2023-04-27 16:47:26 +01:00
Kacper Szelest
f990cd20c9
Added quest giver mesh
...
Added the quest giver mesh into the world space so you can recieve quests from her
2023-04-27 16:40:55 +01:00
Kacper Szelest
e2dd3cfd9c
Added quest giver
...
I added the quest giver into the game so we can have quests
2023-04-27 16:25:12 +01:00
Kacper Szelest
6c3e358460
Updated tunnels
...
I added the improved tunnels which werent in already
2023-04-27 16:21:21 +01:00
MarcelHara
3b725f53bb
Started to work on main menu
2023-04-27 12:31:32 +01:00
MarcelHara
1a039023ed
Updated SmokeParticles to breaking walls
2023-04-27 11:57:03 +01:00
11c905613a
Updated Combat to Include Red Vignette on Damage Taken
2023-04-27 06:59:52 +01:00
9fd372ed9d
Updated Combat to Include Camera Shake on Shoot & Wall Break
2023-04-27 05:13:41 +01:00
MH261677
be31b90112
Updated Gun FX to making smoke more realistic and emission change
...
Updated the color and the way the smoke moves to look more realistic and made the emission a lot lower to prevent smoke from lighting up the whole scene
2023-04-26 12:55:38 +01:00
MH261677
a770fc47f1
Started working on sparks for gun
2023-04-24 18:43:22 +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
3e34ab4c5c
Bugfix Bridge Massive Gap
2023-04-24 12:18:04 +01:00
94f45d99c3
Added Combat UI Asset for World Space
2023-04-21 02:57:18 +01:00
793e096ed5
Merge remote-tracking branch 'origin/tutorial-functionality' into Book-UI
...
# Conflicts:
# Content/Levels/Build.umap
2023-04-20 22:30:57 +01:00
Kacper Szelest
e3c83ba4ff
Added collisions to assets
...
I added collisions to assets
2023-04-20 16:07:17 +01:00
KACPER Szelest
9db6138385
Added river to level
...
I added a little river to our level
2023-04-19 22:39:51 +01:00
KACPER Szelest
9c5f607b83
Updated cave level 1 objects with temp textures
...
I added temporary textures to the assets to have a decent looking level
2023-04-19 22:25:44 +01:00
EMILY TAYLOR
7150d69759
Added Tutorial Assets in engine
2023-04-17 18:07:22 +01:00
MARCEL HARA
2f74de4889
Updated IntroText to add close button
2023-04-17 17:34:26 +01:00
MARCEL HARA
c412e8c163
Added TutorialText to game
...
added a ui and made it appear at the start of the game
2023-04-17 17:33:40 +01:00
6003b61098
Merge remote-tracking branch 'origin/lighting-updates' into dev
2023-04-17 15:03:27 +01:00
Rowland Rowland
fb79fc9bdf
Forgot to save the last change appropriatley
2023-03-30 17:01:18 +01:00
Rowland Rowland
574bd4a33d
Added additonal lighting in front of the Merchant's cave
...
The player should now be guided towards the merchant once they enter the cavern
2023-03-30 17:00:22 +01:00
Rowland Rowland
3be617e9df
Merge branch 'dev' into Combat-Testing
2023-03-30 16:43:42 +01:00
Rowland Rowland
e4187fad25
Removed remnants of hub
2023-03-30 16:37:05 +01:00
Rowland Rowland
01d90fcb3b
Updated Merchant position and removed an enemy
2023-03-30 16:03:40 +01:00
MARCEL HARA
fd64b18f61
Updated LOD to all crystals
2023-03-29 17:16:50 +01:00
MARCEL HARA
00677164b3
Updated all lighting to whole scene
...
Changed the lighting and crystal placements in the starter place and the hub world
2023-03-29 17:03:00 +01:00
8407c02042
Updated Build Map for Light Build
2023-03-28 05:08:52 +01:00
2c9de7ee58
Bugfix Invisible Plane When Entering Large Room Block
2023-03-28 05:01:07 +01:00
e8c29d8004
Updated Build Map to Include Rope Bridge & More Direction
2023-03-28 04:53:13 +01:00
1b4a2673e3
Updated Combat UI for New Conventions (WIP)
2023-03-28 04:36:27 +01:00
e28da9ab26
Added Lights In Shop
2023-03-28 03:16:39 +01:00
24d0f2b334
Added Wooden Sign to Direct Players
2023-03-28 03:11:41 +01:00
Blue Probert
470c78421b
Added level for enemy testing aswell as made reaction speed public.
2023-03-23 17:50:13 +00:00
Marcel Hara
0779e31c75
Updated Positions of Items to Merchant Shop
...
Fixed the origin of the items and properly positioned and scaled items to make the merchant shop work fully
2023-03-16 17:18:01 +00:00
Marcel Hara
6f9f95ab9d
Attempted fix widget to merchant system
2023-03-14 13:04:33 +00:00
363623a315
Updated Build Map for Goat Tweaks
2023-03-14 05:05:20 +00:00
acbbed522b
Cooked New Materials for Build
2023-03-14 04:47:53 +00:00
7d078cbb4c
Added Sprint using Left Shift
2023-03-14 04:40:13 +00:00
7585520586
Added Death Screen
2023-03-14 04:17:29 +00:00
c5409fcaa7
Removed Merchant Soft Lock for Build
...
Merchant SEVERELY BUGGY FUNCTIONALITY HAS BEEN DISABLED
2023-03-14 04:01:09 +00:00
5b6461224a
Updated Build Map for Organisation of Objects
2023-03-14 00:44:57 +00:00
a12aedde9d
Added Breathing Effect on Breakable Walls
2023-03-13 23:59:40 +00:00
78382d7b97
Updated Build Level to Re-Add Science Buildings
2023-03-13 23:18:43 +00:00
b7a5d974ac
Updated Build Map to Stop Goats from Colliding
2023-03-13 22:17:44 +00:00
Rowland Rowland
23985317a2
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
2023-03-13 17:23:18 +00:00
Rowland Rowland
0b9c01189e
Working on Lighting
...
Removed current point lights will replace and decorate envrionment
2023-03-13 17:22:15 +00:00
f82e8a892e
Merge pull request #13 from Games-Academy-Student-Work-22-23/Extra-ammoTypes
...
Extra ammo types
2023-03-13 17:11:33 +00:00
Rowland Rowland
b7924578be
Updated NavMesh
...
Removed all but 1 NavMesh. Single NavMesh now covers entire level
2023-03-13 17:02:22 +00:00
Marcel Hara
7e8ded362a
Added All Item ammo types
...
Added every item ammo type to the game
2023-03-13 17:00:08 +00:00
Kacper Szelest
141ee97312
implemented crystals
...
I implemented the crystals into the game tutorial after they were removed due to merge conflicts
2023-03-13 16:16:50 +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
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
