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.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
44<<<<<<< pentagram.arc
45face pentagram.x11 41face pentagram.x11
46magicmap black 42magicmap black
47=======
48face pentagram.x11
49y 1 43y 1
50>>>>>>> 1.5
51speed 0 44speed 0
52type 41 45type 41
53no_pick 1 46no_pick 1
54activate_on_push 1 47activate_on_push 1
55activate_on_release 1 48activate_on_release 1
56editable 50
57magicmap black
58visibility 50 49visibility 50
59end 50end
60more 51more
61object pentagram_122 52object pentagram_122
62name pentagram 53name pentagram
63<<<<<<< pentagram.arc
64face pentagram.x11 54face pentagram.x11
65magicmap black 55magicmap black
66=======
67face pentagram.x11
68x 1 56x 1
69y 1 57y 1
70>>>>>>> 1.5
71speed 0 58speed 0
72type 41 59type 41
73no_pick 1 60no_pick 1
74activate_on_push 1 61activate_on_push 1
75activate_on_release 1 62activate_on_release 1
76editable 50
77magicmap black
78visibility 50 63visibility 50
79end 64end
80more 65more
81object pentagram_123 66object pentagram_123
82name pentagram 67name pentagram
83<<<<<<< pentagram.arc
84face pentagram.x11 68face pentagram.x11
85magicmap black 69magicmap black
86=======
87face pentagram.x11
88x 2 70x 2
89y 1 71y 1
90>>>>>>> 1.5
91speed 0 72speed 0
92type 41 73type 41
93no_pick 1 74no_pick 1
94activate_on_push 1 75activate_on_push 1
95activate_on_release 1 76activate_on_release 1
96editable 50
97magicmap black
98visibility 50 77visibility 50
99end 78end
100more 79more
101object pentagram_131 80object pentagram_131
102name pentagram 81name pentagram
103<<<<<<< pentagram.arc
104face pentagram.x11 82face pentagram.x11
105magicmap black 83magicmap black
106=======
107face pentagram.x11
108y 2 84y 2
109>>>>>>> 1.5
110speed 0 85speed 0
111type 41 86type 41
112no_pick 1 87no_pick 1
113activate_on_push 1 88activate_on_push 1
114activate_on_release 1 89activate_on_release 1
115editable 50
116magicmap black
117visibility 50 90visibility 50
118end 91end
119more 92more
120object pentagram_132 93object pentagram_132
121name pentagram 94name pentagram
122face pentagram.x11 95face pentagram.x11
96magicmap black
123x 1 97x 1
124y 2 98y 2
125speed 0 99speed 0
126type 41 100type 41
127no_pick 1 101no_pick 1
128activate_on_push 1 102activate_on_push 1
129activate_on_release 1 103activate_on_release 1
130editable 50
131magicmap black
132visibility 50 104visibility 50
133end 105end
134more 106more
135object pentagram_133 107object pentagram_133
136name pentagram 108name pentagram
137<<<<<<< pentagram.arc
138face pentagram.x11 109face pentagram.x11
139magicmap black 110magicmap black
140=======
141face pentagram.x11
142x 2 111x 2
143y 2 112y 2
144>>>>>>> 1.5
145speed 0 113speed 0
146type 41 114type 41
147no_pick 1 115no_pick 1
148activate_on_push 1 116activate_on_push 1
149activate_on_release 1 117activate_on_release 1
150editable 50
151magicmap black
152visibility 50 118visibility 50
153end 119end
154 120

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines