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.8 by root, Sat Mar 3 01:22:13 2007 UTC vs.
Revision 1.11 by root, Tue Nov 3 09:58:39 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines