Compare commits

base: triple-aaa-games:6a23f6617993079b1ab343d35d13fe1693c50734

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:5c3588253a8fc823593afd36bbc69dcd26ef7197

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. "6a23f6617993079b1ab343d35d13fe1693c50734" and "5c3588253a8fc823593afd36bbc69dcd26ef7197" have entirely different histories.

6a23f66179 ... 5c3588253a

406 changed files with 437 additions and 821 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/BP_TurretEnemy.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/Basics/BP_PickupItem_Magnetic.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/LevelDesign/LevelCreation/BP_Stairs.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_Computer.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/LevelDesign/World/BP_ElectricFence.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_ExplodingBarrel.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/Blueprints/Player/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/Blueprints/Projectile/BP_ThrownProjectile.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Meshes/SK_Insurrectionist.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/ExplosionVFX/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