tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

First commit using Visual Studio, I sure hope I'm doing this right. 

More or less a test commit filled with very minor changes.

* Updated the donation sheet in Your Room to match the full list found on http://pokemon3d.net/forum/donations/.
* Added myself as a Debug Tester in the credits (yes I know how modest of me).

Future commits will be focused on a single file instead or more than one.
This commit is contained in:
Conner Joseph Brewster (Tornado9797) 2017-01-16 20:48:41 -06:00 committed by CaptainSegis
parent 3f42993401
commit 0dc9f6ac12
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
2.5DHero/2.5DHero/Screens/Credits/CreditsScreen.vb
View File

@ -69,7 +69,7 @@ Public Class CreditsScreen
CreditsPages.Add(New CreditsPage("Pokéditor Programming", Color.White, Color.Black, {"Nils Drescher", "Jason Houston", "Hunter Graves"}.ToList())) CreditsPages.Add(New CreditsPage("Pokéditor Programming", Color.White, Color.Black, {"Nils Drescher", "Jason Houston", "Hunter Graves"}.ToList()))
CreditsPages.Add(New CreditsPage("Website Host/Server maintenance", Color.White, Color.Black, {"Daniel Billing", "Daniel Laube"}.ToList())) CreditsPages.Add(New CreditsPage("Website Host/Server maintenance", Color.White, Color.Black, {"Daniel Billing", "Daniel Laube"}.ToList()))
CreditsPages.Add(New CreditsPage("GameJolt Service/API programming", Color.White, Color.Black, {"David DeCarmine", "Nils Drescher"}.ToList())) CreditsPages.Add(New CreditsPage("GameJolt Service/API programming", Color.White, Color.Black, {"David DeCarmine", "Nils Drescher"}.ToList()))
CreditsPages.Add(New CreditsPage("Debug testing", Color.White, Color.Black, {"Jan Mika Eine", "Tim Drescher", "Daniel Steinborn", "Andrew Leach", "Marc Boisvert-Dupras", "Matt Chambers", "Hunter Graves", "Benjamin Smith", "William Hunn", "Torben Carrington", """oXFantaXo"""}.ToList())) CreditsPages.Add(New CreditsPage("Debug testing", Color.White, Color.Black, {"Jan Mika Eine", "Tim Drescher", "Daniel Steinborn", "Andrew Leach", "Marc Boisvert-Dupras", "Matt Chambers", "Hunter Graves", "Benjamin Smith", "William Hunn", "Torben Carrington", """oXFantaXo""", "Conner Brewster"}.ToList()))
CreditsPages.Add(New CreditsPage("Special Thanks", Color.White, Color.Black, {"""MunchingOrange""", """TheFlamingSpade""", """SlyFoxHound""", """ArsenioDev""", """TrUShade""", """Isaaking6"""}.ToList())) CreditsPages.Add(New CreditsPage("Special Thanks", Color.White, Color.Black, {"""MunchingOrange""", """TheFlamingSpade""", """SlyFoxHound""", """ArsenioDev""", """TrUShade""", """Isaaking6"""}.ToList()))
CreditsPages.Add(New CreditsPage("Special Thanks", Color.White, Color.Black, {"Davey Van Raaij", "Diego López", "The GameJolt team", "The AppSharp team", "The Smogon University Team"}.ToList())) CreditsPages.Add(New CreditsPage("Special Thanks", Color.White, Color.Black, {"Davey Van Raaij", "Diego López", "The GameJolt team", "The AppSharp team", "The Smogon University Team"}.ToList()))
CreditsPages.Add(New CreditsPage("", Color.White, Color.Black, {"And probably a lot more.", "Especially all the awesome people from", "the pokemon3d.net community.", "Thanks for helping and playing this great game."}.ToList())) CreditsPages.Add(New CreditsPage("", Color.White, Color.Black, {"And probably a lot more.", "Especially all the awesome people from", "the pokemon3d.net community.", "Thanks for helping and playing this great game."}.ToList()))

18
2.5DHero/2.5DHero/Screens/GUI/DonationScreen.vb
View File

