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.9 by root, Sat Mar 3 01:36:05 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
58visibility 50 53visibility 50
59end 54end
60more 55more
61object pentagram_122 56object pentagram_122
62name pentagram 57name pentagram
63<<<<<<< pentagram.arc
64face pentagram.x11
65magicmap black
66=======
67face pentagram.x11 58face pentagram.x11
68x 1 59x 1
69y 1 60y 1
70>>>>>>> 1.5
71speed 0 61speed 0
72type 41 62type 41
73no_pick 1 63no_pick 1
74activate_on_push 1 64activate_on_push 1
75activate_on_release 1 65activate_on_release 1
78visibility 50 68visibility 50
79end 69end
80more 70more
81object pentagram_123 71object pentagram_123
82name pentagram 72name pentagram
83<<<<<<< pentagram.arc
84face pentagram.x11
85magicmap black
86=======
87face pentagram.x11 73face pentagram.x11
88x 2 74x 2
89y 1 75y 1
90>>>>>>> 1.5
91speed 0 76speed 0
92type 41 77type 41
93no_pick 1 78no_pick 1
94activate_on_push 1 79activate_on_push 1
95activate_on_release 1 80activate_on_release 1
98visibility 50 83visibility 50
99end 84end
100more 85more
101object pentagram_131 86object pentagram_131
102name pentagram 87name pentagram
103<<<<<<< pentagram.arc
104face pentagram.x11
105magicmap black
106=======
107face pentagram.x11 88face pentagram.x11
108y 2 89y 2
109>>>>>>> 1.5
110speed 0 90speed 0
111type 41 91type 41
112no_pick 1 92no_pick 1
113activate_on_push 1 93activate_on_push 1
114activate_on_release 1 94activate_on_release 1
132visibility 50 112visibility 50
133end 113end
134more 114more
135object pentagram_133 115object pentagram_133
136name pentagram 116name pentagram
137<<<<<<< pentagram.arc
138face pentagram.x11
139magicmap black
140=======
141face pentagram.x11 117face pentagram.x11
142x 2 118x 2
143y 2 119y 2
144>>>>>>> 1.5
145speed 0 120speed 0
146type 41 121type 41
147no_pick 1 122no_pick 1
148activate_on_push 1 123activate_on_push 1
149activate_on_release 1 124activate_on_release 1

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines