Commit Graph

805 Commits

Author SHA1 Message Date
Rafal Swierczek
9dc764405f Seperated Dining Room Assets in Prep for Merge 2024-05-04 12:18:47 +01:00
MADELINE SPRUCE
e9d79fe1a5 Merge branch 'Environment-Appartment' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-23-24/Endless-Vendetta into Environment-Appartment 2024-05-03 14:38:38 +01:00
MADELINE SPRUCE
ea79391573 Added Assault Rifle and Textures 2024-05-03 14:38:08 +01:00
JAMES WARD
02ac056bd6 UI assets misc things
ALL UI ASSETS. robot characters, some more decals
2024-05-03 12:25:25 +01:00
MADELINE SPRUCE
0ee0887fe6 Added dinnig room textures to scene 2024-04-26 11:23:09 +01:00
MADELINE SPRUCE
2ffd595f4b Added Assault Riffle Low Poly 2024-04-26 10:06:43 +01:00
MADELINE SPRUCE
4f1ff8feff Dinning Room
Added dinning room assets no textures yet
2024-04-19 11:51:07 +01:00
JAMES WARD
8f1aef6899 James' concepts
GUNS, POSTERS, DECALS, PROPS, ENVIRONMENT
2024-04-15 13:57:08 +01:00
REBECCA WYNN
c423bca568 adjusted glass
No longer completely see through
2024-04-08 12:44:18 +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
LOUIS HORNE
8d4b5008f1 Added Lift Chasis, Updated door textures 2024-03-21 19:45:30 +00:00
LOUIS HORNE
53bb7a1338 Added lamposts to blockout 2024-03-18 12:33:20 +00:00
LOUIS HORNE
56a3df2f2e Blockout first pass through 2024-03-15 11:43:45 +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
LOUIS HORNE
39c7a2d896 Merge remote-tracking branch 'origin/Environment-Appartment' into Level-Design 2024-03-15 10:32:16 +00:00
LOUIS HORNE
9c593b6eec Blockout Start 2024-03-15 10:32:02 +00:00
REBECCA WYNN
5728bd8974 added BO to content folder
blockout from screenshots in disc
2024-03-15 10:31:08 +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
KACPER Szelest
ca64611295 Added security office door 2024-03-15 00:18:52 +00:00
KACPER Szelest
54a8096840 Added floor and floor texture 2024-03-15 00:18:38 +00:00
Rafal Swierczek
0df612d883 Added Fountain Area 2024-03-13 16:11:09 +00:00
Rafal Swierczek
4414b6754f Added landscape for blockout 2024-03-13 15:53:19 +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
MH261677
c7d5427f0e Merge branch 'weapon-tweaks-and-fixes' into dev 2024-03-02 23:16:00 +00:00
MH261677
54f4e9afa6 Added more log checks for Shotguns 2024-03-02 23:08:02 +00:00
MH261677
82c87ed7a5 Adjusted Firerate for Shotguns 2024-03-02 22:52:19 +00:00
MH261677
4587dfdea5 Fixed weapons messing up when interacting while reloading 2024-03-02 22:52:09 +00:00
MH261677
adc07b3849 Changed Reload times for Assault and Pistols 2024-03-02 22:51:54 +00:00
315b0b11a1 Update Engine Config to Increase Streaming Pool Size 2024-03-01 17:31:56 +00:00
02520654df Update Gun Particle Effects to Reduce Lifetime and Spawn Cone 2024-03-01 17:17:20 +00:00
02f572b857 Revert Editor Start-up Map back to Main Menu 2024-03-01 13:36:06 +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
16752fb2ce Update Character to Decrease Health Amount 2024-02-29 12:39:33 +00:00
43155be2e6 Update Gun to Play Sound SFX at Location 2024-02-29 12:36:53 +00:00
97d2b53c15 Bugfix Attack Line Trace Unable to Reach Player 2024-02-29 12:36:19 +00:00
07671f3c2a Update Character for Damage Vignette 2024-02-29 11:57:53 +00:00
Rafal Swierczek
cf62d48c55 Setup Apartment Level with New AI 2024-02-29 11:57:37 +00:00
Rafal Swierczek
36bf47ed8b Setup Money Problems Enemies 2024-02-29 11:47:25 +00:00
Rafal Swierczek
ce7d25f21d Merge remote-tracking branch 'origin/AI' into Green-Light/Rafals-Branch 2024-02-29 10:39:12 +00:00