Skip to content

Commit

Permalink
Version
Browse files Browse the repository at this point in the history
Changed the version and readme
  • Loading branch information
greenfire27 committed May 8, 2018
1 parent 010f1f7 commit b863ff1
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Expand Up @@ -59,8 +59,7 @@ linkmap.txt
.Spotlight-V100 .Spotlight-V100
.Trashes .Trashes
Icon? Icon?
ehthumbs.db *.db
Thumbs.db


# Android project files # # Android project files #
######################### #########################
Expand Down
16 changes: 9 additions & 7 deletions README.md
@@ -1,15 +1,15 @@
![Torque Logo](http://static.garagegames.com/static/pg/logokits/Torque-Logo_H.png) ![Torque Logo](http://static.garagegames.com/static/pg/logokits/Torque-Logo_H.png)
## Torque 2D 3.3 ## Torque 2D 3.4


MIT Licensed Open Source version of Torque 2D from GarageGames. Maintained by the T2D Steering Committee and contributions from the community. MIT Licensed Open Source version of Torque 2D from GarageGames. Maintained by the T2D Steering Committee and contributions from the community.


Dedicated to 2D game development, Torque 2D is an extremely powerful, flexible, and fast C++ engine which has been used in hundreds of professional games. It is a true cross platform solution providing you access to Windows, OSX, Linux, iOS, Android, and the web - all from one codebase. It includes an OpenGL batched rendering system, Box2D physics, OpenAL audio, skeletal and spritesheet animation, automated asset management, a modular project structure, TAML object persistence, and a C-like scripting language. Dedicated to 2D game development, Torque 2D is an extremely powerful, flexible, and fast C++ engine which has been used in hundreds of professional games. It is a true cross platform solution providing you access to Windows, OSX, Linux, iOS, Android, and the web - all from one codebase. It includes an OpenGL batched rendering system, Box2D physics, OpenAL audio, skeletal and spritesheet animation, automated asset management, a modular project structure, TAML object persistence, and a C-like scripting language.


### Branches ### Branches


Here is an overview of the branches found in the Torque 2D repository: Here is an overview of the branches found in the Torque 2D repository:


* **master:** this branch contains the current stable release code that can be used in a production environment. * **master:** this branch contains the current stable release code that can be used in a production environment.
* **development:** this branch is dedicated to active development. It contains the latest bug fixes, new features, and other updates. All pull requests need to go to the development branch. While we try our best to test all incoming changes, it is possible for mistakes to slip in therefore this branch should always be considered unstable. * **development:** this branch is dedicated to active development. It contains the latest bug fixes, new features, and other updates. All pull requests need to go to the development branch. While we try our best to test all incoming changes, it is possible for mistakes to slip in therefore this branch should always be considered unstable.
* **gh-pages:** this branch currently contains the html pages generated from doxygen for the engine and TorqueScript references. * **gh-pages:** this branch currently contains the html pages generated from doxygen for the engine and TorqueScript references.


Expand All @@ -21,7 +21,7 @@ If you do not wish to compile the source code yourself, precompiled binary files


After downloading a copy of the source code, the following project files for each platform are provided for you and can be found in the `engine/compilers` folder. After downloading a copy of the source code, the following project files for each platform are provided for you and can be found in the `engine/compilers` folder.


* **Windows:** Visual Studio 2013 or 2015 (works with the free, "Express for Windows Desktop" version) * **Windows:** Visual Studio 2017 (works with the free Community Edition)
* **OSX:** Xcode * **OSX:** Xcode
* **Linux:** Make * **Linux:** Make
* **iOS:** Xcode_iOS * **iOS:** Xcode_iOS
Expand All @@ -32,8 +32,6 @@ See the [wiki](https://github.com/GarageGames/Torque2D/wiki) for available guide


### Batteries Included ### Batteries Included


![truck](http://t2dtutorials.com/img/Truck.png)

Running Torque 2D for the first time out of the box will start you off in the Sandbox. The Sandbox is a collection of over 30 simple "toys" (or modules) which demonstrate various features in T2D. The default toy is a side scrolling level with a monster truck. To see a list of the available modules/toys to choose from, click on the `Show Tools` button in the lower right corner of the screen. Running Torque 2D for the first time out of the box will start you off in the Sandbox. The Sandbox is a collection of over 30 simple "toys" (or modules) which demonstrate various features in T2D. The default toy is a side scrolling level with a monster truck. To see a list of the available modules/toys to choose from, click on the `Show Tools` button in the lower right corner of the screen.


Naturally all of the script code and assets for each toy are available to you in the modules folder to use as practical examples while learning T2D. Naturally all of the script code and assets for each toy are available to you in the modules folder to use as practical examples while learning T2D.
Expand All @@ -46,7 +44,11 @@ All documentation for the open source version of Torque 2D can be found on our [


### Community ### Community


Don't go it alone! Join the active community around Torque 2D at GarageGames.com. Ask questions, talk about T2D and general game development topics, learn the latest news, or post a blog promoting your game or showing off additional engine features in your T2D fork. Don't go it alone! Join the active Torque community. Ask questions, talk about T2D and general game development topics, learn the latest news, or post a blog promoting your game or showing off additional engine features in your T2D fork.

* [Torque 2D Forums on the Torque 3D Website](https://forums.torque3d.org/viewforum.php?f=31)

You also might be able to find useful information on the less active GarageGames website.


* [Torque 2D Beginner Forum](http://www.garagegames.com/community/forums/84) * [Torque 2D Beginner Forum](http://www.garagegames.com/community/forums/84)
* [Torque 2D Professional Forum](http://www.garagegames.com/community/forums/85) * [Torque 2D Professional Forum](http://www.garagegames.com/community/forums/85)
Expand Down
Binary file not shown.
4 changes: 2 additions & 2 deletions engine/source/game/version.h
Expand Up @@ -24,8 +24,8 @@
#define _ENGINE_VERSION_H_ #define _ENGINE_VERSION_H_


// Engine Version. // Engine Version.
#define T2D_ENGINE_VERSION "v3.3" ///< Engine Version String. #define T2D_ENGINE_VERSION "v3.4" ///< Engine Version String.
#define T2D_IPHONETOOLS_VERSION "v3.3" ///< Engine Version String for iPhone tools. Changing this will allow a fresh AppData folder to avoid conflicts with other builds existing on the system. #define T2D_IPHONETOOLS_VERSION "v3.4" ///< Engine Version String for iPhone tools. Changing this will allow a fresh AppData folder to avoid conflicts with other builds existing on the system.


/// Gets the specified version number. The version number is specified as a global in version.cc /// Gets the specified version number. The version number is specified as a global in version.cc
U32 getVersionNumber(); U32 getVersionNumber();
Expand Down

0 comments on commit b863ff1

Please sign in to comment.