X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=Art_Roadmap.textile;h=351d193776e5a25d91e6a55ba144ff623882f99c;hb=ff735ac08f8f164bf3522f29ddaf6b778001f1ba;hp=c1ba69555631e3855cb9d04232ac903d8372a3d0;hpb=a0cdb1c7eb5c767a6244f574df9639c2e2706b45;p=xonotic%2Fxonotic.wiki.git

diff --git a/Art_Roadmap.textile b/Art_Roadmap.textile
index c1ba695..351d193 100644
--- a/Art_Roadmap.textile
+++ b/Art_Roadmap.textile
@@ -2,66 +2,70 @@ h1. 3D Art Roadmap
 
 h2. Player Models
 
-|_.Name|_.Species|_.Style|_.Thread(s)|_.Concept|_.Mesh|_.Textures|_.Animations|_.LOD1|_.LOD2|_.TODO|_.Artist(s)|_.Status|_.Git Branch|_.Priority|
-|Umbra|Human|Humanoid|"1":http://dev.xonotic.org/issues/25|NA|COMPLETED|IN PROGRESS|Fix duckwalk|INCOMPLETE|INCOMPLETE|Improve animations, Merge pants to glow|Oblivion, tZork, DiaboliK|IN PROGRESS|diabolik/umbraplayermodel|{{div_start_tag(a1,red)}}HIGH{{div_end_tag}}|
-|Pyria|Human|Humanoid|NA|NA|COMPLETED|IN PROGRESS|Fix duckwalk|INCOMPLETE|INCOMPLETE|Improve animtaions, Merge pants to glow|Oblivion, tZork, DiaboliK|IN PROGRESS|diabolik/pyriaplayermodel|{{div_start_tag(a2,red)}}HIGH{{div_end_tag}}|
-|Ignis(3 versions)|Human|Humanoid|"1":http://dev.xonotic.org/issues/39|NA|COMPLETED|COMPLETED|Fix most|INCOMPLETE|INCOMPLETE|Fix/improve animations|Oblivion, tZork, DiaboliK|IN PROGRESS|diabolik/ignisplayermodel|{{div_start_tag(a3,red)}}HIGH{{div_end_tag}}|
-|Gak|Alien|Humanoid|NA|NA|COMPLETED|IN PROGRESS|None|INCOMPLETE|INCOMPLETE|Textures/Animations|Oblivion, tZork, DiaboliK|IN PROGRESS|NA|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|_.Name|_.Species|_.Thread(s)|_.Mesh|_.Textures|_.Animations|_.LOD1|_.LOD2|_.TODO|_.Artist(s)|_.Status|_.Git Branch|_.Priority|
+|"Umbra":http://dev.xonotic.org/projects/xonotic/wiki/Players#Umbra|Human|"1":http://dev.xonotic.org/issues/25 "2":http://www.alientrap.org/forum/viewtopic.php?f=2&t=6051|COMPLETED|IN PROGRESS|COMPLETED|INCOMPLETE|INCOMPLETE|Merge pants to glow|Oblivion, tZork, DiaboliK, theShadow|IN PROGRESS|diabolik/umbraplayermodel|{{div_start_tag(a1,red)}}HIGH{{div_end_tag}}|
+|"Pyria":http://dev.xonotic.org/projects/xonotic/wiki/Players#Pyria|Human|"1":http://www.alientrap.org/forum/viewtopic.php?f=2&t=6088&p=76962&hilit=pyria#p76962|COMPLETED|IN PROGRESS|Fix duckwalk|INCOMPLETE|INCOMPLETE|Animations, Merge pants to glow|Oblivion, tZork, DiaboliK, theShadow|IN PROGRESS|diabolik/pyriaplayermodel|{{div_start_tag(a2,red)}}HIGH{{div_end_tag}}|
+|"Ignis-3 versions":http://dev.xonotic.org/projects/xonotic/wiki/Players#Ignis|Human|"1":http://dev.xonotic.org/issues/39 "2":http://forums.xonotic.org//showthread.php?tid=498 "3":http://forums.xonotic.org//showthread.php?tid=500|COMPLETED|COMPLETED|COMPLETED|IN PROGRESS|IN PROGRESS|LODs|Oblivion, tZork, DiaboliK, theShadow|IN PROGRESS|diabolik/ignisplayermodel|{{div_start_tag(a3,red)}}HIGH{{div_end_tag}}|
+|"Gak-3 versions":http://dev.xonotic.org/projects/xonotic/wiki/Players#Gak|Alien|"1":http://forums.xonotic.org//showthread.php?tid=497 "2":http://www.alientrap.org/forum/viewtopic.php?f=2&t=5997|COMPLETED|COMPLETED|COMPLETED|INCOMPLETE|INCOMPLETE|LODs, merge pants to glow|Oblivion, tZork, DiaboliK, theShadow|IN PROGRESS|NA|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|"Erebus":http://dev.xonotic.org/projects/xonotic/wiki/Players#Erebus|Cyborg||COMPLETED|COMPLETED|COMPLETED|INCOMPLETE|INCOMPLETE|LODs|Oblivion, DiaboliK, theShadow|IN PROGRESS|NA|HIGH|
+|"Nyx":http://dev.xonotic.org/projects/xonotic/wiki/Players#Nyx|Cyborg||COMPLETED|COMPLETED|COMPLETED|INCOMPLETE|INCOMPLETE|LODs|Oblivion, DiaboliK, theShadow|IN PROGRESS|NA|HIGH|
+|"Seraphina-2 versions":http://dev.xonotic.org/projects/xonotic/wiki/Players#Seraphina|Human||COMPLETED|COMPLETED|COMPLETED|INCOMPLETE|INCOMPLETE|LODs, use more glow|Oblivion, DiaboliK, theShadow|IN PROGRESS|NA|HIGH|
 
 h2. Weapon Models
 
