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

Merge branch 'development' into issue_2115

Browse source
This commit is contained in:
Bloodknight 2018-02-05 15:59:33 +00:00 • committed by GitHub
commit c8e9b85ed3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
520 changed files with 30537 additions and 151323 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/sim/actionMap.cpp
View file

@ -1868,7 +1868,7 @@ static ConsoleDocFragment _ActionMapbind2(
"ActionMap",
"bool bind( string device, string action, string flag, string deadZone, string scale, string command );");
ConsoleMethod( ActionMap, bind, bool, 5, 10, "actionMap.bind( device, action, [modifier spec, mod...], command )"
ConsoleMethod( ActionMap, bind, bool, 5, 10, "actionMap.bind( device, action, [modifier, spec, mod...], command )"
"@hide")
{
StringStackWrapper args(argc - 2, argv + 2);
@ -1917,7 +1917,7 @@ static ConsoleDocFragment _ActionMapbindObj2(
"ActionMap",
"bool bindObj( string device, string action, string flag, string deadZone, string scale, string command, SimObjectID object );");
ConsoleMethod( ActionMap, bindObj, bool, 6, 11, "(device, action, [modifier spec, mod...], command, object)"
ConsoleMethod( ActionMap, bindObj, bool, 6, 11, "(device, action, [modifier, spec, mod...], command, object)"
"@hide")
{
SimObject* simObject = Sim::findObject(argv[argc - 1]);

6
Engine/source/sim/netObject.cpp
View file

@ -499,3 +499,9 @@ void NetObject::removeScopeRef()
}
}
#endif
DefineEngineMethod(NetObject, clearScopeAlways, void, (), ,
"@brief Clears the scope always flag on this object.\n\n")
{
object->clearScopeAlways();
}