Compare commits

43 Commits

Author SHA1 Message Date
f1a7ca00d8 worked on final polishing touches 2024-04-08 00:32:17 -04:00
a9614f495f Added credits menu 2024-02-10 01:39:41 -05:00
bcb4b737dc Fixed postprocess outline not showing up 2024-02-09 22:32:55 -05:00
c665c7c499 Added main menu 2024-02-09 22:23:20 -05:00
83b6b7f199 Made all chairs children of the boat blueprint 2024-01-19 00:27:02 -05:00
a4fb6fb3ce Added more icebergs 2024-01-13 19:59:25 -05:00
128aa4de06 Put the parts together to form gameplay 2024-01-13 18:52:40 -05:00
ee6ab6fcd7 Minor changes 2023-12-21 04:15:36 -05:00
2d336cae9a Added player slowdown in water 2023-12-20 20:52:59 -05:00
d122d427ce Added dust particles and running animation 2023-12-20 17:42:51 -05:00
6aaaa8fab7 Fixed grabbing and throwing with ragdolls 2023-12-19 21:47:18 -05:00
a2862b2c6c Added proper grabbing functionality 2023-12-19 17:18:00 -05:00
3f18755afd Added baby walking and grabbing "animations" 2023-12-19 02:06:10 -05:00
6bea0e788e Added some new models and textures 2023-12-04 22:44:43 -05:00
6a6fd73292 Merged in main 2023-12-01 19:34:48 -05:00
af138d9110 minor refactoring 2023-12-01 19:22:59 -05:00
1a0227ff28 Enemy flings only horizontal and passenger has running ai
The enemy now can fling all types of actors so long as they can be cast to a character (player and passenger). Also, it flings to the side by a random degrees to prevent the enemy from "dribbling the player like a basketball"(moves forward, flings forward, moves forward, etc). The passenger blueprint has been made(will most likely need to be merged with whatever other one is on the main branch.) The passenger has a 25% of running in a circle, 25% of picking a random direction to face and then run in, and 50% of standing in utter panic.
2023-11-21 21:45:38 -05:00
2a13ba9adb The passenger blueprint now exists and runs in a circle 2023-11-20 20:02:40 -05:00
bf717f3942 Added proper AI and throwing player back on contact 2023-11-14 22:24:58 -05:00
f1d729c7e3 Removed timer error when unplaying game by null checking 2023-11-13 19:05:24 -05:00
1f08736dfd Organized files into proper folders 2023-11-10 23:35:04 -05:00
143f01ab92 Auto stash before merge of "main" and "origin/main" 2023-11-10 23:25:11 -05:00
dddff015be Merge branch 'main' of https://git.nugamestudioclub.com/aszema/jumping-ship 2023-11-10 23:24:23 -05:00
5799cecd53 Fixing merge errors 2023-11-10 23:23:09 -05:00
82a5093509 Merge remote-tracking branch 'origin/main' into main 2023-11-10 23:21:06 -05:00
cea63354f1 Added the grabbing and throwing functionality 2023-11-10 23:19:47 -05:00
5ebccf8700 Added baby model and Passenger tag to track when a passenger is saved 2023-11-10 22:54:48 -05:00
a778d15702 Added a basic rescue boat with counter 2023-10-30 20:04:44 -04:00
e58c62457a minor NPC spawning tweak 2023-10-30 19:37:29 -04:00
ed4fd719e1 re-added civilian class 2023-10-30 19:36:14 -04:00
451433e9f8 Merge remote-tracking branch 'origin/main' into main 2023-10-30 19:24:56 -04:00
3381c4333e misc lfs updates 2023-10-30 19:24:06 -04:00
4b148e8946 Abstracted spawner blueprint 2023-10-30 19:21:55 -04:00
12583fc0fc Fixed Iceberg revert 2023-10-30 18:59:49 -04:00
0fc4b4b6bd Revert "Revert "Added simple iceberg blueprint""
This reverts commit 42f1f3d7d338bfefb9e758f0392491988ff8afa8.
2023-10-30 18:59:49 -04:00
e4b3f1d03d Revert "Added simple iceberg blueprint"
This reverts commit 7ef34cba0474ff9c0d7a04b266d12cd73e2b4b96.
2023-10-30 18:59:43 -04:00
98758acc4c Added simple iceberg blueprint 2023-10-30 18:59:36 -04:00
5704ce68c0 Merge remote-tracking branch 'origin/main' into main 2023-10-30 18:47:28 -04:00
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
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
43b3200dfb Added iceberg terrain to AustinTestScene 2023-10-16 20:01:15 -04:00
43c3257b27 Merge remote-tracking branch 'origin/main' into main 2023-10-16 19:35:59 -04:00
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
543 changed files with 1583 additions and 165 deletions

View File

@ -1,6 +1,6 @@
[/Script/EngineSettings.GameMapsSettings] [/Script/EngineSettings.GameMapsSettings]
GameDefaultMap=/Game/ThirdPerson/Maps/ThirdPersonMap.ThirdPersonMap GameDefaultMap=/Game/Maps/MainMenu.MainMenu
EditorStartupMap=/Game/ThirdPerson/Maps/ThirdPersonMap.ThirdPersonMap EditorStartupMap=/Game/Maps/MainMenu.MainMenu
GlobalDefaultGameMode="/Script/jumpingship.jumpingshipGameMode" GlobalDefaultGameMode="/Script/jumpingship.jumpingshipGameMode"
[/Script/Engine.RendererSettings] [/Script/Engine.RendererSettings]
@ -72,3 +72,9 @@ ConnectionType=USBOnly
bUseManualIPAddress=False bUseManualIPAddress=False
ManualIPAddress= ManualIPAddress=
[/Script/NavigationSystem.RecastNavMesh]
RuntimeGeneration=Dynamic
[/Script/NavigationSystem.NavigationSystemV1]
bGenerateNavigationOnlyAroundNavigationInvokers=False

View File

@ -1,3 +1,95 @@
[/Script/EngineSettings.GeneralProjectSettings] [/Script/EngineSettings.GeneralProjectSettings]
ProjectID=1B0A2EEA4384D9CFD2144284C94AD3D9 ProjectID=1B0A2EEA4384D9CFD2144284C94AD3D9
ProjectName=Third Person Game Template ProjectName=Third Person Game Template
[/Script/UnrealEd.ProjectPackagingSettings]
Build=IfProjectHasCode
BuildConfiguration=PPBC_Development
BuildTarget=
FullRebuild=False
ForDistribution=False
IncludeDebugFiles=False
BlueprintNativizationMethod=Disabled
bIncludeNativizedAssetsInProjectGeneration=False
bExcludeMonolithicEngineHeadersInNativizedCode=False
UsePakFile=True
bUseIoStore=True
bUseZenStore=False
bMakeBinaryConfig=False
bGenerateChunks=False
bGenerateNoChunks=False
bChunkHardReferencesOnly=False
bForceOneChunkPerFile=False
MaxChunkSize=0
bBuildHttpChunkInstallData=False
HttpChunkInstallDataDirectory=(Path="")
WriteBackMetadataToAssetRegistry=Disabled
bCompressed=True
PackageCompressionFormat=Oodle
bForceUseProjectCompressionFormatIgnoreHardwareOverride=False
PackageAdditionalCompressionOptions=
PackageCompressionMethod=Kraken
PackageCompressionLevel_DebugDevelopment=4
PackageCompressionLevel_TestShipping=5
PackageCompressionLevel_Distribution=7
PackageCompressionMinBytesSaved=1024
PackageCompressionMinPercentSaved=5
bPackageCompressionEnableDDC=False
PackageCompressionMinSizeToConsiderDDC=0
HttpChunkInstallDataVersion=
IncludePrerequisites=True
IncludeAppLocalPrerequisites=False
bShareMaterialShaderCode=True
bDeterministicShaderCodeOrder=False
bSharedMaterialNativeLibraries=True
ApplocalPrerequisitesDirectory=(Path="")
IncludeCrashReporter=False
InternationalizationPreset=English
-CulturesToStage=en
+CulturesToStage=en
LocalizationTargetCatchAllChunkId=0
bCookAll=True
bCookMapsOnly=False
bSkipEditorContent=False
bSkipMovies=False
-IniKeyDenylist=KeyStorePassword
-IniKeyDenylist=KeyPassword
-IniKeyDenylist=rsa.privateexp
-IniKeyDenylist=rsa.modulus
-IniKeyDenylist=rsa.publicexp
-IniKeyDenylist=aes.key
-IniKeyDenylist=SigningPublicExponent
-IniKeyDenylist=SigningModulus
-IniKeyDenylist=SigningPrivateExponent
-IniKeyDenylist=EncryptionKey
-IniKeyDenylist=DevCenterUsername
-IniKeyDenylist=DevCenterPassword
-IniKeyDenylist=IOSTeamID
-IniKeyDenylist=SigningCertificate
-IniKeyDenylist=MobileProvision
-IniKeyDenylist=IniKeyDenylist
-IniKeyDenylist=IniSectionDenylist
+IniKeyDenylist=KeyStorePassword
+IniKeyDenylist=KeyPassword
+IniKeyDenylist=rsa.privateexp
+IniKeyDenylist=rsa.modulus
+IniKeyDenylist=rsa.publicexp
+IniKeyDenylist=aes.key
+IniKeyDenylist=SigningPublicExponent
+IniKeyDenylist=SigningModulus
+IniKeyDenylist=SigningPrivateExponent
+IniKeyDenylist=EncryptionKey
+IniKeyDenylist=DevCenterUsername
+IniKeyDenylist=DevCenterPassword
+IniKeyDenylist=IOSTeamID
+IniKeyDenylist=SigningCertificate
+IniKeyDenylist=MobileProvision
+IniKeyDenylist=IniKeyDenylist
+IniKeyDenylist=IniSectionDenylist
-IniSectionDenylist=HordeStorageServers
-IniSectionDenylist=StorageServers
+IniSectionDenylist=HordeStorageServers
+IniSectionDenylist=StorageServers
+MapsToCook=(FilePath="/Game/Maps/AustinTestMap")
+MapsToCook=(FilePath="/Game/Maps/MainMenu")

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/BP_Test.uasset (Stored with Git LFS) Normal file

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/BabyPantsMaterial.uasset (Stored with Git LFS) Normal file

Binary file not shown.

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

Binary file not shown.

BIN
Content/BabyShirtMaterial.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/BabyShoesMaterial.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/BabySkinMaterial.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_Ragdoll.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/BP_RagdollBaby.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_Plane.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprints/Baby.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/Ferry_Boat_Blueprint.uasset (Stored with Git LFS) Normal file

Binary file not shown.

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

Binary file not shown.

BIN
Content/EnemyBabyDiaperMaterial.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/EnemyBabyEyeMaterial.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/EnemyBabyHair_Baby_003.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/EnemyBabyHair_Baby_004.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/EnemyBabyPantsMaterial.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/EnemyBabyPupilMaterial.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/EnemyBabyShirtMaterial.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/EnemyBabyShoesMaterial.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/EnemyBabySkinMaterial.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Ferry_Boat_Base.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Ferry_Boat_Blueprint.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Ferry_Boat_Material.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Ferry_Deck_Material.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Ferry_Metal_Bar_material.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Ferry_Rim_Material.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Ferry_Trim_Material.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/IceMaterial.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Jumping_Ship_Blank_Button.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Jumping_Ship_Button_Button.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Jumping_Ship_Credits_Button.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Jumping_Ship_Credits_Screen_Cleaned.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Jumping_Ship_Game_Over_Screen.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Jumping_Ship_Main_Menu.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Jumping_Ship_Main_Menu_No_Buttons.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Jumping_Ship_Main_Menu_No_Buttons_Cleaned.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Jumping_Ship_Music.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Jumping_Ship_Quit_Button.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Jumping_Ship_Start_Button.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/M_Dust_SubUV.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/M_Outline.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/M_Outline_Inst.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/M_Wood_Oak1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/MainMenu.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Maps/MainMenu.umap (Stored with Git LFS) Normal file

Binary file not shown.

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

Binary file not shown.

BIN
Content/Material.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Material_008.uasset (Stored with Git LFS) Normal file

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Materials/M_Rescue_Boat.uasset (Stored with Git LFS) Normal file

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Mesh/Business Baby.fbx (Stored with Git LFS) Normal file

Binary file not shown.

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

Binary file not shown.

BIN
Content/Mesh/Ferry_Boat.fbx (Stored with Git LFS) Normal file

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

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/Material_002.uasset (Stored with Git LFS) Normal file

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Mesh/Rescue_Boat_Trim_Material.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