Udated for 3.6 and removed RS and B&M.

_includes/newsitem.html

@@ -0,0 +1,3 @@
+<span class="date">{{include.post.date | date_to_string}}</span>
+<a href="{{page.root}}{{post.url}}"><span class="post-title">{{include.post.title}}</span></a>
+<p>{{ include.post.content | strip_html | truncatewords: 40 }}</p>

_layouts/default.html

@@ -53,6 +53,7 @@
                                 <ul class="dropdown-menu">
                                     <li><a href="{{page.root}}/start#download">Download</a></li>
                                     <li><a href="{{page.root}}/start#tutorials">Tutorials</a></li>
+                                    <li><a target="_blank" href="http://torque3d.wikidot.com/">Wiki <i class="fa fa-external-link"></i></a></li>
                                 </ul>
                             </li>
 

engine/index.html

@@ -11,8 +11,8 @@ root: ..
 <div class="container">
     <p>
     Here are some of the premier projects using Torque 3D right now. This isn't
-    an exhaustive list, just a showcase of some of our favourite projects. If
+    an exhaustive list - you can see more projects over at <a href="http://torque3d.wikidot.com/main:madewithtorque">the wiki</a>,
-    you'd like your project to feature on this page, let us know!
+    and even add your own to the list.
     </p>
 
     <div class="row">
@@ -186,7 +186,7 @@ root: ..
                 that challenges you, this is the ticket. Otherwise, take a pass.
                 The game is vicious, both in its lack of morality and its
                 merciless systems. If you want to be the hero of a story, run
-                and don’t look back. If you want to be Attia of the Julii or be
+                and don’t look back. If you want to be Atia of the Julii or be
                 a power player, this is your RPG.
                 </p>
             </div>
@@ -229,43 +229,6 @@ root: ..
             </div>
         </div>
     </div>
-
-    <div class="row">
-        <div class="media col-sm-6">
-            <a class="pull-left" href="http://respawn.gobbogamessa.com/">
-                <img class="made-with-torque" src="{{page.root}}/img/re-spawn-icon.jpg" />
-            </a>
-            <div class="media-body">
-                <h4 class="media-heading"><a href="http://respawn.gobbogamessa.com/">Re-Spawn</a></h4>
-                <a class="media-subheading" href="http://www.gobbogamessa.com/">Gobbo Games</a>
-                <p>
-                Re-Spawn is a competitive, arena-style multi-player first person
-                shooter game with fast-paced, high energy combat that requires
-                both reflexive skill and tactical thinking. 
-                It is strongly influenced by FPS classics like Quake 2,
-                Quake 3 Arena, and Unreal Tournament. Just playing one match will
-                flood your mind with memories and nostalgia.
-                </p>
-            </div>
-        </div>
-
-        <div class="media col-sm-6">
-            <a class="pull-left" href="http://www.bloodandmana.com/">
-                <img class="made-with-torque" src="{{page.root}}/img/blood-and-mana-icon.jpg" />
-            </a>
-            <div class="media-body">
-                <h4 class="media-heading"><a href="http://www.bloodandmana.com/">Blood &amp; Mana</a></h4>
-                <a class="media-subheading" href="http://www.bloodandmana.com/">Blood &amp; Mana team</a>
-                <p>
-                Blood &amp; Mana is a fast-paced multiplayer medieval arena combat
-                game, mixing elements of the RPG and FPS genres. Equip your
-                character for each battle with no restrictions, no levels, and no
-                classes. Choose from a vast collection of armor, weapons, spells,
-                skills, and items.
-                </p>
-            </div>
-        </div>
-    </div>
 </div>
 
 <div class="banner"><div class="container">

index.html

@@ -23,12 +23,14 @@ root: .
 <div class="container">
     <div class="row">
         <div class="col-sm-4">
-            <h2>Proven</h2>
+            <h2>Proven tech</h2>
             <p>
             Torque has been around for a while, and it's been used for everything
-            from interactive coral reefs to MMOs to driving simulators.
+            from driving simulators to MMOs to interactive coral reefs.
             </p>
-            <a href="{{page.root}}/engine">Games made with Torque <i class="fa fa-angle-right"></i></a>
+            <center>
+                <a href="{{page.root}}/engine">Games made with Torque <i class="fa fa-angle-right"></i></a>
+            </center>
         </div>
 
         <div class="col-sm-4">
@@ -37,7 +39,9 @@ root: .
             When you get Torque, you get everything. Under the permissive MIT
             open-source license, you can do what you want with the source code.
             </p>
-            <a href="{{page.root}}/start">Download it now <i class="fa fa-angle-right"></i></a>
+            <center>
+                <a class="btn btn-primary" href="{{page.root}}/start">Download it now</a>
+            </center>
         </div>
 
         <div class="col-sm-4">
@@ -47,9 +51,25 @@ root: .
             Its future is in <em>your</em> hands, not those of a company with a
             bottom line to meet.
             </p>
-            <a href="{{page.root}}/contribute">Get involved <i class="fa fa-angle-right"></i></a>
+            <center>
+                <a href="{{page.root}}/contribute">Get involved <i class="fa fa-angle-right"></i></a>
+            </center>
         </div>
     </div>
+
+    {% if site.posts != empty %}
+    <div class="row">
+        <div class="col-sm-12">
+            <h2>Recent news</h2>
+
+            {% for post in site.posts limit:3 %}
+                {% include newsitem.html post=post %}
+            {% endfor %}
+
+            <a class="pull-right" href="{{page.root}}/news">See all <i class="fa fa-angle-right"></i></a>
+        </div>
+    </div>
+    {% endif %}
 </div>
 
 <div class="break"></div>
@@ -65,12 +85,12 @@ root: .
             <h2 class="status">Status</h2>
             <table class="borderless table">
                 <tr>
-                    <td>Continuous</td>
+                    <td>Current version</td>
-                    <td><img src="http://builds.garagegames.com/app/rest/builds/buildType:(id:bt79)/statusIcon"></img></td>
+                    <td><a href="http://torque3d.wikidot.com/release:three-six-one">3.6.1</a></td>
                 </tr>
                 <tr>
-                    <td>Release</td>
+                    <td>Continuous integration</td>
-                    <td><img src="http://builds.garagegames.com/app/rest/builds/buildType:(id:bt78)/statusIcon"></img></td>
+                    <td><a href="http://t3dci.org">t3dci.org</a></td>
                 </tr>
             </table>
         </div>
@@ -79,7 +99,7 @@ root: .
             <h2>Issues</h2>
             <ul>
                 <li><a href="https://github.com/GarageGames/Torque3D/issues/new">Report an issue</a></li>
-                <li><a href="https://github.com/GarageGames/Torque3D/issues?milestone=2">Issues for next milestone</a></li>
+                <li><a href="https://github.com/GarageGames/Torque3D/issues?q=is%3Aopen+milestone%3A3.7+sort%3Aupdated-desc">Issues for next milestone</a></li>
                 <li><a href="https://github.com/GarageGames/Torque3D/issues?labels=Final+review">Changes for final review</a></li>
                 <li><a href="http://garagegames.uservoice.com/forums/178972-torque-3d-mit/filters/top">Feature requests</a></li>
             </ul>
@@ -87,32 +107,6 @@ root: .
     </div>
 </div>
 
-{% if site.posts != empty %}
-<div class="break"></div>
-
-<div class="container">
-    <div class="imgbanner row">
-        <div class="col-sm-12">
-            <img src="{{page.root}}/img/banner1.jpg"></img>
-        </div>
-    </div>
-
-    <div class="row">
-        <div class="col-sm-12">
-            <h2>Recent news</h2>
-
-            {% for post in site.posts limit:3 %}
-                <span class="date">{{post.date | date_to_string}}</span>
-                <a href="{{page.root}}{{post.url}}"><span class="post-title">{{post.title}}</span></a>
-                <p>{{ post.content | strip_html | truncatewords: 40 }}</p>
-            {% endfor %}
-
-            <a class="pull-right" href="{{page.root}}/news">See all <i class="fa fa-angle-right"></i></a>
-        </div>
-    </div>
-</div>
-{% endif %}
-
 <script type="text/javascript" src="{{page.root}}/js/jquery.cycle.all.js"></script>
 <script type="text/javascript" src="{{page.root}}/js/jquery.timeago.js"></script>
 <script type="text/javascript">