@ -5,7 +5,7 @@
Dim mainTexture As Texture2D Dim mainTexture As Texture2D
Dim scrollTexture As Texture2D Dim scrollTexture As Texture2D
Dim DonatorList() As String = {"Steven Sinclair", "Diego López", "Corbin Lair", "Michael Langen", "Diego Lopez", "Sam Schultz", "Tom Bolen", "Lewis Thompson", "William Hafey", "Edward Akus", "Arno Wendorff", "Kim Nay", "Danie Daniels", "Joe Palacios", "Stuart Oxtoby", "Jack Mckenzie", "Michael Cutipa", "The Homies", "Alicia Barfoot", "Maintrain97", "Shinytish", "Michael Molina", "Edward Akus"} Dim DonatorList() As String = {"Many Anonymous Donors", "Username99", "Merder222", "Felipe 2", "Kuro95", "WheresMyTea", "RandomBounty", "NumseFisK", "abcoanon", "SirMarty", "The_Merciless95", "adm0n", "Avaluque", "Duck Tard", "L3_Purr", "Derata", "TheFlipside", "Zippo", "Dirty Harry", "Chaos7777", "Sontee", "PsYcO363", "Sammyinside", "mickeystand1", "Tripsaur", "Fox405", "LoganKnez", "Jehowi", "Sedat", "Mischapus", "PeanutButter", "Nathan Wilson", "Fluffy", "Shou Liengod", "Gorogok", "Yoshina", "Hodsy Beats", "takenbycats", "sorixkhaos", "lordkango", "northway", "bloodeyezack", "gladdy16", "Paradetheday", "Gawerty", "Haydos709", "ShadyGame", "Mikolaj Nowicki", "Koolboyman", "TrainerStan", "carebear", "Bedders", "Matz", "ITAxDarko", "Rhyinn", "arthegon", "bmalfer", "Noah Cloud", "Matti", "Yrael", "Tornado9797", "Wilkojc", "Namu", "SACooper95", "nilllzz", "Nesasio", "beenlord", "Maria", "JohnnyRooks", "Calcifer", "Nyves", "Daniel Saavedra", "DannyM93", "The-amazing-blackstar", "DevoidLight", "OhSnapItsDavid", "Anvil555", "Clanor", "Liamash3", "Daysofthenew690", "Luan Nicholas", "Pushacher19", "Meowth", "DarknessYami", "Gameshark93", "Enethil", "Gnifle", "abovo", "p1neapple", "Destructosaur", "Darkfire", "Tim Dargan", "PrincessKooh", "Tyler Snyder", "hannes3120", "Raa", "Richard Tisher", "Brutalicious", "DarkLink", "Mpilemann", "PerrBearr", "robod", "Davey", "Colin_Mg", "Whitney", "mreh", "zXxLIPSxXz", "Xane", "LeeMan", "ekwilson79", "Darrin Danhauer", "AlessaGarnish", "Sola", "Luffy343", "Masasume", "Grabsak Turnkoff", "Sporkedmango", "Splint", "Mitchmack", "Pegasuraptor", "CrayonDoctor", "Olliewott", "Maizox", "Gamester565", "Michael", "Syrca", "PaperDanie2", "Gamerunner15", "Ashurnasirpal", "edward", "Gusty Glalie", "DracoHouston", "BakaOnibi", "Tj8805", "Lunick", "Karasu416", "Steven Sinclair", "Corbin Lair", "Michael Langen", "Diego López", "Sam Schultz", "Tom Bolen", "Lewis Thompson", "William Hafey", "Edward Akus", "Arno Wendorff", "Kim Nay", "Danie Daniels", "Joe Palacios", "Stuart Oxtoby", "Jack Mckenzie", "Michael Cutipa", "The Homies", "Alicia Barfoot", "Maintrain97", "Shinytish", "Michael Molina", "Edward Akus"}
Dim OffsetY As Integer = 0 Dim OffsetY As Integer = 0
Const ScrollSpeed As Single = 35.0F Const ScrollSpeed As Single = 35.0F
@ -16,16 +16,16 @@
Me.scrollTexture = TextureManager.GetTexture("GUI\Menus\Menu") Me.scrollTexture = TextureManager.GetTexture("GUI\Menus\Menu")
Dim l As New List(Of String) ' Dim l As New List(Of String)
Dim oldL As List(Of String) = DonatorList.ToList() Dim l As List(Of String) = DonatorList.ToList()
While oldL.Count > 0 ' Decided to remove the seemingly unnecessary randomization of the donor list. Re-implement if voted back in. - Tornado9797
Dim i As Integer = Core.Random.Next(0, oldL.Count)
l.Add(oldL(i))
oldL.RemoveAt(i)
End While
l.Add("Missingno.") ' While oldL.Count > 0
' Dim i As Integer = Core.Random.Next(0, oldL.Count)
' l.Add(oldL(i))
' oldL.RemoveAt(i)
' End While
DonatorList = l.ToArray() DonatorList = l.ToArray()
End Sub End Sub

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 = 42308842 Const EXPECTEDSIZE As Integer = 42308849
Const METAHASH As String = "QzFBQjUzNjQ1MjRGNjlDNUU4MUMzRUY5Qjg3NTgzMzQ=" Const METAHASH As String = "MUIxNzEzNDI3OEQwMkE5QkEzNkZBRjMxQjk4QjU0MEE="
Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean
Get Get

2
2.5DHero/2.5DHeroContent/meta
View File

File diff suppressed because one or more lines are too long