Commit 3148e5cc authored by user472393's avatar user472393
Browse files

Merge branch 'master' of gitlab.tetrisconcept.tv:user472393/uatv

parents a41b9676 99d482d1
Pipeline #71 passed with stage
in 1 minute and 30 seconds
......@@ -4,8 +4,6 @@ ii. All textures in maps are pulled from free-to-use repositories, as found and
13:48 <ultrono> yeah, the texture pack readme literally said "you can do anything you want with these"
13:48 <ultrono> I wasn't able to quickly find it via google again lately
13:48 <user282069> lol
13:48 <orodruin> I'm in there user282069
13:49 <ultrono> but this was something like one of the top google (or yahoo?) hits for "free textures" back in 2005
iii. Maps designated uamap1, uamap2, and uamap3 were originally designed and made available by czm in Ultrono Arena. All versions contained herein are based on those versions.
......
......@@ -2920,9 +2920,9 @@
</poly>
<poly>
<index>246</index>
<point><x>-5120</x><y>2248</y><z>5120</z><s>2.19531</s><t>5</t><r>1</r><g>1</g><b>1</b><a>1</a></point>
<point><x>-5120</x><y>2648</y><z>5120</z><s>2.58594</s><t>5</t><r>1</r><g>1</g><b>1</b><a>1</a></point>
<point><x>-5120</x><y>2248</y><z>5816</z><s>2.19531</s><t>5.67969</t><r>1</r><g>1</g><b>1</b><a>1</a></point>
<point><x>-5120</x><y>2648</y><z>5120</z><s>2.58594</s><t>5</t><r>1</r><g>1</g><b>1</b><a>1</a></point>
<point><x>-5120</x><y>2248</y><z>5120</z><s>2.19531</s><t>5</t><r>1</r><g>1</g><b>1</b><a>1</a></point>
<texname>textures/noctua/wall/brick04.jpg</texname>
<texscale>1024</texscale>
<texscales>1</texscales>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2920,9 +2920,9 @@
</poly>
<poly>
<index>246</index>
<point><x>-5120</x><y>2248</y><z>-5816</z><s>2.19531</s><t>-5.67969</t><r>1</r><g>1</g><b>1</b><a>1</a></point>
<point><x>-5120</x><y>2648</y><z>-5120</z><s>2.58594</s><t>-5</t><r>1</r><g>1</g><b>1</b><a>1</a></point>
<point><x>-5120</x><y>2248</y><z>-5120</z><s>2.19531</s><t>-5</t><r>1</r><g>1</g><b>1</b><a>1</a></point>
<point><x>-5120</x><y>2648</y><z>-5120</z><s>2.58594</s><t>-5</t><r>1</r><g>1</g><b>1</b><a>1</a></point>
<point><x>-5120</x><y>2248</y><z>-5816</z><s>2.19531</s><t>-5.67969</t><r>1</r><g>1</g><b>1</b><a>1</a></point>
<texname>textures/noctua/wall/brick04.jpg</texname>
<texscale>1024</texscale>
<texscales>1</texscales>
......
......@@ -1636,8 +1636,8 @@
<index>136</index>
<point><x>-1536</x><y>640</y><z>-5376</z><s>1.25</s><t>-10.5</t><r>0.9</r><g>0.9</g><b>0.9</b><a>0.9</a></point>
<point><x>-1536</x><y>640</y><z>-7424</z><s>1.25</s><t>-14.5</t><r>0.9</r><g>0.9</g><b>0.9</b><a>0.9</a></point>
<point><x>-1536</x><y>6656</y><z>-7424</z><s>13</s><t>-14.5</t><r>0.9</r><g>0.9</g><b>0.9</b><a>0.9</a></point>
<point><x>-1536</x><y>6656</y><z>-5376</z><s>13</s><t>-10.5</t><r>0.9</r><g>0.9</g><b>0.9</b><a>0.9</a></point>
<point><x>-1536</x><y>3584</y><z>-7424</z><s>7</s><t>-14.5</t><r>1</r><g>1</g><b>1</b><a>1</a></point>
<point><x>-1536</x><y>3584</y><z>-5376</z><s>7</s><t>-10.5</t><r>1</r><g>1</g><b>1</b><a>1</a></point>
<texname>textures/noctua/wall/synbr05.jpg</texname>
<texscale>512</texscale>
<texscales>1</texscales>
......@@ -2271,8 +2271,8 @@
<poly>
<index>189</index>
<point><x>-4608</x><y>3584</y><z>-5376</z><s>-11.3137</s><t>-1.41421</t><r>0.9</r><g>0.9</g><b>0.9</b><a>0.9</a></point>
<point><x>-1536</x><y>3584</y><z>-5376</z><s>-7.07107</s><t>2.82843</t><r>0.9</r><g>0.9</g><b>0.9</b><a>0.9</a></point>
<point><x>-1536</x><y>6656</y><z>-5376</z><s>-11.3137</s><t>7.07107</t><r>0.9</r><g>0.9</g><b>0.9</b><a>0.9</a></point>
<point><x>-1536</x><y>3584</y><z>-7424</z><s>-7.07107</s><t>2.82843</t><r>1</r><g>1</g><b>1</b><a>1</a></point>
<point><x>-1536</x><y>6656</y><z>-7424</z><s>-11.3137</s><t>7.07107</t><r>1</r><g>1</g><b>1</b><a>1</a></point>
<point><x>-4608</x><y>6656</y><z>-5376</z><s>-15.5563</s><t>2.82843</t><r>0.9</r><g>0.9</g><b>0.9</b><a>0.9</a></point>
<texname>textures/noctua/wall/synbr03.jpg</texname>
<texscale>512</texscale>
......@@ -4883,6 +4883,17 @@
<texscalet>1</texscalet>
<texangle>90</texangle>
</poly>
<poly>
<index>408</index>
<point><x>-1536</x><y>3584</y><z>-5376</z><s>3</s><t>-10.5</t><r>1</r><g>1</g><b>1</b><a>1</a></point>
<point><x>-1536</x><y>3584</y><z>-7424</z><s>3</s><t>-14.5</t><r>1</r><g>1</g><b>1</b><a>1</a></point>
<point><x>-4608</x><y>3584</y><z>-5376</z><s>9</s><t>-10.5</t><r>1</r><g>1</g><b>1</b><a>1</a></point>
<texname>textures/noctua/textile/cover02.jpg</texname>
<texscale>512</texscale>
<texscales>1</texscales>
<texscalet>1</texscalet>
<texangle>90</texangle>
</poly>
</world>
<item>
<name>item_health</name><x>-256</x><y>96</y><z>0</z><rt>45000</rt><val>200</val>
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment