Revision: | 1.7 |
Committed: | Sat Mar 3 01:13:55 2007 UTC (17 years, 4 months ago) by root |
Branch: | MAIN |
CVS Tags: | pre_second_normalise_run |
Changes since 1.6: | +75 -49 lines |
Log Message: | re-applied all non-normalising patches (hopefully). beat me if i am wrong, but kepe in mind it was damn complicated |
# | User | Rev | Content |
---|---|---|---|
1 | root | 1.7 | object pentagram_111 |
2 | root | 1.1 | name pentagram |
3 | pippijn | 1.2 | face pentagram.x11 |
4 | root | 1.1 | speed 0 |
5 | type 41 | ||
6 | root | 1.7 | no_pick 1 |
7 | root | 1.1 | activate_on_push 1 |
8 | activate_on_release 1 | ||
9 | editable 50 | ||
10 | root | 1.7 | magicmap black |
11 | root | 1.1 | visibility 50 |
12 | end | ||
13 | root | 1.7 | more |
14 | object pentagram_112 | ||
15 | root | 1.1 | name pentagram |
16 | root | 1.7 | face pentagram.x11 |
17 | x 1 | ||
18 | root | 1.1 | speed 0 |
19 | type 41 | ||
20 | root | 1.7 | no_pick 1 |
21 | root | 1.1 | activate_on_push 1 |
22 | activate_on_release 1 | ||
23 | editable 50 | ||
24 | root | 1.7 | magicmap black |
25 | root | 1.1 | visibility 50 |
26 | end | ||
27 | root | 1.7 | more |
28 | object pentagram_113 | ||
29 | root | 1.1 | name pentagram |
30 | root | 1.7 | face pentagram.x11 |
31 | x 2 | ||
32 | root | 1.1 | speed 0 |
33 | type 41 | ||
34 | root | 1.7 | no_pick 1 |
35 | root | 1.1 | activate_on_push 1 |
36 | activate_on_release 1 | ||
37 | editable 50 | ||
38 | root | 1.7 | magicmap black |
39 | root | 1.1 | visibility 50 |
40 | end | ||
41 | root | 1.7 | more |
42 | object pentagram_121 | ||
43 | root | 1.1 | name pentagram |
44 | root | 1.7 | <<<<<<< pentagram.arc |
45 | face pentagram.x11 | ||
46 | root | 1.6 | magicmap black |
47 | root | 1.7 | ======= |
48 | face pentagram.x11 | ||
49 | y 1 | ||
50 | >>>>>>> 1.5 | ||
51 | root | 1.1 | speed 0 |
52 | type 41 | ||
53 | root | 1.7 | no_pick 1 |
54 | root | 1.1 | activate_on_push 1 |
55 | activate_on_release 1 | ||
56 | editable 50 | ||
57 | root | 1.7 | magicmap black |
58 | root | 1.1 | visibility 50 |
59 | end | ||
60 | root | 1.7 | more |
61 | object pentagram_122 | ||
62 | root | 1.1 | name pentagram |
63 | root | 1.7 | <<<<<<< pentagram.arc |
64 | face pentagram.x11 | ||
65 | root | 1.6 | magicmap black |
66 | root | 1.7 | ======= |
67 | face pentagram.x11 | ||
68 | x 1 | ||
69 | y 1 | ||
70 | >>>>>>> 1.5 | ||
71 | root | 1.1 | speed 0 |
72 | type 41 | ||
73 | root | 1.7 | no_pick 1 |
74 | root | 1.1 | activate_on_push 1 |
75 | activate_on_release 1 | ||
76 | editable 50 | ||
77 | root | 1.7 | magicmap black |
78 | root | 1.1 | visibility 50 |
79 | end | ||
80 | root | 1.7 | more |
81 | object pentagram_123 | ||
82 | root | 1.1 | name pentagram |
83 | root | 1.7 | <<<<<<< pentagram.arc |
84 | face pentagram.x11 | ||
85 | root | 1.6 | magicmap black |
86 | root | 1.7 | ======= |
87 | face pentagram.x11 | ||
88 | x 2 | ||
89 | y 1 | ||
90 | >>>>>>> 1.5 | ||
91 | root | 1.1 | speed 0 |
92 | type 41 | ||
93 | root | 1.7 | no_pick 1 |
94 | root | 1.1 | activate_on_push 1 |
95 | activate_on_release 1 | ||
96 | editable 50 | ||
97 | root | 1.7 | magicmap black |
98 | root | 1.1 | visibility 50 |
99 | end | ||
100 | root | 1.7 | more |
101 | object pentagram_131 | ||
102 | root | 1.1 | name pentagram |
103 | root | 1.7 | <<<<<<< pentagram.arc |
104 | face pentagram.x11 | ||
105 | root | 1.6 | magicmap black |
106 | root | 1.7 | ======= |
107 | face pentagram.x11 | ||
108 | y 2 | ||
109 | >>>>>>> 1.5 | ||
110 | root | 1.1 | speed 0 |
111 | type 41 | ||
112 | root | 1.7 | no_pick 1 |
113 | root | 1.1 | activate_on_push 1 |
114 | activate_on_release 1 | ||
115 | editable 50 | ||
116 | root | 1.7 | magicmap black |
117 | root | 1.1 | visibility 50 |
118 | end | ||
119 | root | 1.7 | more |
120 | object pentagram_132 | ||
121 | root | 1.1 | name pentagram |
122 | root | 1.7 | face pentagram.x11 |
123 | root | 1.1 | x 1 |
124 | root | 1.7 | y 2 |
125 | root | 1.1 | speed 0 |
126 | type 41 | ||
127 | root | 1.7 | no_pick 1 |
128 | root | 1.1 | activate_on_push 1 |
129 | activate_on_release 1 | ||
130 | editable 50 | ||
131 | root | 1.7 | magicmap black |
132 | root | 1.1 | visibility 50 |
133 | end | ||
134 | root | 1.7 | more |
135 | object pentagram_133 | ||
136 | root | 1.1 | name pentagram |
137 | root | 1.7 | <<<<<<< pentagram.arc |
138 | face pentagram.x11 | ||
139 | root | 1.6 | magicmap black |
140 | root | 1.7 | ======= |
141 | face pentagram.x11 | ||
142 | x 2 | ||
143 | y 2 | ||
144 | >>>>>>> 1.5 | ||
145 | root | 1.1 | speed 0 |
146 | type 41 | ||
147 | root | 1.7 | no_pick 1 |
148 | root | 1.1 | activate_on_push 1 |
149 | activate_on_release 1 | ||
150 | editable 50 | ||
151 | root | 1.7 | magicmap black |
152 | root | 1.1 | visibility 50 |
153 | end | ||
154 | root | 1.7 |