http://wiki.armagetronad.org/index.php?action=history&feed=atom&title=TR2N_Origins_merge 2026-10-16T12:50:09Z Revision history for this page on the wiki MediaWiki 1.44.2 http://wiki.armagetronad.org/index.php?title=TR2N_Origins_merge&diff=58699&oldid=prev 2021-08-28T15:44:49Z

<p></p> <table style="background-color: #fff; color: #202122;" data-mw="interface"> <col class="diff-marker" /> <col class="diff-content" /> <col class="diff-marker" /> <col class="diff-content" /> <tr class="diff-title" lang="en"> <td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td> <td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 11:44, 28 August 2021</td> </tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l67">Line 67:</td> <td colspan="2" class="diff-lineno">Line 67:</td></tr> <tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>*AATeam/map-0.2.8.0_pig2.dtd</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>*AATeam/map-0.2.8.0_pig2.dtd</div></td></tr> <tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br></td></tr> <tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>[[Category:<del style="font-weight: bold; text-decoration: none;">Development]]</del></div></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>[[Category:<ins style="font-weight: bold; text-decoration: none;">Projects</ins>]]</div></td></tr> <tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div><del style="font-weight: bold; text-decoration: none;">[[Category:Community</del>]]</div></td><td colspan="2" class="diff-side-added"></td></tr> </table>

Cadillac http://wiki.armagetronad.org/index.php?title=TR2N_Origins_merge&diff=57312&oldid=prev 2021-08-24T00:00:19Z

<p></p> <table style="background-color: #fff; color: #202122;" data-mw="interface"> <col class="diff-marker" /> <col class="diff-content" /> <col class="diff-marker" /> <col class="diff-content" /> <tr class="diff-title" lang="en"> <td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td> <td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 20:00, 23 August 2021</td> </tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l66">Line 66:</td> <td colspan="2" class="diff-lineno">Line 66:</td></tr> <tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>*Durka/fortress/lotta_zones-0.0.1.aamap.xml</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>*Durka/fortress/lotta_zones-0.0.1.aamap.xml</div></td></tr> <tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>*AATeam/map-0.2.8.0_pig2.dtd</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>*AATeam/map-0.2.8.0_pig2.dtd</div></td></tr> <tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;"></ins></div></td></tr> <tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">[[Category:Development]]</ins></div></td></tr> <tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">[[Category:Community]]</ins></div></td></tr> </table>

Cadillac http://wiki.armagetronad.org/index.php?title=TR2N_Origins_merge&diff=25421&oldid=prev 2010-01-18T02:37:06Z

<p>New page: ==Status== ===Done=== *Hacked in TR2N obfuscated-protocol support to 0.2.8 series *Imported bundled-but-missing resources where comment-licenses allow. ===TODO=== *TR2N obfuscated-protoco...</p> <p><b>New page</b></p><div>==Status==<br /> ===Done===<br /> *Hacked in TR2N obfuscated-protocol support to 0.2.8 series<br /> *Imported bundled-but-missing resources where comment-licenses allow.<br /> <br /> ===TODO===<br /> *TR2N obfuscated-protocol support for trunk<br /> *Figure out what to do with non-licensed bundled-but-missing resources<br /> *Moviepack?<br /> <br /> ==Bundled Resources==<br /> TR2N Origins bundles (included with the game) several resources that aren&#039;t included with Armagetron<br /> <br /> ===Bundled-But-Missing===<br /> These are NOT on their own repository.<br /> <br /> ====Freely redistributable====<br /> These give us permission to redistribute them in comments.<br /> They have been added to our repository.<br /> <br /> *manta/cockpit/fort_rooms-0.0.5.aamap.xml<br /> *manta/cockpit/killing_zone-0.0.5.aamap.xml<br /> *manta/fortress/m_team_fort-0.0.3.aamap.xml<br /> *manta/fortress/fort_rooms-0.0.5.aamap.xml<br /> *manta/fortress/prs_team_fortress-0.0.1.aamap.xml<br /> *manta/fortress/chico_chalice-0.0.3.aamap.xml<br /> *manta/fortress/multi_team_fortress-0.0.3.aamap.xml<br /> *Durka/fortress/multi_team-0.0.1.aamap.xml<br /> <br /> =====CORRUPT=====<br /> This map is distributed with TR2N Origins corrupt.<br /> (That is, it&#039;s in the official repository already, but the one distributed is different)<br /> <br /> *manta/fortress/quasar-0.0.3.aamap.xml<br /> <br /> ====Unknown Licensing Terms====<br /> We need to get permission to redistribute these.<br /> <br /> *rain/fortress/teamsumo-0.0.1.aamap.xml<br /> *manta/ctf/default-0.0.3.aamap.xml<br /> *manta/fortress/ctf3p-0.0.1.aamap.xml<br /> *manta/fortress/tagteamsumo-0.0.1.aamap.xml<br /> *manta/fortress/chico_sumo-0.1.aamap.xml<br /> *manta/fortress/ddown-0_1.aamap.xml<br /> *manta/fortress/ctf4p-0.0.1.aamap.xml<br /> *manta/fortress/grinding-0.0.1.aamap.xml<br /> *Your_mom/dtd/map-0.2.8.0_pig2.dtd<br /> *AATeam/map-0.2.8.0_sty+ct.dtd<br /> *AATeam/map-0.2.8.0_sty+ct2.dtd<br /> <br /> ===TR2N Repository===<br /> These are in the TR2N resource repository, so we don&#039;t need to do anything.<br /> <br /> *manta/misc/nano_slingers-0.0.2.aamap.xml<br /> *manta/misc/hexagon_triangles-0.0.4.aamap.xml<br /> *manta/misc/dia_nano_chico-0.0.2.aamap.xml<br /> *manta/fortress/octa_mash-0.0.1.aamap.xml<br /> *manta/fortress/horseshoe-0.0.1.aamap.xml<br /> *Your_mom/clever/soccersty-0.2.0.aamap.xml<br /> *Your_mom/clever/ctfsty-0.0.2.aamap.xml<br /> *Durka/4_team_fortress/sumo_chutes-0.0.1.aamap.xml<br /> *Durka/4_team_fortress/side_chutes-0.0.2.aamap.xml<br /> *Durka/teamsumo/map-1.aamap.xml<br /> *Durka/sumo/team-0.0.8.aamap.xml<br /> *Durka/fortress/4_team_fortress-0.0.2.aamap.xml<br /> *Durka/fortress/lotta_zones-0.0.1.aamap.xml<br /> *AATeam/map-0.2.8.0_pig2.dtd</div>

Luke-Jr