127 Commits

Author SHA1 Message Date
LOUIS HORNE
dee776761e Organised files, added appartment building and bin 2024-04-10 10:40:05 +01:00
LOUIS HORNE
77d06533ee placed lamposts 2024-04-10 09:51:13 +01:00
Louis Horne
56499a9d8b Appartment bp 2024-04-08 17:37:17 +01:00
LOUIS HORNE
765422fe04 Added pillar to Parlour 2024-04-08 15:02:37 +01:00
LOUIS HORNE
3b9173303a Lighting pass01 2024-04-08 11:58:37 +01:00
Rafal Swierczek
b17da83843 Merge remote-tracking branch 'origin/Environment-Appartment' into ApartmentCheckpoints
# Conflicts:
#	EndlessVendetta/Content/Levels/Apartment_hit.umap
#	EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
2024-04-01 16:35:12 +01:00
Louis Horne
908cb33262 Merge branch 'LevelDesign' into Environment-Appartment 2024-03-25 23:25:24 +00:00
LOUIS HORNE
af19533994 Updated kitchen floor roughness 2024-03-22 16:41:11 +00:00
LOUIS HORNE
b09c80d468 Added Kitchen Floor first passhtrough 2024-03-22 14:49:04 +00:00
LOUIS HORNE
1f7dda8a9f Updated Elevator 2024-03-22 13:08:07 +00:00
KACPER Szelest
06facabb9d Added vent asset 2024-03-22 11:28:07 +00:00
LOUIS HORNE
8d4b5008f1 Added Lift Chasis, Updated door textures 2024-03-21 19:45:30 +00:00
Rafal Swierczek
7f46336301 Merge branch 'LevelDesign' into Main-Bounty-Update
# Conflicts:
#	EndlessVendetta/Config/DefaultEngine.ini
#	EndlessVendetta/Content/Levels/Apartment_hit.umap
#	EndlessVendetta/Content/Levels/OpenWorldRework.umap
#	EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
2024-03-20 22:35:26 +00:00
LOUIS HORNE
53bb7a1338 Added lamposts to blockout 2024-03-18 12:33:20 +00:00
LOUIS HORNE
f2540ee8d4 Merge branch 'Megabuilding-Test' into level-design-temp
# Conflicts:
#	EndlessVendetta/Content/Levels/NewMiamiOpenWorld.umap
2024-03-15 11:17:05 +00:00
LOUIS HORNE
1b7780b61c Continued Blockout 2024-03-15 11:04:53 +00:00
7ae5c1f349 Update AI for Hit Location Damage, Dynamic Crosshair & Hit Markers 2024-03-15 10:45:11 +00:00
LOUIS HORNE
9c593b6eec Blockout Start 2024-03-15 10:32:02 +00:00
LOUIS HORNE
f54a6646ac Merge branch 'Level-Design' into Environment-Appartment 2024-03-15 09:43:46 +00:00
LOUIS HORNE
fe4f5c4aa7 Merge remote-tracking branch 'origin/Main-bounty-rework' into Environment-Appartment
# Conflicts:
#	EndlessVendetta/Content/Cyberpunk_Gigapack/Materials/Master/MM_Glass_01_Restaurant.uasset
2024-03-15 09:40:49 +00:00
KACPER Szelest
8eb61928a0 Added lighting 2024-03-15 00:19:11 +00:00
KACPER Szelest
860f0bf2e2 Added wall textures 2024-03-15 00:19:01 +00:00
d1124c2e8b Bugfix Impact Actor Not De-Spawning 2024-03-14 17:48:37 +00:00
LOUIS HORNE
34198eb68a Added building update + lampost 2024-03-13 15:30:47 +00:00
REBECCA WYNN
905035219d test blockout
added my building blockouts in a temp scene (becca tests)
2024-03-11 12:04:57 +00:00
LOUIS HORNE
2b968af6a4 Market Blockout - Collision no go
Placed blockout, collision dosen't work
2024-03-08 09:59:52 +00:00
LOUIS HORNE
51cc97aff2 Building01 first pass 2024-03-07 16:08:56 +00:00
c83e3ba022 Merge Latest Changes Excluding Asset Packs 2024-03-01 12:54:16 +00:00
45d86209be Merge remote-tracking branch 'origin/Green-Light/Rafals-Branch' into AI
# Conflicts:
#	EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
2024-02-29 13:03:34 +00:00
43155be2e6 Update Gun to Play Sound SFX at Location 2024-02-29 12:36:53 +00:00
Rafal Swierczek
e891c99fa7 Merge remote-tracking branch 'origin/Open-World-Reworked' into Green-Light/Rafals-Branch
# Conflicts:
#	EndlessVendetta/Content/Audio/Music/Combat_track_1/Combat_start__808s_.uasset
#	EndlessVendetta/Content/Audio/Music/Combat_track_1/Drums.uasset
#	EndlessVendetta/Content/Audio/Music/Combat_track_1/Guitar.uasset
#	EndlessVendetta/Content/Audio/Music/Combat_track_1/Hats_and_clap.uasset
#	EndlessVendetta/Content/Audio/Music/Combat_track_1/Sound_effect.uasset
#	EndlessVendetta/Content/Audio/Music/Combat_track_1/combat_Continuous.uasset
#	EndlessVendetta/Content/Levels/OpenWorldRework.umap
2024-02-29 02:45:30 +00:00
KACPER Szelest
6e36e28889 Landscape changes main bounty area 2024-02-28 22:12:01 +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
Louis Horne
270e384ae7 Added Plants 2024-02-28 01:29:06 +00:00
KACPER Szelest
1b884e2a21 Added roads and polish to landscapes again
Added some roads to highlight areas of use and continued to polish the landscape
2024-02-27 22:12:58 +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
KACPER Szelest
1314a24727 polished landscape and added hill
I polished the current landscape to make the game look better and also added a hill that will contain the mainbounty location
2024-02-26 23:58:20 +00:00
KACPER Szelest
b9f026ced5 Made beach area look nice 2024-02-25 18:46:44 +00:00
KACPER Szelest
5aec5aa985 Fixed up the landscapes
Added up some extra polish to the landscapes to make them seem a little nicer
2024-02-25 17:02:13 +00:00
Rafal Swierczek
5a7bf44f7d Merge branch 'dev' into Open-World-Reworked
# Conflicts:
#	EndlessVendetta/Content/Levels/OpenWorldRework.umap
2024-02-25 09:03:44 +00:00
KACPER Szelest
69293e12dc Added Canyon road landscape
Added a canyon road landscape in order to help add life to the open world
2024-02-24 13:31:05 +00:00
KACPER Szelest
c7bb319014 Added Rocky Landscape
ADded in a rocky landscape in preperation for me to build the final landscape and then decorate it with art assets
2024-02-24 11:55:58 +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
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
ca473033ae Add Sci-fi Icons Asset Pack 2024-02-23 05:53:43 +00:00
KACPER Szelest
3a7c75e6d1 Added Landscape Environments 2024-02-22 21:14:23 +00:00