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.8 by root, Sat Mar 3 01:22:13 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines