Readme fixup

README.md

@@ -1,65 +1,138 @@
-Torque 3D v3.5.1 - PhysX 3.3 Basic Plugin
-==========================
+Torque 3D v3.5.1
+================
 
-This is a basic PhysX 3.3 plugin that does not contain any added features like cloth,particles and CCD. This plugin provides no more features than the bullet plugin and can therefore be used as a drop in alternative. It does not modify any files outside of the physx3 folder. A far more advanced physx3 plugin with CCD, cloth and particles can be found on this repository under the physx3 branch.
+MIT Licensed Open Source version of [Torque 3D](http://www.garagegames.com/products/torque-3d) from [GarageGames](http://www.garagegames.com)
 
-Setting up PhysX 3.3 using the Torque 3D Project Manager
-------------------------------------------
- - You can find a pre compiled binary of the Torque3D Project Manager that supports PhysX 3.3 here: http://www.narivtech.com/downloads/T3DProjectManager-2-1-devel.zip and source code here: https://github.com/rextimmy/Torque3D-ProjectManager/tree/development
- - For the Project Manager to find PhysX 3.3 SDK you have two options 1)Create an environment variable called TORQUE_PHYSX3_PATH and have that pointing to the location you installed the SDK 2)Place the SDK into a folder called "Program Files"/NVIDIA Corporation/NVIDIA PhysX SDK/v3.3.0_win
- - Simply choose PhysX 3.3 physics from the modules list in the project manager and everything should be automatically taken care of.
+More Information
+----------------
 
-Setting up PhysX 3.3 manually
-------------------------------------------
+* Torque 3D [main repository](https://github.com/GarageGames/Torque3D)
+* Torque 3D [GitHub Wiki](https://github.com/GarageGames/Torque3D/wiki)
+* Documentation is in the [Torque3D-Documentation](https://github.com/GarageGames/Torque3D-Documentation) GitHub repo.
+* Project Manager is in the [Torque3D-ProjectManager](https://github.com/GarageGames/Torque3D-ProjectManager) GitHub repo.
+* T3D [Beginner's Forum](http://www.garagegames.com/community/forums/73)
+* T3D [Professional Forum](http://www.garagegames.com/community/forums/63)
+* Torque 3D [FPS Tutorial](http://www.garagegames.com/products/torque-3d/fps#/1-setup/1)
+* GarageGames [Store](http://www.garagegames.com/products)
+* GarageGames [Professional Services](http://services.garagegames.com/)
 
- - You will need the latest SDK from NVIDIA. This requires signing up for their developer program. If you don't already have access to their developer site then sign up now as access is not immediate.
- - Set up a standard Torque3D project, don't include any PhysX or Bullet, just regular Torque Physics in project manager options (if you're using it)
- - Generate Projects and open the source code in Visual Studio ( or the IDE of your choice )
- - In the solution explorer in the DLL for your project you should find Source Files -> Engine -> T3D -> physics
- - Add a new filter "physx3" and then right click on it and add existing item
- - Add all the files found under Engine\Source\T3D\physics\physx3\
- - Now you need to add the PhysX SDK. 
- - Under the properties for the DLL project, under Linker -> Additional Library Directories add the lib\win32 directory for the PhysX 3.3 SDK. For example, mine is in: C:\Program Files (x86)\NVIDIA Corporation\NVIDIA PhysX SDK\v3.3.0_win\Lib\win32
- - In the same window under C/C++ you should see Additional Include Directories, you need to add the Include directory for the PhysX 3.3 SDK. For example, mine is in: C:\Program Files %28x86%29\NVIDIA Corporation\NVIDIA PhysX SDK\v3.3.0_win\Include
- - You should now be able to compile now without any issues.
-
-The following libraries will also be needed:
- 
-Release , Debug
-
- - PhysX3_x86.lib,PhysX3CHECKED_x86.lib
- - PhysX3Common_x86.lib,PhysX3CommonCHECKED_x86.lib
- - PhysX3Extensions.lib,PhysX3ExtensionsCHECKED.lib
- - PhysX3Cooking_x86.lib,PhysX3CookingCHECKED_x86.lib
- - PxTask.lib,PxTaskCHECKED.lib
- - PhysX3CharacterKinematic_x86.lib,PhysX3CharacterKinematicCHECKED_x86.lib
- - PhysXVisualDebuggerSDK.lib, PhysXVisualDebuggerSDKCHECKED.lib
- - PhysXProfileSDK.lib, PhysXProfileSDKCHECKED.lib
-
-With debug build feel free to change CHECKED to DEBUG if you prefer but it will still require the CHECKED dll's though.
+Pre-compiled Version
+--------------------
+
+In addition to GitHub we also have a couple of pre-packaged files for you to download if you would prefer to not compile the code yourself:
  
-Running a project
-=======
 * [Complete Torque 3D 3.5.1 zip package](http://mit.garagegames.com/Torque3D-3-5-1.zip) with updated TorqueScript documentation, the *Project Manager*, and compiled versions of the templates.
 * [Torque 3D Project Manager v2.1](http://mit.garagegames.com/T3DProjectManager-2-1.zip) on its own for use in your T3D forks.
 
 If you're looking for an older release see the [Torque 3D Archive](https://github.com/GarageGames/Torque3D/wiki/Torque-3D-Archive)
 
 Creating a New Project Based on a Template
->>>>>>> GarageGames/development
 ------------------------------------------
 
- - To run a release project you will need the following from the SDK bin folder:
-   1. PhysX3_x86.dll
-   2. PhysX3CharacterKinematic_x86.dll
-   3. PhysX3Common_x86.dll
-   4. PhysX3Cooking_x86.dll
-   
- - To run a debug project you will need the following from the SDK bin folder:
-   1. PhysX3CHECKED_x86.dll
-   2. nvToolsExt32_1.dll
-   3. PhysX3CookingCHECKED_x86.dll
-   4. PhysX3CommonCHECKED_x86.dll
-   5. PhysX3CharacterKinematicCHECKED_x86.dll
- 
-Place these files along side the exe and this should get you up and running.
+The templates included with Torque 3D provide a starting point for your project.  Once we have created our own project based on a template we may then compile an executable and begin work on our game.  The following templates are included in this version of Torque 3D:
+
+* Empty
+* Full
+
+### Using PhysX ###
+
+If you plan on creating a project that uses PhysX you will first need to have the PhysX SDK intalled on your computer.  Without the PhysX SDK in place the project generation step will fail when using either the *Project Manager* or manual project generation methods.
+
+PhysX SDK version 2.8.4.6 is required for Torque 3D's PhysX templates.  The following steps are used to install this SDK:
+
+1. In a web browser, go to the [NVidia Support Center](http://supportcenteronline.com/ics/support/default.asp?deptID=1949)
+2. If you do not have an account, you will need to register with them to have the support staff create an account for you.
+3. If you have an account, login.
+4. On the middle of the page, on the right, click on Downloads.
+5. On the far right column, under Old downloads, click More.
+6. Download the Windows 2.8.4.6 version.
+7. Run the installer and follow the steps to install it in the default location.
+8. Depending on your operating system version, you may need to reboot after the installation.
+
+### Using the Project Manager to Create a Project ###
+
+The *Project Manager* may be used to create a new game project based on one of the templates that are included with Torque 3D.  If you are using Torque 3D directly from the [GitHub](https://github.com/GarageGames/Torque3D) repository then you will need to get the *Project Manager* from the [Torque3D-ProjectManager](https://github.com/GarageGames/Torque3D-ProjectManager) repo, or download a pre-compiled version from the [Project Manager Wiki Page](https://github.com/GarageGames/Torque3D/wiki/Project-Manager).
+
+The following steps use the *Project Manager* to create a new project.  This is a quick summary and more detailed instructions may be found on the [Project Manager Wiki Page](https://github.com/GarageGames/Torque3D/wiki/Project-Manager)
+
+1. Run the *Project Manager*.
+2. Click the *New Project* button.
+3. Choose a template from the drop down on the right.
+4. Pick which modules you want to compile into your project by using the *Choose Modules* button.
+5. Give the project a name.
+6. Click the *Create* button to create the project.  This will open a new dialog window that shows the progress.
+7. When it finishes, click the *Finished* button.
+8. You may click on the *Open Folder* button to go to the project's directory.
+
+### Manually Creating a Project ###
+
+We may also manually create a project based on a template.  The following steps outline how to do this:
+
+1. Open the *Templates* directory.
+2. Right-click on the template you would like to use and choose *Copy*.
+3. Go to the *My Projects* directory and paste the template there.
+4. Rename the pasted template to the name of your project/game.
+5. Go into your project's *game* directory and rename all executables, DLL files and the .torsion file (and maybe .torsion.opt) from the template name to that of your project (these files may not be present at this time).
+6. Open the .torsion file in a text editor and replace all references to the template's name with that of your project (you only need to do this if you plan on using Torsion).  You will need to also do this with the .torsion.opt if it exists.
+7. Open you project's *source/torqueConfig.h* file in a text editor and change the `TORQUE_APP_NAME` define to the name of your project.
+8. In your project's *buildFiles/config* directory open each .conf file and find each reference to the template's name and replace it with the name of your project.
+9. Open your project's *game/main.cs* file in a text editor and change the `$appName` assignment to the name of your project.
+10. Go to your project's directory and double click on the *generateProjects.bat* to create your project's solution files.
+
+Compiling Torque 3D (Windows)
+-----------------------------
+If this is the first time you will compile Torque 3D, or if you have added or removed any files to either the standard Torque 3D *Engine/source* directory or your project's *source* directory, you will need to run your project's *generateProjects.bat* file.  This will rebuild your project's solution and project files.  Now follow these steps to compile Torque 3D:
+
+1. Navigate to your project's *buildFiles/VisualStudio 2010* directory (or the *2008* directory if that is the version of Visual Studio you are using).
+2. Double click on your project's .sln file.  This will open Visual Studio.
+3. When Visual Studio has fully loaded, press `F7` to start compiling your project.
+
+Compiling Torque 3D (Linux)
+-----------------------------
+This version of Torque 3D supports being run as a dedicated server under Linux.  As with a Windows build you will need to run your project's *generateProjects.command* file to properly generate the required make file.
+
+Prior to compiling Torque 3D under Linux, you will need to make sure you have the appropriate libraries and tools installed.  The exact packages will depend on which Linux distribution you are using.  For example, under Ubuntu you will need:
+
+* build-essential
+* nasm
+* git
+* php5-cli
+* libsdl-dev
+* libogg-dev
+
+With everything in place you may now follow these steps to compile Torque 3D:
+
+1. Change to you project's *buildFiles/Make_Ded* directory.
+2. Enter the `make clean` command.
+3. Enter the either the `make debug` or `make release` command depending on the type of build you wish to make.
+4. Go to your project's *game* directory.
+5. To start your game enter the following command (we'll use the name *MyGame* as the example project name):  
+    `./MyGame -dedicated -mission "levels/Empty Terrain.mis"`  
+    where the argument after the `-mission` switch is the path to the mission to load.
+
+Accessing the Editors
+---------------------
+From the Main Menu or while in-game, pressing F10 opens the GUI Editor and pressing F11 opens the World Editor.
+
+License
+-------
+
+Copyright (c) 2012 GarageGames, LLC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.