-|_.Name|_.Style|_.Thread(s)|_.Concept|_.Mesh|_.Textures|_.TODO|_.Artist(s)|_.Status|_.Git Branch|_.Priority|
-|Tuba|\9=.NOT ASSIGNED|{{div_start_tag(a5,red)}}HIGH{{div_end_tag}}|
-|Laser|\9=.NOT ASSIGNED|{{div_start_tag(a6,red)}}HIGH{{div_end_tag}}|
-|Shotgun|NA|"1":http://forums.xonotic.org/showthread.php?tid=54|Shotgun Cannon, (possibly fireball with the reintroduction of TAG seeker)|COMPLETED|IN PROGRESS|Texture/Rigging|Lamoot|IN PROGRESS|NA|{{div_start_tag(a7,yellow)}}MEDIUM{{div_end_tag}}|
-|MachineGun|\9=.NOT ASSIGNED|{{div_start_tag(a7,green)}}LOW{{div_end_tag}}|
-|Rifle|NA|"1":http://forums.xonotic.org/showthread.php?tid=219|NA|IN PROGRESS|IN PROGRESS|Mesh|theShadow|IN PROGRESS|NA|{{div_start_tag(a9,yellow)}}MEDIUM{{div_end_tag}}|
-|Mortar|\9=.NOT ASSIGNED|{{div_start_tag(a10,green)}}LOW{{div_end_tag}}|
-|Electro|\9=.NOT ASSIGNED|{{div_start_tag(a11,green)}}LOW{{div_end_tag}}|
-|Crylink|\9=.NOT ASSIGNED|{{div_start_tag(a12,green)}}LOW{{div_end_tag}}|
-|Nex|NA|"1":http://forums.xonotic.org/showthread.php?tid=219|NA|IN PROGRESS|IN PROGRESS|Mesh|theShadow|IN PROGRESS|NA|{{div_start_tag(a13,red)}}HIGH{{div_end_tag}}|
-|MinstaNex|\9=.NOT ASSIGNED|{{div_start_tag(a14,green)}}LOW{{div_end_tag}}|
-|Hagar|\9=.NOT ASSIGNED|{{div_start_tag(a15,green)}}LOW{{div_end_tag}}|
-|RocketLauncher|NA|"1":http://forums.xonotic.org/showthread.php?tid=219|NA|IN PROGRESS|IN PROGRESS|Mesh|theShadow, Oblivion(maybe?)|IN PROGRESS|NA|{{div_start_tag(a16,yellow)}}MEDIUM{{div_end_tag}}|
-|Seeker|\9=.NOT ASSIGNED|{{div_start_tag(a17,red)}}HIGH{{div_end_tag}}|
-|Fireball|\9=.NOT ASSIGNED|{{div_start_tag(a18,red)}}HIGH{{div_end_tag}}|
-|Porto|\9=.NOT ASSIGNED|{{div_start_tag(a19,green)}}LOW{{div_end_tag}}|
-|HookGun|\9=.NOT ASSIGNED|{{div_start_tag(a20,green)}}LOW{{div_end_tag}}|
+|_.Name|_.Thread(s)|_.Concept|_.Mesh|_.Textures|_.TODO|_.Artist(s)|_.Status|_.Git Branch|_.Priority|
+|Tuba|\8=.NOT ASSIGNED|{{div_start_tag(a5,red)}}HIGH{{div_end_tag}}|
+|Laser|\8=.NOT ASSIGNED|{{div_start_tag(a6,red)}}HIGH{{div_end_tag}}|
+|Shotgun|"1":http://forums.xonotic.org/showthread.php?tid=54|Shotgun Cannon, (possibly fireball with the reintroduction of TAG seeker)|COMPLETED|IN PROGRESS|Texture/Rigging|Lamoot|IN PROGRESS|NA|{{div_start_tag(a7,yellow)}}MEDIUM{{div_end_tag}}|
+|MachineGun|\8=.NOT ASSIGNED|{{div_start_tag(a7,green)}}LOW{{div_end_tag}}|
+|Rifle|"1":http://forums.xonotic.org/showthread.php?tid=219|NA|IN PROGRESS|IN PROGRESS|Mesh|theShadow|IN PROGRESS|NA|{{div_start_tag(a9,yellow)}}MEDIUM{{div_end_tag}}|
+|Mortar|\8=.NOT ASSIGNED|{{div_start_tag(a10,green)}}LOW{{div_end_tag}}|
+|Electro|\8=.NOT ASSIGNED|{{div_start_tag(a11,green)}}LOW{{div_end_tag}}|
+|Crylink|\8=.NOT ASSIGNED|{{div_start_tag(a12,green)}}LOW{{div_end_tag}}|
+|Nex|"1":http://forums.xonotic.org/showthread.php?tid=219|NA|COMPLETED|COMPLETED|NA|theShadow, Oblivion, DiaboliK|COMPLETED|MASTER|NA|
+|MinstaNex|\8=.NOT ASSIGNED|{{div_start_tag(a14,green)}}LOW{{div_end_tag}}|
+|Hagar|\8=.NOT ASSIGNED|{{div_start_tag(a15,green)}}LOW{{div_end_tag}}|
+|RocketLauncher|"1":http://forums.xonotic.org/showthread.php?tid=219|NA|IN PROGRESS|IN PROGRESS|Mesh|theShadow, Oblivion(maybe?)|IN PROGRESS|NA|{{div_start_tag(a16,yellow)}}MEDIUM{{div_end_tag}}|
+|Seeker|||LJFHutch|IN PROGRESS|INCOMPLETE|Mesh and Textures|LJFHutch, theShadow|IN PROGRESS|{{div_start_tag(a17,red)}}HIGH{{div_end_tag}}|
+|Fireball|||LJFHutch|INCOMPLETE|INCOMPLETE|Mesh and Textures|LJFHutch|IN PROGRESS|{{div_start_tag(a18,red)}}HIGH{{div_end_tag}}|
+|Porto|\8=.NOT ASSIGNED|{{div_start_tag(a19,green)}}LOW{{div_end_tag}}|
+|HookGun|\8=.NOT ASSIGNED|{{div_start_tag(a20,green)}}LOW{{div_end_tag}}|
 
 
 h2. Items/Pickups
 
 |_.Name|_.Style|_.Thread(s)|_.Concept|_.Mesh|_.Textures|_.TODO|_.Artist(s)|_.Status|_.Git Branch|_.Priority|
