Browse Source

More work.

Daniel Buckmaster 11 years ago
parent
commit
8488ef4064

+ 1 - 1
_config.yml

@@ -1,3 +1,3 @@
 name: Torque 3D
 name: Torque 3D
-permalink: /blog/:year/:title
+permalink: /news/:year/:title
 markdown: kramdown
 markdown: kramdown

+ 4 - 0
_layouts/default.html

@@ -32,6 +32,10 @@
 
 
                     <div class="navbar-collapse collapse">
                     <div class="navbar-collapse collapse">
                         <ul class="nav navbar-nav">
                         <ul class="nav navbar-nav">
+                            <li>
+                                <a href="{{page.root}}/news">News</a>
+                            </li>
+
                             <li class="dropdown">
                             <li class="dropdown">
                                 <a href="{{page.root}}/engine" class="dropdown-toggle" data-toggle="dropdown">Engine<i class="fa fa-angle-down"></i></a>
                                 <a href="{{page.root}}/engine" class="dropdown-toggle" data-toggle="dropdown">Engine<i class="fa fa-angle-down"></i></a>
                                 <ul class="dropdown-menu">
                                 <ul class="dropdown-menu">

+ 12 - 4
_layouts/post.html

@@ -1,10 +1,18 @@
 ---
 ---
 layout: default
 layout: default
+root: ../../..
 ---
 ---
 
 
-<h2>{{page.title}}</h2>
-<p class="meta">{{page.date | date_to_string}}</p>
+<div class="banner"><div class="container">
+    <h2>{{page.title}}</h2>
+    <span class="meta pull-right">{{page.date | date_to_string}}</span>
+</div></div>
 
 
-<div class="post">
-  {{ content }}
+<div class="container">
+    <div class="post">
+        {{ content }}
+    </div>
+
+    <br />
+    <a href="{{page.root}}/news"><i class="fa fa-angle-left"></i> Back to news archive</a>
 </div>
 </div>

+ 21 - 14
committee/index.html

@@ -5,27 +5,34 @@ root: ..
 ---
 ---
 
 
 <div class="banner"><div class="container">
 <div class="banner"><div class="container">
-    <h1 id="what-is-the-steering-committee">What is the Steering Committee?</h1>
+    <h2 id="what-is-the-steering-committee">What is the Steering Committee?</h2>
 </div></div>
 </div></div>
 
 
 <div class="container">
 <div class="container">
     <p>
     <p>
     The Torque 3D Steering Committee is the hand-picked body of community members
     The Torque 3D Steering Committee is the hand-picked body of community members
-    who are responsible for maintaining the core version of the Torque 3D codebase.
+    that is responsible for maintaining the core version of the Torque 3D codebase.
     The first Committee was chosen by GarageGames, but new recruitments are made
     The first Committee was chosen by GarageGames, but new recruitments are made
     by the Committee itself when necessary.
     by the Committee itself when necessary.
     </p>
     </p>
 
 
     <p>
     <p>
     The Committee's day-to-day activities include evaluating pull-requests made
     The Committee's day-to-day activities include evaluating pull-requests made
-    on the engine repository, deciding on a roadmap for the engine's future, and
+    to the engine repository, deciding on a roadmap for the engine's future, and
     of course doing some programming in order to make that happen! The Committee's
     of course doing some programming in order to make that happen! The Committee's
-    actions are governed by its Charter, which is laid out in the section below.
+    actions are governed by its Charter, which is displayed below.
+    </p>
+
+    <p>
+    The Committee is <em>not</em> the lead development team for Torque, though
+    it tends to consist of people who spend a lot of time using the engine already.
+    It consists of volunteers who are passionate about making Torque the best
+    open-source game engine out there.
     </p>
     </p>
 </div>
 </div>
 
 
 <div class="banner"><div class="container">
 <div class="banner"><div class="container">
-    <h1 id="current-membership">Current membership</h1>
+    <h2 id="current-membership">Current membership</h2>
 </div></div>
 </div></div>
 
 
 <div class="container">
 <div class="container">
@@ -84,11 +91,11 @@ root: ..
 </div>
 </div>
 
 
 <div class="banner"><div class="container">
 <div class="banner"><div class="container">
-    <h1 id="steering-committee-charter">Steering Committee Charter</h1>
+    <h2 id="steering-committee-charter">Steering Committee Charter</h2>
 </div></div>
 </div></div>
 
 
 <div class="container">
 <div class="container">
-    <h2 id="charter-vision">1. Vision</h2>
+    <h3 id="charter-vision">1. Vision</h3>
     <p>
     <p>
     We are dedicated to making the best core version of Torque 3D possible, a
     We are dedicated to making the best core version of Torque 3D possible, a
     reliable foundation for others to build upon. We will ensure that Torque
     reliable foundation for others to build upon. We will ensure that Torque
@@ -96,7 +103,7 @@ root: ..
     of students, hobbyists, independent game makers, and professional studios.
     of students, hobbyists, independent game makers, and professional studios.
     </p>
     </p>
 
 
-    <h2 id="charter-goals">2. Goals</h2>
+    <h3 id="charter-goals">2. Goals</h3>
     <ol>
     <ol>
         <li>To maintain the best possible ‘master’ version of Torque 3D measured
         <li>To maintain the best possible ‘master’ version of Torque 3D measured
         in terms of performance, reliability, versatility, maintainability and
         in terms of performance, reliability, versatility, maintainability and
@@ -110,7 +117,7 @@ root: ..
         effective organisation.</li>
         effective organisation.</li>
     </ol>
     </ol>
 
 
-    <h2 id="charter-duties-and-responsibilities">3. Duties and Responsibilities</h2>
+    <h3 id="charter-duties-and-responsibilities">3. Duties and Responsibilities</h3>
     <ol>
     <ol>
         <li>Create and regularly revise the engine roadmap after:
         <li>Create and regularly revise the engine roadmap after:
             <ol>
             <ol>
@@ -147,7 +154,7 @@ root: ..
         the committee’s activities.</li>
         the committee’s activities.</li>
     </ol>
     </ol>
 
 
-    <h2 id="charter-membership">4. Membership</h2>
+    <h3 id="charter-membership">4. Membership</h3>
     <p>
     <p>
     Members of the steering committee must be willing and able to commit time
     Members of the steering committee must be willing and able to commit time
     and energy to fulfilling the committee’s mission. The total committee size
     and energy to fulfilling the committee’s mission. The total committee size
@@ -177,7 +184,7 @@ root: ..
     GarageGames LLC.
     GarageGames LLC.
     </p>
     </p>
 
 
-    <h2 id="charter-reports">5. Reports</h2>
+    <h3 id="charter-reports">5. Reports</h3>
     <p>
     <p>
     To facilitate the committee’s operation while accounting for members in
     To facilitate the committee’s operation while accounting for members in
     varied timezones, reports are the primary method of internal communication.
     varied timezones, reports are the primary method of internal communication.
@@ -185,7 +192,7 @@ root: ..
     into a monthly work report in a publicly available format.
     into a monthly work report in a publicly available format.
     </p>
     </p>
 
 
-    <h2 id="charter-voting">6. Voting</h2>
+    <h3 id="charter-voting">6. Voting</h3>
     <p>
     <p>
     Any actions to be undertaken by members of the committee in an official
     Any actions to be undertaken by members of the committee in an official
     capacity should be voted on where there is any disagreement. Voting will
     capacity should be voted on where there is any disagreement. Voting will
@@ -196,7 +203,7 @@ root: ..
     majority of all members (not only members who participate in the vote).
     majority of all members (not only members who participate in the vote).
     </p>
     </p>
 
 
-    <h2 id="charter-removal">7. Removal</h2>
+    <h3 id="charter-removal">7. Removal</h3>
     <p>
     <p>
     If a committee member is unable to fulfill their requirements, or fails to
     If a committee member is unable to fulfill their requirements, or fails to
     uphold the charter, they may be removed from the committee after having had
     uphold the charter, they may be removed from the committee after having had
@@ -207,7 +214,7 @@ root: ..
     <a href="#charter-membership">section 4</a> above.
     <a href="#charter-membership">section 4</a> above.
     </p>
     </p>
 
 
-    <h2 id="charter-amendments">8. Amendments</h2>
+    <h3 id="charter-amendments">8. Amendments</h3>
     <p>
     <p>
     This charter is a living document and may be amended by the committee as
     This charter is a living document and may be amended by the committee as
     outlined in <a href="#charter-voting">section 6</a>.
     outlined in <a href="#charter-voting">section 6</a>.

+ 7 - 7
contribute/index.html

@@ -5,7 +5,7 @@ root: ..
 ---
 ---
 
 
 <div class="banner"><div class="container">
 <div class="banner"><div class="container">
-    <h1 id="get-the-source-code">Get the source code</h1>
+    <h2 id="get-the-source-code">Get the source code</h2>
 </div></div>
 </div></div>
 
 
 <div class="container">
 <div class="container">
@@ -15,7 +15,7 @@ root: ..
 </div>
 </div>
 
 
 <div class="banner"><div class="container">
 <div class="banner"><div class="container">
-    <h1 id="report-issues">Report issues</h1>
+    <h2 id="report-issues">Report issues</h2>
 </div></div>
 </div></div>
 
 
 <div class="container">
 <div class="container">
@@ -25,7 +25,7 @@ root: ..
 </div>
 </div>
 
 
 <div class="banner"><div class="container">
 <div class="banner"><div class="container">
-    <h1 id="pull-request-guide">Pull-request guide</h1>
+    <h2 id="pull-request-guide">Pull-request guide</h2>
 </div></div>
 </div></div>
 
 
 <div class="container">
 <div class="container">
@@ -100,8 +100,8 @@ root: ..
         goal, it's easy for us to decide whether we want it, and to then test it
         goal, it's easy for us to decide whether we want it, and to then test it
         and make sure it works as advertised and doesn't break things.</li>
         and make sure it works as advertised and doesn't break things.</li>
 
 
-        <li>If you're fixing a bug, we need you to provide steps to reproduce the
-        bug, so we can verify that exists and that your patch actually does fix it.
+        <li>If you're fixing a bug, we need you to provide steps to reproduce it
+        so we can verify that exists and that your patch actually does fix it.
         We'd also appreciate platform and compiler information.</li>
         We'd also appreciate platform and compiler information.</li>
 
 
         <li></li>
         <li></li>
@@ -114,7 +114,7 @@ root: ..
 </div>
 </div>
 
 
 <div class="banner"><div class="container">
 <div class="banner"><div class="container">
-    <h1 id="version-policy">Version policy</h1>
+    <h2 id="version-policy">Version policy</h2>
 </div></div>
 </div></div>
 
 
 <div class="container">
 <div class="container">
@@ -124,7 +124,7 @@ root: ..
 </div>
 </div>
 
 
 <div class="banner"><div class="container">
 <div class="banner"><div class="container">
-    <h1 id="request-features">Request features</h1>
+    <h2 id="request-features">Request features</h2>
 </div></div>
 </div></div>
 
 
 <div class="container">
 <div class="container">

+ 24 - 5
css/main.css

@@ -1,3 +1,7 @@
+body {
+  overflow-y: scroll;
+}
+
 /*-----------------------------------------------------------------------------
 /*-----------------------------------------------------------------------------
  * Bootstrap overrides
  * Bootstrap overrides
  */
  */
@@ -43,13 +47,19 @@
   margin-left: 10%;
   margin-left: 10%;
 }
 }
 
 
-.site h1 { font-size: 24px; }
-.site h2 { font-size: 20px; }
-
 /*-----------------------------------------------------------------------------
 /*-----------------------------------------------------------------------------
  * Site
  * Site
  */
  */
 
 
+span.post-title {
+  font-weight: bold;
+}
+
+span.date {
+  color: gray;
+  margin-right: 1em;
+}
+
 h4 a,
 h4 a,
 h4 a:hover {
 h4 a:hover {
   color: rgb(51, 51, 51);
   color: rgb(51, 51, 51);
@@ -108,7 +118,7 @@ h4 a:hover {
  * Static pages
  * Static pages
  */
  */
 
 
-.page h2 {
+.page h3 {
   color: #555;
   color: #555;
 }
 }
 
 
@@ -116,10 +126,11 @@ h4 a:hover {
   margin-top: 1em;
   margin-top: 1em;
 }
 }
 
 
-.page .banner h1 {
+.banner h2 {
   /* Fixes scrolling to anchors with the fixed navbar. */
   /* Fixes scrolling to anchors with the fixed navbar. */
   margin-top: -60px;
   margin-top: -60px;
   padding-top: 70px;
   padding-top: 70px;
+  display: inline-block;
 }
 }
 
 
 img.history,
 img.history,
@@ -132,3 +143,11 @@ img.made-with-torque {
 img.history {
 img.history {
   margin: 1em;
   margin: 1em;
 }
 }
+
+/*-----------------------------------------------------------------------------
+ * Posts
+ */
+
+.meta {
+  margin-top: 10px;
+}

+ 42 - 19
engine/index.html

@@ -5,7 +5,7 @@ root: ..
 ---
 ---
 
 
 <div class="banner"><div class="container">
 <div class="banner"><div class="container">
-    <h1 id="made-with-torque">Made with Torque</h1>
+    <h2 id="made-with-torque">Made with Torque</h2>
 </div></div>
 </div></div>
 
 
 <div class="container">
 <div class="container">
@@ -146,12 +146,14 @@ root: ..
 </div>
 </div>
 
 
 <div class="banner"><div class="container">
 <div class="banner"><div class="container">
-    <h1 id="features">Features</h1>
+    <h2 id="features">Features</h2>
 </div></div>
 </div></div>
 
 
 <div class="container">
 <div class="container">
     <div class="media">
     <div class="media">
-        <img class="pull-left feature" src="{{page.root}}/img/rendering-feature.jpg" />
+        <img class="pull-left feature"
+        src="{{page.root}}/img/rendering-feature.jpg"
+        title="By Felix Westin"/>
         <div class="media-body">
         <div class="media-body">
             <h4 class="media-heading">Rendering</h4>
             <h4 class="media-heading">Rendering</h4>
             <p>
             <p>
@@ -178,7 +180,9 @@ root: ..
     </div>
     </div>
 
 
     <div class="media">
     <div class="media">
-        <img class="pull-left feature" src="{{page.root}}/img/editors-feature.jpg" />
+        <img class="pull-left feature"
+            src="{{page.root}}/img/editors-feature.jpg"
+            title="Metal Drift by Black Jacket Studios" />
         <div class="media-body">
         <div class="media-body">
             <h4 class="media-heading">Editors</h4>
             <h4 class="media-heading">Editors</h4>
             <p>
             <p>
@@ -209,26 +213,35 @@ root: ..
     </div>
     </div>
 
 
     <div class="media">
     <div class="media">
-        <img class="pull-left feature" src="{{page.root}}/img/rendering-feature.jpg" />
+        <img class="pull-left feature"
+            src="{{page.root}}/img/networking-feature.jpg"
+            title="Frozen Endzone by Mode 7" />
         <div class="media-body">
         <div class="media-body">
             <h4 class="media-heading">Networking</h4>
             <h4 class="media-heading">Networking</h4>
             <p>
             <p>
             Since its inception as the engine behind the online shooter Tribes 2,
             Since its inception as the engine behind the online shooter Tribes 2,
             Torque has consistently provided high performance, reliable networking
             Torque has consistently provided high performance, reliable networking
             for fast-paced online games. The engine has networking built into 
             for fast-paced online games. The engine has networking built into 
-            its core, including interpolation and prediction to smooth over
-            high-latency environments and provide instant feedback to clients.
+            its core, allowing you to quickly get up and running with networked
+            games.
             </p>
             </p>
             <p>
             <p>
             Time-invarying data is transferred via datablocks at client join time,
             Time-invarying data is transferred via datablocks at client join time,
             reducing the amount of data that needs to be networked during
             reducing the amount of data that needs to be networked during
             gameplay.
             gameplay.
             </p>
             </p>
+            <p>
+            Torque uses a <em>server authoritative</em> networking model that
+            helps you to reduce cheating and exploitation. At the same time,
+            the game state is predicted and interpolated locally so each client
+            experiences a smooth view of the action.
         </div>
         </div>
     </div>
     </div>
 
 
     <div class="media">
     <div class="media">
-        <img class="pull-left feature" src="{{page.root}}/img/physics-feature.jpg" />
+        <img class="pull-left feature"
+            src="{{page.root}}/img/physics-feature.jpg"
+            title="Pacific Demo by GarageGames" />
         <div class="media-body">
         <div class="media-body">
             <h4 class="media-heading">Physics</h4>
             <h4 class="media-heading">Physics</h4>
             <p>
             <p>
@@ -240,7 +253,9 @@ root: ..
     </div>
     </div>
 
 
     <div class="media">
     <div class="media">
-        <img class="pull-left feature" src="{{page.root}}/img/scripting-feature.jpg" />
+        <img class="pull-left feature"
+            src="{{page.root}}/img/scripting-feature.jpg"
+            title="Life is Feudal" />
         <div class="media-body">
         <div class="media-body">
             <h4 class="media-heading">Scripts and source code</h4>
             <h4 class="media-heading">Scripts and source code</h4>
             <p>
             <p>
@@ -266,7 +281,7 @@ function Fubar::onReachDestination(%self) {
 </div>
 </div>
 
 
 <div class="banner"><div class="container">
 <div class="banner"><div class="container">
-    <h1 id="roadmap">Roadmap</h1>
+    <h2 id="roadmap">Roadmap</h2>
 </div></div>
 </div></div>
 
 
 <div class="container">
 <div class="container">
@@ -277,7 +292,7 @@ function Fubar::onReachDestination(%self) {
         versions here with their planned outcomes.
         versions here with their planned outcomes.
     </p>
     </p>
 
 
-    <h2>Short-term</h2>
+    <h3>Short-term</h3>
     <p>
     <p>
     The theme of our immediate efforts will be cleaning up the state of the repository,
     The theme of our immediate efforts will be cleaning up the state of the repository,
     forging new links with the community, and putting in place procedures that will
     forging new links with the community, and putting in place procedures that will
@@ -285,31 +300,39 @@ function Fubar::onReachDestination(%self) {
     </p>
     </p>
     <ul>
     <ul>
         <li>Complete and launch this website!</li>
         <li>Complete and launch this website!</li>
-        <li>Set up automated testing to increase confidence in pull requests.</li>
-        <li>Merge (possibly into unstable branches) or reject all outstanding pull-requests.</li>
+        <li>Set up automated testing to increase ease of maintenance.</li>
+        <li>Merge (possibly into unstable branches) or reject all outstanding pull-requests.
+        In particular:
+        <ul>
+            <li>A usable CMake alternative to the current Project Generator</li>
+            <li>64-bit-ready changes</li>
+            <li>VS2013 compatibility</li>
+        </ul></li>
     </ul>
     </ul>
 
 
-    <h2>Middle-term</h2>
+    <h3>Middle-term</h3>
     <ul>
     <ul>
         <li>Linux and OSX support via OpenGL rendering layer.</li>
         <li>Linux and OSX support via OpenGL rendering layer.</li>
-        <li>Clean up engine source code (e.g. use of non-STL container replacements, signed/unsigned mismatches).</li>
+        <li>DirectX 11 and PhysX 3.3 support.
         <li>New modular script templates and content distribution.</li>
         <li>New modular script templates and content distribution.</li>
+        <li>More difficult existing pull-requests, particularly improvements to the TorqueScript language.</li>
     </ul>
     </ul>
 
 
-    <h2>Long-term</h2>
+    <h3>Long-term</h3>
     <ul>
     <ul>
+        <li>Clean up engine source code (e.g. use of non-STL container replacements, signed/unsigned mismatches).</li>
         <li>Modularise scripting engine, paving the way for other scripting languages.</li>
         <li>Modularise scripting engine, paving the way for other scripting languages.</li>
-        <li>Replace project generator with CMake or other appropriate solution.</li>
         <li>Entity/component system replacing hardcoded gameplay classes.</li>
         <li>Entity/component system replacing hardcoded gameplay classes.</li>
-        <li>64-bit support.</li>
+        <li>Overhaul editor suite</li>
     </ul>
     </ul>
 </div>
 </div>
 
 
 <div class="banner"><div class="container">
 <div class="banner"><div class="container">
-    <h1 id="history">History</h1>
+    <h2 id="history">History</h2>
 </div></div>
 </div></div>
 
 
 <div class="container">
 <div class="container">
+
     <img class="pull-left history" src="{{page.root}}/img/frozen-endzone-icon.jpg" />
     <img class="pull-left history" src="{{page.root}}/img/frozen-endzone-icon.jpg" />
     <p>
     <p>
     Torque began as the game engine behind Starsiege: Tribes, one of the venerable
     Torque began as the game engine behind Starsiege: Tribes, one of the venerable

BIN
img/editors-feature.jpg


BIN
img/networking-feature.jpg


BIN
img/scripting-feature.jpg


+ 18 - 9
index.html

@@ -5,7 +5,7 @@ root: .
 ---
 ---
 
 
 <div class="jumbotron banner">
 <div class="jumbotron banner">
-    <div id="home-carousel" class="carousel slide" data-ride="carousel">
+    <div id="home-carousel" class="carousel slide" data-ride="carousel" data-interval="5000">
         <!-- Indicators -->
         <!-- Indicators -->
         <ol class="carousel-indicators">
         <ol class="carousel-indicators">
             <li data-target="#home-carousel" data-slide-to="0" class="active"></li>
             <li data-target="#home-carousel" data-slide-to="0" class="active"></li>
@@ -25,7 +25,7 @@ root: .
                         </div>
                         </div>
                         <div class="col-sm-8">
                         <div class="col-sm-8">
                             <h1 class="title">Torque 3D</h1>
                             <h1 class="title">Torque 3D</h1>
-                            <p>The open-source game engine of the future.</p>
+                            <p>The premier open-source game engine.</p>
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
@@ -93,20 +93,29 @@ root: .
 
 
 <div class="container">
 <div class="container">
     <div class="row">
     <div class="row">
+        <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</a>
+    </div>
+
+    <div class="row">
+        <h2>From GarageGames</h2>
         <div class="col-sm-4">
         <div class="col-sm-4">
+            <h3>Blogs</h3>
         </div>
         </div>
 
 
         <div class="col-sm-4">
         <div class="col-sm-4">
+            <h3>Forums</h3>
         </div>
         </div>
 
 
         <div class="col-sm-4">
         <div class="col-sm-4">
+            <h3>Resources</h3>
         </div>
         </div>
     </div>
     </div>
-
-    <div class="row">
-        <h2>Recent news</h2>
-        <p>
-I am by birth a Genevese, and my family is one of the most distinguished of that republic. My ancestors had been for many years counsellors and syndics,[1] and my father had filled several public situations with honour and reputation. He was respected by all who knew him for his integrity and indefatigable attention to public business.
-        </p>
-    </div>
 </div>
 </div>

+ 19 - 0
news/index.html

@@ -0,0 +1,19 @@
+---
+layout: page
+title: News | Torque 3D
+root: ..
+---
+
+<div class="banner"><div class="container">
+    <h2>News Archive</h2>
+</div></div>
+
+<div class="container">
+    <p></p>
+    <ul class="list-unstyled">
+    {% for post in site.posts %}
+        <li><span class="date">{{post.date | date_to_string}}</span>
+        <a class="post-title" href="{{page.root}}{{post.url}}">{{post.title}}</a></li>
+    {% endfor %}
+    </ul>
+</div>

+ 2 - 2
start/index.html

@@ -5,7 +5,7 @@ root: ..
 ---
 ---
 
 
 <div class="banner"><div class="container">
 <div class="banner"><div class="container">
-    <h1 id="download">Download</h1>
+    <h2 id="download">Download</h2>
 </div></div>
 </div></div>
 
 
 <div class="container">
 <div class="container">
@@ -15,7 +15,7 @@ It is a general truism of this world that anything long divided will surely unit
 </div>
 </div>
 
 
 <div class="banner"><div class="container">
 <div class="banner"><div class="container">
-    <h1 id="tutorials">Tutorials</h1>
+    <h2 id="tutorials">Tutorials</h2>
 </div></div>
 </div></div>
 
 
 <div class="container">
 <div class="container">