Mercurial > fife-parpg
comparison tools/editor/gui/objectedit.xml @ 684:4f36c890b1dd
* 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 |
comparison
equal
deleted
inserted
replaced
683:4fe9747d5f88 | 684:4f36c890b1dd |
---|---|
17 <Label text="None" name="object_id" min_size="30,20"/> | 17 <Label text="None" name="object_id" min_size="30,20"/> |
18 </HBox> | 18 </HBox> |
19 <HBox> | 19 <HBox> |
20 <Label text="Blocking:" min_size="45,20"/> | 20 <Label text="Blocking:" min_size="45,20"/> |
21 <TextBox text="0" name="object_blocking" min_size="20,20"/> | 21 <TextBox text="0" name="object_blocking" min_size="20,20"/> |
22 <Button name="object_blocking_toggle" text="toggle" max_size="50,20"/> | |
22 | 23 |
23 <Label text="Static:" min_size="45,20"/> | 24 <Label text="Static:" min_size="45,20"/> |
24 <TextBox text="0" name="object_static" min_size="20,20"/> | 25 <TextBox text="0" name="object_static" min_size="20,20"/> |
25 </HBox> | 26 </HBox> |
26 | 27 |
45 <Button name="y_offset_up" text="+" max_size="20,20"/> | 46 <Button name="y_offset_up" text="+" max_size="20,20"/> |
46 <Button name="y_offset_dn" text="-" max_size="20,20"/> | 47 <Button name="y_offset_dn" text="-" max_size="20,20"/> |
47 </HBox> | 48 </HBox> |
48 </VBox> | 49 </VBox> |
49 | 50 |
50 <Button name="change_data" text="Save rotation"/> | 51 <Button name="change_data" text="Save object data"/> |
51 | 52 |
52 <Label text=" Selected Instance" background_color="0,0,0" /> | 53 <Label text=" Selected Instance" background_color="0,0,0" /> |
53 | 54 |
54 <HBox > | 55 <HBox > |
55 <Label text="Instance ID:" min_size="85,20"/> | 56 <Label text="Instance ID:" min_size="85,20"/> |
57 </HBox> | 58 </HBox> |
58 <HBox > | 59 <HBox > |
59 <Label text="Instance rot:" min_size="85,20"/> | 60 <Label text="Instance rot:" min_size="85,20"/> |
60 <TextBox text="0" name="instance_rotation" min_size="30,20"/> | 61 <TextBox text="0" name="instance_rotation" min_size="30,20"/> |
61 </HBox> | 62 </HBox> |
63 <HBox > | |
64 <Label text="Instance blocking:" min_size="85,20"/> | |
65 <TextBox text="0" name="instance_blocking" min_size="30,20"/> | |
66 </HBox> | |
62 | 67 |
63 <HBox> | 68 <HBox> |
64 <Button name="use_data" text="Set instance id"/> | 69 <Button name="use_data" text="Set instance id"/> |
65 </HBox> | 70 </HBox> |
71 <HBox> | |
72 <CheckBox name="override_blocking_toggle" text="Allowed to override blocking"/> | |
73 </HBox> | |
74 <HBox> | |
75 <Button name="instance_blocking_toggle" text="Toggle instance blocking"/> | |
76 </HBox> | |
66 <Spacer /> | 77 <Spacer /> |
67 | 78 |
68 <Label text=" Animation viewer" background_color="0,0,0" /> | 79 <Label text=" Animation viewer" background_color="0,0,0" /> |
69 <VBox name="animation_panel_wrapper"> | 80 <VBox name="animation_panel_wrapper"> |
70 <Spacer /> | 81 <Spacer /> |