MarcelHara
06f424883b
Created and Imported new UI assets for merchant
2023-05-09 00:00:30 +01:00
38591bfcac
Merge branch 'dev' into Boss-Combat
2023-05-08 23:48:56 +01:00
b32e3c21d9
Applied New Gun Model to Combat Character
2023-05-08 23:40:44 +01:00
a17a80cf13
Applied Pendant Texture
2023-05-08 22:44:19 +01:00
44f7ca13b5
Updated Boss AI for New Skeleton Mesh
2023-05-08 22:42:02 +01:00
32f4e4974b
Added Boss Animation Blueprint Ready For Triggers with Tree
2023-05-08 22:20:00 +01:00
4820351159
Added Additional Combat Animation
2023-05-08 22:15:43 +01:00
4b2be1a956
Added Boss Character Animations
2023-05-08 22:00:29 +01:00
e0130ffff5
Merged Boss Character Static Meshes for Animation
2023-05-08 21:59:40 +01:00
fd7c35e2ac
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
2023-05-08 20:02:39 +01:00
81680a2f72
Merge pull request #33 from Games-Academy-Student-Work-22-23/mainmenu-qol
...
Mainmenu qol
2023-05-08 20:01:15 +01:00
cfaa192304
Merge branch 'houes-modles' into dev
2023-05-08 20:00:47 +01:00
Alicia
6121262a97
Reimported the pendant
2023-05-07 21:24:10 +01:00
006ef56692
Merge branch 'houes-modles' into dev
2023-05-07 19:39:07 +01:00
MarcelHara
14e5549e88
Added Shadow text to display by default
2023-05-07 15:53:52 +01:00
MarcelHara
86a969c9de
Replaced TempDrowpDown to MainMenu with new ones
2023-05-07 14:52:29 +01:00
Alicia
06a9295430
Added pendant object
2023-05-04 18:59:46 +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
MARCEL HARA
b2c81bf9eb
Added Shadow settings and QOL Fixes
2023-05-04 17:57:25 +01:00
Phoebe Harris-Wilson
8a7dc816ca
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
...
# Conflicts:
# Content/Levels/Build.umap
2023-05-04 17:48:46 +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
MARCEL HARA
d69809a64e
Added Resolution settings functionality
2023-05-04 17:22:01 +01:00
MARCEL HARA
49496861a0
Updated Buttons to be dropdown buttons
2023-05-04 16:29:14 +01:00
EMILY TAYLOR
c542a23f0e
Added Statue and Boss Character
...
Created and put in content drawer:
- Statue mesh and material
- Boss Character mesh and material
2023-05-04 16:13:51 +01:00
MarcelHara
098aa0bb74
Gave buttons functionality
...
Play and quit works and gave settings placeholders
2023-05-04 13:56:42 +01:00
MarcelHara
a82d277a26
Updated GunEffect to fix sparks not feeling realistic
2023-05-04 13:41:18 +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
9bb98b314b
Updated Dialogue for Optimisations and Abstraction
2023-05-04 01:42:54 +01:00
Rowland Rowland
cb1fcf7258
Added additional skeleton
...
Added a skeleton pointing towards side area
2023-05-02 11:47:19 +01:00
d237e6c8de
Replaced Ripped Paper Image to Remove Padding
2023-05-02 11:23:35 +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
d1f959a9dc
Updated Quest & Dialogue to Add Quests from Dialogue
2023-05-02 07:16:40 +01:00
e3027fcd24
Updated Quest System for Functionality
2023-05-02 05:42:48 +01:00
MarcelHara
9295fa2fbc
Imported Play,Quit,Settings icon and applied to mainmenu
2023-05-01 23:22:26 +01:00
25e9a4f4fc
Updated Dialogue UI for Style Consistency
2023-05-01 05:22:56 +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
172686eebd
Updated CrystalMaterial for mainmenu crystals
2023-04-30 15:15:39 +01:00
MarcelHara
be4625da17
Imported megascans for textures and nature assets for mainmenu
2023-04-30 15:15:27 +01:00
MarcelHara
cc8f605bfa
Material changes to mainmenu assets
2023-04-30 15:15:11 +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
99f88bb31c
Bugfix Combat Initialisation Calculation Failure on Tutorial
2023-04-28 05:33:08 +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
825e2a7631
Added Movement Animation to Goats
2023-04-28 02:40:18 +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
003edc4e0a
Reimported Goat Walking Animation & Imported Merchant Animation
2023-04-28 00:37:06 +01:00
Phoebe Harris-Wilson
e666ed28fb
Rope and talisman and textures
2023-04-27 18:00:30 +01:00
Rowland Rowland
c61d8ed9e3
Merge branch 'dev' into Collisions
...
# Conflicts:
# Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_004.uasset
# Content/Levels/Build.umap
2023-04-27 17:51:21 +01:00
Rowland Rowland
6865b506b8
Added quest giver
...
Quest giver is now placed to the side of the cave entrance
2023-04-27 17:35:46 +01:00
Rowland Rowland
b4a8af9d43
Added platform for quest giver
...
Copied temporary platform at rope bridge and placed one next to it for the guest giver
2023-04-27 17:28:49 +01:00
Rowland Rowland
4579c73929
Fixed collision issues
...
Had an issue on Monday, seems to be fixed and pushed now
2023-04-27 17:20:07 +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
1d076b851b
Implemented the quest system
...
I implemented the quest system into the game
2023-04-27 16:42:40 +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
Kacper Szelest
97d0cb2505
Created collisions for level
...
Added collisions for certain objects which didnt have any
2023-04-27 16:15:31 +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
4f8f2b37d1
Updated Combat to Hide Book in Non-Combat
2023-04-27 07:19:19 +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
19fcc0c063
Updated Combat to Include Enemy UI
2023-04-27 04:24:54 +01:00
2df31aa719
Bugfix Camera Clipping and Render Depth On Book & Gun
2023-04-27 03:47:24 +01:00
383a85449e
Merge branch 'Combat' into dev
2023-04-26 13:20:48 +01:00
MH261677
a845c079a4
Merge branch 'fx-creation' into dev
...
# Conflicts:
# Content/Blueprints/Combat_UI/__RealTime/CombatCharacterRT.uasset
2023-04-26 13:09:58 +01:00
MH261677
873671db64
Updated BreakAsset to add FX
2023-04-26 13:04:05 +01:00
MH261677
8d20b563e7
Updated Gun FX to make smoke smaller
2023-04-26 12:59:44 +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
a90fccd72e
Updated Gun Effects to add smoke and sparks
...
added smoke and spark effects to the gun upon firing
2023-04-26 12:12:50 +01:00
MH261677
70b8c41c99
Imported Smoke Texture and created smoke mat
2023-04-26 12:12:30 +01:00
4f336263fb
Bugfix Enemy Always Started First
2023-04-26 06:21:08 +01:00
37268a3dc2
Bugfix Unable to Escape in Some Situations
2023-04-26 05:51:07 +01:00
5634557af2
Bugfix Game End on Player Death & Lock Combat on Tutorial
2023-04-26 05:28:02 +01:00
b1bdcb7618
Merge remote-tracking branch 'origin/Tutorial' into Combat
...
# Conflicts:
# Content/Blueprints/Combat_UI/CombatTutorial.uasset
2023-04-26 04:18:42 +01:00
32f20c12c3
Updated Combat to Include Damage Stacking
2023-04-26 03:52:22 +01:00
15d2734c52
Bugfix Pointer Retaining Position After Combat Has Ended
2023-04-26 03:51:17 +01:00
0c13de4668
Bugfix BindAction Consuming Left Mouse Input
2023-04-26 03:22:13 +01:00
f7c4fdac3f
Updated Combat to Include a Reload Effect
2023-04-26 02:10:01 +01:00
fde1537dc0
Merge branch 'Book-UI' into dev
2023-04-25 04:31:26 +01:00
cf2a198c3e
Updated BookUI to Display Turn State and Escape Percentage
2023-04-25 04:23:51 +01:00
32e65e3f47
Updated BookUI for Cast & Clear Buttons
2023-04-25 03:46:52 +01:00
d0eaf37de7
Updated BookUI for Icon Positioning
2023-04-25 01:13:04 +01:00
e7121dbb49
Updated BookUI to Include Escape Button & Percent
2023-04-25 01:08:26 +01:00
eb43c252af
Updated BookUI to Include Element Icons
2023-04-25 01:07:35 +01:00
MH261677
a770fc47f1
Started working on sparks for gun
2023-04-24 18:43:22 +01:00
18ceedfa03
Updated Character to Convert Screen Space to World for Interaction
2023-04-24 18:01:51 +01:00
Kacper Szelest
0384c4977d
Changed location of text int tutorial
...
I changed the lovation of the text in the tutorial to fit the page better.
2023-04-24 16:08:45 +01:00
EMILY TAYLOR
795732d147
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
2023-04-24 16:07:45 +01:00
Kacper Szelest
00a22d1c39
Changed tutorial text
...
I shortened the text on the tutorial to condense it and not dump the player with text.
2023-04-24 16:07:09 +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
George Taylor
e97ee6a9c7
Imported new beams into unreal
...
I updated the beams asset too have smoother edges
2023-04-24 15:54:24 +01:00
3e34ab4c5c
Bugfix Bridge Massive Gap
2023-04-24 12:18:04 +01:00
ba35cfd06e
Bound Health Percent UI to Get Combat Character Health
2023-04-24 12:08:59 +01:00
fa3a811553
Added Tutorial Widget with Functionality
2023-04-24 11:54:28 +01:00
233125cc81
Merge branch 'Animations' into dev
2023-04-21 15:36:29 +01:00
8342865f74
Added Delay On Escape From Combat
2023-04-21 15:32:41 +01:00
39113cad58
Added Animation Blueprint for Goat Walking
2023-04-21 14:59:22 +01:00
2987ac3bb1
Merge remote-tracking branch 'origin/Animations' into dev
2023-04-21 14:46:12 +01:00
bc94d3aeae
Updated Intro Text for Cosmetic Changes
2023-04-21 14:41:06 +01:00
b5d451d948
Updated BookUI for Small Cosmetic Changes
2023-04-21 14:35:36 +01:00
7c39553dd2
Updated Book UI to Display Only Valid Combos
2023-04-21 04:26:09 +01:00
11a58bb836
Added 1st and 2nd Element UI Book Elements
2023-04-21 04:16:46 +01:00
02e1ec436c
Updated TurnBasedCombat to Use New Book UI
2023-04-21 03:44:01 +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
19ebf111a3
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
2023-04-20 16:46:39 +01:00
Kacper Szelest
b50e9dc161
Added UI elements and collisions
...
I added ui elements and collisions
2023-04-20 16:46:27 +01:00
George Taylor
5e28b7e6e2
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
2023-04-20 16:30:24 +01:00
George Taylor
66c26efeef
Improved Rock Texture in Unreal
...
changed the bitmaps and graph for the rock texture
2023-04-20 16:29:56 +01:00
Kacper Szelest
8102db3bc7
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
2023-04-20 16:07:35 +01:00
Kacper Szelest
e3c83ba4ff
Added collisions to assets
...
I added collisions to assets
2023-04-20 16:07:17 +01:00
George Taylor
2ec38c4c60
Imported the improved environment assets
...
i imported the level environment too the unreal build
2023-04-20 15:53:07 +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
6c59905e9b
Created Water marterial
...
I created a water material to use for a little river we have in the level
2023-04-19 22:39:32 +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
KACPER Szelest
b88cc9dfe8
Added Temporary texture
...
I added a temporary texture to use for the level for testing purposes
2023-04-19 21:31:32 +01:00
KACPER Szelest
0616e21fbc
Added temporary level assets
2023-04-19 21:30:10 +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
985fdfa3af
Updated Goat Textures
2023-04-17 17:21:45 +01:00
George Taylor
6455ce96a8
Fixed the Wood and Rock Textures
...
Imported the bitmaps as targas and fixed the wood and rock textures so they can be used in the build
2023-04-17 16:53:47 +01:00
dc7e00b5f3
Imported Goat Attack and Walking Animations
2023-04-17 16:53:01 +01:00
fa4857447c
Merge branch 'UI_implementation' into dev
2023-04-17 15:03:56 +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
