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.2 by pippijn, Tue Jan 2 21:47:47 2007 UTC vs.
Revision 1.8 by root, Sat Mar 3 01:22:13 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines