Mercurial > fife-parpg

diff tools/editor/gui/objectedit.xml @ 684:4f36c890b1dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Merged the 0.3.3dev branche changes to the trunk.
author helios2000@33b003aa-7bff-0310-803a-e67f0ece8222
date Mon, 06 Dec 2010 19:25:27 +0000
parents a2024b994ca3
children
line wrap: on
line diff
--- a/tools/editor/gui/objectedit.xml	Mon Dec 06 18:37:18 2010 +0000
+++ b/tools/editor/gui/objectedit.xml	Mon Dec 06 19:25:27 2010 +0000
@@ -19,6 +19,7 @@
 	<HBox>
 		<Label text="Blocking:" min_size="45,20"/>
 		<TextBox text="0" name="object_blocking" min_size="20,20"/>
+    <Button name="object_blocking_toggle" text="toggle" max_size="50,20"/>
 
 		<Label text="Static:" min_size="45,20"/>
 		<TextBox text="0" name="object_static" min_size="20,20"/>
@@ -47,7 +48,7 @@
 		</HBox>
 	</VBox>
 
-	<Button name="change_data" text="Save rotation"/>
+	<Button name="change_data" text="Save object data"/>
 
 	<Label text="          Selected Instance" background_color="0,0,0" />
 
@@ -59,10 +60,20 @@
 		<Label text="Instance rot:" min_size="85,20"/>
 		<TextBox text="0" name="instance_rotation" min_size="30,20"/>
 	</HBox>
+  <HBox >
+    <Label text="Instance blocking:" min_size="85,20"/>
+    <TextBox text="0" name="instance_blocking" min_size="30,20"/>
+  </HBox>
 
 	<HBox>
 		<Button name="use_data" text="Set instance id"/>
 	</HBox>
+  <HBox>
+    <CheckBox name="override_blocking_toggle" text="Allowed to override blocking"/>
+  </HBox>
+  <HBox>
+    <Button name="instance_blocking_toggle" text="Toggle instance blocking"/>
+  </HBox>
 	<Spacer />
 
 	<Label text="          Animation viewer" background_color="0,0,0" />