tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-28 16:24:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into Cool_menus_experiment

Browse Source
This commit is contained in:
CaptainSegis 2017-02-16 14:42:23 -05:00
commit d408c9d196
6 changed files with 167 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
2.5DHero/2.5DHero/CurrentVersion.dat
View File

@ -1 +1 @@
0.54.1 0.54.1a

43
2.5DHero/2.5DHero/Screens/MainMenu/MainMenuScreen.vb
View File

@ -92,24 +92,43 @@ Public Class MainMenuScreen
Logger.Debug("---Check Version---") Logger.Debug("---Check Version---")
If Not Core.GameOptions.UpdateDisabled AndAlso My.Computer.Network.IsAvailable Then If Not Core.GameOptions.UpdateDisabled AndAlso My.Computer.Network.IsAvailable Then
Task.Factory.StartNew(Sub() WaitForUpdaterAsync()
Dim Updater As New Process()
Updater.StartInfo = New ProcessStartInfo("Updater.exe")
Updater.Start()
Updater.WaitForExit()
If Updater.ExitCode = 1 Then
Core.GameInstance.Exit()
Else
GameController.UpdateChecked = True
End If
End Sub)
End If End If
End If End If
Catch ex As Exception Catch ex As Exception
End Try End Try
End Sub End Sub
Private Async Function WaitForUpdaterAsync() As Task
Dim Updater As New Process
Updater.EnableRaisingEvents = True
Updater.StartInfo = New ProcessStartInfo("Updater.exe")
Updater.Start()
AddHandler Updater.Exited, Sub()
Select Case Updater.ExitCode
Case 0
GameController.UpdateChecked = True
Case 1
Core.GameInstance.Exit()
Case 2
Core.GameOptions.UpdateDisabled = True
Core.GameOptions.SaveOptions()
GameController.UpdateChecked = True
Case 3
Core.GameOptions.UpdateDisabled = True
Core.GameOptions.SaveOptions()
Core.GameInstance.Exit()
End Select
End Sub
Await Task.Delay(20000)
If Not Updater.HasExited Then
Updater.Kill()
GameController.UpdateChecked = True
End If
End Function
Private Sub GetPacks(Optional ByVal reload As Boolean = False) Private Sub GetPacks(Optional ByVal reload As Boolean = False)
PackNames.Clear() PackNames.Clear()

4
2.5DHero/2.5DHero/Security/FileValidation.vb
View File

@ -6,8 +6,8 @@
Shared _valid As Boolean = False Shared _valid As Boolean = False
Const RUNVALIDATION As Boolean = False Const RUNVALIDATION As Boolean = False
Const EXPECTEDSIZE As Integer = 42417354 Const EXPECTEDSIZE As Integer = 42417361
Const METAHASH As String = "RUM3N0U1REM0NzREQjkzRUU2MEE1NDk2MUQxNDU5NDU=" Const METAHASH As String = "ODNEM0E3NkZFMTNBODk2ODAyODAxRkYzN0U3RTM0Mzk="
Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean
Get Get

BIN
2.5DHero/2.5DHero/Updater.exe
View File

Binary file not shown.

132
2.5DHero/2.5DHeroContent/Content.mgcb
View File

