TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-02 20:10:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into development

Browse source
This commit is contained in:
marauder2k7 2022-12-29 08:54:16 +00:00
commit 52a37c25d3
17 changed files with 213 additions and 173 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 4001
#define TORQUE_GAME_ENGINE 4002
/// Human readable engine version string.
#define TORQUE_GAME_ENGINE_VERSION_STRING "4.0.1"
#define TORQUE_GAME_ENGINE_VERSION_STRING "4.0.2"
/// Gets the engine version number. The version number is specified as a global in version.cc
U32 getVersionNumber();

11
Engine/source/gui/controls/guiGameSettingsCtrl.cpp
View file

@ -817,16 +817,9 @@ void GuiGameSettingsCtrl::clickKeybind(S32 xPos)
S32 columnSplit = mColumnSplit;
S32 height = getHeight();
S32 width = getWidth();
Point2I button;
button.x = columnSplit + (columnSplit / 2.5)/* + (optionWidth / 2)*/;
button.y = 0;
Point2I buttonSize;
buttonSize.x = height;
buttonSize.y = height;
RectI rect(button, buttonSize);
RectI rect(Point2I::Zero, Point2I(width, height));
onChange_callback();

4
Engine/source/module/moduleManager.cpp
View file

@ -385,6 +385,8 @@ bool ModuleManager::loadModuleGroup( const char* pModuleGroup )
// Create a scope set.
SimSet* pScopeSet = new SimSet;
pScopeSet->registerObject( pLoadReadyModuleDefinition->getModuleId() );
pScopeSet->setClassNamespace("ModuleRoot");
pReadyEntry->mpModuleDefinition->mScopeSet = pScopeSet->getId();
// Increase load count.
@ -773,6 +775,8 @@ bool ModuleManager::loadModuleExplicit( const char* pModuleId, const U32 version
// Create a scope set.
SimSet* pScopeSet = new SimSet;
pScopeSet->registerObject( pLoadReadyModuleDefinition->getModuleId() );
pScopeSet->setClassNamespace("ModuleRoot");
pReadyEntry->mpModuleDefinition->mScopeSet = pScopeSet->getId();
// Increase load count.