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

Merge branch 'EngineAssetify' of https://github.com/Areloch/Torque3D into EngineAssetify_Followups_XML2Check

Browse source 
# Conflicts:
#	Engine/source/ts/tsShapeConstruct.cpp
This commit is contained in:
AzaezelX 2021-08-02 13:54:51 -05:00
commit c5d0310bc3
180 changed files with 2337 additions and 1572 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/data/Prototyping/shapes/ConePrimitive.tscript
View file

@ -1,6 +1,6 @@
//--- OBJECT WRITE BEGIN ---
new TSShapeConstructor(ConePrimitive_fbx) {
baseShape = "./ConePrimitive.fbx";
baseShapeAsset = "Prototyping:ConePrimitive";
upAxis = "DEFAULT";
unit = "-1";
LODType = "TrailingNumber";

2
Templates/BaseGame/game/data/Prototyping/shapes/CubePrimitive.tscript
View file

@ -1,6 +1,6 @@
//--- OBJECT WRITE BEGIN ---
new TSShapeConstructor(CubePrimitive_fbx) {
baseShape = "./CubePrimitive.fbx";
baseShapeAsset = "Prototyping:CubePrimitive";
upAxis = "DEFAULT";
unit = "-1";
LODType = "TrailingNumber";

2
Templates/BaseGame/game/data/Prototyping/shapes/CylinderPrimitive.tscript
View file

@ -1,6 +1,6 @@
//--- OBJECT WRITE BEGIN ---
new TSShapeConstructor(CylinderPrimitive_fbx) {
baseShape = "./CylinderPrimitive.fbx";
baseShapeAsset = "Prototyping:CylinderPrimitive";
upAxis = "DEFAULT";
unit = "-1";
LODType = "TrailingNumber";

2
Templates/BaseGame/game/data/Prototyping/shapes/SpherePrimitive.tscript
View file

@ -1,6 +1,6 @@
//--- OBJECT WRITE BEGIN ---
new TSShapeConstructor(SpherePrimitive_fbx) {
baseShape = "./SpherePrimitive.fbx";
baseShapeAsset = "Prototyping:SpherePrimitive";
upAxis = "DEFAULT";
unit = "-1";
LODType = "TrailingNumber";

2
Templates/BaseGame/game/data/Prototyping/shapes/TorusPrimitive.tscript
View file

@ -1,6 +1,6 @@
//--- OBJECT WRITE BEGIN ---
new TSShapeConstructor(TorusPrimitive_fbx) {
baseShape = "./TorusPrimitive.fbx";
baseShapeAsset = "Prototyping:TorusPrimitive";
upAxis = "DEFAULT";
unit = "-1";
LODType = "TrailingNumber";

2
Templates/BaseGame/game/data/Prototyping/shapes/TubePrimitive.tscript
View file

@ -1,6 +1,6 @@
//--- OBJECT WRITE BEGIN ---
new TSShapeConstructor(TubePrimitive_fbx) {
baseShape = "./TubePrimitive.fbx";
baseShapeAsset = "Prototyping:TubePrimitive";
upAxis = "DEFAULT";
unit = "-1";
LODType = "TrailingNumber";

2
Templates/BaseGame/game/data/Prototyping/shapes/kork_chanShape.tscript
View file

@ -1,6 +1,6 @@
//--- OBJECT WRITE BEGIN ---
new TSShapeConstructor(kork_chanShape_fbx) {
baseShape = "./kork_chanShape.fbx";
baseShapeAsset = "Prototyping:kork_chanShape";
upAxis = "DEFAULT";
unit = "-1";
LODType = "TrailingNumber";

4
Templates/BaseGame/game/data/ui/guis/startupGui.gui
View file

@ -13,7 +13,7 @@
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
hovertime = "1000";
bitmap = "";
bitmapAsset = "";
wrap = "0";
fadeinTime = "1000";
waitTime = "4000";
@ -70,7 +70,7 @@ new GuiFadeinBitmapCtrl(BlankGui) {
minExtent = "8 8";
visible = "1";
helpTag = "0";
bitmap = "";
bitmapAsset = "";
wrap = "0";
fadeinTime = "100";
waitTime = "2000";