diff --git a/gfx/fGTS colour blending.psd b/gfx/fGTS colour blending.psd index b3c4964c..25264c9c 100644 Binary files a/gfx/fGTS colour blending.psd and b/gfx/fGTS colour blending.psd differ diff --git a/gts/Default.aspx b/gts/Default.aspx index 5a1ed613..0e0c7a50 100644 --- a/gts/Default.aspx +++ b/gts/Default.aspx @@ -1,13 +1,73 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/masters/ThreeColumn.master" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="PkmnFoundations.GTS.Default" %> <%@ Register TagPrefix="pf" Namespace="PkmnFoundations.Web" Assembly="PkmnFoundations.GTS" %> +<%@ Register TagPrefix="pf" TagName="LabelTextBox" Src="~/controls/LabelTextBox.ascx" %> - + - + -
+ +
+
+ + + + + + + +
+ +
+

Maintenance periods are Thursdays at + UTC 0500.

+
+ +
+

Supported games: Diamond, Pearl, + Platinum, Heart Gold, + Soul Silver, Black, + White, Black 2, + White 2.

+
+
+

Supported features: Wi-Fi Clubaltwfc, + GTS, Battle Videos, + Random Matchup

+
+ +
+ + +
+ + + + + + + + + +

How to connect

+
    +
  1. Obtain an Action Replay code for your game. (complete list coming + soon)
    If you are using an emulator, you can patch your game with + WfcPatcher.
    2. +
  2. If applicable, enable the code and launch your game.
    3. +
  3. On your DS, set the DNS to 104.131.93.87.
    4. +
  4. Connect!
    5. +
+ +

Complete instructions can be found at + the + AltWFC Wiki.

+ +

Update - August 29:

Wi-fi Battle Tower and Battle Subway are now available! @@ -22,39 +82,5 @@

Dressup photos, box uploads, and musical photos are also available.

-

What is Foundations GTS?

-

Foundations GTS aims to re-create the same functionality of the original -GTS service found in the games, Pokémon Diamond, -Pearl, Platinum, Heart Gold, Soul Silver, Black, White, Black 2, and White 2, in an open source -project.

-

The main reason I chose to write my own GTS is because of the -shutdown - of Nintendo Wi-fi Connection services on May 20. To allow players to -continue trading, someone would need to make a replacement server, so I decided to help out.

- -

This is a WORK IN PROGRESS. I make no promises that your -Pokémon will be safe or that you will get them back. If you find any problems, please -report them in the - -issue tracker with complete replication steps, and Wireshark captures if possible. -Thanks. -

- -

What is Pokémon Foundations?

-

Pokémon Foundations is going to be a collection of utilities dealing with the logic, math, -and data related to the main series of Pokémon RPG videogames. Planned is a Pokédex, stat calculator, -damage calculator, and possibly more! (For now, it’s just a GTS.)

- -

How do I use this GTS?

-

Connections are made through the -DWC Network Server Emulator (altWFC). Complete instructions on how to patch your game are found at the -above link.

-

To preview the latest features, you can use this alternate DNS:

-

191.236.98.208

-

Please note that using this DNS server may interfere with the operation of some other - titles besides Pokémon.

