Merge branch 'daniel_level' of bitbucket.org:joseph-rafferty/gam305_green_repo into daniel_level

This commit is contained in:
Joseph Rafferty 2024-01-19 21:20:14 -05:00
commit baf14d74f0
83 changed files with 45 additions and 204 deletions

3
.gitignore vendored
View File

@ -60,9 +60,6 @@ Build/*/**
# Don't ignore icon files in Build # Don't ignore icon files in Build
!Build/**/*.ico !Build/**/*.ico
# Built data for maps
*_BuiltData.uasset
# Configuration files generated by the Editor # Configuration files generated by the Editor
Saved/* Saved/*

BIN
Content/FirstPerson/Blueprints/Widgets/WBP_HUD.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/FirstPerson/Blueprints/Widgets/WBP_HealthBar.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/FirstPerson/Maps/FirstPersonMap_BuiltData.uasset (Stored with Git LFS) Normal file

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.