From f732fd801ea5457aea87cbf57c19b8d2bbb9b876 Mon Sep 17 00:00:00 2001 From: Mythos_Ruler Date: Thu, 13 Sep 2012 18:22:09 +0000 Subject: [PATCH] A bunch of stuff. This was SVN commit r12670. --- .../actors/structures/romans/triumphal_arch.xml | 8 ++++++-- .../art/terrains/biome-desert/desert_city_tile.xml | 13 +++++++------ .../biome-desert/desert_city_tile_plaza.xml | 14 +++++++------- .../textures/skins/structural/kart_struct_norm.png | 4 ++-- .../skins/structural/rome_struct_arch_norm.png | 3 +++ .../skins/structural/rome_struct_arch_spec.png | 3 +++ .../terrain/types/desert_city_tile_norm.png | 3 +++ .../terrain/types/desert_city_tile_plaza_norm.png | 3 +++ .../terrain/types/desert_city_tile_plaza_spec.png | 3 +++ .../terrain/types/desert_city_tile_spec.png | 3 +++ .../public/maps/scenarios/Athenian Sandbox.pmp | 4 ++-- .../public/maps/scenarios/Athenian Sandbox.xml | 4 ++-- .../mods/public/maps/scenarios/Eire and Albion.pmp | 3 +++ .../mods/public/maps/scenarios/Eire and Albion.xml | 3 +++ .../templates/template_unit_fauna_fish.xml | 5 +++++ 15 files changed, 55 insertions(+), 21 deletions(-) create mode 100644 binaries/data/mods/public/art/textures/skins/structural/rome_struct_arch_norm.png create mode 100644 binaries/data/mods/public/art/textures/skins/structural/rome_struct_arch_spec.png create mode 100644 binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_norm.png create mode 100644 binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_plaza_norm.png create mode 100644 binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_plaza_spec.png create mode 100644 binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_spec.png create mode 100644 binaries/data/mods/public/maps/scenarios/Eire and Albion.pmp create mode 100644 binaries/data/mods/public/maps/scenarios/Eire and Albion.xml diff --git a/binaries/data/mods/public/art/actors/structures/romans/triumphal_arch.xml b/binaries/data/mods/public/art/actors/structures/romans/triumphal_arch.xml index 532f1ad812..b422a57474 100644 --- a/binaries/data/mods/public/art/actors/structures/romans/triumphal_arch.xml +++ b/binaries/data/mods/public/art/actors/structures/romans/triumphal_arch.xml @@ -4,7 +4,11 @@ structural/rome_arch.dae - + + + + + @@ -17,5 +21,5 @@ - player_trans.xml + player_trans_parallax_spec.xml diff --git a/binaries/data/mods/public/art/terrains/biome-desert/desert_city_tile.xml b/binaries/data/mods/public/art/terrains/biome-desert/desert_city_tile.xml index 70e6fc2ff3..ddbe54518b 100644 --- a/binaries/data/mods/public/art/terrains/biome-desert/desert_city_tile.xml +++ b/binaries/data/mods/public/art/terrains/biome-desert/desert_city_tile.xml @@ -1,8 +1,9 @@ - - - - edgy - terrain_base.xml - + + + + + + terrain_norm_spec.xml + \ No newline at end of file diff --git a/binaries/data/mods/public/art/terrains/biome-desert/desert_city_tile_plaza.xml b/binaries/data/mods/public/art/terrains/biome-desert/desert_city_tile_plaza.xml index 1120b64d16..b10fa98337 100644 --- a/binaries/data/mods/public/art/terrains/biome-desert/desert_city_tile_plaza.xml +++ b/binaries/data/mods/public/art/terrains/biome-desert/desert_city_tile_plaza.xml @@ -1,9 +1,9 @@ - - - - blurry - - terrain_base.xml - + + + + + + terrain_norm_spec.xml + \ No newline at end of file diff --git a/binaries/data/mods/public/art/textures/skins/structural/kart_struct_norm.png b/binaries/data/mods/public/art/textures/skins/structural/kart_struct_norm.png index 3f980225bd..88d46df8f2 100644 --- a/binaries/data/mods/public/art/textures/skins/structural/kart_struct_norm.png +++ b/binaries/data/mods/public/art/textures/skins/structural/kart_struct_norm.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2194be2c0d86af009708c8d4f2adf910a638e0e75b0e171b5d5df83a18955fce -size 2605348 +oid sha256:32d4699b0baddebebdff9eef3e0e4c866255516bf680764454548cc0ad798e75 +size 2583323 diff --git a/binaries/data/mods/public/art/textures/skins/structural/rome_struct_arch_norm.png b/binaries/data/mods/public/art/textures/skins/structural/rome_struct_arch_norm.png new file mode 100644 index 0000000000..f1ff4eda59 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/structural/rome_struct_arch_norm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7b1e309970c947b81074d0b0cdee5bcf25264a2e0de75c93a76504c01f7242a +size 1419673 diff --git a/binaries/data/mods/public/art/textures/skins/structural/rome_struct_arch_spec.png b/binaries/data/mods/public/art/textures/skins/structural/rome_struct_arch_spec.png new file mode 100644 index 0000000000..70e745c80c --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/structural/rome_struct_arch_spec.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5bb727d6691d0453ee3a73ac1038b1067e5af6cbc2fdfcb9efa9c4dadc8a889 +size 588801 diff --git a/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_norm.png b/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_norm.png new file mode 100644 index 0000000000..fdabfaa24d --- /dev/null +++ b/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_norm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18675f1dfa6e21da548c0bf11ed515837da7d9739c821aba3facc772c403f039 +size 783235 diff --git a/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_plaza_norm.png b/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_plaza_norm.png new file mode 100644 index 0000000000..b007199c0d --- /dev/null +++ b/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_plaza_norm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07df9ced92d0a1f4f38e068622d21040fa12033d0d1c74ab8353bb39d0f9bfbc +size 770920 diff --git a/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_plaza_spec.png b/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_plaza_spec.png new file mode 100644 index 0000000000..254f18e342 --- /dev/null +++ b/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_plaza_spec.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39401c3a77e601ebdadaaa02426822bca9c582a0aea555b0bcbbb7f5be3fef31 +size 246423 diff --git a/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_spec.png b/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_spec.png new file mode 100644 index 0000000000..b837fa7507 --- /dev/null +++ b/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_spec.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbba5efbb480d916c629062219d6e547d6acf07a3efe54e4cd5c08990a661a54 +size 271116 diff --git a/binaries/data/mods/public/maps/scenarios/Athenian Sandbox.pmp b/binaries/data/mods/public/maps/scenarios/Athenian Sandbox.pmp index 2975944dda..c33b2e6f25 100644 --- a/binaries/data/mods/public/maps/scenarios/Athenian Sandbox.pmp +++ b/binaries/data/mods/public/maps/scenarios/Athenian Sandbox.pmp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:154fb548355abf3f94ec3e12a22fe8506aa2eace321ecf2c870da8476e6c9f70 -size 656423 +oid sha256:ced9e208757bfbef7015491b0579e19bcdac3657c7b1707ea6a107cfcb161b46 +size 2623773 diff --git a/binaries/data/mods/public/maps/scenarios/Athenian Sandbox.xml b/binaries/data/mods/public/maps/scenarios/Athenian Sandbox.xml index 4c1df2f7fe..3aa95d53de 100644 --- a/binaries/data/mods/public/maps/scenarios/Athenian Sandbox.xml +++ b/binaries/data/mods/public/maps/scenarios/Athenian Sandbox.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f98fe8f686e321d7b2ca4ed2a8431d3bb43aae4127434f3256cc7afef8d0eaec -size 20877 +oid sha256:58398def2bc104a4cff0f2b67e3534779b9663a9dbc65a6ce77fc13cbc35603e +size 11881 diff --git a/binaries/data/mods/public/maps/scenarios/Eire and Albion.pmp b/binaries/data/mods/public/maps/scenarios/Eire and Albion.pmp new file mode 100644 index 0000000000..1e0cab9a32 --- /dev/null +++ b/binaries/data/mods/public/maps/scenarios/Eire and Albion.pmp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf23f17053df326438efb75ed7c51a2332988aece80160d40f8524ed92963d19 +size 9844647 diff --git a/binaries/data/mods/public/maps/scenarios/Eire and Albion.xml b/binaries/data/mods/public/maps/scenarios/Eire and Albion.xml new file mode 100644 index 0000000000..277ebb418e --- /dev/null +++ b/binaries/data/mods/public/maps/scenarios/Eire and Albion.xml @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d6ad6bf9baa28b713872db49d30e4755845f7e717e468bff6b7e47aa6f61a80 +size 2474 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml index 50e6a3ba97..5780bdd66c 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml @@ -33,6 +33,11 @@ + + 4.0 + 0.666 + 5.0 +