@@ -124,11 +118,9 @@ $(document).ready(function() {
     4:  'Life is Feudal',
     5:  'Frozen Endzone by Mode 7',
     6:  'The Reef by QUT',
-    7:  'By Felix Westin',
+    7:  'Grim Prospects',
-    8:  'By Felix Westin',
+    8:  'Grim Prospects',
     9:  'BeamNG.drive by BeamNG',
-    10: 'Re-Spawn by Gobbo Games',
-    11: 'Blood & Mana',
     12: 'Villagers and Heroes by Mad Otter Games',
     13: 'Villagers and Heroes by Mad Otter Games',
     14: 'Villagers and Heroes by Mad Otter Games',
@@ -144,8 +136,6 @@ $(document).ready(function() {
     24: 'Airship Dragoon by YorkshireRifes',
     25: 'Frozen Endzone by Mode 7',
     26: 'Frozen Endzone by Mode 7',
-    27: 'Re-Spawn by Gobbo Games',
-    28: 'Blood & Mana',
     29: 'Dark Horizons: Mechanized Corps by Max Gaming Technologies',
     30: 'Dark Horizons: Mechanized Corps by Max Gaming Technologies',
     31: 'Dark Horizons: Mechanized Corps by Max Gaming Technologies',

news/index.html

@@ -12,8 +12,7 @@ root: ..
     <p></p>
     <ul class="list-unstyled">
     {% for post in site.posts %}
-        <li><span class="date">{{post.date | date_to_string}}</span>
+        {% include newsitem.html post=post %}
-        <a class="post-title" href="{{page.root}}{{post.url}}">{{post.title}}</a></li>
     {% endfor %}
     </ul>
 </div>

start/index.html

@@ -23,6 +23,13 @@ root: ..
     the official version.
     </p>
 
+    <p class="alert alert-warning">
+    Have a look at <a href="http://torque3d.wikidot.com/main:downloads">this
+    wiki page</a> for all downloads and explanations of what to download if you
+    need help! The contents of the zip files have changed in version 3.6.1, as
+    explained <a href="http://torque3d.wikidot.com/introduction:what-to-download">here</a>
+    </p>
+
     <ul class="nav nav-tabs">
         <li class="active"><a href="#windows-tab" data-toggle="tab">Windows</a></li>
         <li><a href="#linux-tab" data-toggle="tab">Linux (DS only)</a></li>
@@ -33,16 +40,18 @@ root: ..
             <table class="borderless download table">
                 <tr>
                     <td>Current version</td>
-                    <td><a href="http://mit.garagegames.com/Torque3D-3-5-1.zip">Torque 3D 3.5.1</a>
+                    <td><a href="http://mit.garagegames.com/Torque3D-3-6-1.zip">Torque 3D 3.6.1</a>
+                    <br />
+                    <a href="http://mit.garagegames.com/Torque3D-3-6-1-FullTemplate.zip">Full template (demo)</a>
                     <br />
                     <a href="http://mit.garagegames.com/T3DProjectManager-2-1.zip">Project Manager 2.1</a></td>
                 </tr>
 
                 <tr>
                     <td>Previous version</td>
-                    <td><a href="http://mit.garagegames.com/Torque3D-3-5.zip">Torque 3D 3.5</a>
+                    <td><a href="http://mit.garagegames.com/Torque3D-3-5-1.zip">Torque 3D 3.5.1</a>
                     <br />
-                    <a href="http://mit.garagegames.com/T3DProjectManager-2-0.zip">Project Manager 2.0</a></td>
+                    <a href="http://mit.garagegames.com/T3DProjectManager-2-1.zip">Project Manager 2.1</a></td>
                 </tr>
 
                 <tr>
@@ -93,7 +102,7 @@ root: ..
     There is a wealth of learning material out there for the Torque line of engines,
     some of which has been collected
     <a href="http://www.garagegames.com/community/forums/viewthread/134078">here</a>.
-    There is also a collection of knowledge on our <a href="https://github.com/GarageGames/Torque3D/wiki">GitHub wiki</a>.
+    There is also a collection of knowledge on our <a href="https://torque3d.wikidot.com">wiki</a>.
     Below are some tutorials that we highly recommend to beginners, but for more
     comprehensive or specific tutorials we recommend you check the forums or wiki.
     </p>