Compare commits

base: triple-aaa-games:2f3d3d3fec188bc530b19c2e3d7070187835f80f

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:ac5fca6b6d48feddbbfdf1eceee4c63d688c5f42

Branches Tags

triple-aaa-games:final-submission

triple-aaa-games:master

triple-aaa-games:DialogueSystemMerge

triple-aaa-games:v1.0.0

No commits in common. "2f3d3d3fec188bc530b19c2e3d7070187835f80f" and "ac5fca6b6d48feddbbfdf1eceee4c63d688c5f42" have entirely different histories.

2f3d3d3fec ... ac5fca6b6d

118 changed files with 16 additions and 328 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/Enemys/Basics/BP_Enemy_Base.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/LevelDesign/EventSystem/Airship/Enum_Airship.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/LevelDesign/EventSystem/Airship/Struct_Airship.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/Blueprints/SaveGame/World/WorldSaveStruct.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/SaveGame/World/WorldSaveStruct_Interactables.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/VFX/ExplosionShake.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/Curve_AirshipEase.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Maps/L_AssetTest.umap Normal file

View File

Binary file not shown.

BIN

Content/Maps/L_ConnorTest1.umap

View File

Binary file not shown.

BIN

Content/Maps/L_ConnorTestAscent.umap

View File

Binary file not shown.

BIN

Content/Maps/L_LevelTest.umap

View File

Binary file not shown.

BIN

Content/Maps/L_LevelTest1.umap

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/MI_Barrel.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/MI_Car_Wind.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_BarrelEx_riseup03.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Barrel_Ex.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Car_Ex.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Car_riseup01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Debri_A_Inst.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Debri_B_Inst.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Ex_Grenade_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Ex_Grenade_02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Ex_nst1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Ex_nst2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Ex_nst4.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Fire_Trail.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_LargEx_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_LargEx_02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_LargEx_03.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_LargEx_riseup1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_LargEx_riseup2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Larg_Ex_Wind_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Larg_Ex_Wind_03.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_MEx_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_MEx_02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_MEx_03.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_MEx_Rise_Up_02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_MEx_Rise_Up_03.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_MEx_Rise_Up_04.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_MEx_Wind_04.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_MEx_riseup02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_M_Ex_Wind_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Mas_Ex_03.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Mas_Ex_Wind_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Mas_Ex_Wind_02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Mas_Ex_Wind_03.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Mas_Exp_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Mas_Exp_02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_SEx_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_SEx_02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_SEx_03.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_SEx_Rise_Up_05.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Shockwave_Inst1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Wind_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/Inst/M_Wind_02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/M_Master_Debri.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/M_Master_Explosion.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/M_Shockwave.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/M_Sprite.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Material/M_master_Fire_Gun.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Models/SM_Rock_A.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Models/SM_Rock_B.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Models/SM_sphere.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Niagara_FX/Explosions/NET_ExploType.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Niagara_FX/Explosions/NE_Explosions_Emitter.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Niagara_FX/Explosions/NS_Barrel_Ex.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Niagara_FX/Explosions/NS_Car_Ex.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Niagara_FX/Explosions/NS_Debris_FX.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Niagara_FX/Explosions/NS_Fire_Trail.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Niagara_FX/Explosions/NS_General_L_Ex_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Niagara_FX/Explosions/NS_General_L_Ex_02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Niagara_FX/Explosions/NS_General_L_Ex_03.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Niagara_FX/Explosions/NS_General_M_Ex_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Niagara_FX/Explosions/NS_General_M_Ex_02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Niagara_FX/Explosions/NS_General_M_Ex_03.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Niagara_FX/Explosions/NS_General_Mas_Ex_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Niagara_FX/Explosions/NS_General_Mas_Ex_02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Niagara_FX/Explosions/NS_General_Mas_Ex_03.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Niagara_FX/Explosions/NS_General_S_Ex_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Niagara_FX/Explosions/NS_General_S_Ex_02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Niagara_FX/Explosions/NS_General_S_Ex_03.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Niagara_FX/Explosions/NS_Grenade_Ex_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Niagara_FX/Explosions/NS_Grenade_Ex_02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Texture/Debris/T_Rock_A_C.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Texture/Debris/T_Rock_A_N.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Texture/Debris/T_Rock_B_C.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Texture/Debris/T_Rock_B_N.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Texture/Fire/T_fire.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Texture/T_Floor_Normal_OpenGL.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Texture/explosion/T_explo.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Texture/explosion/T_explo_02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Texture/explosion/T_explo_03.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/PyroVFX/Texture/explosion/T_explo_04.uasset (Stored with Git LFS)

View File

Binary file not shown.

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