Louis Horne
|
22855e8f1e
|
Added more Pipes
|
2024-04-20 03:44:32 +01:00 |
|
Louis Horne
|
a31559daf4
|
Added and placed extra pipe part
|
2024-04-19 22:50:28 +01:00 |
|
LOUIS HORNE
|
48889272da
|
Added Road Signs
|
2024-04-19 16:59:38 +01:00 |
|
REBECCA WYNN
|
66652ce0ec
|
adjusted laundrette
optimised floors and changed lighting of parlour
|
2024-04-19 14:53:13 +01:00 |
|
MADELINE SPRUCE
|
4f1ff8feff
|
Dinning Room
Added dinning room assets no textures yet
|
2024-04-19 11:51:07 +01:00 |
|
Rafal Swierczek
|
7574f8b921
|
Implemented Brain Virus AI Functionality
|
2024-04-19 00:27:15 +01:00 |
|
Rafal Swierczek
|
7d1cd80a4b
|
Added Set Dressing to Gadget Training Room
|
2024-04-18 23:22:10 +01:00 |
|
|
|
10938d7b8d
|
Update Combat Audio Automation for Timing Engine & Track Queue
|
2024-04-18 22:06:38 +01:00 |
|
|
|
0b9791086e
|
Update AI, Character to Detect If Being Investigated
|
2024-04-18 21:26:09 +01:00 |
|
|
|
6e056a94f2
|
Update AI, Character to Detect If Player is In Combat
|
2024-04-18 21:12:47 +01:00 |
|
Louis Horne
|
e61925516a
|
Added Fire Hydrant and Bus stop
|
2024-04-18 19:31:18 +01:00 |
|
REBECCA WYNN
|
546f09e343
|
finish laundrette
added and dressed laundrette location. also made arcade carpet and layed floor
|
2024-04-18 18:49:49 +01:00 |
|
Rafal Swierczek
|
488de73a53
|
Created Big Gadget Room without Set Dressing
|
2024-04-18 16:28:20 +01:00 |
|
Rafal Swierczek
|
a2cb74d38e
|
Created Elevator Section with Elevation Functionality
|
2024-04-18 15:04:17 +01:00 |
|
MH261677
|
f28e909448
|
Basic Stealth Layout Finished
|
2024-04-18 13:56:27 +01:00 |
|
Rafal Swierczek
|
eb8799bef1
|
Created Entrance into Gadget Tutorial Area with Set Dressing
|
2024-04-17 22:35:15 +01:00 |
|
REBECCA WYNN
|
ed18c8bdad
|
laundrette blockout
adjusting layout of parlour starting with the laundrette front to the arcade
|
2024-04-17 18:08:44 +01:00 |
|
|
|
c0df68596b
|
Update Enemy AI to Increase Rotation Speed
|
2024-04-17 14:17:31 +01:00 |
|
|
|
e7aa411c09
|
Bugfix Duplicate Foot Step Sounds
|
2024-04-17 14:17:17 +01:00 |
|
Rafal Swierczek
|
805f7e384b
|
Bugfix Inventory not Opening After Unequipping any Gadget
|
2024-04-17 13:19:16 +01:00 |
|
Rafal Swierczek
|
fcd0d4ab20
|
Bugfix Loading Screen not Initializing Properly after Tutorial and Apartment Levels
|
2024-04-17 13:18:40 +01:00 |
|
Rafal Swierczek
|
0443a010b3
|
Merge remote-tracking branch 'origin/Outside-Lighting-Pass' into GadgetTutorialRevamp
|
2024-04-17 12:48:07 +01:00 |
|
Rafal Swierczek
|
24a18e40ba
|
Merge remote-tracking branch 'origin/stealth-area-tutorial' into GadgetTutorialRevamp
|
2024-04-17 12:47:44 +01:00 |
|
|
|
50605f7d8e
|
Merge branch 'Music-System' into dev
|
2024-04-17 02:25:15 +01:00 |
|
LOUIS HORNE
|
e1e5fcf02e
|
Added metal Barrier
|
2024-04-16 17:20:37 +01:00 |
|
MH261677
|
fbae8ab713
|
Created and Started working on stealth area
|
2024-04-16 15:20:15 +01:00 |
|
Rafal Swierczek
|
2e54dff29b
|
Bug Fix Laptop not Initaiting Properly after Death
|
2024-04-16 14:24:59 +01:00 |
|
Rafal Swierczek
|
599a129415
|
Merge remote-tracking branch 'origin/Outside-Lighting-Pass' into ApartmentCheckpoints
|
2024-04-16 13:48:57 +01:00 |
|
LOUIS HORNE
|
969a7498fa
|
Cable Passthrough
|
2024-04-15 18:13:32 +01:00 |
|
LOUIS HORNE
|
6a1180cae4
|
Added Pile of Papers
|
2024-04-15 17:48:40 +01:00 |
|
LOUIS HORNE
|
89589c2014
|
Changed Height of Road and Pavement
|
2024-04-15 17:38:31 +01:00 |
|
LOUIS HORNE
|
07825dfc1e
|
Added Pipe Kit
|
2024-04-15 16:39:34 +01:00 |
|
REBECCA WYNN
|
260b04ab7e
|
added buiding textures and updated models
all in the open world now too
|
2024-04-15 14:34:48 +01:00 |
|
MH261677
|
569e66c442
|
Merge branch 'weapon-info-revamp' into dev
|
2024-04-15 14:15:03 +01:00 |
|
MH261677
|
cfe7b440f3
|
Updated Weapon Stats Pop-up UI
|
2024-04-15 14:12:10 +01:00 |
|
Rafal Swierczek
|
cefafa4f1c
|
Implemented a Fake Loading Screen
|
2024-04-14 22:59:28 +01:00 |
|
Rafal Swierczek
|
97e306a4b3
|
Added Our Credits to Game End
|
2024-04-14 21:15:55 +01:00 |
|
Rafal Swierczek
|
acafc375d2
|
Implemented Entering Apartment Through Vent Functionality
|
2024-04-14 20:01:09 +01:00 |
|
Rafal Swierczek
|
dfe50b6548
|
Added Construction Area Outside Apartment
|
2024-04-14 18:58:45 +01:00 |
|
Rafal Swierczek
|
a9990dd7f2
|
Merge remote-tracking branch 'origin/Outside-Lighting-Pass' into ApartmentCheckpoints
# Conflicts:
# EndlessVendetta/Content/Levels/OpenWorldRework.umap
# EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
|
2024-04-14 17:48:44 +01:00 |
|
Rafal Swierczek
|
21edf5cfdf
|
Imported a Construction Worker Character with Idle Animation
|
2024-04-14 17:46:33 +01:00 |
|
Rafal Swierczek
|
8aec5e374d
|
Updated Placement of Restricted Zone and Some Enemies
|
2024-04-14 14:37:30 +01:00 |
|
Rafal Swierczek
|
091929fdf3
|
Implemented Escape Apartment Sequence Checkpoints
|
2024-04-14 14:07:52 +01:00 |
|
Rafal Swierczek
|
81e330ecf2
|
Implemented Find Key in Random Room Checkpoint
|
2024-04-13 22:22:50 +01:00 |
|
Rafal Swierczek
|
6d7bf7c69a
|
Created Try To Enter Timothys Bedroom Checkpoint
|
2024-04-13 21:46:05 +01:00 |
|
Rafal Swierczek
|
281239a126
|
Implemented Functional Door Keys
|
2024-04-13 21:21:14 +01:00 |
|
Rafal Swierczek
|
a5133c41ef
|
Implemented Locked Door Functionality
|
2024-04-13 15:46:56 +01:00 |
|
Rafal Swierczek
|
ad8b9abbca
|
Implemented Base World Item Functionality
|
2024-04-13 15:46:23 +01:00 |
|
Rafal Swierczek
|
3a3c00418a
|
Implemented Enter Party Checkpoint
|
2024-04-13 12:58:50 +01:00 |
|
Rafal Swierczek
|
636bac7609
|
Made Bouncer and Security Guard Despawn When Player is Caught
|
2024-04-13 12:08:17 +01:00 |
|
LOUIS HORNE
|
3c6274a592
|
Applied Road Texture and sand texture to level
|
2024-04-12 16:18:51 +01:00 |
|
LOUIS HORNE
|
380989c083
|
Placed Assets, added sand
|
2024-04-12 15:35:39 +01:00 |
|
CHRIS FARRER
|
4aa2761a7a
|
Added Barrier and Recycle bin
With textures
|
2024-04-12 14:39:41 +01:00 |
|
LOUIS HORNE
|
f0b5143180
|
Wires
|
2024-04-12 14:07:46 +01:00 |
|
LOUIS HORNE
|
49a01dbc73
|
Added Puddles
|
2024-04-12 12:48:08 +01:00 |
|
LOUIS HORNE
|
53dfd68839
|
Brackets and adjusted signs
|
2024-04-12 12:44:47 +01:00 |
|
LOUIS HORNE
|
3c92eeedbf
|
Neon Signs
|
2024-04-12 12:12:13 +01:00 |
|
|
|
37902328dd
|
Add Base Audio Components & Tracks
|
2024-04-11 23:51:08 +01:00 |
|
Rafal Swierczek
|
1ea0bbb05e
|
Merge remote-tracking branch 'origin/dev' into ApartmentCheckpoints
|
2024-04-11 20:52:24 +01:00 |
|
|
|
e306ecf9a1
|
Update Enemy Character to Stop Setting Alert Level on Sense
|
2024-04-11 20:51:37 +01:00 |
|
Rafal Swierczek
|
5086aa3877
|
Updated Party NPCs to Run Away When Enemies Become Hostile
|
2024-04-11 20:44:11 +01:00 |
|
Rafal Swierczek
|
c65c963cc5
|
Decreased Player Sensitivity
|
2024-04-11 20:43:43 +01:00 |
|
|
|
e56c9d39b7
|
Add Proper Texture Maps for Mars Planet
|
2024-04-11 20:40:49 +01:00 |
|
Rafal Swierczek
|
b64e55a7db
|
Updated Party NPCs to React to Player Equipping their Gun
|
2024-04-11 20:08:03 +01:00 |
|
Rafal Swierczek
|
11a4767a29
|
Merge remote-tracking branch 'origin/dev' into ApartmentCheckpoints
|
2024-04-11 18:29:14 +01:00 |
|
Rafal Swierczek
|
fe77508fb9
|
Bugfix Collisions in Elevator
|
2024-04-11 18:27:04 +01:00 |
|
LOUIS HORNE
|
a18fe13dc9
|
Open World Claustorphobia
Cleaned up open world and added a ton of buildings to make it feel as claustrophobic as possible
|
2024-04-11 16:54:05 +01:00 |
|
LOUIS HORNE
|
b156cdc4ed
|
Added AcUnit04
|
2024-04-11 16:07:06 +01:00 |
|
MH261677
|
7dfa960b76
|
Merge branch 'tutorial-remodell' into dev
|
2024-04-11 15:50:56 +01:00 |
|
MH261677
|
1574acb1da
|
Fixed Lighting and other map issues
|
2024-04-11 15:46:09 +01:00 |
|
MH261677
|
92e3fdcff9
|
Finalized Base Gadget Room
|
2024-04-11 15:33:32 +01:00 |
|
MH261677
|
56e9b46702
|
Created New Lightsources & Polished Gun Range
|
2024-04-11 15:28:04 +01:00 |
|
MH261677
|
484455ae0e
|
Fixed Lighting Issues & Created Gadget Base Area
|
2024-04-11 14:56:05 +01:00 |
|
MH261677
|
8ff0d8cdc6
|
Created all target dummies for weapons and tested
|
2024-04-11 14:36:29 +01:00 |
|
MH261677
|
ab9f392e68
|
Added Weapon Table to new tutorial map
|
2024-04-11 14:20:19 +01:00 |
|
MH261677
|
6d3a89f7a6
|
Fixed Mars Texture, Added Higher poly and created gun range
|
2024-04-11 14:14:53 +01:00 |
|
Rafal Swierczek
|
4ff9305583
|
Bugfix Player Respawn Defaulting to Player Start over Allocated Respawn Location Randomly
|
2024-04-11 14:11:22 +01:00 |
|
Louis Horne
|
27c75352cc
|
Merge remote-tracking branch 'origin/Outside-Lighting-Pass' into dev
|
2024-04-10 17:37:11 +01:00 |
|
Rafal Swierczek
|
6c2b3d7f29
|
Improved Main Menu Cinematic Loop Transition
|
2024-04-10 16:37:47 +01:00 |
|
Rafal Swierczek
|
f19dcf5d32
|
Added Toilet Cinematic Camera
|
2024-04-10 16:24:57 +01:00 |
|
|
|
bb832fedd2
|
Merge branch 'AI-n-Stuff' into dev
|
2024-04-10 16:21:34 +01:00 |
|
Rafal Swierczek
|
12578f134a
|
Added Two Bedroom Cinematic Cameras
|
2024-04-10 15:40:37 +01:00 |
|
|
|
ab7127d52a
|
Update AI to Implement AI Sense Sound Emitting & Response
|
2024-04-10 15:37:11 +01:00 |
|
|
|
0901cc7973
|
Update AI to Be Hostile If Player is Holding a Weapon
|
2024-04-10 15:36:17 +01:00 |
|
LOUIS HORNE
|
a334e6e6ac
|
Fixed Bp's dissapearing when running game
|
2024-04-10 14:09:47 +01:00 |
|
MH261677
|
378f9d3c96
|
Replaced old workbench model with new one and corrected pos
|
2024-04-10 12:37:29 +01:00 |
|
MH261677
|
019caf602e
|
Imported Workbench into engine and setup materials
|
2024-04-10 12:37:16 +01:00 |
|
LOUIS HORNE
|
3e33a857fe
|
added appartment colour wave
|
2024-04-10 11:59:12 +01:00 |
|
Rafal Swierczek
|
01ee27bcb1
|
Added Laundry Room Cinematic Cam
|
2024-04-10 11:36:47 +01:00 |
|
Rafal Swierczek
|
102695b4f5
|
Added Kitchen Cinematic Camera
|
2024-04-10 11:30:07 +01:00 |
|
LOUIS HORNE
|
9fdc724e79
|
UDS Passthrough
|
2024-04-10 11:20:26 +01:00 |
|
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 |
|
MH261677
|
893f4d7fb0
|
Changed stars
|
2024-04-09 17:30:14 +01:00 |
|
MH261677
|
0e9d056356
|
Added more Openable Doors
|
2024-04-09 15:59:54 +01:00 |
|
MH261677
|
f13b243943
|
Added Smoke and particles to vents
|
2024-04-09 15:36:02 +01:00 |
|
MH261677
|
5d70c45482
|
Completed Parkour Room and Started Gun/Gadget Range
|
2024-04-09 15:10:56 +01:00 |
|
Louis Horne
|
56499a9d8b
|
Appartment bp
|
2024-04-08 17:37:17 +01:00 |
|
MH261677
|
4e074f252a
|
Finalized extra stuff
|
2024-04-08 17:04:17 +01:00 |
|
MH261677
|
43d1ae99b2
|
Added Extra Assets for use in level rework
|
2024-04-08 16:46:58 +01:00 |
|
MH261677
|
d61afa5755
|
Finished Mayors Office Re-work/added Mars Planet
|
2024-04-08 16:46:13 +01:00 |
|
LOUIS HORNE
|
071bdc2c35
|
UDS passthrough
|
2024-04-08 15:35:12 +01:00 |
|
MH261677
|
9dece4ef7c
|
Added Moving Spaceship Door
|
2024-04-08 15:33:49 +01:00 |
|
MH261677
|
8201e7a6d1
|
Added Mayor Room and Started adding parkour area
|
2024-04-08 15:32:59 +01:00 |
|
LOUIS HORNE
|
765422fe04
|
Added pillar to Parlour
|
2024-04-08 15:02:37 +01:00 |
|
MH261677
|
602c628d31
|
Created NewTutorialMap with basic level layout
|
2024-04-08 13:11:31 +01:00 |
|
REBECCA WYNN
|
c423bca568
|
adjusted glass
No longer completely see through
|
2024-04-08 12:44:18 +01:00 |
|
LOUIS HORNE
|
3b9173303a
|
Lighting pass01
|
2024-04-08 11:58:37 +01:00 |
|
|
|
8e0caf8d27
|
Bugfix Unable to Walk Backwards
|
2024-04-07 20:54:53 +01:00 |
|
|
|
922ec7dfc9
|
Update Sprint Rotation Speed to Match Camera Rotation
|
2024-04-07 20:54:19 +01:00 |
|
|
|
43c6379183
|
Update Character to Slow Down Breathing Animation
|
2024-04-07 20:12:49 +01:00 |
|
|
|
c2460b7c9c
|
Update Character for Full Shadow
|
2024-04-07 20:12:31 +01:00 |
|
Rafal Swierczek
|
0876053d09
|
Added NPC Cinematic Cameras
|
2024-04-07 13:25:22 +01:00 |
|
Rafal Swierczek
|
cfe381acdd
|
Added Fish Tank Sweep Cinematic Camera
|
2024-04-05 10:56:12 +01:00 |
|
Rafal Swierczek
|
7cb3fcf06e
|
Created and Added Entrance Cinematic Camera
|
2024-04-05 10:22:56 +01:00 |
|
Rafal Swierczek
|
440cbd5347
|
Created and Added Cinematic Hallway Camera
|
2024-04-04 13:22:42 +01:00 |
|
Rafal Swierczek
|
43efdee401
|
Created Cinematic Elevator Camera and Added to Intro Cinematic
|
2024-04-04 12:55:37 +01:00 |
|
Rafal Swierczek
|
cd0fd6d4e8
|
Fixed Elevator Doors Opening on the Wrong Axis
|
2024-04-01 19:20:35 +01:00 |
|
Rafal Swierczek
|
b771fd789e
|
Adjusted Elevator Position
|
2024-04-01 19:15:14 +01:00 |
|
Rafal Swierczek
|
2f1ebe30e7
|
Merged Conflicts in Apartment_Hit level
|
2024-04-01 17:20:39 +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 |
|
Rafal Swierczek
|
52eb557bb7
|
Prepared Apartment_Hit Level for Merging
|
2024-04-01 16:33:59 +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 |
|
|
|
9a2398d2d1
|
Bugfix Dialogue Not Triggering Objective & Cosmetic Changes
|
2024-03-22 14:08:16 +00:00 |
|
LOUIS HORNE
|
1f7dda8a9f
|
Updated Elevator
|
2024-03-22 13:08:07 +00:00 |
|
|
|
3ac9bab40b
|
Bugfix Build Error ALS UI Structs & Tree Editor Only Data
|
2024-03-22 13:01:29 +00:00 |
|
|
|
a7976f6749
|
Update Legacy Weapons for Sound
|
2024-03-22 12:41:41 +00:00 |
|
|
|
1559c61e8e
|
Update Apartment for Placement of Favour System NPC's
|
2024-03-22 12:24:44 +00:00 |
|
|
|
edf05035d0
|
Merge branch 'Main-Bounty-Update' into AI-n-Stuff
# Conflicts:
# EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h
|
2024-03-22 12:19:29 +00:00 |
|
|
|
ffc668ad6d
|
Add Dialogue for Lobby Security & Bouncer
|
2024-03-22 12:15:40 +00:00 |
|
|
|
8c550dfbe9
|
Update Dialogue for Adding Items to Inventory
|
2024-03-22 12:15:15 +00:00 |
|
KACPER Szelest
|
06facabb9d
|
Added vent asset
|
2024-03-22 11:28:07 +00:00 |
|
KACPER Szelest
|
7694a455c9
|
decorated hallway
|
2024-03-22 10:58:58 +00:00 |
|
|
|
aa23ea1223
|
Update Dialogue, Character, Inventory for Dialogue Requirements Check
|
2024-03-22 09:39:18 +00:00 |
|
|
|
a5493b8a2c
|
Add Favour System Characters w/ Animations
|
2024-03-22 06:59:54 +00:00 |
|
|
|
c591fd3f8c
|
Update Character for More Responsive Sprint Rotation
|
2024-03-22 06:23:39 +00:00 |
|
Rafal Swierczek
|
91e74b2b21
|
Created Pachinko Enemies Level Instance
|
2024-03-22 06:19:34 +00:00 |
|
Rafal Swierczek
|
de262655c8
|
Implemented All Remaining Open World Checkpoints
|
2024-03-22 05:47:07 +00:00 |
|
Rafal Swierczek
|
0ffd8453bf
|
Implemented Pachinko Downstairs Checkpoints
|
2024-03-22 03:02:07 +00:00 |
|
Rafal Swierczek
|
29d0963d5b
|
Implemented Going Over the Plan with Greasy Rick Checkpoint
|
2024-03-22 01:01:40 +00:00 |
|
Rafal Swierczek
|
b19446acf6
|
Implemented Workbench Checkpoint
|
2024-03-21 23:03:12 +00:00 |
|
Rafal Swierczek
|
21927b06de
|
Implemented Market Area Thugs and Checkpoint
|
2024-03-21 22:21:57 +00:00 |
|
Rafal Swierczek
|
5ce987aae1
|
Temporarily Skipped Tutorial Functionality
|
2024-03-21 22:07:38 +00:00 |
|
LOUIS HORNE
|
8d4b5008f1
|
Added Lift Chasis, Updated door textures
|
2024-03-21 19:45:30 +00:00 |
|
Rafal Swierczek
|
94b22abef0
|
Implemented Greasy Rick Checkpoints
|
2024-03-21 18:47:40 +00:00 |
|
Rafal Swierczek
|
e47172b790
|
Setup Follow Greasy Rick Functionality
|
2024-03-21 15:38:37 +00:00 |
|
Rafal Swierczek
|
09c18e07fa
|
Imported Temp Greasy Rick Character with End Dialogue Functionality
|
2024-03-21 15:01:21 +00:00 |
|
Rafal Swierczek
|
ba5250e62b
|
Bugfix Wrong Pistol Texture
|
2024-03-21 13:18:34 +00:00 |
|
Rafal Swierczek
|
d5f78c190d
|
Merge remote-tracking branch 'origin/grip-attachment' into Main-Bounty-Update
# Conflicts:
# EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/BP_BasePistolWeapon_Animated.uasset
|
2024-03-21 13:10:27 +00:00 |
|
Rafal Swierczek
|
fa31f957d6
|
Added Areas to Open World Needed for Main Bounty Checkpoints
|
2024-03-21 05:00:26 +00:00 |
|
Rafal Swierczek
|
a219cbdceb
|
Created Functional City Blockout on Mars Landscape
|
2024-03-21 02:57:41 +00:00 |
|
Rafal Swierczek
|
ee6a16193d
|
Re-Imported White Marble for Apartment Corridor
|
2024-03-20 23:13:42 +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 |
|
Rafal Swierczek
|
e298691255
|
Made Duplicate of Apartment Level for Merging
|
2024-03-20 21:53:53 +00:00 |
|
Rafal Swierczek
|
a1854bb2db
|
Added Functional Buttons to Death Screen
|
2024-03-20 16:52:51 +00:00 |
|
MH261677
|
2e6d88a53f
|
Added grip attachment code to baseweaponclass
|
2024-03-20 16:07:59 +00:00 |
|
MH261677
|
df8fccfe57
|
Created tempgrip and added workbench code for new grip attachment
|
2024-03-20 16:07:46 +00:00 |
|
MH261677
|
e2449fe185
|
Created GripAttachment Class and Added Grip Socket to pistol
|
2024-03-20 16:07:22 +00:00 |
|
Rafal Swierczek
|
3bb50d2ea5
|
Created Death Sequence and UI
|
2024-03-20 14:33:02 +00:00 |
|
Rafal Swierczek
|
031a74352f
|
Implemented Open World Checkpoints to Save System
|
2024-03-20 12:23:19 +00:00 |
|
Rafal Swierczek
|
2cc1d566a6
|
Implemented Open World Checkpoint Respawns
|
2024-03-20 00:47:24 +00:00 |
|
MH261677
|
343ee8f985
|
Fixed Secondary weapon not being able to equip attachments
|
2024-03-19 16:49:37 +00:00 |
|
MH261677
|
4500562577
|
Added empty base remove all attachment function class
|
2024-03-19 16:39:08 +00:00 |
|
MH261677
|
ef4ce07b39
|
Fixed spawning workbench ui to be infinite to only happen once
|
2024-03-19 16:38:55 +00:00 |
|
MH261677
|
62a85e8e79
|
Stopped being able to stack already equipped attachments
|
2024-03-19 16:38:40 +00:00 |
|
MH261677
|
826cadbbcb
|
Added ExtendedMag code to give more ammo to the weapon
|
2024-03-19 16:10:01 +00:00 |
|
MH261677
|
2542404a4f
|
Added AttachmentLoc to weapon mesh
|
2024-03-19 15:16:06 +00:00 |
|
MH261677
|
abee971d6b
|
Changed workbench code to allow certain attachments on certain weapons
|
2024-03-19 15:15:56 +00:00 |
|
MH261677
|
cd8f414b03
|
Fixed extended mag attachement code not working
|
2024-03-19 13:51:30 +00:00 |
|
MH261677
|
dd4cb95d1c
|
Created ExtendedMag option in workbench
|
2024-03-19 13:51:13 +00:00 |
|
MH261677
|
68172acede
|
Positioned and Scaled ExtendedMag attachment
|
2024-03-19 13:49:17 +00:00 |
|
MH261677
|
e2eb32653e
|
Created ExtendedMag attachment code to baseweapon class
|
2024-03-19 13:12:37 +00:00 |
|
MH261677
|
1cf66a7773
|
Added ExtendedMag socket point for pistol weapon
|
2024-03-19 13:12:16 +00:00 |
|
MH261677
|
28d6f400ef
|
Created Extended Mag attachment class
|
2024-03-19 13:12:00 +00:00 |
|
MH261677
|
397ed93c31
|
Fixed New pistol not having needed stuff for attachments
|
2024-03-19 12:56:36 +00:00 |
|
MH261677
|
61082c2b77
|
Fixed workbench not working with new pistol code
|
2024-03-19 12:56:15 +00:00 |
|
MH261677
|
1bb9378517
|
Fixed workbench not working with new pistol
|
2024-03-19 12:56:05 +00:00 |
|
MH261677
|
655803fb18
|
Fixed Testing level crashing
|
2024-03-19 12:55:53 +00:00 |
|
Rafal Swierczek
|
1f2243134f
|
Set Door to Static Object
|
2024-03-18 22:28:06 +00:00 |
|
Rafal Swierczek
|
ebb981646d
|
Fixed AI and Shot Collision Issues
|
2024-03-18 21:54:41 +00:00 |
|
Rafal Swierczek
|
fbff6fdd62
|
Reworked Open World Checkpoint System to Allow Multiple Checkpoints
|
2024-03-18 21:07:48 +00:00 |
|
LOUIS HORNE
|
53bb7a1338
|
Added lamposts to blockout
|
2024-03-18 12:33:20 +00:00 |
|
Rafal Swierczek
|
530c9580ff
|
Bugfix Primary Rifles Appear off screen
|
2024-03-17 21:57:01 +00:00 |
|
Rafal Swierczek
|
3633e1fe24
|
Fixed Player BP Issues
|
2024-03-17 19:32:07 +00:00 |
|
Rafal Swierczek
|
0b12f2e0df
|
Merge branch 'PartyCrowdAI' into dev
# Conflicts:
# EndlessVendetta/Config/DefaultEngine.ini
|
2024-03-17 17:51:57 +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 |
|
|
|
d1caa3d8d4
|
Bugfix Dialogue Skipping Too Far on Click
|
2024-03-15 10:57:56 +00:00 |
|
|
|
7ae5c1f349
|
Update AI for Hit Location Damage, Dynamic Crosshair & Hit Markers
|
2024-03-15 10:45:11 +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 |
|
Rafal Swierczek
|
1ab1120346
|
Imported Mixamo Martha Char and Hip Hop Dance Anim
|
2024-03-15 04:11:34 +00:00 |
|
Rafal Swierczek
|
ce2ed54125
|
Imported Mixamo Lewis Char with Rumba Dance Anim
|
2024-03-15 03:55:41 +00:00 |
|
Rafal Swierczek
|
f495cb61f2
|
Imported Mixamo Brian Char with Silly Dance Anim
|
2024-03-15 03:43:38 +00:00 |
|
Rafal Swierczek
|
580edbf666
|
Disabled Shadows on Partying AI
|
2024-03-15 03:26:21 +00:00 |
|
Rafal Swierczek
|
6d12f96306
|
Imported Mixamo Josh Char with Argue Anim
|
2024-03-15 03:23:43 +00:00 |
|
Rafal Swierczek
|
b34356e594
|
Imported Mixamo Josh Char with Argue Anims
|
2024-03-15 03:09:42 +00:00 |
|
Rafal Swierczek
|
426a24352a
|
Imported Mixamo Kate Character with Talking on the Phone Anim
|
2024-03-15 02:44:11 +00:00 |
|
Rafal Swierczek
|
c5d7e354c6
|
Imported Mixamo Leonard Char with Happy Idle Anim
|
2024-03-15 02:28:33 +00:00 |
|
Rafal Swierczek
|
96ff0756ca
|
Imported Mixamo Louise Char with Sitting Animation
|
2024-03-15 01:29:37 +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 |
|
|
|
d7a0ffbbec
|
Bugfix Not Taking Damage as Line Trace Hit Projectile
|
2024-03-14 18:36:35 +00:00 |
|
|
|
d1124c2e8b
|
Bugfix Impact Actor Not De-Spawning
|
2024-03-14 17:48:37 +00:00 |
|
|
|
b4e69352f9
|
Bugfix Update Capsule Size to Stop Camera Clipping
|
2024-03-14 17:39:26 +00:00 |
|
|
|
5ac9e3fda5
|
Update Character to Trigger Pistol Reload Animation
|
2024-03-14 17:33:41 +00:00 |
|
Rafal Swierczek
|
fc6ee5e4da
|
Implemented Temp Party Area Functionality
|
2024-03-13 23:07:35 +00:00 |
|
Rafal Swierczek
|
5e68eec467
|
Created Crowd AI Base with Escaping Behaviour
|
2024-03-13 23:06:57 +00:00 |
|
|
|
eab0b2b18b
|
Bugfix Shots Landing Not Dealing Damage
|
2024-03-13 23:06:27 +00:00 |
|
|
|
7b26664218
|
Bugfix Stamina Not Being Used
|
2024-03-13 22:03:55 +00:00 |
|
|
|
3b41b28b4c
|
Bugfix Getting Shot and Taking No Damage
|
2024-03-13 21:44:04 +00:00 |
|
|
|
9ab356f813
|
Bugfix Over Healing
|
2024-03-13 21:37:42 +00:00 |
|
|
|
977b80bf64
|
Bugfix Pistol Not Snapping to Location
|
2024-03-13 18:01:33 +00:00 |
|
|
|
9ab282b229
|
Update Pickup Pistol Checkpoint for Animated Pistol
|
2024-03-13 17:50:15 +00:00 |
|
|
|
cd9baf6858
|
Bugfix ALS Sprint not Triggering
|
2024-03-13 17:28:18 +00:00 |
|
|
|
0cbfbd0625
|
Update Character for Animation System Integration
|
2024-03-13 16:23:20 +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 |
|
|
|
a8d2f57778
|
Update Pistol for Arms & Reload Animation
|
2024-03-08 13:19:38 +00:00 |
|
LOUIS HORNE
|
2b968af6a4
|
Market Blockout - Collision no go
Placed blockout, collision dosen't work
|
2024-03-08 09:59:52 +00:00 |
|
|
|
998d1920b4
|
Bugfix Getting Procedural Animation Parameters for 1 Handed Weapons
|
2024-03-08 03:02:30 +00:00 |
|
|
|
4fdd640562
|
Update Pistol for Arms & Gun Fire Animation
|
2024-03-08 01:25:16 +00:00 |
|
LOUIS HORNE
|
51cc97aff2
|
Building01 first pass
|
2024-03-07 16:08:56 +00:00 |
|
|
|
1fd59390ff
|
Update Character for Procedural Aiming & Character Parenting
|
2024-03-06 18:13:46 +00:00 |
|
|
|
e8c3a10c57
|
Merge branch 'dev' into GunAnimation
|
2024-03-05 14:37:13 +00:00 |
|
|
|
1d1de7b3e0
|
Add Advanced Locomotion System for Gun Animations
|
2024-03-05 14:36:40 +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 |
|
|
|
ec120018fa
|
Add Pistol w/ Rigged Separated Parts
|
2024-03-01 19:37:55 +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 |
|
Rafal Swierczek
|
7791c54877
|
Setup Side Bounties in new Open World
|
2024-02-29 10:25:35 +00:00 |
|
|
|
72251b6f0d
|
Update Stats UI to Animate Damage
|
2024-02-29 04:33:20 +00:00 |
|
|
|
fd9c37d148
|
Bugfix Stuck on Face Rotation on Attack
|
2024-02-29 04:32:37 +00:00 |
|
|
|
a36f65cbc6
|
Bugfix Crash on AI with No Weapons
|
2024-02-29 04:31:55 +00:00 |
|
|
|
82de3a9342
|
Merge remote-tracking branch 'origin/Green-Light/Rafals-Branch' into AI
# Conflicts:
# EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset
|
2024-02-29 03:49:49 +00:00 |
|
|
|
90d9fd50a5
|
Update Reload Text for Animation & Concise Wording
|
2024-02-29 03:41:55 +00:00 |
|
|
|
f52a69798a
|
Bugfix Unable to Damage Dhruv
|
2024-02-29 03:31:04 +00:00 |
|
|
|
82f20c6a3b
|
Update AI Movement to Improve Rotation & Walk Path
|
2024-02-29 03:16:06 +00:00 |
|
|
|
768d53549f
|
Update AI for Improved Hit Detection & Projectiles
|
2024-02-29 02:57:55 +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 |
|
Rafal Swierczek
|
664ece2858
|
Fixed Merge Errors
|
2024-02-29 02:21:32 +00:00 |
|
|
|
c7a52e42a5
|
Update HUD for Crosshair Change, Health & Stamina Redesign
|
2024-02-29 02:13:53 +00:00 |
|
Rafal Swierczek
|
6e7450f3fa
|
Merge remote-tracking branch 'origin/AI' into Green-Light/Rafals-Branch
# Conflicts:
# EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset
# EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
# EndlessVendetta/Content/MetaHumans/Common/Female/Medium/NormalWeight/Body/metahuman_base_skel.uasset
# EndlessVendetta/Content/MetaHumans/Common/Male/Medium/NormalWeight/Bottoms/Slacks/m_med_nrw_btm_slacks_nrm.uasset
# EndlessVendetta/Content/MetaHumans/Common/Male/Medium/NormalWeight/Shoes/Oxfords/m_med_nrw_shs_oxfords.uasset
# EndlessVendetta/Content/MetaHumans/Common/Male/Medium/NormalWeight/Tops/Shirt/m_med_nrw_top_shirt_nrm.uasset
# EndlessVendetta/Content/MetaHumans/Jhon/BP_Jhon.uasset
# EndlessVendetta/Content/MetaHumans/Jhon/Face/Jhon_FaceMesh.uasset
# EndlessVendetta/Content/MetaHumans/Jhon/Male/Medium/NormalWeight/Body/m_med_nrw_body.uasset
# EndlessVendetta/Content/MetaHumans/Jhon/MaleHair/Hair/Mustache_S_Full_CardsMesh_Group0_LOD0.uasset
# EndlessVendetta/Content/MetaHumans/Jhon/MaleHair/Hair/Mustache_S_Full_CardsMesh_Group0_LOD1.uasset
# EndlessVendetta/Content/MetaHumans/Jhon/MaleHair/Hair/Mustache_S_Full_CardsMesh_Group0_LOD2.uasset
# EndlessVendetta/Content/MetaHumans/Jhon/MaleHair/Hair/Mustache_S_Full_CardsMesh_Group0_LOD3.uasset
# EndlessVendetta/Content/MetaHumans/Jhon/MaleHair/Hair/Mustache_S_Full_CardsMesh_Group0_LOD4.uasset
# EndlessVendetta/Content/MetaHumans/MHAssetModified.txt
# EndlessVendetta/Content/MetaHumans/MHAssetVersions.txt
# EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.cpp
# EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.h
|
2024-02-29 01:35:40 +00:00 |
|
Rafal Swierczek
|
3f6539fc1a
|
Merge remote-tracking branch 'origin/dev' into Green-Light/Rafals-Branch
|
2024-02-29 01:30:19 +00:00 |
|
Rafal Swierczek
|
0ddee55593
|
Merge remote-tracking branch 'origin/Environment-Appartment' into Green-Light/Rafals-Branch
# Conflicts:
# EndlessVendetta/Content/Levels/MainMenuLevel.umap
|
2024-02-29 01:28:40 +00:00 |
|
Louis Horne
|
a2d25a40e2
|
Placed Chris's assets in level
|
2024-02-29 01:16:07 +00:00 |
|
Rafal Swierczek
|
fa01239f10
|
Added Boombox to Hover Bike
|
2024-02-29 01:12:55 +00:00 |
|
Rafal Swierczek
|
db90e632d6
|
Added Gun Tips to Tutorial
|
2024-02-29 01:05:25 +00:00 |
|
Rafal Swierczek
|
1022b794a9
|
Added Open World Tips
|
2024-02-29 00:40:42 +00:00 |
|
MH261677
|
4efe8f8a33
|
Hidden BikeWidget when opening weapon workbench
|
2024-02-29 00:07:36 +00:00 |
|
MH261677
|
58ebd660f2
|
Fixed bike spawning while opening weapon workbench
|
2024-02-29 00:04:07 +00:00 |
|
MH261677
|
1d693a5f79
|
Added UI to let players know if attachment is equipped
|
2024-02-29 00:01:22 +00:00 |
|
MH261677
|
6e52fe09c0
|
Updated Workbench UI to proper UI
|
2024-02-28 23:49:29 +00:00 |
|
|
|
730ea76ce8
|
Add Cyberpunk Gigapack Asset Pack
|
2024-02-28 23:29:40 +00:00 |
|
Rafal Swierczek
|
da0b5b516e
|
Implemented Bounty Rewards UI
|
2024-02-28 22:35:28 +00:00 |
|
KACPER Szelest
|
6e36e28889
|
Landscape changes main bounty area
|
2024-02-28 22:12:01 +00:00 |
|
Rafal Swierczek
|
3c1ff4412d
|
Added Gadgets to Save System
|
2024-02-28 20:28:35 +00:00 |
|
Rafal Swierczek
|
6b6492592b
|
Added Interact Propmpt
|
2024-02-28 20:02:40 +00:00 |
|
Rafal Swierczek
|
6d0ad3fc0a
|
Added Mayor to Tutorial Area and Fixed Philips Horrid ZOrder Practices
|
2024-02-28 19:04:51 +00:00 |
|
|
|
3b882e4a9e
|
Merge remote-tracking branch 'origin/Sound-and-music' into AI
|
2024-02-28 18:18:47 +00:00 |
|
|
|
70fb655dd8
|
Add City Megapack Asset pack
|
2024-02-28 18:08:12 +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 |
|
KACPER Szelest
|
3e94570181
|
Added asset packs and updated main bounty area
|
2024-02-28 14:43:27 +00:00 |
|
Rafal Swierczek
|
3ac7e7a3be
|
Added Gadget Tutorials
|
2024-02-28 09:29:45 +00:00 |
|
Rafal Swierczek
|
8d5e02916f
|
Quality of Life Changes
|
2024-02-28 07:17:52 +00:00 |
|
Rafal Swierczek
|
d8a04aec38
|
Implemented Heat Blast Functionality
|
2024-02-28 06:35:20 +00:00 |
|
Rafal Swierczek
|
1088828c46
|
Implemented Heat Blast Gadget Aesthetics
|
2024-02-28 06:22:36 +00:00 |
|
Rafal Swierczek
|
bca178cb45
|
Implemented Vision Pulse Logic
|
2024-02-28 04:27:39 +00:00 |
|
Rafal Swierczek
|
26d4540541
|
Implemented Vision Ping Aesthetics
|
2024-02-28 03:11:04 +00:00 |
|
KACPER Szelest
|
9a7ce7d762
|
Added brutalist assetpack
|
2024-02-28 02:30:51 +00:00 |
|
KACPER Szelest
|
4d114bfcde
|
Added some temp buildings finished roads
|
2024-02-28 02:30:26 +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 |
|
KACPER Szelest
|
660930aa55
|
ReAdded Voicelines as rafal was crying
|
2024-02-27 23:28:09 +00:00 |
|
KACPER Szelest
|
99112733e8
|
Added combat track into this branch cos rafal cry
|
2024-02-27 23:09:00 +00:00 |
|
KACPER Szelest
|
68917f73c3
|
Added AI voicelines
|
2024-02-27 22:55:37 +00:00 |
|
