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

Various fixes

Browse source
This commit is contained in:
Areloch 2019-05-11 21:42:27 -05:00
parent 60a29777fa
commit 3fa7a0d4fa
27 changed files with 171 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Templates/BaseGame/game/core/gameObjects/Core_GameObjects.cs
View file

@ -1,4 +1,3 @@
function Core_GameObjects::onCreate(%this)
{
}

4
Templates/BaseGame/game/core/gameObjects/Core_GameObjects.module
View file

@ -10,10 +10,10 @@
canSave="true"
canSaveDynamicFields="true"
Extension="asset.taml"
Recurse="true" />
Recurse="true"/>
<AutoloadAssets
canSave="true"
canSaveDynamicFields="true"
AssetType="GameObjectAsset"
Recurse="true" />
Recurse="true"/>
</ModuleDefinition>

4
Templates/BaseGame/game/core/gameObjects/gameObjects/AIPlayerObject.asset.taml
View file

@ -3,6 +3,6 @@
canSaveDynamicFields="true"
AssetName="AIPlayerObject"
gameObjectName="AIPlayerObject"
scriptFilePath="core/gameObjects/gameObjects/AIPlayerObject.cs"
TAMLFilePath="core/gameObjects/gameObjects/AIPlayerObject.taml"
scriptFile="AIPlayerObject.cs"
TAMLFile="AIPlayerObject.taml"
description="A basic AI Player Object example." />

4
Templates/BaseGame/game/core/gameObjects/gameObjects/PlayerObject.asset.taml
View file

@ -3,6 +3,6 @@
canSaveDynamicFields="true"
AssetName="PlayerObject"
gameObjectName="PlayerObject"
scriptFilePath="core/gameObjects/gameObjects/PlayerObject.cs"
TAMLFilePath="core/gameObjects/gameObjects/PlayerObject.taml"
scriptFile="PlayerObject.cs"
TAMLFile="PlayerObject.taml"
description="A basic Player Object example." />

2
Templates/BaseGame/game/core/gameObjects/gameObjects/soundEmitterObject.asset.taml
View file

@ -3,5 +3,5 @@
canSaveDynamicFields="true"
AssetName="soundEmitterObject"
gameObjectName="soundEmitterObject"
TAMLFilePath="core/gameObjects/gameObjects/soundEmitterObject.taml"
TAMLFile="soundEmitterObject.taml"
description="A basic sound emitter example." />

2
Templates/BaseGame/game/core/gameObjects/gameObjects/staticShapeObject.asset.taml
View file

@ -3,5 +3,5 @@
canSaveDynamicFields="true"
AssetName="StaticShapeObject"
gameObjectName="StaticShapeObject"
TAMLFilePath="core/gameObjects/gameObjects/staticShapeObject.taml"
TAMLFile="staticShapeObject.taml"
description="A basic static shape example." />

50
Templates/BaseGame/game/core/utility/scripts/helperFunctions.cs
View file

@ -198,56 +198,6 @@ function getPrefpath()
return $prefPath;
}
function updateTSShapeLoadProgress(%progress, %msg)
{
// Check if the loading GUI is visible and use that instead of the
// separate import progress GUI if possible
/* if ( isObject(LoadingGui) && LoadingGui.isAwake() )
{
// Save/Restore load progress at the start/end of the import process
if ( %progress == 0 )
{
ColladaImportProgress.savedProgress = LoadingProgress.getValue();
ColladaImportProgress.savedText = LoadingProgressTxt.getValue();
ColladaImportProgress.msgPrefix = "Importing " @ %msg;
%msg = "Reading file into memory...";
}
else if ( %progress == 1.0 )
{
LoadingProgress.setValue( ColladaImportProgress.savedProgress );
LoadingProgressTxt.setValue( ColladaImportProgress.savedText );
}
%msg = ColladaImportProgress.msgPrefix @ ": " @ %msg;
%progressCtrl = LoadingProgress;
%textCtrl = LoadingProgressTxt;
}
else
{
//it's probably the editors using it
if(isFunction("updateToolTSShapeLoadProgress"))
{
updateToolTSShapeLoadProgress(%progress, %msg);
}
}
// Update progress indicators
if (%progress == 0)
{
%progressCtrl.setValue(0.001);
%textCtrl.setText(%msg);
}
else if (%progress != 1.0)
{
%progressCtrl.setValue(%progress);
%textCtrl.setText(%msg);
}
Canvas.repaint(33);*/
}
/// A helper function which will return the ghosted client object
/// from a server object when connected to a local server.
function serverToClientObject( %serverObject )