|
|
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 |
|
MH261677
|
794c9b872c
|
Created doormesh copy to change origin point
|
2024-02-21 15:56:02 +00:00 |
|
LOUIS HORNE
|
9119fb0471
|
Megabuilding apt wip
|
2024-02-21 14:36:35 +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 |
|
|
|
a7d57e34a9
|
Add SFX Montages for Pistol w/ Silenced Option
|
2024-02-16 18:16:50 +00:00 |
|
|
|
bf46adfb47
|
Add Niagara VFX Assets for Shooting
|
2024-02-16 15:14:57 +00:00 |
|
|
|
9ea72a861f
|
Add Sci-fi Icons Asset Pack
|
2024-02-16 15:14:47 +00:00 |
|
Louis Horne
|
f2d01f159b
|
Added Roof to the appartnment hit
|
2024-02-11 19:02:35 +00:00 |
|
KACPER Szelest
|
04dc798053
|
Added Water material
|
2024-02-11 15:10:47 +00:00 |
|
KACPER Szelest
|
45447db225
|
Added New reworked open level and landscape
|
2024-02-11 13:46:03 +00:00 |
|
KACPER Szelest
|
6aabb4b7b6
|
Added temp new player landscape
|
2024-02-11 00:55:47 +00:00 |
|
LOUIS HORNE
|
fdc3898bb0
|
Added window01
|
2024-02-09 16:27:44 +00:00 |
|
LOUIS HORNE
|
99f649c6df
|
Updated rug
|
2024-02-07 12:26:42 +00:00 |
|
LOUIS HORNE
|
ded0bf6413
|
Put Together Modular Kit
|
2024-02-07 12:04:15 +00:00 |
|
Louis Horne
|
52964b640f
|
Added more walls
|
2024-02-06 02:40:49 +00:00 |
|
Rafal Swierczek
|
71c79f00bd
|
BugFix Merge Errors With Apartment Level
|
2024-02-02 18:43:10 +00:00 |
|
REBECCA WYNN
|
88a1bb58c7
|
Post Process Volume added. Particles testing. livingroom rearranged
major changes to visuals camera-wise
|
2024-02-02 15:01:15 +00:00 |
|
LOUIS HORNE
|
2b559ff268
|
Added Rugs
|
2024-01-31 12:59:00 +00:00 |
|
REBECCA WYNN
|
fa7bf26c93
|
Added posters w/ textures
not decorated level with them yet
|
2024-01-29 12:03:19 +00:00 |
|
LOUIS HORNE
|
8c4793a617
|
Updated bed textures
|
2024-01-26 20:08:23 +00:00 |
|
LOUIS HORNE
|
5b63d14d88
|
added door frame sttarted replacing walls with modular kit
|
2024-01-26 18:52:17 +00:00 |
|
REBECCA WYNN
|
8de17be88e
|
added all boiler room assets
everything for the boiler room (incl. textures) placed into new scene
|
2024-01-26 14:41:08 +00:00 |
|
LOUIS HORNE
|
a2a8e53df4
|
Added wardrobe and scaled some assets
|
2024-01-25 16:02:16 +00:00 |
|
LOUIS HORNE
|
9f6607d31a
|
Added more Modular Wall Textures
|
2024-01-22 14:28:34 +00:00 |
|
KACPER Szelest
|
ebbc558f3b
|
Added BoomBox
I added the boombox asset into the game files
|
2024-01-21 23:08:23 +00:00 |
|
Rafal Swierczek
|
8d0f5534ce
|
Merge branch 'Tutorial-Enviroment' into dev
# Conflicts:
# EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.uasset
# EndlessVendetta/Content/Levels/TrainingFacility.umap
# EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
# EndlessVendetta/EndlessVendetta.uproject
|
2024-01-14 22:01:42 +00:00 |
|
