Merge branch 'master' of https://github.com/CameronBonde/MelbPolyGroupB

CameronBonde · Dec 1, 2015 · 4d74615 · 4d74615
2 parents 55a8692 + 03b85a7
commit 4d74615
Show file tree

Hide file tree

Showing 69 changed files with 27 additions and 2 deletions.
diff --git a/Config/DefaultEditorPerProjectUserSettings.ini b/Config/DefaultEditorPerProjectUserSettings.ini
@@ -1,4 +1,3 @@
-
 [/Script/UnrealEd.LevelEditorPlaySettings]
 PlayFromHerePlayerStartClassName=/Script/Engine.PlayerStartPIE
 GameGetsMouseControl=False
@@ -114,4 +113,30 @@ LastExecutedPlayModeType=PlayMode_InViewPort
 +TelevisionScreenResolutions=(Description="4K Ultra HD",Width=3840,Height=2160,AspectRatio="16:9")
 +TelevisionScreenResolutions=(Description="4K Digital Cinema",Width=4096,Height=2160,AspectRatio="1.90:1")
 
+[/Script/UnrealEd.EditorLoadingSavingSettings]
+LoadLevelAtStartup=ProjectDefault
+bForceCompilationAtStartup=False
+bRestoreOpenAssetTabsOnRestart=False
+bEnableSourceControlCompatabilityCheck=True
+bMonitorContentDirectories=True
++AutoReimportDirectorySettings=(SourceDirectory="/Game/",MountPoint=,Wildcards=)
+AutoReimportThreshold=3.000000
+bAutoCreateAssets=True
+bAutoDeleteAssets=True
+bDetectChangesOnRestart=True
+bDeleteSourceFilesWithAssets=False
+bAutoReimportTextures=False
+bAutoReimportCSV=False
+bDirtyMigratedBlueprints=False
+bAutoSaveEnable=True
+bAutoSaveMaps=True
+bAutoSaveContent=True
+AutoSaveTimeMinutes=5
+AutoSaveWarningInSeconds=10
+bAutomaticallyCheckoutOnAssetModification=False
+bPromptForCheckoutOnAssetModification=True
+bSCCAutoAddNewFiles=True
+bSCCUseGlobalSettings=False
+TextDiffToolPath=(FilePath="p4merge.exe")
+
 
diff --git a/Content/George.uasset b/Content/George.uasset
diff --git a/Content/George/01_-_Default.uasset b/Content/George/01_-_Default.uasset
diff --git a/Content/George/02_-_Default.uasset b/Content/George/02_-_Default.uasset
diff --git a/Content/George/03_-_Default.uasset b/Content/George/03_-_Default.uasset
diff --git a/Content/George/07_-_Default.uasset b/Content/George/07_-_Default.uasset
diff --git a/Content/George/08_-_Default.uasset b/Content/George/08_-_Default.uasset
diff --git a/Content/George/09_-_Default.uasset b/Content/George/09_-_Default.uasset
diff --git a/Content/George/Bullet.uasset b/Content/George/Bullet.uasset
diff --git a/Content/George/Character_Blueprint.uasset b/Content/George/Character_Blueprint.uasset
diff --git a/Content/George/Floor.uasset b/Content/George/Floor.uasset
diff --git a/Content/George/Items/Floor.uasset b/Content/George/Items/Floor.uasset
diff --git a/Content/George/Items/NewGameMode.uasset b/Content/George/Items/NewGameMode.uasset
diff --git a/Content/George/Items/Robot.uasset b/Content/George/Items/Robot.uasset
diff --git a/Content/George/NewBlueprint.uasset b/Content/George/NewBlueprint.uasset
diff --git a/Content/George/NewGameMode.uasset b/Content/George/NewGameMode.uasset
diff --git a/Content/George/Robot.uasset b/Content/George/Robot.uasset
diff --git a/Content/George/Robot_PhysicsAsset.uasset b/Content/George/Robot_PhysicsAsset.uasset
diff --git a/Content/George/Robot_Skeleton.uasset b/Content/George/Robot_Skeleton.uasset
diff --git a/Content/George/Robot_Skeleton_Sequence.uasset b/Content/George/Robot_Skeleton_Sequence.uasset
diff --git a/Content/George/Standardmaterial.uasset b/Content/George/Standardmaterial.uasset
diff --git a/Content/George/colours/01_-_Default.uasset b/Content/George/colours/01_-_Default.uasset
diff --git a/Content/George/colours/02_-_Default.uasset b/Content/George/colours/02_-_Default.uasset
diff --git a/Content/George/colours/03_-_Default.uasset b/Content/George/colours/03_-_Default.uasset
diff --git a/Content/George/colours/07_-_Default.uasset b/Content/George/colours/07_-_Default.uasset
diff --git a/Content/George/colours/08_-_Default.uasset b/Content/George/colours/08_-_Default.uasset
diff --git a/Content/George/colours/09_-_Default.uasset b/Content/George/colours/09_-_Default.uasset
diff --git a/Content/George/colours/Standardmaterial.uasset b/Content/George/colours/Standardmaterial.uasset
diff --git a/Content/George/glow.uasset b/Content/George/glow.uasset
diff --git a/Content/People/Bradley_Porter/Materials/m_glass.uasset b/Content/People/Bradley_Porter/Materials/m_glass.uasset
diff --git a/Content/People/CameronBonde/Blueprints/Dude.uasset b/Content/People/CameronBonde/Blueprints/Dude.uasset
diff --git a/Content/People/ChristopherDivers/ChrisState.uasset b/Content/People/ChristopherDivers/ChrisState.uasset
diff --git a/Content/People/ChristopherDivers/Chris_Pratt.uasset b/Content/People/ChristopherDivers/Chris_Pratt.uasset
diff --git a/Content/People/ChristopherDivers/NewMap.umap b/Content/People/ChristopherDivers/NewMap.umap
diff --git a/Content/People/ChristopherDivers/Test1.umap b/Content/People/ChristopherDivers/Test1.umap
diff --git a/Content/People/ChristopherDivers/Untitled.umap b/Content/People/ChristopherDivers/Untitled.umap
diff --git a/Content/People/George/01_-_Default.uasset b/Content/People/George/01_-_Default.uasset
diff --git a/Content/People/George/02_-_Default.uasset b/Content/People/George/02_-_Default.uasset
diff --git a/Content/People/George/03_-_Default.uasset b/Content/People/George/03_-_Default.uasset
diff --git a/Content/People/George/07_-_Default.uasset b/Content/People/George/07_-_Default.uasset
diff --git a/Content/People/George/08_-_Default.uasset b/Content/People/George/08_-_Default.uasset
diff --git a/Content/People/George/09_-_Default.uasset b/Content/People/George/09_-_Default.uasset
diff --git a/Content/People/George/Cube_Blueprint.uasset b/Content/People/George/Cube_Blueprint.uasset
diff --git a/Content/People/George/George.uasset b/Content/People/George/George.uasset
diff --git a/Content/People/George/Killa.uasset b/Content/People/George/Killa.uasset
diff --git a/Content/People/George/Killa_states.uasset b/Content/People/George/Killa_states.uasset
diff --git a/Content/People/George/NewBlueprint.uasset b/Content/People/George/NewBlueprint.uasset
diff --git a/Content/People/George/Robot.uasset b/Content/People/George/Robot.uasset
diff --git a/Content/People/George/Robot_Main.uasset b/Content/People/George/Robot_Main.uasset
diff --git a/Content/People/George/Robot_PhysicsAsset.uasset b/Content/People/George/Robot_PhysicsAsset.uasset
diff --git a/Content/People/George/Robot_Skeleton.uasset b/Content/People/George/Robot_Skeleton.uasset
diff --git a/Content/People/George/Standardmaterial.uasset b/Content/People/George/Standardmaterial.uasset
diff --git a/Content/George/Items/George.umap → Content/People/George/Test_lvl.umap b/Content/George/Items/George.umap → Content/People/George/Test_lvl.umap
diff --git a/Content/People/George/my_level.umap b/Content/People/George/my_level.umap
diff --git a/Content/People/George/spawn_loactions.uasset b/Content/People/George/spawn_loactions.uasset
diff --git a/Content/People/KareemDrayton/Blueprints/Actions.uasset b/Content/People/KareemDrayton/Blueprints/Actions.uasset
diff --git a/Content/People/KareemDrayton/Blueprints/KDrayton.uasset b/Content/People/KareemDrayton/Blueprints/KDrayton.uasset
diff --git a/Content/People/KareemDrayton/KDTestBuddies.umap b/Content/People/KareemDrayton/KDTestBuddies.umap
diff --git a/Content/People/KareemDrayton/TestLevel.umap b/Content/People/KareemDrayton/TestLevel.umap
diff --git a/Content/People/WellenThai/EnemyDosh.uasset b/Content/People/WellenThai/EnemyDosh.uasset
diff --git a/Content/People/WellenThai/SirDosh.uasset b/Content/People/WellenThai/SirDosh.uasset
diff --git a/Content/People/WellenThai/Test_Level_Is_Real.umap b/Content/People/WellenThai/Test_Level_Is_Real.umap
diff --git a/Content/People/ZachariahBroomhall/Blueprints/Zack_Character.uasset b/Content/People/ZachariahBroomhall/Blueprints/Zack_Character.uasset
diff --git a/Content/People/ZachariahBroomhall/Blueprints/ZakStates.uasset b/Content/People/ZachariahBroomhall/Blueprints/ZakStates.uasset
diff --git a/Content/People/ZachariahBroomhall/Hell.umap b/Content/People/ZachariahBroomhall/Hell.umap
diff --git a/Content/spawn_1.uasset b/Content/spawn_1.uasset
diff --git a/Content/spawn_loactions.uasset b/Content/spawn_loactions.uasset
diff --git a/Content/spawn_loc_1.uasset b/Content/spawn_loc_1.uasset
diff --git a/MelbPolyGroupB.uproject b/MelbPolyGroupB.uproject
@@ -1,6 +1,6 @@
 {
  "FileVersion": 3,
- "EngineAssociation": "{9F5F781F-4755-A41C-99A8-56B30B9D1463}",
+ "EngineAssociation": "4.9",
  "Category": "",
  "Description": ""
 }