AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-05-25 16:51:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Template updates + small fixes

Browse Source
This commit is contained in:
parax0 2016-01-25 23:12:22 -07:00
parent 75091f718c
commit c91c275af7
23 changed files with 108 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/script/common/Camera.cmdl Normal file
View File

Binary file not shown.

BIN
resources/script/common/Generator.txtr Normal file
View File

Binary file not shown.

BIN
resources/script/common/PickupGenerator.txtr Normal file
View File

Binary file not shown.

BIN
resources/script/mp3/WeaponGenerator.txtr
View File

Binary file not shown.

3
src/Editor/PropertyEdit/CPropertyModel.cpp
View File

@ -285,7 +285,8 @@ QVariant CPropertyModel::data(const QModelIndex& rkIndex, int Role) const
if (!(rkIndex.internalId() & 0x1)) if (!(rkIndex.internalId() & 0x1))
{ {
IProperty *pProp = PropertyForIndex(rkIndex, false); IProperty *pProp = PropertyForIndex(rkIndex, false);
QString Text = QString("<b>%1</b> <i>(%2)</i>").arg(TO_QSTRING(pProp->Name())).arg(TO_QSTRING(PropEnumToPropString(pProp->Type()))); QString DisplayText = data(rkIndex, Qt::DisplayRole).toString();
QString Text = QString("<b>%1</b> <i>(%2)</i>").arg(DisplayText).arg(TO_QSTRING(PropEnumToPropString(pProp->Type())));
TString Desc = pProp->Template()->Description(); TString Desc = pProp->Template()->Description();
if (!Desc.IsEmpty()) Text += "<br/>" + TO_QSTRING(Desc); if (!Desc.IsEmpty()) Text += "<br/>" + TO_QSTRING(Desc);
return Text; return Text;

3
src/Editor/Widgets/WColorPicker.cpp
View File

@ -85,8 +85,11 @@ QColor WColorPicker::getColor()
} }
void WColorPicker::setColor(QColor Color) void WColorPicker::setColor(QColor Color)
{
if (mColor != Color)
{ {
mColor = Color; mColor = Color;
emit colorChanged(mColor); emit colorChanged(mColor);
update(); update();
} }
}

4
templates/dkcr/Script/Generator.xml
View File

@ -53,7 +53,9 @@
<property name="Scale" ID="0x255A4580:0x5846524D:0x02"/> <property name="Scale" ID="0x255A4580:0x5846524D:0x02"/>
<property name="Active" ID="0x255A4580:0x41435456"/> <property name="Active" ID="0x255A4580:0x41435456"/>
</properties> </properties>
<assets/> <assets>
<billboard source="file">script/common/Generator.txtr</billboard>
</assets>
<preview_scale>0.5</preview_scale> <preview_scale>0.5</preview_scale>
<rotation_type>enabled</rotation_type> <rotation_type>enabled</rotation_type>
<scale_type>enabled</scale_type> <scale_type>enabled</scale_type>

0
templates/dkcr/Script/PRLA.xml → templates/dkcr/Script/PickupRelay.xml
View File

18
templates/dkcr/Script/SequenceTimer.xml
View File

@ -5,7 +5,23 @@
<struct ID="0x255A4580" template="Structs/EditorProperties.xml"/> <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
<array ID="0xEF5C94E9"> <array ID="0xEF5C94E9">
<default>0</default> <default>0</default>
<properties/> <element_name>Connection</element_name>
<properties>
<property ID="0x00" name="Connection Index" type="short" />
<array ID="0x01" name="Activation Times">
<element_name>Activation Time</element_name>
<properties>
<property ID="0x00" name="Time" type="float" />
<property ID="0x01" name="Unknown 1" type="long">
<description>Always 0</description>
</property>
<property ID="0x02" name="Unknown 2" type="long"/>
<property ID="0x03" name="Unknown 3" type="long">
<description>Always 0</description>
</property>
</properties>
</array>
</properties>
</array> </array>
<property ID="0xB8BD2175" type="float"> <property ID="0xB8BD2175" type="float">
<default>0.0</default> <default>0.0</default>

4
templates/mp1/Script/Camera.xml
View File

@ -24,7 +24,9 @@
<property name="Position" ID="0x01"/> <property name="Position" ID="0x01"/>
<property name="Rotation" ID="0x02"/> <property name="Rotation" ID="0x02"/>
</properties> </properties>
<assets/> <assets>
<model source="file">script/common/Camera.cmdl</model>
</assets>
<rotation_type>enabled</rotation_type> <rotation_type>enabled</rotation_type>
<scale_type>disabled</scale_type> <scale_type>disabled</scale_type>
</editor> </editor>

8
templates/mp1/Script/Generator.xml
View File

