Commit Graph

672 Commits

Author SHA1 Message Date
Louis Horne
a2d25a40e2 Placed Chris's assets in level 2024-02-29 01:16:07 +00:00
CHRIS FARRER
38be2b7676 Added Kitchen Models
Added Kitchen Oven Island Pot and Pan with textures
2024-02-28 16:19:45 +00:00
KRISTIAN CHARNLEY-PARR
48cf609d31 Sand_pistol
Sand and pistol added to asset folder
2024-02-28 13:29:22 +00:00
Louis Horne
044a40e570 Jhon 2024-02-28 01:48:00 +00:00
Louis Horne
270e384ae7 Added Plants 2024-02-28 01:29:06 +00:00
Louis Horne
6f959b32e4 Merge remote-tracking branch 'origin/fish' into Environment-Appartment 2024-02-28 00:20:05 +00:00
REBECCA WYNN
a2790b76a1 added fish and plant movement in fish tank
placeholder texture on plants
2024-02-27 13:34:54 +00:00
REBECCA WYNN
ea8f604d0f added fish tank and bubbles
implimented into unreal.
2024-02-27 11:50:09 +00:00
LEO LANE
8026cfeb1e Fish added to folder
mmm png fish
2024-02-27 11:10:00 +00:00
247f31448e Merge pull request #10 from Games-Academy-Student-Work-23-24/dev
Dev
2024-02-23 09:21:33 +00:00
Rafal Swierczek
6fc0a508cf Build Error Fixes for Malformed Tags 2024-02-23 08:48:19 +00:00
Rafal Swierczek
739bc786c3 Added Showcase Open World Level 2024-02-23 07:49:51 +00:00
Rafal Swierczek
f0f472bf86 Updated Game Intro Text 2024-02-23 07:35:41 +00:00
Rafal Swierczek
2fc54e009d Bugfix Corrupted Pause Menu Background Asset 2024-02-23 07:31:06 +00:00
Rafal Swierczek
b71d597d00 Merge remote-tracking branch 'origin/Environment-Appartment' into dev
# Conflicts:
#	EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence1.uasset
#	EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence2.uasset
#	EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence3.uasset
#	EndlessVendetta/Content/BountySystem/Waypoint/MainBountyIcon.uasset
#	EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset
#	EndlessVendetta/Content/MainMenu/Music/Menu_maybe_1.uasset
#	EndlessVendetta/Content/MainMenu/Music/Menu_maybe_2.uasset
#	EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset
#	EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset
#	EndlessVendetta/Content/Ships/LZ_HomeHubIcon.uasset
#	EndlessVendetta/Content/Ships/LandingZoneIcon.uasset
2024-02-23 07:10:46 +00:00
Rafal Swierczek
8be741b67d Merge branch 'Open-World-Reworked' into dev
# Conflicts:
#	EndlessVendetta/Content/BountySystem/Waypoint/MainBountyIcon.uasset
#	EndlessVendetta/EndlessVendetta.uproject
2024-02-23 07:09:35 +00:00
Rafal Swierczek
0012488f1d Merge branch 'PauseMenuTabs' into dev
# Conflicts:
#	EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
#	EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence1.uasset
#	EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence2.uasset
#	EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence3.uasset
#	EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
2024-02-23 07:04:45 +00:00
69a98173ba Merge branch 'AI' into dev
# Conflicts:
#	EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
#	EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset
#	EndlessVendetta/EndlessVendetta.sln.DotSettings.user
2024-02-23 06:55:40 +00:00
a174d87d02 Merge branch 'dev' into Sound-and-music
# Conflicts:
#	EndlessVendetta/Content/Levels/ControlTutorialLevel.umap
#	EndlessVendetta/Content/Ships/BP_SpaceShip.uasset
#	EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
2024-02-23 06:50:22 +00:00
350a1d3b65 Update AI for Segregated Player Position Knowledge 2024-02-23 06:45:09 +00:00
MH261677
220f9ef159 Created Show and Hide Widget Functions 2024-02-23 05:54:49 +00:00
MH261677
d408958096 Added Empty Functions to prep for future 2024-02-23 05:54:48 +00:00
MH261677
70cc5bc96f Added WBP To show Need to Reload Text and Hide Reload 2024-02-23 05:54:48 +00:00
ca473033ae Add Sci-fi Icons Asset Pack 2024-02-23 05:53:43 +00:00
MH261677
9a66e91309 Fixed Sniper display information following player 2024-02-23 05:53:42 +00:00
MH261677
9388cae4c4 Fixed sniper not showing information display 2024-02-23 05:53:41 +00:00
MH261677
cee46afead Fixed Primary Weapon not replacing when picking up new primary bug 2024-02-23 05:53:41 +00:00
0383b5ff02 Add Oasis Asset Pack 2024-02-23 05:53:39 +00:00
5e50fd1f6f Update Dialogue to Skip Typewriter Effect 2024-02-23 05:53:15 +00:00
59a51239ee Update Dialogue to be Able to Click to Progress 2024-02-23 05:53:14 +00:00
ccade9dfa1 Bugfix Game Mode Not Correctly Being Set On Dialogue End 2024-02-23 05:53:14 +00:00
Rafal Swierczek
d1b1826f12 Updated all Current Checkpoint Tips 2024-02-23 05:50:59 +00:00
MH261677
aec345028d Created Show and Hide Widget Functions 2024-02-23 05:50:26 +00:00
MH261677
841c68ca7e Added Empty Functions to prep for future 2024-02-23 05:50:26 +00:00
MH261677
f0e1dfeac8 Added WBP To show Need to Reload Text and Hide Reload 2024-02-23 05:50:25 +00:00
6a26ae70b5 Bugfix Telemetry Sending Invalid UUIDs 2024-02-23 05:29:36 +00:00
Rafal Swierczek
ae3f2f4495 Added Pause Menu Side Bounty Tab for No Remaining Side Bounties 2024-02-23 05:27:10 +00:00
Rafal Swierczek
d46bc7e45f Reworked and Reimplemented Checkpoint Tips 2024-02-23 05:11:17 +00:00
Rafal Swierczek
9a2a365528 Added Side Bounties to Save System 2024-02-22 23:28:08 +00:00
KACPER Szelest
3a7c75e6d1 Added Landscape Environments 2024-02-22 21:14:23 +00:00
Rafal Swierczek
c166aa1cdb Bugfix Side Bounties Stayed in Pause Menu after Completion 2024-02-22 16:18:08 +00:00
Rafal Swierczek
b6fb2da0ca Added New Bounty Tab for Game Over State 2024-02-22 16:07:03 +00:00
Rafal Swierczek
20c331e8a3 Implemented Receiving Bounty Awards for Completing Bounties 2024-02-22 13:52:20 +00:00
MH261677
75c934e715 Replaced all doors in apartment to openable doors 2024-02-21 15:56:11 +00:00
MH261677
794c9b872c Created doormesh copy to change origin point 2024-02-21 15:56:02 +00:00
LOUIS HORNE
449b7a7482 AddedToilet Roll 2024-02-21 11:01:19 +00:00
LOUIS HORNE
603a59bc5f Added bins fixed hole in wall piece 2024-02-21 10:22:33 +00:00
LOUIS HORNE
5bb865aff0 Added fridge and changed some placement of assets 2024-02-21 09:38:28 +00:00
Rafal Swierczek
1cdaea777e WIP Completing Side Bounties and Receiving Rewards 2024-02-18 19:51:49 +00:00
Rafal Swierczek
6a8e5a98c2 Added Wave Survival Side Bounty Stand In 2024-02-17 16:44:01 +00:00