-|10 Armor|NA|NA|Shoulder Pad|IN PROGRESS|IN PROGRESS|NA|Morphed|IN PROGRESS|NA|HIGH|
-|25 Armor|NA|NA|Double Shoulder Pads (Shin Pads?)|IN PROGRESS|IN PROGRESS|NA|Morphed|IN PROGRESS|NA|HIGH|
-|50 Armor|NA|NA|Armor|IN PROGRESS|IN PROGRESS|NA|Morphed|IN PROGRESS|NA|HIGH|
-|100 Armor|NA|NA|Armor w/ Shoulder Pads|IN PROGRESS|IN PROGRESS|NA|Morphed|IN PROGRESS|NA|HIGH|
-|10 Health|\9=.NOT ASSIGNED|HIGH|
-|25 Health|\9=.NOT ASSIGNED|HIGH|
-|50 Health|\9=.NOT ASSIGNED|HIGH|
-|100 Health|\9=.NOT ASSIGNED|HIGH|
-|Strength|\9=.NOT ASSIGNED|HIGH|
-|Shield|\9=.NOT ASSIGNED|HIGH|
-|RocketAmmo|\9=.NOT ASSIGNED|HIGH|
-|BulletAmmo|\9=.NOT ASSIGNED|HIGH|
-|ShotgunAmmo|\9=.NOT ASSIGNED|HIGH|
-|PlasmaAmmo|\9=.NOT ASSIGNED|HIGH|
-|CTF Flag|\9=.NOT ASSIGNED|HIGH|
+|10 Armor|NA|NA|Shoulder Pad|IN PROGRESS|IN PROGRESS|NA|Morphed|IN PROGRESS|NA|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|25 Armor|NA|NA|Double Shoulder Pads (Shin Pads?)|IN PROGRESS|IN PROGRESS|NA|Morphed|IN PROGRESS|NA|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|50 Armor|NA|NA|Armor|IN PROGRESS|IN PROGRESS|NA|Morphed|IN PROGRESS|NA|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|100 Armor|NA|NA|Armor w/ Shoulder Pads|IN PROGRESS|IN PROGRESS|NA|Morphed|IN PROGRESS|NA|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|10 Health|\9=.NOT ASSIGNED|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|25 Health|\9=.NOT ASSIGNED|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|50 Health|\9=.NOT ASSIGNED|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|100 Health|\9=.NOT ASSIGNED|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|Strength|\9=.NOT ASSIGNED|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|Shield|\9=.NOT ASSIGNED|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|RocketAmmo|Futuristic|NA|"1":http://img37.imageshack.us/img37/5294/20100612xonoticammo2roc.jpg|IN PROGRESS|IN PROGRESS|NA|LJFHutch, theShadow|IN PROGRESS|NA|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|BulletAmmo|Futuristic|NA|"1":http://img145.imageshack.us/img145/1856/20100612xonoticammo2bul.jpg|IN PROGRESS|IN PROGRESS|NA|LJFHutch, theShadow|IN PROGRESS|NA|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|ShellAmmo|Futuristic|NA|"1":http://img99.imageshack.us/img99/4475/20100612xonoticammo2she.jpg|IN PROGRESS|IN PROGRESS|NA|LJFHutch, theShadow|IN PROGRESS|NA|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|PlasmaAmmo|Futuristic|NA|"1":http://img541.imageshack.us/img541/7389/20100612xonoticammo2cel.jpg "2":http://img6.imageshack.us/img6/7389/20100612xonoticammo2cel.jpg|IN PROGRESS|IN PROGRESS|NA|LJFHutch, theShadow|IN PROGRESS|NA|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|FuelAmmo|Futuristic|NA|"1":http://img37.imageshack.us/img37/1849/20100612xonoticammo2fue.jpg|IN PROGRESS|IN PROGRESS|NA|LJFHutch, theShadow|IN PROGRESS|NA|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|CTF Flag|\9=.NOT ASSIGNED|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
 
 
 
 h2. Maps
 
 |_.Name|_.Gametype|_.Style|_.Thread(s)/Link(s)|_.Concept|_.TODO|_.Artist(s)|_.Status|_.Git Branch|_.Priority|
