TR2N Origins merge

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-protocol support for trunk
• Figure out what to do with non-licensed bundled-but-missing resources
• Moviepack?

Bundled Resources

TR2N Origins bundles (included with the game) several resources that aren't included with Armagetron

Bundled-But-Missing

These are NOT on their own repository.

Freely redistributable

These give us permission to redistribute them in comments. They have been added to our repository.

• manta/cockpit/fort_rooms-0.0.5.aamap.xml
• manta/cockpit/killing_zone-0.0.5.aamap.xml
• manta/fortress/m_team_fort-0.0.3.aamap.xml
• manta/fortress/fort_rooms-0.0.5.aamap.xml
• manta/fortress/prs_team_fortress-0.0.1.aamap.xml
• manta/fortress/chico_chalice-0.0.3.aamap.xml
• manta/fortress/multi_team_fortress-0.0.3.aamap.xml
• Durka/fortress/multi_team-0.0.1.aamap.xml

CORRUPT

This map is distributed with TR2N Origins corrupt. (That is, it's in the official repository already, but the one distributed is different)

• manta/fortress/quasar-0.0.3.aamap.xml

Unknown Licensing Terms

We need to get permission to redistribute these.

• rain/fortress/teamsumo-0.0.1.aamap.xml
• manta/ctf/default-0.0.3.aamap.xml
• manta/fortress/ctf3p-0.0.1.aamap.xml
• manta/fortress/tagteamsumo-0.0.1.aamap.xml
• manta/fortress/chico_sumo-0.1.aamap.xml
• manta/fortress/ddown-0_1.aamap.xml
• manta/fortress/ctf4p-0.0.1.aamap.xml
• manta/fortress/grinding-0.0.1.aamap.xml
• Your_mom/dtd/map-0.2.8.0_pig2.dtd
• AATeam/map-0.2.8.0_sty+ct.dtd
• AATeam/map-0.2.8.0_sty+ct2.dtd

TR2N Repository

These are in the TR2N resource repository, so we don't need to do anything.

• manta/misc/nano_slingers-0.0.2.aamap.xml
• manta/misc/hexagon_triangles-0.0.4.aamap.xml
• manta/misc/dia_nano_chico-0.0.2.aamap.xml
• manta/fortress/octa_mash-0.0.1.aamap.xml
• manta/fortress/horseshoe-0.0.1.aamap.xml
• Your_mom/clever/soccersty-0.2.0.aamap.xml
• Your_mom/clever/ctfsty-0.0.2.aamap.xml
• Durka/4_team_fortress/sumo_chutes-0.0.1.aamap.xml
• Durka/4_team_fortress/side_chutes-0.0.2.aamap.xml
• Durka/teamsumo/map-1.aamap.xml
• Durka/sumo/team-0.0.8.aamap.xml
• Durka/fortress/4_team_fortress-0.0.2.aamap.xml
• Durka/fortress/lotta_zones-0.0.1.aamap.xml
• AATeam/map-0.2.8.0_pig2.dtd