ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/arch/exit/Pentagram/pentagram.arc
(Generate patch)

Comparing deliantra/arch/exit/Pentagram/pentagram.arc (file contents):
Revision 1.7 by root, Sat Mar 3 01:13:55 2007 UTC vs.
Revision 1.12 by root, Sat Oct 16 09:17:02 2010 UTC

4speed 0 4speed 0
5type 41 5type 41
6no_pick 1 6no_pick 1
7activate_on_push 1 7activate_on_push 1
8activate_on_release 1 8activate_on_release 1
9editable 50
10magicmap black
11visibility 50
12end 9end
13more 10more
14object pentagram_112 11object pentagram_112
15name pentagram 12name pentagram
16face pentagram.x11 13face pentagram.x11
18speed 0 15speed 0
19type 41 16type 41
20no_pick 1 17no_pick 1
21activate_on_push 1 18activate_on_push 1
22activate_on_release 1 19activate_on_release 1
23editable 50
24magicmap black
25visibility 50
26end 20end
27more 21more
28object pentagram_113 22object pentagram_113
29name pentagram 23name pentagram
30face pentagram.x11 24face pentagram.x11
32speed 0 26speed 0
33type 41 27type 41
34no_pick 1 28no_pick 1
35activate_on_push 1 29activate_on_push 1
36activate_on_release 1 30activate_on_release 1
37editable 50
38magicmap black
39visibility 50
40end 31end
41more 32more
42object pentagram_121 33object pentagram_121
43name pentagram 34name pentagram
44<<<<<<< pentagram.arc
45face pentagram.x11
46magicmap black
47=======
48face pentagram.x11 35face pentagram.x11
49y 1 36y 1
50>>>>>>> 1.5
51speed 0 37speed 0
52type 41 38type 41
53no_pick 1 39no_pick 1
54activate_on_push 1 40activate_on_push 1
55activate_on_release 1 41activate_on_release 1
56editable 50
57magicmap black
58visibility 50
59end 42end
60more 43more
61object pentagram_122 44object pentagram_122
62name pentagram 45name pentagram
63<<<<<<< pentagram.arc
64face pentagram.x11
65magicmap black
66=======
67face pentagram.x11 46face pentagram.x11
68x 1 47x 1
69y 1 48y 1
70>>>>>>> 1.5
71speed 0 49speed 0
72type 41 50type 41
73no_pick 1 51no_pick 1
74activate_on_push 1 52activate_on_push 1
75activate_on_release 1 53activate_on_release 1
76editable 50
77magicmap black
78visibility 50
79end 54end
80more 55more
81object pentagram_123 56object pentagram_123
82name pentagram 57name pentagram
83<<<<<<< pentagram.arc
84face pentagram.x11
85magicmap black
86=======
87face pentagram.x11 58face pentagram.x11
88x 2 59x 2
89y 1 60y 1
90>>>>>>> 1.5
91speed 0 61speed 0
92type 41 62type 41
93no_pick 1 63no_pick 1
94activate_on_push 1 64activate_on_push 1
95activate_on_release 1 65activate_on_release 1
96editable 50
97magicmap black
98visibility 50
99end 66end
100more 67more
101object pentagram_131 68object pentagram_131
102name pentagram 69name pentagram
103<<<<<<< pentagram.arc
104face pentagram.x11
105magicmap black
106=======
107face pentagram.x11 70face pentagram.x11
108y 2 71y 2
109>>>>>>> 1.5
110speed 0 72speed 0
111type 41 73type 41
112no_pick 1 74no_pick 1
113activate_on_push 1 75activate_on_push 1
114activate_on_release 1 76activate_on_release 1
115editable 50
116magicmap black
117visibility 50
118end 77end
119more 78more
120object pentagram_132 79object pentagram_132
121name pentagram 80name pentagram
122face pentagram.x11 81face pentagram.x11
125speed 0 84speed 0
126type 41 85type 41
127no_pick 1 86no_pick 1
128activate_on_push 1 87activate_on_push 1
129activate_on_release 1 88activate_on_release 1
130editable 50
131magicmap black
132visibility 50
133end 89end
134more 90more
135object pentagram_133 91object pentagram_133
136name pentagram 92name pentagram
137<<<<<<< pentagram.arc
138face pentagram.x11
139magicmap black
140=======
141face pentagram.x11 93face pentagram.x11
142x 2 94x 2
143y 2 95y 2
144>>>>>>> 1.5
145speed 0 96speed 0
146type 41 97type 41
147no_pick 1 98no_pick 1
148activate_on_push 1 99activate_on_push 1
149activate_on_release 1 100activate_on_release 1
150editable 50
151magicmap black
152visibility 50
153end 101end
154 102

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines