Compare commits

base: aszema:5ce49be574f95f740164436e9e9ffc341e49d7c6

Branches Tags

aszema:main aszema:testingPush aszema:test_obstacle

..

compare: aszema:test_obstacle

Branches Tags

aszema:main aszema:testingPush aszema:test_obstacle

18 Commits

5ce49be574 ... test_obsta

Author	SHA1	Message	Date
ga28299	e2187e3947	test obstacles push	2023-11-27 18:48:48 -05:00
ga28299	911ffbaa8d	Drop hold obstacle	2023-11-27 16:32:38 -05:00
Austin Szema	a778d15702	Added a basic rescue boat with counter	2023-10-30 20:04:44 -04:00
striandafellos	e58c62457a	minor NPC spawning tweak	2023-10-30 19:37:29 -04:00
striandafellos	ed4fd719e1	re-added civilian class	2023-10-30 19:36:14 -04:00
striandafellos	451433e9f8	Merge remote-tracking branch 'origin/main' into main	2023-10-30 19:24:56 -04:00
striandafellos	3381c4333e	misc lfs updates	2023-10-30 19:24:06 -04:00
striandafellos	4b148e8946	Abstracted spawner blueprint	2023-10-30 19:21:55 -04:00
Austin Szema	12583fc0fc	Fixed Iceberg revert	2023-10-30 18:59:49 -04:00
Austin Szema	0fc4b4b6bd	Revert "Revert "Added simple iceberg blueprint"" ... This reverts commit 42f1f3d7d338bfefb9e758f0392491988ff8afa8.	2023-10-30 18:59:49 -04:00
Austin Szema	e4b3f1d03d	Revert "Added simple iceberg blueprint" ... This reverts commit 7ef34cba0474ff9c0d7a04b266d12cd73e2b4b96.	2023-10-30 18:59:43 -04:00
Austin Szema	98758acc4c	Added simple iceberg blueprint	2023-10-30 18:59:36 -04:00
Joel Bernardes	5704ce68c0	Merge remote-tracking branch 'origin/main' into main	2023-10-30 18:47:28 -04:00
striandafellos	b50f265b10	Fixed AI movement ... Fixed navmesh on Austin test map and fixed enemy spawner blueprint recursively calling itself infinitely	2023-10-27 20:09:07 -04:00
striandafellos	dd9d13a727	Added Movement to Civilian BP Class ... now randomly moves on its own given a nav mesh boundary volume	2023-10-23 20:03:16 -04:00
Austin Szema	43b3200dfb	Added iceberg terrain to AustinTestScene	2023-10-16 20:01:15 -04:00
Joel Bernardes	43c3257b27	Merge remote-tracking branch 'origin/main' into main	2023-10-16 19:35:59 -04:00
Joel Bernardes	d9915f01c9	Added tossing mechanic as well as tinkered with layout ... Now when you press left click you are able to pick up and carry an object (need to work on physics so that you cant send an object to the moon by flicking quick and letting go of left click)	2023-10-13 19:56:32 -04:00

142 changed files with 418 additions and 143 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Expand all files Collapse all files

BIN

