Comparing deliantra/arch/exit/Pentagram/pentagram.arc (file contents):
Revision 1.8 by root, Sat Mar 3 01:22:13 2007 UTC vs.
Revision 1.9 by root, Sat Mar 3 01:36:05 2007 UTC
| … | |
… | |
| 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 |
|
|
| 54 | editable 50 |
51 | editable 50 |
| 55 | magicmap black |
52 | magicmap black |
| 56 | visibility 50 |
53 | visibility 50 |
| 57 | end |
54 | end |
| 58 | more |
55 | more |
| … | |
… | |
| 64 | speed 0 |
61 | speed 0 |
| 65 | type 41 |
62 | type 41 |
| 66 | no_pick 1 |
63 | no_pick 1 |
| 67 | activate_on_push 1 |
64 | activate_on_push 1 |
| 68 | activate_on_release 1 |
65 | activate_on_release 1 |
| 69 | <<<<<<< pentagram.arc |
|
|
| 70 | ======= |
|
|
| 71 | >>>>>>> 1.5 |
|
|
| 72 | editable 50 |
66 | editable 50 |
| 73 | magicmap black |
67 | magicmap black |
| 74 | visibility 50 |
68 | visibility 50 |
| 75 | end |
69 | end |
| 76 | more |
70 | more |
| … | |
… | |
| 82 | speed 0 |
76 | speed 0 |
| 83 | type 41 |
77 | type 41 |
| 84 | no_pick 1 |
78 | no_pick 1 |
| 85 | activate_on_push 1 |
79 | activate_on_push 1 |
| 86 | activate_on_release 1 |
80 | activate_on_release 1 |
| 87 | <<<<<<< pentagram.arc |
|
|
| 88 | ======= |
|
|
| 89 | >>>>>>> 1.5 |
|
|
| 90 | editable 50 |
81 | editable 50 |
| 91 | magicmap black |
82 | magicmap black |
| 92 | visibility 50 |
83 | visibility 50 |
| 93 | end |
84 | end |
| 94 | more |
85 | more |
| … | |
… | |
| 99 | speed 0 |
90 | speed 0 |
| 100 | type 41 |
91 | type 41 |
| 101 | no_pick 1 |
92 | no_pick 1 |
| 102 | activate_on_push 1 |
93 | activate_on_push 1 |
| 103 | activate_on_release 1 |
94 | activate_on_release 1 |
| 104 | <<<<<<< pentagram.arc |
|
|
| 105 | ======= |
|
|
| 106 | >>>>>>> 1.5 |
|
|
| 107 | editable 50 |
95 | editable 50 |
| 108 | magicmap black |
96 | magicmap black |
| 109 | visibility 50 |
97 | visibility 50 |
| 110 | end |
98 | end |
| 111 | more |
99 | more |
| … | |
… | |
| 132 | speed 0 |
120 | speed 0 |
| 133 | type 41 |
121 | type 41 |
| 134 | no_pick 1 |
122 | no_pick 1 |
| 135 | activate_on_push 1 |
123 | activate_on_push 1 |
| 136 | activate_on_release 1 |
124 | activate_on_release 1 |
| 137 | <<<<<<< pentagram.arc |
|
|
| 138 | ======= |
|
|
| 139 | >>>>>>> 1.5 |
|
|
| 140 | editable 50 |
125 | editable 50 |
| 141 | magicmap black |
126 | magicmap black |
| 142 | visibility 50 |
127 | visibility 50 |
| 143 | end |
128 | end |
| 144 | |
129 | |
Diff Legend
| – |
Removed lines |
| + |
Added lines |
| < |
Changed lines |
| > |
Changed lines |
