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.10 by root, Tue Nov 3 09:48:32 2009 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 9magicmap black
11visibility 50 10visibility 50
12end 11end
13more 12more
14object pentagram_112 13object pentagram_112
18speed 0 17speed 0
19type 41 18type 41
20no_pick 1 19no_pick 1
21activate_on_push 1 20activate_on_push 1
22activate_on_release 1 21activate_on_release 1
23editable 50
24magicmap black 22magicmap black
25visibility 50 23visibility 50
26end 24end
27more 25more
28object pentagram_113 26object pentagram_113
32speed 0 30speed 0
33type 41 31type 41
34no_pick 1 32no_pick 1
35activate_on_push 1 33activate_on_push 1
36activate_on_release 1 34activate_on_release 1
37editable 50
38magicmap black 35magicmap 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
46magicmap black
47=======
48face pentagram.x11 41face pentagram.x11
49y 1 42y 1
50>>>>>>> 1.5
51speed 0 43speed 0
52type 41 44type 41
53no_pick 1 45no_pick 1
54activate_on_push 1 46activate_on_push 1
55activate_on_release 1 47activate_on_release 1
56editable 50
57magicmap black 48magicmap 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
65magicmap black
66=======
67face pentagram.x11 54face pentagram.x11
68x 1 55x 1
69y 1 56y 1
70>>>>>>> 1.5
71speed 0 57speed 0
72type 41 58type 41
73no_pick 1 59no_pick 1
74activate_on_push 1 60activate_on_push 1
75activate_on_release 1 61activate_on_release 1
76editable 50
77magicmap black 62magicmap 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
85magicmap black
86=======
87face pentagram.x11 68face pentagram.x11
88x 2 69x 2
89y 1 70y 1
90>>>>>>> 1.5
91speed 0 71speed 0
92type 41 72type 41
93no_pick 1 73no_pick 1
94activate_on_push 1 74activate_on_push 1
95activate_on_release 1 75activate_on_release 1
96editable 50
97magicmap black 76magicmap 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
105magicmap black
106=======
107face pentagram.x11 82face pentagram.x11
108y 2 83y 2
109>>>>>>> 1.5
110speed 0 84speed 0
111type 41 85type 41
112no_pick 1 86no_pick 1
113activate_on_push 1 87activate_on_push 1
114activate_on_release 1 88activate_on_release 1
115editable 50
116magicmap black 89magicmap black
117visibility 50 90visibility 50
118end 91end
119more 92more
120object pentagram_132 93object pentagram_132
125speed 0 98speed 0
126type 41 99type 41
127no_pick 1 100no_pick 1
128activate_on_push 1 101activate_on_push 1
129activate_on_release 1 102activate_on_release 1
130editable 50
131magicmap black 103magicmap 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
139magicmap black
140=======
141face pentagram.x11 109face pentagram.x11
142x 2 110x 2
143y 2 111y 2
144>>>>>>> 1.5
145speed 0 112speed 0
146type 41 113type 41
147no_pick 1 114no_pick 1
148activate_on_push 1 115activate_on_push 1
149activate_on_release 1 116activate_on_release 1
150editable 50
151magicmap black 117magicmap black
152visibility 50 118visibility 50
153end 119end
154 120

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines