Compare commits

base: triple-aaa-games:8a051e7b223b9a0ab645dcb462fb6621222e3c4c

Branches Tags

triple-aaa-games:master

triple-aaa-games:final-submission

triple-aaa-games:DialogueSystemMerge

triple-aaa-games:v1.0.0

...

compare: triple-aaa-games:4cdcaa6dce60fba88c8931a3a11328169ecd48ac

Branches Tags

triple-aaa-games:final-submission

triple-aaa-games:master

triple-aaa-games:DialogueSystemMerge

triple-aaa-games:v1.0.0

8 Commits

8a051e7b22 ... 4cdcaa6dce

Author	SHA1	Message	Date
Connor Elsworth	4cdcaa6dce	Update Level	2023-11-24 01:25:30 -05:00
Connor Elsworth	5a518bb867	Add Level Design Mechanics	2023-11-24 01:25:20 -05:00
Connor Elsworth	c04048d843	Update Pickup Mechanics	2023-11-24 01:24:59 -05:00
Connor Elsworth	5a3d3ab3b4	Add Laser Wall	2023-11-24 01:24:48 -05:00
Connor Elsworth	0642441835	Update Enemy Behvior	2023-11-24 01:24:22 -05:00
Connor Elsworth	b093b3b70c	Black Fadeout for levels	2023-11-24 01:24:04 -05:00
Connor Elsworth	82703e6aea	Update Interaction UI	2023-11-24 01:23:43 -05:00
Connor Elsworth	d5b02049b6	Add Save Game	2023-11-24 01:23:27 -05:00

64 changed files with 156 additions and 48 deletions

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

Show Stats Expand all files Collapse all files

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/Blueprints/Enemys/BP_Enemy_Base.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Enemys/CharacterEnemies/BP_Enemy_Character.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Enemys/CharacterEnemies/BehaviorTree/BasicEnemyBehavior.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Items/BP_PickupItem_Health.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Items/BP_PickupItem_Magnetic.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/LevelDesign/BP_Door.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/LevelDesign/BP_EnemySpawner.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/Blueprints/LevelDesign/BP_FoldingPlatform.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/Blueprints/LevelDesign/BP_TriggerBox.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/Blueprints/Msc/BP_SaveGame.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Msc/Enemy/EnemySaveStruct.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/Msc/Player/PlayerSaveStruct.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/Msc/SaveGameStructure.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Msc/Settings/SettingsSaveStruct.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/Msc/World/WorldSaveStruct.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/Msc/World/WorldSaveStruct_Doors.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/Msc/World/WorldSaveStruct_EnemySpawners.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/Msc/World/WorldSaveStruct_Interactables.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/Blueprints/Projectile/BP_Projectile.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/LevelPrototyping/Materials/MF_ProcGrid.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Maps/LevelDesignTest.umap

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/UI/Menus/WB_SettingsMenu.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/UI/WB_Interact.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/0/U3/HAMR7NQO52QF2IE31Y1SOB.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/1/2Y/R8M2DG789OISX095X0TZ9R.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/1/6J/YHOSMAW0HS63Q42RFEKZBC.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/1/U7/CPCIPBFWLCXVS2EN114LM9.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/2/H8/36PAMZYP0FIRXWZBEXVT3P.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/2/HT/LBG914ZLRL5F41B23ENF5I.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/2/OI/SKJAX1ADQLEC0FPICOVUA5.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/2/RA/1RBQ34P3MLHQ2UKY9LJ16G.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/3/BC/J41G9Y252TNDOIBY85LAYG.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/4/VL/94QNOBIEHDGFSR4DWPUF0Z.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/5/ZW/9S7A4Z3M2GK7TEHNFP2DW5.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/6/2D/AGJX0THC6M89IXQBICDHLO.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/6/71/ZFYBAFC8H9LOY9RWL0GOSU.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/7/7J/1F6LMN8ES2BNYRIZKXXEQL.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/7/PG/VKYW7668WPGRK5AMCX1TUL.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/8/IJ/Y09CASJWK81R0BVTONLYK9.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/8/NL/LT4MS620GD2MZJ89VY274O.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/8/UR/73BPNP0GK4WRIJI913UN9F.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/9/B3/FH4A2NNYSK5IIVIOLRO01C.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/9/CY/CTKQIKS3FSSSD5HQTP7FC6.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/9/UX/9QPIR53WTHM5ZV5IYT24V1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/9/ZB/FG54RQUSDHSFRR144G8KRH.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/A/GL/UE5PV6G4KT5PR5O5MN80DP.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/B/6A/RW8I6WSBY5E8PJMR2VVADJ.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/B/IK/38GTMIVGHG1R0FF7122ME8.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/B/LK/NA3EAS93HSF4YMP1SUKYTR.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/B/NJ/1F4NSFXUTN7IDRJM2LFCX0.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/C/LU/WUMH8RTP984NQEO56XCQRK.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Maps/LevelDesignTest/F/28/1TR3PI0EMO5F1FQRNRS9EE.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.