From a6230497ba425971c5dff6906348ff4ac55b8d0d Mon Sep 17 00:00:00 2001 From: Enrique Date: Fri, 17 Aug 2012 02:17:38 +0000 Subject: [PATCH] Committed updated theatron and updated gymnasion for athenians This was SVN commit r12453. --- .../gym_decor.xml} | 6 +++--- .../actors/props/structures/athenians/gym_props.xml | 13 +++++++++++++ .../props/structures/athenians/gym_shields.xml | 6 ++++-- .../actors/props/structures/athenians/gym_tiles.xml | 13 +++++++++++++ .../actors/props/structures/athenians/gym_trees.xml | 13 +++++++++++++ .../props/structures/hellenes/theatron_decor.xml | 13 +++++++++++++ .../props/structures/hellenes/theatron_marble.xml | 2 +- .../props/structures/hellenes/theatron_nature.xml | 13 +++++++++++++ .../props/structures/hellenes/theatron_props.xml | 4 ++-- .../{theatron_tiles.xml => theatron_tile.xml} | 4 ++-- .../art/actors/structures/athenians/gymnasion.xml | 13 ++++++++----- .../art/actors/structures/hellenes/theatre_new.xml | 7 ++++--- .../public/art/meshes/props/athen_gym_decor.dae | 3 +++ .../public/art/meshes/props/athen_gym_propsa.dae | 3 +++ .../public/art/meshes/props/athen_gym_shields.dae | 3 +++ .../public/art/meshes/props/athen_gym_tileb.dae | 3 +++ .../public/art/meshes/props/athen_gym_trees.dae | 3 +++ .../art/meshes/structural/athen_gym_struct.dae | 3 +++ .../art/meshes/structural/hele_theatron_decor.dae | 3 +++ .../art/meshes/structural/hele_theatron_marble.dae | 4 ++-- .../art/meshes/structural/hele_theatron_nature.dae | 3 +++ .../art/meshes/structural/hele_theatron_props.dae | 3 --- .../art/meshes/structural/hele_theatron_propsa.dae | 3 +++ .../art/meshes/structural/hele_theatron_struct.dae | 4 ++-- .../art/meshes/structural/hele_theatron_structB.dae | 3 --- .../art/meshes/structural/hele_theatron_tilec.dae | 3 +++ .../art/meshes/structural/hele_theatron_tiles.dae | 3 --- .../public/art/textures/skins/props/hele_decor.png | 3 +++ 28 files changed, 126 insertions(+), 31 deletions(-) rename binaries/data/mods/public/art/actors/props/structures/{hellenes/theatron_structb.xml => athenians/gym_decor.xml} (57%) create mode 100644 binaries/data/mods/public/art/actors/props/structures/athenians/gym_props.xml create mode 100644 binaries/data/mods/public/art/actors/props/structures/athenians/gym_tiles.xml create mode 100644 binaries/data/mods/public/art/actors/props/structures/athenians/gym_trees.xml create mode 100644 binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_decor.xml create mode 100644 binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_nature.xml rename binaries/data/mods/public/art/actors/props/structures/hellenes/{theatron_tiles.xml => theatron_tile.xml} (70%) create mode 100644 binaries/data/mods/public/art/meshes/props/athen_gym_decor.dae create mode 100644 binaries/data/mods/public/art/meshes/props/athen_gym_propsa.dae create mode 100644 binaries/data/mods/public/art/meshes/props/athen_gym_shields.dae create mode 100644 binaries/data/mods/public/art/meshes/props/athen_gym_tileb.dae create mode 100644 binaries/data/mods/public/art/meshes/props/athen_gym_trees.dae create mode 100644 binaries/data/mods/public/art/meshes/structural/athen_gym_struct.dae create mode 100644 binaries/data/mods/public/art/meshes/structural/hele_theatron_decor.dae create mode 100644 binaries/data/mods/public/art/meshes/structural/hele_theatron_nature.dae delete mode 100644 binaries/data/mods/public/art/meshes/structural/hele_theatron_props.dae create mode 100644 binaries/data/mods/public/art/meshes/structural/hele_theatron_propsa.dae delete mode 100644 binaries/data/mods/public/art/meshes/structural/hele_theatron_structB.dae create mode 100644 binaries/data/mods/public/art/meshes/structural/hele_theatron_tilec.dae delete mode 100644 binaries/data/mods/public/art/meshes/structural/hele_theatron_tiles.dae create mode 100644 binaries/data/mods/public/art/textures/skins/props/hele_decor.png diff --git a/binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_structb.xml b/binaries/data/mods/public/art/actors/props/structures/athenians/gym_decor.xml similarity index 57% rename from binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_structb.xml rename to binaries/data/mods/public/art/actors/props/structures/athenians/gym_decor.xml index 80f74f1c3f..bb767e2380 100644 --- a/binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_structb.xml +++ b/binaries/data/mods/public/art/actors/props/structures/athenians/gym_decor.xml @@ -2,10 +2,10 @@ - - structural/hele_theatron_structB.dae + + props/athen_gym_decor.dae - + diff --git a/binaries/data/mods/public/art/actors/props/structures/athenians/gym_props.xml b/binaries/data/mods/public/art/actors/props/structures/athenians/gym_props.xml new file mode 100644 index 0000000000..6e78eda628 --- /dev/null +++ b/binaries/data/mods/public/art/actors/props/structures/athenians/gym_props.xml @@ -0,0 +1,13 @@ + + + + + + props/athen_gym_propsa.dae + + + + + + player_trans.xml + diff --git a/binaries/data/mods/public/art/actors/props/structures/athenians/gym_shields.xml b/binaries/data/mods/public/art/actors/props/structures/athenians/gym_shields.xml index 7e21a019b4..dc1e3916c3 100644 --- a/binaries/data/mods/public/art/actors/props/structures/athenians/gym_shields.xml +++ b/binaries/data/mods/public/art/actors/props/structures/athenians/gym_shields.xml @@ -3,8 +3,10 @@ - props/hele_gym_shields.dae - + props/athen_gym_shields.dae + + + player_trans.xml diff --git a/binaries/data/mods/public/art/actors/props/structures/athenians/gym_tiles.xml b/binaries/data/mods/public/art/actors/props/structures/athenians/gym_tiles.xml new file mode 100644 index 0000000000..74a718b086 --- /dev/null +++ b/binaries/data/mods/public/art/actors/props/structures/athenians/gym_tiles.xml @@ -0,0 +1,13 @@ + + + + + + props/athen_gym_tileb.dae + + + + + + player_trans.xml + diff --git a/binaries/data/mods/public/art/actors/props/structures/athenians/gym_trees.xml b/binaries/data/mods/public/art/actors/props/structures/athenians/gym_trees.xml new file mode 100644 index 0000000000..dc30da73f8 --- /dev/null +++ b/binaries/data/mods/public/art/actors/props/structures/athenians/gym_trees.xml @@ -0,0 +1,13 @@ + + + + + + props/athen_gym_trees.dae + + + + + + player_trans.xml + diff --git a/binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_decor.xml b/binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_decor.xml new file mode 100644 index 0000000000..72324737b9 --- /dev/null +++ b/binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_decor.xml @@ -0,0 +1,13 @@ + + + + + + structural/hele_theatron_decor.dae + + + + + + player_trans.xml + diff --git a/binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_marble.xml b/binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_marble.xml index e3f2c1d5cd..3fb16b429a 100644 --- a/binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_marble.xml +++ b/binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_marble.xml @@ -2,7 +2,7 @@ - + structural/hele_theatron_marble.dae diff --git a/binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_nature.xml b/binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_nature.xml new file mode 100644 index 0000000000..6993932dc6 --- /dev/null +++ b/binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_nature.xml @@ -0,0 +1,13 @@ + + + + + + structural/hele_theatron_nature.dae + + + + + + basic_trans.xml + diff --git a/binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_props.xml b/binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_props.xml index db51d6aa6a..3d6bbd2094 100644 --- a/binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_props.xml +++ b/binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_props.xml @@ -2,8 +2,8 @@ - - structural/hele_theatron_props.dae + + structural/hele_theatron_propsa.dae diff --git a/binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_tiles.xml b/binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_tile.xml similarity index 70% rename from binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_tiles.xml rename to binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_tile.xml index b39077c93f..e5c7c84426 100644 --- a/binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_tiles.xml +++ b/binaries/data/mods/public/art/actors/props/structures/hellenes/theatron_tile.xml @@ -2,8 +2,8 @@ - - structural/hele_theatron_tiles.dae + + structural/hele_theatron_tilec.dae diff --git a/binaries/data/mods/public/art/actors/structures/athenians/gymnasion.xml b/binaries/data/mods/public/art/actors/structures/athenians/gymnasion.xml index 815db6fdde..25e21fcb82 100644 --- a/binaries/data/mods/public/art/actors/structures/athenians/gymnasion.xml +++ b/binaries/data/mods/public/art/actors/structures/athenians/gymnasion.xml @@ -3,15 +3,18 @@ - structural/hele_gym.dae + structural/athen_gym_struct.dae - - + + - + + - + + + diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/theatre_new.xml b/binaries/data/mods/public/art/actors/structures/hellenes/theatre_new.xml index 6dceba4c53..c3c695a01d 100644 --- a/binaries/data/mods/public/art/actors/structures/hellenes/theatre_new.xml +++ b/binaries/data/mods/public/art/actors/structures/hellenes/theatre_new.xml @@ -2,13 +2,14 @@ - + structural/hele_theatron_struct.dae - - + + + diff --git a/binaries/data/mods/public/art/meshes/props/athen_gym_decor.dae b/binaries/data/mods/public/art/meshes/props/athen_gym_decor.dae new file mode 100644 index 0000000000..b43fa662c1 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/props/athen_gym_decor.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4dd74382041b128c398b7a9d4435c79f4ff29cd8f0944673fb3b3f9c0a247d33 +size 13844 diff --git a/binaries/data/mods/public/art/meshes/props/athen_gym_propsa.dae b/binaries/data/mods/public/art/meshes/props/athen_gym_propsa.dae new file mode 100644 index 0000000000..3fd9ad2350 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/props/athen_gym_propsa.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58748de4a7ecbcf1999ef1256934de6d590af8fb3eaddd0384465fa482fa7fec +size 259755 diff --git a/binaries/data/mods/public/art/meshes/props/athen_gym_shields.dae b/binaries/data/mods/public/art/meshes/props/athen_gym_shields.dae new file mode 100644 index 0000000000..92818c31c5 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/props/athen_gym_shields.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb534dc1d1e516100ccd2a37fac6076b1a5faa055b395bf51a2c2ea0a916baf4 +size 35174 diff --git a/binaries/data/mods/public/art/meshes/props/athen_gym_tileb.dae b/binaries/data/mods/public/art/meshes/props/athen_gym_tileb.dae new file mode 100644 index 0000000000..3cc06bba18 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/props/athen_gym_tileb.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:162cdc284134490ed187ae4e9045880ea51da5c962d76d869d4ce83de3f9a893 +size 75694 diff --git a/binaries/data/mods/public/art/meshes/props/athen_gym_trees.dae b/binaries/data/mods/public/art/meshes/props/athen_gym_trees.dae new file mode 100644 index 0000000000..eac2d09bc7 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/props/athen_gym_trees.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c099532de01bfe1c4cf12521494352a76155ff76db72d4f51b3aaa028d24dab +size 37172 diff --git a/binaries/data/mods/public/art/meshes/structural/athen_gym_struct.dae b/binaries/data/mods/public/art/meshes/structural/athen_gym_struct.dae new file mode 100644 index 0000000000..be04249d0b --- /dev/null +++ b/binaries/data/mods/public/art/meshes/structural/athen_gym_struct.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7617f1b5e8c96ceb8bbad7711e86abb83d40077a338fc11248a1671d82763a2d +size 276276 diff --git a/binaries/data/mods/public/art/meshes/structural/hele_theatron_decor.dae b/binaries/data/mods/public/art/meshes/structural/hele_theatron_decor.dae new file mode 100644 index 0000000000..273f08dbdc --- /dev/null +++ b/binaries/data/mods/public/art/meshes/structural/hele_theatron_decor.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cf7265f90badb268c168e5d1892b9a1593b27865a38d29040744e1430b08392 +size 22353 diff --git a/binaries/data/mods/public/art/meshes/structural/hele_theatron_marble.dae b/binaries/data/mods/public/art/meshes/structural/hele_theatron_marble.dae index 7145f9d11d..468959bc70 100644 --- a/binaries/data/mods/public/art/meshes/structural/hele_theatron_marble.dae +++ b/binaries/data/mods/public/art/meshes/structural/hele_theatron_marble.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b0f7b9b3e9298678bcdde2a0679fb98d88dc62b40fa95e448e102c8e8c809c5 -size 17522 +oid sha256:c79c55610b08bb1f976780d84cf2a40b5b0d56c38ce7003f09bb98a85a683ba0 +size 17519 diff --git a/binaries/data/mods/public/art/meshes/structural/hele_theatron_nature.dae b/binaries/data/mods/public/art/meshes/structural/hele_theatron_nature.dae new file mode 100644 index 0000000000..a0dcf29dea --- /dev/null +++ b/binaries/data/mods/public/art/meshes/structural/hele_theatron_nature.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a46729b72572c2c8055b7498e037387600fdab229eca389026918b8cf1aa6012 +size 74306 diff --git a/binaries/data/mods/public/art/meshes/structural/hele_theatron_props.dae b/binaries/data/mods/public/art/meshes/structural/hele_theatron_props.dae deleted file mode 100644 index d5d1d940bc..0000000000 --- a/binaries/data/mods/public/art/meshes/structural/hele_theatron_props.dae +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9ab71b7e272e0f88cbe91aca6dd45da835a9c283bdfd96fa38f6b2a5c664f5b -size 525877 diff --git a/binaries/data/mods/public/art/meshes/structural/hele_theatron_propsa.dae b/binaries/data/mods/public/art/meshes/structural/hele_theatron_propsa.dae new file mode 100644 index 0000000000..12008c754a --- /dev/null +++ b/binaries/data/mods/public/art/meshes/structural/hele_theatron_propsa.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6fad927a70ae52dd45fd65d0c49ae2e28010a2be8195978a7fb71595359b0d3 +size 513045 diff --git a/binaries/data/mods/public/art/meshes/structural/hele_theatron_struct.dae b/binaries/data/mods/public/art/meshes/structural/hele_theatron_struct.dae index 7117d2466e..9420d34f11 100644 --- a/binaries/data/mods/public/art/meshes/structural/hele_theatron_struct.dae +++ b/binaries/data/mods/public/art/meshes/structural/hele_theatron_struct.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:379dcdd3deb1c9f58d6c47f08e627f41ccc0c13b8d9db20b2f4f501a72960700 -size 542227 +oid sha256:f7913b9d33c81a49212528f209abf761cc5c769128516cfc61624d0ec3360f15 +size 514884 diff --git a/binaries/data/mods/public/art/meshes/structural/hele_theatron_structB.dae b/binaries/data/mods/public/art/meshes/structural/hele_theatron_structB.dae deleted file mode 100644 index 8af55cbcc7..0000000000 --- a/binaries/data/mods/public/art/meshes/structural/hele_theatron_structB.dae +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ef164f7d751a0eb326ac508b1d03d2a2248dd51d66732058c8eef98e3f72222 -size 6999 diff --git a/binaries/data/mods/public/art/meshes/structural/hele_theatron_tilec.dae b/binaries/data/mods/public/art/meshes/structural/hele_theatron_tilec.dae new file mode 100644 index 0000000000..e7b2a269d6 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/structural/hele_theatron_tilec.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:721fdd93c3db508149b7c4c2666dc9457cf1dd8799f268f6e8b855b2c942d72e +size 82402 diff --git a/binaries/data/mods/public/art/meshes/structural/hele_theatron_tiles.dae b/binaries/data/mods/public/art/meshes/structural/hele_theatron_tiles.dae deleted file mode 100644 index fffdb927aa..0000000000 --- a/binaries/data/mods/public/art/meshes/structural/hele_theatron_tiles.dae +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae133e8fc0d20511448104f7aa9a504eb989b72ce98f144fa6ec156707205d81 -size 83368 diff --git a/binaries/data/mods/public/art/textures/skins/props/hele_decor.png b/binaries/data/mods/public/art/textures/skins/props/hele_decor.png new file mode 100644 index 0000000000..7ca4705110 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/props/hele_decor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08a754e86fb41b70ecd76715aaf15ac0c787453ac6462dbbd17f4fdea3654e2e +size 1769139