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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines