Auto stash before merge of "main" and "origin/main"
This commit is contained in:
@ -16,10 +16,11 @@
|
||||
<value>2</value>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<value>5</value>
|
||||
<value>6</value>
|
||||
</property>
|
||||
<property name="enumerationLabels">
|
||||
<value>Start</value>
|
||||
<value>Value A</value>
|
||||
<value>CombatStart</value>
|
||||
<value>Invest</value>
|
||||
<value>Seen</value>
|
||||
<value>Combat</value>
|
||||
@ -29,7 +30,7 @@
|
||||
<value>true</value>
|
||||
</property>
|
||||
<property name="initialValue">
|
||||
<value>0</value>
|
||||
<value>1</value>
|
||||
</property>
|
||||
<property name="isExposedRecursively">
|
||||
<value>false</value>
|
||||
|
@ -0,0 +1,36 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.02.00">
|
||||
<object class="ParameterPreset" id="{3478e07a-a821-4e84-bae8-33d08271914e}">
|
||||
<property name="name">
|
||||
<value>Controller Transitions</value>
|
||||
</property>
|
||||
<relationship name="folder">
|
||||
<destination>{18af223d-abd8-4074-9e25-0c1698cedc53}</destination>
|
||||
</relationship>
|
||||
<relationship name="parameter">
|
||||
<destination>{44359f5c-f1b6-4099-bb13-23652c422183}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="GameParameter" id="{44359f5c-f1b6-4099-bb13-23652c422183}">
|
||||
<property name="parameterType">
|
||||
<value>2</value>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<value>3</value>
|
||||
</property>
|
||||
<property name="enumerationLabels">
|
||||
<value>Overworld</value>
|
||||
<value>Battle</value>
|
||||
<value>Value C</value>
|
||||
</property>
|
||||
<property name="isGlobal">
|
||||
<value>true</value>
|
||||
</property>
|
||||
<property name="initialValue">
|
||||
<value>0</value>
|
||||
</property>
|
||||
<property name="isExposedRecursively">
|
||||
<value>false</value>
|
||||
</property>
|
||||
</object>
|
||||
</objects>
|
@ -0,0 +1,29 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.02.00">
|
||||
<object class="ParameterPreset" id="{44a9c0ce-ce50-465f-8774-2a97a178d5e5}">
|
||||
<property name="name">
|
||||
<value>Camp</value>
|
||||
</property>
|
||||
<relationship name="folder">
|
||||
<destination>{18af223d-abd8-4074-9e25-0c1698cedc53}</destination>
|
||||
</relationship>
|
||||
<relationship name="parameter">
|
||||
<destination>{3dd03d4c-ef23-4d03-a152-62b3a06b6509}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="GameParameter" id="{3dd03d4c-ef23-4d03-a152-62b3a06b6509}">
|
||||
<property name="parameterType">
|
||||
<value>2</value>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<value>2</value>
|
||||
</property>
|
||||
<property name="enumerationLabels">
|
||||
<value>Camp</value>
|
||||
<value>Shop</value>
|
||||
</property>
|
||||
<property name="initialValue">
|
||||
<value>0</value>
|
||||
</property>
|
||||
</object>
|
||||
</objects>
|
@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.02.00">
|
||||
<object class="ParameterPreset" id="{4ccf98a7-b0d4-4b3d-9045-9d227947ccc2}">
|
||||
<property name="name">
|
||||
<value>Music transitions</value>
|
||||
</property>
|
||||
<relationship name="folder">
|
||||
<destination>{18af223d-abd8-4074-9e25-0c1698cedc53}</destination>
|
||||
</relationship>
|
||||
<relationship name="parameter">
|
||||
<destination>{c64e33ea-feb5-4063-9326-a0044c8182f6}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="GameParameter" id="{c64e33ea-feb5-4063-9326-a0044c8182f6}">
|
||||
<property name="initialValue">
|
||||
<value>0</value>
|
||||
</property>
|
||||
</object>
|
||||
</objects>
|
Reference in New Issue
Block a user