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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines