aszema/jumping-ship
3
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: aszema:af138d91103ef5db1b4ae8c634233e21ee26e474
Branches Tags
aszema:main
aszema:testingPush
aszema:test_obstacle
...
compare: aszema:6a6fd732928e328bd72398b0a9498db77bcc119c
Branches Tags
aszema:main
aszema:testingPush
aszema:test_obstacle

25 Commits
af138d9110 ... 6a6fd73292

Author SHA1 Message Date
LukTeg
6a6fd73292 Merged in main 2023-12-01 19:34:48 -05:00
Austin Szema
f1d729c7e3 Removed timer error when unplaying game by null checking 2023-11-13 19:05:24 -05:00
Austin Szema
1f08736dfd Organized files into proper folders 2023-11-10 23:35:04 -05:00
Austin Szema
143f01ab92 Auto stash before merge of "main" and "origin/main" 2023-11-10 23:25:11 -05:00
Austin Szema
dddff015be Merge branch 'main' of https://git.nugamestudioclub.com/aszema/jumping-ship 2023-11-10 23:24:23 -05:00
Austin Szema
5799cecd53 Fixing merge errors 2023-11-10 23:23:09 -05:00
Austin Szema
82a5093509 Merge remote-tracking branch 'origin/main' into main 2023-11-10 23:21:06 -05:00
Austin Szema
cea63354f1 Added the grabbing and throwing functionality 2023-11-10 23:19:47 -05:00
Austin Szema
5ebccf8700 Added baby model and Passenger tag to track when a passenger is saved 2023-11-10 22:54:48 -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
182 changed files with 534 additions and 21 deletions
Show Stats Expand all files Collapse all files

12
Config/DefaultGameplayTags.ini Normal file
View File

@ -0,0 +1,12 @@
[/Script/GameplayTags.GameplayTagsSettings]
ImportTagsFromConfig=True
WarnOnInvalidTags=True
ClearInvalidTags=False
AllowEditorTagUnloading=True
AllowGameTagUnloading=False
FastReplication=False
InvalidTagCharacters="\"\',"
NumBitsForContainerSize=6
NetIndexFirstBitSegment=16
+GameplayTagList=(Tag="Passenger",DevComment="")

BIN
Content/Baby.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Blueprints/Baby.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Maps/ThirdPersonMapJoel.umap (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Materials/BabyDiaperMaterial.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Materials/BabyEyeMaterial.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Materials/BabyPupilMaterial.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Materials/BabySkinMaterial.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Mesh/Unreal_Baby.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/AustinTestMap/5/3D/Z75B8FUO02492CJNK5HUTC.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/AustinTestMap/8/B3/Q9KYBVZNCQOZKGXKB0MPXD.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/AustinTestMap/9/4E/PNL9YXQ3TBVFK0ESW3SFQY.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/AustinTestMap/B/NW/WHFVPNVWATX9I8IKP7BMS4.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/ThirdPersonMapJoel/0/8P/67ROUKJYDTQBAQHQJEI3F1.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/ThirdPersonMapJoel/0/JG/80CU8PNB3RVG7BNC61EVO8.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/ThirdPersonMapJoel/0/PN/3NJMIX08C9LP47UFEKK0K6.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/ThirdPersonMapJoel/1/7P/IVGXPBV3AGAXX98I9N8Y7D.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/ThirdPersonMapJoel/1/TG/4255DCFLQHW57TRZ7SJNIC.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/ThirdPersonMapJoel/2/FZ/HWN85UND44Z68KRY4WO12P.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/ThirdPersonMapJoel/2/LC/S5PD6OQZYNA31PONIKYGMB.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/ThirdPersonMapJoel/2/Z5/AMFSNVN2HXNXTKUUYV7HAT.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/ThirdPersonMapJoel/3/FD/WLDUC12VBZB4NKCE9863SY.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/ThirdPersonMapJoel/3/JQ/3CL0LQMXY9C16FIK1N1LFQ.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/ThirdPersonMapJoel/3/O1/MBAZN6A806V32CPJ1ZT1ZM.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/ThirdPersonMapJoel/4/QQ/U8DJRQP9P6DC25IX104BBN.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/ThirdPersonMapJoel/5/02/61CYDC4L6K91UTDRE7HS9I.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/ThirdPersonMapJoel/5/9V/3J9MYNVNAWF6AUJ7LLPIPP.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/ThirdPersonMapJoel/6/DS/POVJAUB5NVZ1Y5SFQURQO6.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/ThirdPersonMapJoel/6/I3/IQCPXAC6XD9DOCT01654TU.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/ThirdPersonMapJoel/6/IR/W5MAEO27KPBJG7YU4WH9WK.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/ThirdPersonMapJoel/6/V2/V2TQH4B40CFZMS90G6C332.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Maps/ThirdPersonMapJoel/7/EG/7GU8KZEUYBW0NK464UEJIC.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

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