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