TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-21 20:35:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'gg/development-3.6' into development

Browse source 
Conflicts:
	Engine/source/T3D/gameFunctions.cpp
This commit is contained in:
Daniel Buckmaster 2015-01-29 21:17:38 +11:00
commit 014b566014
29 changed files with 252 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/app/version.h
View file

@ -41,10 +41,10 @@
/// code version, the game name, and which type of game it is (TGB, TGE, TGEA, etc.).
///
/// Version number is major * 1000 + minor * 100 + revision * 10.
#define TORQUE_GAME_ENGINE 3620
#define TORQUE_GAME_ENGINE 3630
/// Human readable engine version string.
#define TORQUE_GAME_ENGINE_VERSION_STRING "3.6.2"
#define TORQUE_GAME_ENGINE_VERSION_STRING "3.6.3"
/// Gets the engine version number. The version number is specified as a global in version.cc
U32 getVersionNumber();