Comparing deliantra/arch/exit/Pentagram/pentagram.arc (file contents):
Revision 1.3 by root, Tue Feb 6 22:40:00 2007 UTC vs.
Revision 1.8 by root, Sat Mar 3 01:22:13 2007 UTC
| … | |
… | |
| 11 | visibility 50 |
11 | visibility 50 |
| 12 | end |
12 | end |
| 13 | more |
13 | more |
| 14 | object pentagram_112 |
14 | object pentagram_112 |
| 15 | name pentagram |
15 | name pentagram |
| 16 | face pentagram.x12 |
16 | face pentagram.x11 |
| 17 | x 1 |
17 | x 1 |
| 18 | speed 0 |
18 | speed 0 |
| 19 | type 41 |
19 | type 41 |
| 20 | no_pick 1 |
20 | no_pick 1 |
| 21 | activate_on_push 1 |
21 | activate_on_push 1 |
| … | |
… | |
| 25 | visibility 50 |
25 | visibility 50 |
| 26 | end |
26 | end |
| 27 | more |
27 | more |
| 28 | object pentagram_113 |
28 | object pentagram_113 |
| 29 | name pentagram |
29 | name pentagram |
| 30 | face pentagram.x13 |
30 | face pentagram.x11 |
| 31 | x 2 |
31 | x 2 |
| 32 | speed 0 |
32 | speed 0 |
| 33 | type 41 |
33 | type 41 |
| 34 | no_pick 1 |
34 | no_pick 1 |
| 35 | activate_on_push 1 |
35 | activate_on_push 1 |
| … | |
… | |
| 39 | visibility 50 |
39 | visibility 50 |
| 40 | end |
40 | end |
| 41 | more |
41 | more |
| 42 | object pentagram_121 |
42 | object pentagram_121 |
| 43 | name pentagram |
43 | name pentagram |
| 44 | face pentagram.x21 |
44 | face pentagram.x11 |
| 45 | y 1 |
45 | y 1 |
| 46 | speed 0 |
46 | speed 0 |
| 47 | type 41 |
47 | type 41 |
| 48 | no_pick 1 |
48 | no_pick 1 |
| 49 | activate_on_push 1 |
49 | activate_on_push 1 |
| 50 | activate_on_release 1 |
50 | activate_on_release 1 |
|
|
51 | <<<<<<< pentagram.arc |
|
|
52 | ======= |
|
|
53 | >>>>>>> 1.5 |
| 51 | editable 50 |
54 | editable 50 |
| 52 | magicmap black |
55 | magicmap black |
| 53 | visibility 50 |
56 | visibility 50 |
| 54 | end |
57 | end |
| 55 | more |
58 | more |
| 56 | object pentagram_122 |
59 | object pentagram_122 |
| 57 | name pentagram |
60 | name pentagram |
| 58 | face pentagram.x22 |
61 | face pentagram.x11 |
| 59 | x 1 |
62 | x 1 |
| 60 | y 1 |
63 | y 1 |
| 61 | speed 0 |
64 | speed 0 |
| 62 | type 41 |
65 | type 41 |
| 63 | no_pick 1 |
66 | no_pick 1 |
| 64 | activate_on_push 1 |
67 | activate_on_push 1 |
| 65 | activate_on_release 1 |
68 | activate_on_release 1 |
|
|
69 | <<<<<<< pentagram.arc |
|
|
70 | ======= |
|
|
71 | >>>>>>> 1.5 |
| 66 | editable 50 |
72 | editable 50 |
| 67 | magicmap black |
73 | magicmap black |
| 68 | visibility 50 |
74 | visibility 50 |
| 69 | end |
75 | end |
| 70 | more |
76 | more |
| 71 | object pentagram_123 |
77 | object pentagram_123 |
| 72 | name pentagram |
78 | name pentagram |
| 73 | face pentagram.x23 |
79 | face pentagram.x11 |
| 74 | x 2 |
80 | x 2 |
| 75 | y 1 |
81 | y 1 |
| 76 | speed 0 |
82 | speed 0 |
| 77 | type 41 |
83 | type 41 |
| 78 | no_pick 1 |
84 | no_pick 1 |
| 79 | activate_on_push 1 |
85 | activate_on_push 1 |
| 80 | activate_on_release 1 |
86 | activate_on_release 1 |
|
|
87 | <<<<<<< pentagram.arc |
|
|
88 | ======= |
|
|
89 | >>>>>>> 1.5 |
| 81 | editable 50 |
90 | editable 50 |
| 82 | magicmap black |
91 | magicmap black |
| 83 | visibility 50 |
92 | visibility 50 |
| 84 | end |
93 | end |
| 85 | more |
94 | more |
| 86 | object pentagram_131 |
95 | object pentagram_131 |
| 87 | name pentagram |
96 | name pentagram |
| 88 | face pentagram.x31 |
97 | face pentagram.x11 |
| 89 | y 2 |
98 | y 2 |
| 90 | speed 0 |
99 | speed 0 |
| 91 | type 41 |
100 | type 41 |
| 92 | no_pick 1 |
101 | no_pick 1 |
| 93 | activate_on_push 1 |
102 | activate_on_push 1 |
| 94 | activate_on_release 1 |
103 | activate_on_release 1 |
|
|
104 | <<<<<<< pentagram.arc |
|
|
105 | ======= |
|
|
106 | >>>>>>> 1.5 |
| 95 | editable 50 |
107 | editable 50 |
| 96 | magicmap black |
108 | magicmap black |
| 97 | visibility 50 |
109 | visibility 50 |
| 98 | end |
110 | end |
| 99 | more |
111 | more |
| 100 | object pentagram_132 |
112 | object pentagram_132 |
| 101 | name pentagram |
113 | name pentagram |
| 102 | face pentagram.x32 |
114 | face pentagram.x11 |
| 103 | x 1 |
115 | x 1 |
| 104 | y 2 |
116 | y 2 |
| 105 | speed 0 |
117 | speed 0 |
| 106 | type 41 |
118 | type 41 |
| 107 | no_pick 1 |
119 | no_pick 1 |
| … | |
… | |
| 112 | visibility 50 |
124 | visibility 50 |
| 113 | end |
125 | end |
| 114 | more |
126 | more |
| 115 | object pentagram_133 |
127 | object pentagram_133 |
| 116 | name pentagram |
128 | name pentagram |
| 117 | face pentagram.x33 |
129 | face pentagram.x11 |
| 118 | x 2 |
130 | x 2 |
| 119 | y 2 |
131 | y 2 |
| 120 | speed 0 |
132 | speed 0 |
| 121 | type 41 |
133 | type 41 |
| 122 | no_pick 1 |
134 | no_pick 1 |
| 123 | activate_on_push 1 |
135 | activate_on_push 1 |
| 124 | activate_on_release 1 |
136 | activate_on_release 1 |
|
|
137 | <<<<<<< pentagram.arc |
|
|
138 | ======= |
|
|
139 | >>>>>>> 1.5 |
| 125 | editable 50 |
140 | editable 50 |
| 126 | magicmap black |
141 | magicmap black |
| 127 | visibility 50 |
142 | visibility 50 |
| 128 | end |
143 | end |
| 129 | |
144 | |
Diff Legend
| – |
Removed lines |
| + |
Added lines |
| < |
Changed lines |
| > |
Changed lines |
