Merge branch 'feature-resolve-warnings' into feature-credential-service

mediumTaj · mediumTaj · commit 963114005320 · 2018-01-15T13:21:01.000-06:00
diff --git a/ThirdParty/FullSerializer/Aot/Editor/fsAotConfigurationEditor.cs b/ThirdParty/FullSerializer/Aot/Editor/fsAotConfigurationEditor.cs
@@ -12,10 +12,10 @@ namespace FullSerializer {
 	[InitializeOnLoad]
 	public static class PlayStateNotifier {
 		static PlayStateNotifier() {
-			EditorApplication.playmodeStateChanged += ModeChanged;
+			EditorApplication.playModeStateChanged += ModeChanged;
 		}
 
-		private static void ModeChanged () {
+		private static void ModeChanged (PlayModeStateChange playModeStateChange) {
 			if (!EditorApplication.isPlayingOrWillChangePlaymode && EditorApplication.isPlaying) {
 				Debug.Log("There are " + fsAotCompilationManager.AotCandidateTypes.Count + " candidate types");
 				foreach (fsAotConfiguration target in Resources.FindObjectsOfTypeAll<fsAotConfiguration>()) {
diff --git a/Travis/TravisBuild.cs b/Travis/TravisBuild.cs
@@ -34,7 +34,7 @@ public static class RunTravisBuild
 
   static public void OSX()
   {
-    BuildPipeline.BuildPlayer(BuildScenes, Application.dataPath + "TestBuildOSX", BuildTarget.StandaloneOSXIntel64, BuildOptions.None);
+    BuildPipeline.BuildPlayer(BuildScenes, Application.dataPath + "TestBuildOSX", BuildTarget.StandaloneOSX, BuildOptions.None);
   }
 
   static public void Windows()

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public static class RunTravisBuild`
`34`	`34`
`35`	`35`	`static public void OSX()`
`36`	`36`	`{`
`37`		`- BuildPipeline.BuildPlayer(BuildScenes, Application.dataPath + "TestBuildOSX", BuildTarget.StandaloneOSXIntel64, BuildOptions.None);`
	`37`	`+ BuildPipeline.BuildPlayer(BuildScenes, Application.dataPath + "TestBuildOSX", BuildTarget.StandaloneOSX, BuildOptions.None);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`static public void Windows()`