@ -4007,6 +4007,18 @@
/processorParam:TextureFormat=Color /processorParam:TextureFormat=Color
/build:Content/Pokemon/Overworld/Normal/115.png /build:Content/Pokemon/Overworld/Normal/115.png
#begin Content/Pokemon/Overworld/Normal/115_mega.png
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
/processorParam:ColorKeyEnabled=True
/processorParam:GenerateMipmaps=False
/processorParam:PremultiplyAlpha=True
/processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
/build:Content/Pokemon/Overworld/Normal/115_mega.png
#begin Content/Pokemon/Overworld/Normal/116.png #begin Content/Pokemon/Overworld/Normal/116.png
/importer:TextureImporter /importer:TextureImporter
/processor:TextureProcessor /processor:TextureProcessor
@ -14579,6 +14591,18 @@
/processorParam:TextureFormat=Color /processorParam:TextureFormat=Color
/build:Content/Pokemon/Overworld/Shiny/115.png /build:Content/Pokemon/Overworld/Shiny/115.png
#begin Content/Pokemon/Overworld/Shiny/115_mega.png
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
/processorParam:ColorKeyEnabled=True
/processorParam:GenerateMipmaps=False
/processorParam:PremultiplyAlpha=True
/processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
/build:Content/Pokemon/Overworld/Shiny/115_mega.png
#begin Content/Pokemon/Overworld/Shiny/116.png #begin Content/Pokemon/Overworld/Shiny/116.png
/importer:TextureImporter /importer:TextureImporter
/processor:TextureProcessor /processor:TextureProcessor
@ -17639,6 +17663,18 @@
/processorParam:TextureFormat=Color /processorParam:TextureFormat=Color
/build:Content/Pokemon/Overworld/Shiny/308.png /build:Content/Pokemon/Overworld/Shiny/308.png
#begin Content/Pokemon/Overworld/Shiny/308_mega.png
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
/processorParam:ColorKeyEnabled=True
/processorParam:GenerateMipmaps=False
/processorParam:PremultiplyAlpha=True
/processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
/build:Content/Pokemon/Overworld/Shiny/308_mega.png
#begin Content/Pokemon/Overworld/Shiny/309.png #begin Content/Pokemon/Overworld/Shiny/309.png
/importer:TextureImporter /importer:TextureImporter
/processor:TextureProcessor /processor:TextureProcessor
@ -20099,6 +20135,18 @@
/processorParam:TextureFormat=Color /processorParam:TextureFormat=Color
/build:Content/Pokemon/Overworld/Shiny/475.png /build:Content/Pokemon/Overworld/Shiny/475.png
#begin Content/Pokemon/Overworld/Shiny/475_mega.png
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
/processorParam:ColorKeyEnabled=True
/processorParam:GenerateMipmaps=False
/processorParam:PremultiplyAlpha=True
/processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
/build:Content/Pokemon/Overworld/Shiny/475_mega.png
#begin Content/Pokemon/Overworld/Shiny/476.png #begin Content/Pokemon/Overworld/Shiny/476.png
/importer:TextureImporter /importer:TextureImporter
/processor:TextureProcessor /processor:TextureProcessor
@ -21179,6 +21227,18 @@
/processorParam:TextureFormat=Color /processorParam:TextureFormat=Color
/build:Content/Pokemon/Overworld/Shiny/531.png /build:Content/Pokemon/Overworld/Shiny/531.png
#begin Content/Pokemon/Overworld/Shiny/531_mega.png
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
/processorParam:ColorKeyEnabled=True
/processorParam:GenerateMipmaps=False
/processorParam:PremultiplyAlpha=True
/processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
/build:Content/Pokemon/Overworld/Shiny/531_mega.png
#begin Content/Pokemon/Overworld/Shiny/532.png #begin Content/Pokemon/Overworld/Shiny/532.png
/importer:TextureImporter /importer:TextureImporter
/processor:TextureProcessor /processor:TextureProcessor
@ -24755,6 +24815,18 @@
/processorParam:TextureFormat=Color /processorParam:TextureFormat=Color
/build:Content/Pokemon/Overworld/Shiny/94.png /build:Content/Pokemon/Overworld/Shiny/94.png
#begin Content/Pokemon/Overworld/Shiny/94_mega.png
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
/processorParam:ColorKeyEnabled=True
/processorParam:GenerateMipmaps=False
/processorParam:PremultiplyAlpha=True
/processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
/build:Content/Pokemon/Overworld/Shiny/94_mega.png
#begin Content/Pokemon/Overworld/Shiny/95.png #begin Content/Pokemon/Overworld/Shiny/95.png
/importer:TextureImporter /importer:TextureImporter
/processor:TextureProcessor /processor:TextureProcessor
@ -25451,6 +25523,18 @@
/processorParam:TextureFormat=Color /processorParam:TextureFormat=Color
/build:Content/Pokemon/Sprites/Audino.png /build:Content/Pokemon/Sprites/Audino.png
#begin Content/Pokemon/Sprites/Audino_mega.png
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
/processorParam:ColorKeyEnabled=True
/processorParam:GenerateMipmaps=False
/processorParam:PremultiplyAlpha=True
/processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
/build:Content/Pokemon/Sprites/Audino_mega.png
#begin Content/Pokemon/Sprites/Aurorus.png #begin Content/Pokemon/Sprites/Aurorus.png
/importer:TextureImporter /importer:TextureImporter
/processor:TextureProcessor /processor:TextureProcessor
@ -27035,6 +27119,18 @@
/processorParam:TextureFormat=Color /processorParam:TextureFormat=Color
/build:Content/Pokemon/Sprites/diancie.png /build:Content/Pokemon/Sprites/diancie.png
#begin Content/Pokemon/Sprites/Diancie_mega.png
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
/processorParam:ColorKeyEnabled=True
/processorParam:GenerateMipmaps=False
/processorParam:PremultiplyAlpha=True
/processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
/build:Content/Pokemon/Sprites/Diancie_mega.png
#begin Content/Pokemon/Sprites/diggersby.png #begin Content/Pokemon/Sprites/diggersby.png
/importer:TextureImporter /importer:TextureImporter
/processor:TextureProcessor /processor:TextureProcessor
@ -27959,6 +28055,18 @@
/processorParam:TextureFormat=Color /processorParam:TextureFormat=Color
/build:Content/Pokemon/Sprites/Gallade.png /build:Content/Pokemon/Sprites/Gallade.png
#begin Content/Pokemon/Sprites/Gallade_mega.png
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
/processorParam:ColorKeyEnabled=True
/processorParam:GenerateMipmaps=False
/processorParam:PremultiplyAlpha=True
/processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
/build:Content/Pokemon/Sprites/Gallade_mega.png
#begin Content/Pokemon/Sprites/Galvantula.png #begin Content/Pokemon/Sprites/Galvantula.png
/importer:TextureImporter /importer:TextureImporter
/processor:TextureProcessor /processor:TextureProcessor
@ -29819,6 +29927,18 @@
/processorParam:TextureFormat=Color /processorParam:TextureFormat=Color
/build:Content/Pokemon/Sprites/Lopunny.png /build:Content/Pokemon/Sprites/Lopunny.png
#begin Content/Pokemon/Sprites/Lopunny_mega.png
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
/processorParam:ColorKeyEnabled=True
/processorParam:GenerateMipmaps=False
/processorParam:PremultiplyAlpha=True
/processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
/build:Content/Pokemon/Sprites/Lopunny_mega.png
#begin Content/Pokemon/Sprites/Lotad.png #begin Content/Pokemon/Sprites/Lotad.png
/importer:TextureImporter /importer:TextureImporter
/processor:TextureProcessor /processor:TextureProcessor
@ -44328,6 +44448,18 @@
/processorParam:TextureFormat=Color /processorParam:TextureFormat=Color
/build:Content/Textures/NPC/OldLady.png /build:Content/Textures/NPC/OldLady.png
#begin Content/Textures/NPC/Omega.png
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
/processorParam:ColorKeyEnabled=True
/processorParam:GenerateMipmaps=False
/processorParam:PremultiplyAlpha=True
/processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
/build:Content/Textures/NPC/Omega.png
#begin Content/Textures/NPC/Petrel.png #begin Content/Textures/NPC/Petrel.png
/importer:TextureImporter /importer:TextureImporter
/processor:TextureProcessor /processor:TextureProcessor

2
2.5DHero/2.5DHeroContent/meta
View File

File diff suppressed because one or more lines are too long