- - -
 diff --git a/gts/Default.aspx.designer.cs b/gts/Default.aspx.designer.cs index 6e21d013..ce231679 100644 --- a/gts/Default.aspx.designer.cs +++ b/gts/Default.aspx.designer.cs @@ -21,6 +21,51 @@ namespace PkmnFoundations.GTS { /// protected global::PkmnFoundations.Web.HeaderColour HeaderColour1; + /// + /// theForm control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlForm theForm; + + /// + /// txtUsername control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::PkmnFoundations.GTS.controls.LabelTextBox txtUsername; + + /// + /// txtPassword control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::PkmnFoundations.GTS.controls.LabelTextBox txtPassword; + + /// + /// btnSubmit control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnSubmit; + + /// + /// hlRegister control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink hlRegister; + /// /// hlBattleVideos control. /// @@ -29,14 +74,5 @@ namespace PkmnFoundations.GTS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HyperLink hlBattleVideos; - - /// - /// hlIssueTracker control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.HyperLink hlIssueTracker; } } diff --git a/gts/controls/LabelTextBox.ascx b/gts/controls/LabelTextBox.ascx index 0ab9b408..a8f45987 100644 --- a/gts/controls/LabelTextBox.ascx +++ b/gts/controls/LabelTextBox.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="LabelTextBox.ascx.cs" Inherits="PkmnFoundations.GTS.controls.LabelTextBox" %> <%@ Register TagPrefix="pf" Namespace="PkmnFoundations.Web" Assembly="PkmnFoundations.GTS" %> - + diff --git a/gts/css/form.css b/gts/css/form.css index b2e93d32..a7f9a973 100644 --- a/gts/css/form.css +++ b/gts/css/form.css @@ -4,11 +4,13 @@ border: 1px solid #999999; background-color: white; box-shadow: 0 1px 2px 0 rgba(0,0,0,0.1) inset; - width: 200px; + width: 230px; height: 14px; - padding: 2px; + padding: 3px 2px; font-size: 10pt; font-family: Arial,Helvetica,sans-serif; + margin-bottom: 4px; + border-radius: 2px; } input[type=text]:focus, input[type=password]:focus, select, textarea:focus, @@ -17,10 +19,44 @@ input[type=text]:focus, input[type=password]:focus, select, textarea:focus } +input[type=submit], button +{ + height: 28px; + margin-bottom: 4px; + border-radius: 2px; + background-color: #008fc4; + background-image: -moz-linear-gradient(top, #008fc4 0%, #00749f 100%); /* FF3.6+ */ + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#008fc4), color-stop(100%,#00749f)); /* Chrome,Safari4+ */ + background-image: -webkit-linear-gradient(top, #008fc4 0%,#00749f 100%); /* Chrome10+,Safari5.1+ */ + background-image: -o-linear-gradient(top, #008fc4 0%,#00749f 100%); /* Opera 11.10+ */ + background-image: -ms-linear-gradient(top, #008fc4 0%,#00749f 100%); /* IE10+ */ + background-image: linear-gradient(to bottom, #008fc4 0%,#00749f 100%); /* W3C */ + background-size: 100%; + box-shadow: 0 2px 1px -1px #89b4d5 inset, 0 1px 2px 0 rgba(0,0,0,0.1); + border: 1px solid; + border-color: #bcd1e4 #00749f #004a68 #89b4d5; + color: white; + text-shadow: 0 1px 0 #004a68; + font-family: Lato,Candara,'Meiryo UI',Arial,sans-serif; + font-weight: bold; + cursor: pointer; +} + +input[type=submit].large, button.large +{ + width: 236px; +} + .pfLabelTextBox { position: relative; - font-family: Arial,Helvetica,sans-serif + background-color: white; + font-family: Arial,Helvetica,sans-serif; + display: inline-block; + margin: 0; padding: 0; + margin-bottom: 4px; + vertical-align: top; + border-radius: 2px; } .pfLabelTextBox label @@ -29,7 +65,7 @@ input[type=text]:focus, input[type=password]:focus, select, textarea:focus height: 0; overflow: visible; position: relative; - top: 2px; left: 3px; + top: 3px; left: 3px; color: #cccccc; } @@ -38,6 +74,7 @@ input[type=text]:focus, input[type=password]:focus, select, textarea:focus display: block; background-color: transparent; position: relative; + margin-bottom: 0; } .pfLabelTextBox input:focus, .pfLabelTextBox input.hasContent diff --git a/gts/css/login.css b/gts/css/login.css new file mode 100644 index 00000000..1a5f47e0 --- /dev/null +++ b/gts/css/login.css @@ -0,0 +1,5 @@ +.gtsLogin +{ + width: 236px; +} + diff --git a/gts/css/main.css b/gts/css/main.css index 3ad407bf..31ae8c07 100644 --- a/gts/css/main.css +++ b/gts/css/main.css @@ -15,6 +15,38 @@ h1, h2, h3, h4, strong font-weight: 700; } +hr +{ + margin: 16px 0; + border: 1px solid #cccccc; + border-width: 1px 0 0; +} + +a +{ + color: #00749f; +} + +a:hover +{ + color: #004a68; +} + +a:visited +{ + color: #7e3bd0; +} + +a:visited:hover +{ + color: #512489; +} + +li +{ + margin: 4px 0; +} + .setWidth { width: 980px; @@ -37,7 +69,7 @@ h1, h2, h3, h4, strong width: 160px; height: 160px; } -.github +.github, a.github, a.github:hover { width: 300px; height: 20px; @@ -80,6 +112,33 @@ h1, h2, h3, h4, strong display: block; } +.gtsInfo +{ + margin-left: 40px; + position: relative; +} + +.gtsInfo::before +{ + width: 24px; + height: 0; + padding: 12px 0; + position: absolute; + left: -40px; + top: calc(50% - 16px); + content: 'i'; + border: 4px solid #999999; + color: #999999; + font-family: Arial,Helvetica,sans-serif; + line-height: 0; + vertical-align: middle; + border-radius: 100%; + font-size: 24px; + font-weight: bold; + text-align: center; + display: block; +} + #gtsHeader { padding-top: 16px; @@ -92,6 +151,11 @@ h1, h2, h3, h4, strong position: relative; } +#gtsHeader a, #gtsHeader a:visited +{ + color: white; +} + #gtsHeader #gtsLogo { width: 276px; @@ -106,7 +170,6 @@ h1, h2, h3, h4, strong text-decoration: none; } - #gtsHeader #gtsLogo .gtsLogoImage, #gtsHeader #gtsLogo .gtsLogoWord { display: block; @@ -277,6 +340,11 @@ h1, h2, h3, h4, strong width: 728px; } +#gtsMain .gtsColumn .gtsSection +{ + margin-bottom: 16px; +} + #gtsSubNav { border: 1px solid #cccccc; diff --git a/gts/gts.csproj b/gts/gts.csproj index ffbfd0cd..0ad738c2 100644 --- a/gts/gts.csproj +++ b/gts/gts.csproj @@ -81,6 +81,7 @@ + diff --git a/gts/masters/MasterPage.master b/gts/masters/MasterPage.master index 06f3a6c8..38c06ab9 100644 --- a/gts/masters/MasterPage.master +++ b/gts/masters/MasterPage.master @@ -35,6 +35,7 @@
    +
  • Powered by AltWFC
  • DNS: 104.131.93.87
  • Pokémon available for offer.