Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfixes'

master
automerge 2014-01-31 08:00:08 +01:00 committed by cybersphinx
parent 1eb4cb09e6 e0dd069d89
commit 80d43e08e6
6 changed files with 178 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

370
data/base/structs/blhq.pie
View File

@ -1,197 +1,181 @@
PIE 2
PIE 3
TYPE 10200
TEXTURE 0 page-12-player-buildings.png 256 256
TEXTURE 0 page-12-player-buildings.png 0 0
LEVELS 1
LEVEL 1
POINTS 92
30 281 -72
30 281 -95
30 227 -95
30 227 -72
42 281 -83
19 281 -83
19 227 -83
42 227 -83
-14 0 -88
14 0 -88
9 156 -57
-9 156 -57
42 0 -14
85 0 -14
55 156 -9
27 156 -9
85 0 15
42 0 15
27 156 10
55 156 10
14 0 90
-14 0 90
-9 156 59
9 156 59
-42 0 15
-85 0 15
-55 156 10
-27 156 10
-85 0 -14
-42 0 -14
-27 156 -9
-55 156 -9
33 227 -97
132 227 0
33 227 96
-34 227 -97
-34 227 96
-133 227 0
-34 155 -97
33 155 -97
132 155 0
33 155 96
-34 155 96
-133 155 0
-14 0 -44
-9 156 -28
14 0 -44
9 156 -28
14 0 45
9 156 29
-14 0 45
-9 156 29
43 0 15
14 0 44
8 156 29
28 156 10
-43 0 -14
-13 0 -42
-8 156 -27
-28 156 -9
-32 281 -72
-32 281 -95
-32 227 -95
-32 227 -72
-20 281 -83
-43 281 -83
-43 227 -83
-20 227 -83
-32 281 95
-32 281 72
-32 227 72
-32 227 95
-20 281 83
-43 281 83
-43 227 83
-20 227 83
30 281 95
30 281 72
30 227 72
30 227 95
42 281 83
19 281 83
19 227 83
42 227 83
30 281 83
30 227 83
-32 281 83
-32 227 83
30 281 -83
30 227 -83
-32 281 -83
-32 227 -83
POLYGONS 96
200 3 27 26 25 29 100 16 100 0 179
200 3 27 25 24 29 100 0 179 21 179
200 3 19 18 17 73 100 59 100 66 179
200 3 19 17 16 73 100 66 179 88 179
200 3 55 54 53 54 103 35 103 30 179
200 3 55 53 52 54 103 30 179 58 179
200 3 49 23 20 29 102 16 102 0 180
200 3 49 20 48 29 102 0 180 21 180
200 3 23 22 21 49 100 40 100 37 179
200 3 23 21 20 49 100 37 179 51 179
200 3 22 51 50 15 102 29 102 22 180
200 3 22 50 21 15 102 22 180 0 180
200 3 51 27 24 54 103 35 103 30 179
200 3 51 24 50 54 103 30 179 58 179
200 3 14 19 16 50 102 40 102 37 180
200 3 14 16 13 50 102 37 180 51 180
200 3 31 30 29 15 100 29 100 22 179
200 3 31 29 28 15 100 22 179 0 179
200 3 15 14 13 59 100 72 100 88 179
200 3 15 13 12 59 100 88 179 67 179
200 3 59 58 57 54 103 35 103 30 179
200 3 59 57 56 54 103 30 179 58 179
200 3 45 11 8 59 102 73 102 88 180
200 3 45 8 44 59 102 88 180 67 180
200 3 10 47 46 74 102 59 102 66 180
200 3 10 46 9 74 102 66 180 88 180
200 3 47 15 12 54 103 35 103 30 179
200 3 47 12 46 54 103 30 179 58 179
200 3 33 34 41 254 144 255 91 221 91
200 3 33 41 40 254 144 221 91 221 144
200 3 11 10 9 39 100 48 100 51 179
200 3 11 9 8 39 100 51 179 37 179
200 3 34 36 42 254 90 255 54 221 54
200 3 34 42 41 254 90 221 54 221 90
200 3 32 33 40 254 91 255 144 221 144
200 3 32 40 39 254 91 221 144 221 91
200 3 26 31 28 39 102 49 102 51 180
200 3 26 28 25 39 102 51 180 37 180
200 3 35 32 39 254 54 255 90 221 90
200 3 35 39 38 254 54 221 90 221 54
200 3 36 37 43 254 53 255 0 221 0
200 3 36 43 42 254 53 221 0 221 53
200 3 34 35 37 78 0 47 98 0 50
200 3 34 37 36 78 0 0 50 46 0
200 3 35 34 33 47 98 78 0 125 49
200 3 35 33 32 47 98 125 49 79 98
200 3 76 79 85 219 147 246 147 246 154
200 3 76 85 84 219 147 246 154 219 154
200 3 79 76 84 246 147 219 147 219 154
200 3 79 84 85 246 147 219 154 246 154
200 3 71 68 86 246 147 219 147 219 154
200 3 71 86 87 246 147 219 154 246 154
200 3 68 71 87 219 147 246 147 246 154
200 3 68 87 86 219 147 246 154 219 154
200 3 73 72 75 219 162 219 147 246 147
200 3 73 75 74 219 162 246 147 246 162
200 3 81 80 83 219 162 219 147 246 147
200 3 81 83 82 219 162 246 147 246 162
200 3 75 72 73 246 147 219 147 219 162
200 3 75 73 74 246 147 219 162 246 162
200 3 83 80 81 246 147 219 147 219 162
200 3 83 81 82 246 147 219 162 246 162
200 3 4 7 89 219 147 246 147 246 154
200 3 4 89 88 219 147 246 154 219 154
200 3 7 4 88 246 147 219 147 219 154
200 3 7 88 89 246 147 219 154 246 154
200 3 77 78 85 219 162 246 162 246 154
200 3 77 85 84 219 162 246 154 219 154
200 3 3 0 1 246 147 219 147 219 162
200 3 3 1 2 246 147 219 162 246 162
200 3 78 77 84 246 162 219 162 219 154
200 3 78 84 85 246 162 219 154 246 154
200 3 1 0 3 219 162 219 147 246 147
200 3 1 3 2 219 162 246 147 246 162
200 3 65 66 91 219 162 246 162 246 154
200 3 65 91 90 219 162 246 154 219 154
200 3 66 65 90 246 162 219 162 219 154
200 3 66 90 91 246 162 219 154 246 154
200 3 61 60 63 219 162 219 147 246 147
200 3 61 63 62 219 162 246 147 246 162
200 3 70 69 86 246 162 219 162 219 154
200 3 70 86 87 246 162 219 154 246 154
200 3 63 60 61 246 147 219 147 219 162
200 3 63 61 62 246 147 219 162 246 162
200 3 69 70 87 219 162 246 162 246 154
200 3 69 87 86 219 162 246 154 219 154
200 3 67 64 90 246 147 219 147 219 154
200 3 67 90 91 246 147 219 154 246 154
200 3 5 6 89 219 162 246 162 246 154
200 3 5 89 88 219 162 246 154 219 154
200 3 64 67 91 219 147 246 147 246 154
200 3 64 91 90 219 147 246 154 219 154
200 3 6 5 88 246 162 219 162 219 154
200 3 6 88 89 246 162 219 154 246 154
200 3 37 35 38 254 0 255 53 221 53
200 3 37 38 43 254 0 221 53 221 0
POINTS 84
-27 156 10.0001
-55 156 10.0001
-85 -4e-006 15
-42 -4e-006 15
55 156 10.0001
27 156 10.0001
42 -4e-006 15
85 -4e-006 15
14 -1.4e-005 45
9 156 29
9 156 59.0001
14 -3e-005 90
-9 156 59.0001
-14 -3e-005 90
-9 156 29
-14 -1.4e-005 45
55 156 -8.99995
85 4e-006 -14
-55 156 -8.99995
-27 156 -8.99995
-42 4e-006 -14
-85 4e-006 -14
27 156 -8.99995
42 4e-006 -14
-14 1.4e-005 -44
-9 156 -28
-9 156 -56.9999
-14 2.8e-005 -88
9 156 -56.9999
9 156 -28
14 1.4e-005 -44
14 2.8e-005 -88
132 227 7.4e-005
33 227 96.0001
33 155 96
132 155 5e-005
-34 227 96.0001
-34 155 96
33 227 -96.9999
33 155 -97
-34 227 -96.9999
-34 155 -97
-133 227 7.4e-005
-133 155 5e-005
30 281 95.0001
30 227 95.0001
30 227 83.0001
30 281 83.0001
-32 227 95.0001
-32 281 95.0001
-32 281 83.0001
-32 227 83.0001
-43 281 83.0001
-20 281 83.0001
-20 227 83.0001
19 281 83.0001
42 227 83.0001
19 227 83.0001
-43 227 83.0001
42 281 83.0001
42 281 -82.9999
42 227 -82.9999
30 227 -82.9999
30 281 -82.9999
30 281 72.0001
30 227 72.0001
30 227 -71.9999
30 281 -71.9999
30 281 -94.9999
30 227 -94.9999
-43 281 -82.9999
-43 227 -82.9999
-32 227 -82.9999
-32 281 -82.9999
-32 227 72.0001
-32 281 72.0001
-32 227 -71.9999
-32 281 -71.9999
-32 281 -94.9999
-32 227 -94.9999
-20 227 -82.9999
-20 281 -82.9999
19 281 -82.9999
19 227 -82.9999
POLYGONS 88
200 3 0 1 2 0.113281 0.390625 0.0625 0.390625 0 0.699219
200 3 0 2 3 0.113281 0.390625 0 0.699219 0.082031 0.699219
200 3 4 5 6 0.285156 0.390625 0.230469 0.390625 0.257812 0.699219
200 3 4 6 7 0.285156 0.390625 0.257812 0.699219 0.34375 0.699219
200 3 8 6 5 0.119804 0.699235 0.229174 0.699271 0.213796 0.402386
200 3 8 5 9 0.119804 0.699235 0.213796 0.402386 0.139384 0.402355
200 3 9 10 11 0.113281 0.398438 0.0625 0.398438 0 0.703125
200 3 9 11 8 0.113281 0.398438 0 0.703125 0.082031 0.703125
200 3 10 12 13 0.194706 0.392025 0.155727 0.392025 0.1477 0.704682
200 3 10 13 11 0.194706 0.392025 0.1477 0.704682 0.202519 0.704551
200 3 12 14 15 0.058594 0.398438 0.113281 0.398438 0.085938 0.703125
200 3 12 15 13 0.058594 0.398438 0.085938 0.703125 0 0.703125
200 3 14 0 3 0.213559 0.402344 0.13934 0.402344 0.119809 0.699219
200 3 14 3 15 0.213559 0.402344 0.119809 0.699219 0.229183 0.699219
200 3 16 4 7 0.194585 0.391869 0.155607 0.391953 0.147831 0.704525
200 3 16 7 17 0.194585 0.391869 0.147831 0.704525 0.202519 0.704525
200 3 18 19 20 0.058594 0.390625 0.113281 0.390625 0.085938 0.699219
200 3 18 20 21 0.058594 0.390625 0.085938 0.699219 0 0.699219
200 3 22 16 17 0.230469 0.390625 0.28125 0.390625 0.34375 0.699219
200 3 22 17 23 0.230469 0.390625 0.34375 0.699219 0.261719 0.699219
200 3 24 20 19 0.119893 0.699182 0.22919 0.699254 0.213704 0.402587
200 3 24 19 25 0.119893 0.699182 0.213704 0.402587 0.139326 0.402357
200 3 25 26 27 0.230469 0.398438 0.285156 0.398438 0.34375 0.703125
200 3 25 27 24 0.230469 0.398438 0.34375 0.703125 0.261719 0.703125
200 3 28 29 30 0.289062 0.398438 0.230469 0.398438 0.257812 0.703125
200 3 28 30 31 0.289062 0.398438 0.257812 0.703125 0.34375 0.703125
200 3 29 22 23 0.213559 0.402344 0.13934 0.402344 0.119809 0.699219
200 3 29 23 30 0.213559 0.402344 0.119809 0.699219 0.229183 0.699219
200 3 32 33 34 0.992438 0.558749 0.991311 0.357455 0.863531 0.35735
200 3 32 34 35 0.992438 0.558749 0.863531 0.35735 0.863531 0.558749
200 3 26 28 31 0.155644 0.392025 0.194407 0.392025 0.20265 0.704813
200 3 26 31 27 0.155644 0.392025 0.20265 0.704813 0.147569 0.704551
200 3 33 36 37 0.991392 0.357269 0.992127 0.204125 0.863302 0.204345
200 3 33 37 34 0.991392 0.357269 0.863302 0.204345 0.863457 0.357128
200 3 38 32 35 0.991188 0.355686 0.992494 0.561084 0.863556 0.561067
200 3 38 35 39 0.991188 0.355686 0.863556 0.561067 0.863539 0.355686
200 3 1 18 21 0.155644 0.391953 0.194622 0.391869 0.202519 0.704525
200 3 1 21 2 0.155644 0.391953 0.202519 0.704525 0.147831 0.704525
200 3 40 38 39 0.992167 0.204155 0.99138 0.3573 0.863442 0.357107
200 3 40 39 41 0.992167 0.204155 0.863442 0.357107 0.86324 0.204343
200 3 36 42 43 0.992127 0.204125 0.992175 0.000348985 0.863281 0.000294983
200 3 36 43 37 0.992127 0.204125 0.863281 0.000294983 0.863281 0.204058
200 3 33 40 42 0.303256 0.004601 0.185026 0.384611 0.005773 0.190696
200 3 33 42 36 0.303256 0.004601 0.005773 0.190696 0.181212 0.004601
200 3 40 33 32 0.185026 0.384611 0.303256 0.004601 0.482508 0.186883
200 3 40 32 38 0.185026 0.384611 0.482508 0.186883 0.30707 0.384611
200 3 44 45 46 0.855469 0.574219 0.960938 0.574219 0.960938 0.601562
200 3 44 46 47 0.855469 0.574219 0.960938 0.601562 0.855469 0.601562
200 3 45 44 47 0.960938 0.574219 0.855469 0.574219 0.855469 0.601562
200 3 45 47 46 0.960938 0.574219 0.855469 0.601562 0.960938 0.601562
200 3 48 49 50 0.960938 0.574219 0.855469 0.574219 0.855469 0.601562
200 3 48 50 51 0.960938 0.574219 0.855469 0.601562 0.960938 0.601562
200 3 49 48 51 0.855469 0.574219 0.960938 0.574219 0.960938 0.601562
200 3 49 51 50 0.855469 0.574219 0.960938 0.601562 0.855469 0.601562
200 3 52 53 54 0.855469 0.632812 0.855469 0.574219 0.960938 0.574219
200 3 55 56 57 0.855469 0.632812 0.960938 0.574219 0.960938 0.632812
200 3 54 52 58 0.960938 0.574219 0.855469 0.632812 0.960938 0.632812
200 3 56 59 55 0.960938 0.574219 0.855469 0.574219 0.855469 0.632812
200 3 60 61 62 0.855469 0.574219 0.960938 0.574219 0.960938 0.601562
200 3 60 62 63 0.855469 0.574219 0.960938 0.601562 0.855469 0.601562
200 3 61 60 63 0.960938 0.574219 0.855469 0.574219 0.855469 0.601562
200 3 61 63 62 0.960938 0.574219 0.855469 0.601562 0.960938 0.601562
200 3 64 65 46 0.855469 0.632812 0.960938 0.632812 0.960938 0.601562
200 3 64 46 47 0.855469 0.632812 0.960938 0.601562 0.855469 0.601562
200 3 66 67 68 0.960938 0.574219 0.855469 0.574219 0.855469 0.632812
200 3 66 68 69 0.960938 0.574219 0.855469 0.632812 0.960938 0.632812
200 3 65 64 47 0.960938 0.632812 0.855469 0.632812 0.855469 0.601562
200 3 65 47 46 0.960938 0.632812 0.855469 0.601562 0.960938 0.601562
200 3 70 71 72 0.855469 0.632812 0.960938 0.632812 0.960938 0.601562
200 3 70 72 73 0.855469 0.632812 0.960938 0.601562 0.855469 0.601562
200 3 71 70 73 0.960938 0.632812 0.855469 0.632812 0.855469 0.601562
200 3 71 73 72 0.960938 0.632812 0.855469 0.601562 0.960938 0.601562
200 3 74 75 50 0.960938 0.632812 0.855469 0.632812 0.855469 0.601562
200 3 74 50 51 0.960938 0.632812 0.855469 0.601562 0.960938 0.601562
200 3 76 77 78 0.960938 0.574219 0.855469 0.574219 0.855469 0.632812
200 3 76 78 79 0.960938 0.574219 0.855469 0.632812 0.960938 0.632812
200 3 75 74 51 0.855469 0.632812 0.960938 0.632812 0.960938 0.601562
200 3 75 51 50 0.855469 0.632812 0.960938 0.601562 0.855469 0.601562
200 3 80 81 73 0.960938 0.574219 0.855469 0.574219 0.855469 0.601562
200 3 80 73 72 0.960938 0.574219 0.855469 0.601562 0.960938 0.601562
200 3 82 83 62 0.855469 0.632812 0.960938 0.632812 0.960938 0.601562
200 3 82 62 63 0.855469 0.632812 0.960938 0.601562 0.855469 0.601562
200 3 81 80 72 0.855469 0.574219 0.960938 0.574219 0.960938 0.601562
200 3 81 72 73 0.855469 0.574219 0.960938 0.601562 0.855469 0.601562
200 3 83 82 63 0.960938 0.632812 0.855469 0.632812 0.855469 0.601562
200 3 83 63 62 0.960938 0.632812 0.855469 0.601562 0.960938 0.601562
200 3 42 40 41 0.992175 0.000348985 0.992031 0.210161 0.863281 0.210161
200 3 42 41 43 0.992175 0.000348985 0.863281 0.210161 0.863281 0.000294983
CONNECTORS 1
1 0 229
1 0 229

2
data/base/structs/blvtolpd.pie
View File

@ -1,5 +1,5 @@
PIE 2
TYPE 200
TYPE 10200
TEXTURE 0 page-11-player-buildings.png 256 256
LEVELS 1
LEVEL 1

BIN
data/base/texpages/page-11-player-buildings.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

BIN
data/base/texpages/page-12-player-buildings.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 MiB

After

Width:  |  Height:  |  Size: 1.3 MiB

BIN
data/base/texpages/page-13-player-buildings.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1007 KiB

After

Width:  |  Height:  |  Size: 1006 KiB

BIN
data/base/texpages/page-29-features-arizona.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 985 KiB

After

Width:  |  Height:  |  Size: 963 KiB