Content/Blueprints/BP_Ice_Slip.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Blueprints/BP_Iceberg.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Blueprints/BP_Rescue_Boat.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Blueprints/BP_Water_drop.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Blueprints/BP_Wind.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Blueprints/Enemy1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Blueprints/Enemy2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Blueprints/Slippery.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Materials/wood.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Mesh/Funny_Iceberg.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Mesh/Material_001.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Mesh/SM_Cruise_Ship.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Mesh/T_Iceberg.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/MoveBlueprint.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/NewActorComponent.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacterJoel.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ThirdPerson/Blueprints/Civillian.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/ThirdPerson/Blueprints/EnemySpawnerBP.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/ThirdPerson/Blueprints/NPCSpawnerBP.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ThirdPerson/Blueprints/Timer.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/ThirdPerson/Blueprints/WBP_Timer.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ThirdPersonMapJoel.umap (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/0/EC/ZRR3IPR0IZRO410SDP3JZK.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/0/FB/XG5QOR34GNPFM5XGFJ1HW9.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/0/NI/CQE5QF2HSQY9HAI1GTFO2E.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/0/R6/QTY6AKHYYXAWJZR4KZN07D.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/1/G3/XK9YPUJ1TX3MQ2NYI1J0XC.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/1/UB/SKYDMB1KF6RN4ZVPT76X6D.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/2/06/UTIKCMF8LKP4VYP7PCMA0S.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/3/0U/US2YSSQGQAS38MA296FDRQ.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/3/2A/LKLALTVZ09V86FUXTLYJ04.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/3/2G/NACP6IGI2AGWPV1GB71K3W.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/3/7L/RUF8JASBIDFYHGTXFM8EBL.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/3/JU/OGEBHA73OPKWPQKJ8TC0G8.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/3/TE/91ISW0HOXLN1J2RFZUH6AP.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/3/TK/MEH5FWHS3SK68DNI2SOXE4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/3/TV/L9NJA4W03DRWPH9BGBL67N.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/3/VV/M01W4PRB9A1TERO4FHXEPH.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/3/XQ/4NBB927LTKWVH8RASYJJGG.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/4/04/E6GHWF8HGN0TKBOFEJGIWG.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/4/GL/3FUL0VAAS391ORZRGXLLEU.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/4/Z4/WNSKNDFO4BJ6LQJBPK7HUV.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/4/ZN/XSAADLDGC995WVFSX2JRBL.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/5/7A/TB1TDQPRTJOVIL89HQ3EU1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/5/J7/G8871J8AURFZOYHSM14HL0.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/5/MD/OI8TWANGBHINDPQHT4O4FV.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/5/N6/HGSE58HCLY95RCR1XIJFWK.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/6/85/80GVNLHQJBS6T9DRA73UUB.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/6/LQ/QKITF78F2V1CVLT1KQNWQ9.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/7/4L/IE9A36AV82YFAZQV8DDJX8.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/7/UW/3QE9O2IG9TR1UMHR8OZEF4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/8/7S/BNAECT1CEO76ZYNSQT8MFL.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/8/RZ/AYD71LHNNFMOO47MULGZT3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/8/UU/14HKOXSH1EFYU68H1IDELR.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/9/4W/UEFIYJHQ0SAT4W8FO0T49Y.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/9/J4/V3CG5T6L2TLS8EZBRRGY9S.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/9/WT/0OY70EDOL55YQV9XWNEF5D.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/9/YS/0Y4F5607YGGQK8GQ94K4I7.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/9/ZN/6ENO632PXWN8SXH8GBANIT.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/A/4T/KLXOAWKT7RQQT3WEKMHZEY.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/A/QL/K636CYUEP4AZWA0Q0X382K.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/A/RC/QDI5CCDHMC4WFT5DJY3W2O.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/B/I2/RRPHV75M4HBAIVZB2NBVJ7.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/B/KO/UKCPUPZEVVW68XSA71X4ZI.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/B/KR/VY3T9MPVNSIEUPWVP3RTPU.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/B/MG/H3IOPKZBP8Q7GONLB7OCKU.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/C/00/RB1KDR4ZACSI98RDNHPZ1W.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/C/0J/JRDJXYI5INEQ62KSKRTT2J.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/C/5P/RWTNRF6BOH5Z4OMSIWSXQ3.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/C/KG/IGDA9XUEZRL6FKIB2R8UF1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/D/IJ/1FOQUDJYJ22DEEWB0SDUK0.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/E/4X/WGVF3PHYXUPKNTTPEX7THJ.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/E/DY/ZP4Z2TQNUM7APTCHHKEYMH.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/E/EL/FMO2T2JZYGD22ZPL69MPI4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/E/NB/G19HL8ZOA900QAZYTNMQLC.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/AustinTestMap/F/02/I6KS1R0T5LWN5ZLVU5VHSX.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/StephenTestMap/8/I1/X9AQCPTJENT7FXRHW9Q8KQ.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/StephenTestMap/8/VK/NL0QIRWRPF24Y69R5ZMO3A.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/StephenTestMap/9/I8/16P4080JWC5GZ687RW0WQ8.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/StephenTestMap/A/AK/I26PXKVS8KFJSLWY88WDYD.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/WE/N7TQAW7EYBX1N3M24YRH1W.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/1/33/TKK82D44PKUQ3I6DQX0Y90.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/GF/DSP61390DCUYCTAMIGPN19.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/NR/3PPF1JB1HIA5CBG5OZ4R7K.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/XE/XZF4FG6J7P5ELB9G6BX7Z6.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/9N/KEY1WNHPMBTRIPJOO74VKR.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/D/DE/SWSI13675DVYIZ0N4NF7Y3.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/E/8F/LTNR05I601XM8YRDOU31N6.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPersonMapJoel/0/0A/NE9LSFNZVNAAO3M029Q5VZ.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPersonMapJoel/0/1T/TE5GOY2SVFAUUQCRHMKF43.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPersonMapJoel/0/3B/GUCE3H8NZBZ57EFFOB0BJH.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPersonMapJoel/0/IQ/MZQMR7N8LJJG46BQC778LC.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPersonMapJoel/0/LH/1UCAWCJBQ324FUN1MUP864.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPersonMapJoel/0/N6/0I51T8X1KCTUC4CYEMI7UH.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPersonMapJoel/0/TI/JHIRAAVFR8P323KNF5CXSH.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPersonMapJoel/1/5Z/WW5AVDL6LY555C4AS56QPL.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPersonMapJoel/2/58/09IKK5OSJ13FG92V9KRRM3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPersonMapJoel/2/V9/LKK6P6E3J0WLFOE336MU4O.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPersonMapJoel/2/X6/LOA1RBKZMIEP8W2F1BEZYM.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More