@ -15,8 +15,10 @@
<properties> <properties>
<property name="InstanceName" ID="0x00"/> <property name="InstanceName" ID="0x00"/>
</properties> </properties>
<assets/> <assets>
<rotation_type>disabled</rotation_type> <billboard source="file">script/common/Generator.txtr</billboard>
<scale_type>disabled</scale_type> </assets>
<rotation_type>enabled</rotation_type>
<scale_type>enabled</scale_type>
</editor> </editor>
</ScriptTemplate> </ScriptTemplate>

4
templates/mp1/Script/PickupGenerator.xml
View File

@ -12,7 +12,9 @@
<property name="InstanceName" ID="0x00"/> <property name="InstanceName" ID="0x00"/>
<property name="Active" ID="0x02"/> <property name="Active" ID="0x02"/>
</properties> </properties>
<assets/> <assets>
<billboard source="file">script/common/PickupGenerator.txtr</billboard>
</assets>
<rotation_type>disabled</rotation_type> <rotation_type>disabled</rotation_type>
<scale_type>disabled</scale_type> <scale_type>disabled</scale_type>
</editor> </editor>

4
templates/mp2/Script/Camera.xml
View File

@ -36,7 +36,9 @@
<property name="Scale" ID="0x255A4580:0x5846524D:0x02"/> <property name="Scale" ID="0x255A4580:0x5846524D:0x02"/>
<property name="Active" ID="0x255A4580:0x41435456"/> <property name="Active" ID="0x255A4580:0x41435456"/>
</properties> </properties>
<assets/> <assets>
<model source="file">script/common/Camera.cmdl</model>
</assets>
<rotation_type>enabled</rotation_type> <rotation_type>enabled</rotation_type>
<scale_type>enabled</scale_type> <scale_type>enabled</scale_type>
</editor> </editor>

4
templates/mp2/Script/Generator.xml
View File

@ -35,7 +35,9 @@
<property name="Scale" ID="0x255A4580:0x5846524D:0x02"/> <property name="Scale" ID="0x255A4580:0x5846524D:0x02"/>
<property name="Active" ID="0x255A4580:0x41435456"/> <property name="Active" ID="0x255A4580:0x41435456"/>
</properties> </properties>
<assets/> <assets>
<billboard source="file">script/common/Generator.txtr</billboard>
</assets>
<preview_scale>0.5</preview_scale> <preview_scale>0.5</preview_scale>
<rotation_type>enabled</rotation_type> <rotation_type>enabled</rotation_type>
<scale_type>enabled</scale_type> <scale_type>enabled</scale_type>

4
templates/mp2/Script/PickupGenerator.xml
View File

@ -23,7 +23,9 @@
<property name="Scale" ID="0x255A4580:0x5846524D:0x02"/> <property name="Scale" ID="0x255A4580:0x5846524D:0x02"/>
<property name="Active" ID="0x255A4580:0x41435456"/> <property name="Active" ID="0x255A4580:0x41435456"/>
</properties> </properties>
<assets/> <assets>
<billboard source="file">script/common/PickupGenerator.txtr</billboard>
</assets>
<preview_scale>0.5</preview_scale> <preview_scale>0.5</preview_scale>
<rotation_type>enabled</rotation_type> <rotation_type>enabled</rotation_type>
<scale_type>enabled</scale_type> <scale_type>enabled</scale_type>

4
templates/mp2demo/Script/Camera.xml
View File

@ -36,7 +36,9 @@
<property name="Scale" ID="0x255A4580:0x5846524D:0x02"/> <property name="Scale" ID="0x255A4580:0x5846524D:0x02"/>
<property name="Active" ID="0x255A4580:0x41435456"/> <property name="Active" ID="0x255A4580:0x41435456"/>
</properties> </properties>
<assets/> <assets>
<model source="file">script/common/Camera.cmdl</model>
</assets>
<rotation_type>enabled</rotation_type> <rotation_type>enabled</rotation_type>
<scale_type>enabled</scale_type> <scale_type>enabled</scale_type>
</editor> </editor>

4
templates/mp2demo/Script/Generator.xml
View File

@ -35,7 +35,9 @@
<property name="Scale" ID="0x255A4580:0x5846524D:0x02"/> <property name="Scale" ID="0x255A4580:0x5846524D:0x02"/>
<property name="Active" ID="0x255A4580:0x41435456"/> <property name="Active" ID="0x255A4580:0x41435456"/>
</properties> </properties>
<assets/> <assets>
<billboard source="file">script/common/Generator.txtr</billboard>
</assets>
<preview_scale>0.5</preview_scale> <preview_scale>0.5</preview_scale>
<rotation_type>enabled</rotation_type> <rotation_type>enabled</rotation_type>
<scale_type>enabled</scale_type> <scale_type>enabled</scale_type>

4
templates/mp2demo/Script/PickupGenerator.xml
View File

@ -23,7 +23,9 @@
<property name="Scale" ID="0x255A4580:0x5846524D:0x02"/> <property name="Scale" ID="0x255A4580:0x5846524D:0x02"/>
<property name="Active" ID="0x255A4580:0x41435456"/> <property name="Active" ID="0x255A4580:0x41435456"/>
</properties> </properties>
<assets/> <assets>
<billboard source="file">script/common/PickupGenerator.txtr</billboard>
</assets>
<preview_scale>0.5</preview_scale> <preview_scale>0.5</preview_scale>
<rotation_type>enabled</rotation_type> <rotation_type>enabled</rotation_type>
<scale_type>enabled</scale_type> <scale_type>enabled</scale_type>

10
templates/mp2demo/Script/SequenceTimer.xml
View File

@ -5,7 +5,15 @@
<struct ID="0x255A4580" template="Structs/EditorProperties.xml"/> <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
<array ID="0xEF5C94E9"> <array ID="0xEF5C94E9">
<default>0</default> <default>0</default>
<properties/> <element_name>Connection</element_name>
<properties>
<property ID="0x00" name="Connection Index" type="short" />
<array ID="0x01" name="Activation Times">
<properties>
<property ID="0x00" name="Time" type="float" />
</properties>
</array>
</properties>
</array> </array>
<property ID="0x03E7B2B4" type="float"> <property ID="0x03E7B2B4" type="float">
<default>0.0</default> <default>0.0</default>

4
templates/mp3/Script/Generator.xml
View File

@ -44,7 +44,9 @@
<property name="Scale" ID="0x255A4580:0x5846524D:0x02"/> <property name="Scale" ID="0x255A4580:0x5846524D:0x02"/>
<property name="Active" ID="0x255A4580:0x41435456"/> <property name="Active" ID="0x255A4580:0x41435456"/>
</properties> </properties>
<assets/> <assets>
<billboard source="file">script/common/Generator.txtr</billboard>
</assets>
<preview_scale>0.5</preview_scale> <preview_scale>0.5</preview_scale>
<rotation_type>enabled</rotation_type> <rotation_type>enabled</rotation_type>
<scale_type>enabled</scale_type> <scale_type>enabled</scale_type>

18
templates/mp3/Script/SequenceTimer.xml
View File

@ -5,7 +5,23 @@
<struct ID="0x255A4580" template="Structs/EditorProperties.xml"/> <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
<array ID="0xEF5C94E9"> <array ID="0xEF5C94E9">
<default>0</default> <default>0</default>
<properties/> <element_name>Connection</element_name>
<properties>
<property ID="0x00" name="Connection Index" type="short" />
<array ID="0x01" name="Activation Times">
<element_name>Activation Time</element_name>
<properties>
<property ID="0x00" name="Time" type="float" />
<property ID="0x01" name="Unknown 1" type="long">
<description>Always 0</description>
</property>
<property ID="0x02" name="Unknown 2" type="long"/>
<property ID="0x03" name="Unknown 3" type="long">
<description>Always 0</description>
</property>
</properties>
</array>
</properties>
</array> </array>
<property ID="0xB8BD2175" type="float"> <property ID="0xB8BD2175" type="float">
<default>0.0</default> <default>0.0</default>

4
templates/mp3proto/Script/Generator.xml
View File

@ -41,7 +41,9 @@
<property name="Scale" ID="0x255A4580:0x5846524D:0x02"/> <property name="Scale" ID="0x255A4580:0x5846524D:0x02"/>
<property name="Active" ID="0x255A4580:0x41435456"/> <property name="Active" ID="0x255A4580:0x41435456"/>
</properties> </properties>
<assets/> <assets>
<billboard source="file">script/common/Generator.txtr</billboard>
</assets>
<preview_scale>0.5</preview_scale> <preview_scale>0.5</preview_scale>
<rotation_type>enabled</rotation_type> <rotation_type>enabled</rotation_type>
<scale_type>enabled</scale_type> <scale_type>enabled</scale_type>

18
templates/mp3proto/Script/SequenceTimer.xml
View File

@ -5,7 +5,23 @@
<struct ID="0x255A4580" template="Structs/EditorProperties.xml"/> <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
<array ID="0xEF5C94E9"> <array ID="0xEF5C94E9">
<default>0</default> <default>0</default>
<properties/> <element_name>Connection</element_name>
<properties>
<property ID="0x00" name="Connection Index" type="short" />
<array ID="0x01" name="Activation Times">
<element_name>Activation Time</element_name>
<properties>
<property ID="0x00" name="Time" type="float" />
<property ID="0x01" name="Unknown 1" type="long">
<description>Always 0</description>
</property>
<property ID="0x02" name="Unknown 2" type="long"/>
<property ID="0x03" name="Unknown 3" type="long">
<description>Always 0</description>
</property>
</properties>
</array>
</properties>
</array> </array>
<property ID="0xB8BD2175" type="float"> <property ID="0xB8BD2175" type="float">
<default>0.0</default> <default>0.0</default>