-|Space Elevator|CTF|Space|"1":http://dev.xonotic.org/issues/10|GasolinePowered||FruitieX, Cuinnton|IN PROGRESS|NA|HIGH|
-|Dance(rename possibly)|CTF|Space|"1":http://dev.xonotic.org/issues/11|Dance||FruitieX|IN PROGRESS|fruitiex/dance|HIGH|
-|Condenser|CTF|Closed|"1":http://dev.xonotic.org/issues/57|Castles||FruitieX, Cuinnton|IN PROGRESS|NA|HIGH|
-|Stormkeep2|DM|Closed|"1":http://dev.xonotic.org/issues/12|Stormkeep||FruitieX|IN PROGRESS|fruitiex/stormkeep2|HIGH|
-|Evilspace2|DM|Space|"1":http://dev.xonotic.org/issues/43|Evilspace||Cortez666|IN PROGRESS|NA|HIGH|
-|Downer2|DM|Closed|"1":http://forums.xonotic.org/showthread.php?tid=334&highlight=downer|Downer||Cortez666|IN PROGRESS|NA|HIGH|
-|Toxic2|DM|Closed|NA|Toxic||Cuinnton|IN PROGRESS|NA|HIGH|
-|GlowArena|DM|Closed|NA|GlowArena||tZork|IN PROGRESS|NA|HIGH|
-|Space|CTF|Space|"1":http://dev.xonotic.org/issues/18|cbctf1||C. Brutail|IN PROGRESS|NA|HIGH|
+|Space Elevator|CTF|Space|"1":http://dev.xonotic.org/issues/10|GasolinePowered||FruitieX, Cuinnton|IN PROGRESS|NA|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|Dance(rename possibly)|CTF|Space|"1":http://dev.xonotic.org/issues/11|Dance||FruitieX|IN PROGRESS|fruitiex/dance|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|Condenser|CTF|Closed|"1":http://dev.xonotic.org/issues/57|Castles||FruitieX, Cuinnton|IN PROGRESS|NA|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|Stormkeep2|DM|Closed|"1":http://dev.xonotic.org/issues/12|Stormkeep||FruitieX|IN PROGRESS|fruitiex/stormkeep2|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|Evilspace2|DM|Space|"1":http://dev.xonotic.org/issues/43|Evilspace||Cortez666|IN PROGRESS|NA|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|Downer2|DM|Closed|"1":http://forums.xonotic.org/showthread.php?tid=334&highlight=downer|Downer||Cortez666|DONE|NA|---|
+|Toxic2|DM|Closed|NA|Toxic||Cuinnton|IN PROGRESS|NA|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|GlowArena|DM|Closed|NA|GlowArena||tZork|IN PROGRESS|NA|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
+|Space|CTF|Space|"1":http://dev.xonotic.org/issues/18|cbctf1||C. Brutail|IN PROGRESS|NA|{{div_start_tag(a4,red)}}HIGH{{div_end_tag}}|
 
 h2. Vehicles