Skip to content

Commit

Permalink
Merge branch 'programming'
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcpages2020
marcpages2020 committed May 2, 2020
2 parents 0d15e04 + c4de7a2 commit 4e50f01
Show file tree
Hide file tree
Showing 66 changed files with 165,726 additions and 8,286 deletions.
Binary file added FalloutStrategy/FalloutStrategy/Assets/maps/Decoration.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified FalloutStrategy/FalloutStrategy/Assets/maps/Floors64x32.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified FalloutStrategy/FalloutStrategy/Assets/maps/debug_textures.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11,377 changes: 11,319 additions & 58 deletions FalloutStrategy/FalloutStrategy/Assets/maps/desert_low_left.tmx
View file

Large diffs are not rendered by default.

11,379 changes: 11,320 additions & 59 deletions FalloutStrategy/FalloutStrategy/Assets/maps/desert_low_right.tmx
View file

Large diffs are not rendered by default.

11,377 changes: 11,319 additions & 58 deletions FalloutStrategy/FalloutStrategy/Assets/maps/desert_up_left.tmx
View file

Large diffs are not rendered by default.

11,751 changes: 11,506 additions & 245 deletions FalloutStrategy/FalloutStrategy/Assets/maps/desert_up_right.tmx
View file

Large diffs are not rendered by default.

6,940 changes: 6,286 additions & 654 deletions FalloutStrategy/FalloutStrategy/Assets/maps/grassland_low_left.tmx
View file

Large diffs are not rendered by default.

9,852 changes: 7,742 additions & 2,110 deletions FalloutStrategy/FalloutStrategy/Assets/maps/grassland_low_right.tmx
View file

Large diffs are not rendered by default.

6,700 changes: 6,166 additions & 534 deletions FalloutStrategy/FalloutStrategy/Assets/maps/grassland_up_left.tmx
View file

Large diffs are not rendered by default.

6,500 changes: 6,066 additions & 434 deletions FalloutStrategy/FalloutStrategy/Assets/maps/grassland_up_right.tmx
View file

Large diffs are not rendered by default.

11,463 changes: 11,362 additions & 101 deletions FalloutStrategy/FalloutStrategy/Assets/maps/oldstone_low_left.tmx
View file

Large diffs are not rendered by default.

11,403 changes: 11,332 additions & 71 deletions FalloutStrategy/FalloutStrategy/Assets/maps/oldstone_low_right.tmx
View file

Large diffs are not rendered by default.

11,856 changes: 11,559 additions & 297 deletions FalloutStrategy/FalloutStrategy/Assets/maps/oldstone_up_left.tmx
View file

Large diffs are not rendered by default.

11,373 changes: 11,317 additions & 56 deletions FalloutStrategy/FalloutStrategy/Assets/maps/oldstone_up_right.tmx
View file

Large diffs are not rendered by default.

11,915 changes: 11,588 additions & 327 deletions FalloutStrategy/FalloutStrategy/Assets/maps/wasteland_low_left.tmx
View file

Large diffs are not rendered by default.

11,941 changes: 11,601 additions & 340 deletions FalloutStrategy/FalloutStrategy/Assets/maps/wasteland_low_right.tmx
View file

Large diffs are not rendered by default.

12,138 changes: 11,700 additions & 438 deletions FalloutStrategy/FalloutStrategy/Assets/maps/wasteland_up_left.tmx
View file

Large diffs are not rendered by default.

11,801 changes: 11,531 additions & 270 deletions FalloutStrategy/FalloutStrategy/Assets/maps/wasteland_up_right.tmx
View file

Large diffs are not rendered by default.

0 ...textures/characters/Animals/Bighorner.png → .../characters/Animals/Animals_Bighorner.png
View file
File renamed without changes
274 changes: 80 additions & 194 deletions ...textures/characters/Animals/Bighorner.tmx → .../characters/Animals/Animals_Bighorner.tmx
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.0" orientation="orthogonal" renderorder="right-down" width="4" height="5" tilewidth="128" tileheight="128" nextobjectid="1">
<tileset firstgid="1" name="Bighorner" tilewidth="128" tileheight="128" tilecount="256" columns="16">
<image source="Bighorner.png" width="2048" height="2048"/>
<tile id="0">
<tileset firstgid="1" name="Animals_Bighorner" tilewidth="128" tileheight="128" tilecount="256" columns="16">
<image source="Animals_Bighorner.png" width="2048" height="2048"/>
<tile id="16">
<properties>
<property name="die" value="top_left"/>
</properties>
<animation>
<frame tileid="0" duration="100"/>
<frame tileid="1" duration="100"/>
<frame tileid="2" duration="100"/>
<frame tileid="3" duration="100"/>
<frame tileid="4" duration="100"/>
<frame tileid="5" duration="100"/>
<frame tileid="6" duration="100"/>
<frame tileid="7" duration="100"/>
<frame tileid="16" duration="100"/>
<frame tileid="17" duration="100"/>
<frame tileid="18" duration="100"/>
<frame tileid="19" duration="100"/>
<frame tileid="20" duration="100"/>
</animation>
</tile>
<tile id="8">
<properties>
<property name="hit" value="right"/>
</properties>
<animation>
<frame tileid="8" duration="100"/>
<frame tileid="9" duration="100"/>
<frame tileid="10" duration="100"/>
<frame tileid="11" duration="100"/>
<frame tileid="12" duration="100"/>
<frame tileid="13" duration="100"/>
</animation>
</tile>
<tile id="24">
<properties>
<property name="hit" value="bottom_right"/>
Expand All @@ -48,27 +27,6 @@
<frame tileid="29" duration="100"/>
</animation>
</tile>
<tile id="32">
<properties>
<property name="idle" value="bottom_left"/>
</properties>
<animation>
<frame tileid="32" duration="100"/>
<frame tileid="33" duration="100"/>
<frame tileid="34" duration="100"/>
<frame tileid="35" duration="100"/>
<frame tileid="36" duration="100"/>
<frame tileid="37" duration="100"/>
<frame tileid="38" duration="100"/>
<frame tileid="39" duration="100"/>
<frame tileid="48" duration="100"/>
<frame tileid="49" duration="100"/>
<frame tileid="50" duration="100"/>
<frame tileid="51" duration="100"/>
<frame tileid="52" duration="100"/>
<frame tileid="53" duration="100"/>
</animation>
</tile>
<tile id="40">
<properties>
<property name="walk" value="bottom_left"/>
Expand All @@ -88,47 +46,47 @@
<frame tileid="59" duration="100"/>
</animation>
</tile>
<tile id="64">
<tile id="48">
<properties>
<property name="idle" value="left"/>
<property name="idle" value="bottom_left"/>
</properties>
<animation>
<frame tileid="64" duration="100"/>
<frame tileid="65" duration="100"/>
<frame tileid="66" duration="100"/>
<frame tileid="67" duration="100"/>
<frame tileid="68" duration="100"/>
<frame tileid="69" duration="100"/>
<frame tileid="70" duration="100"/>
<frame tileid="71" duration="100"/>
<frame tileid="80" duration="100"/>
<frame tileid="81" duration="100"/>
<frame tileid="82" duration="100"/>
<frame tileid="83" duration="100"/>
<frame tileid="84" duration="100"/>
<frame tileid="85" duration="100"/>
<frame tileid="32" duration="100"/>
<frame tileid="33" duration="100"/>
<frame tileid="34" duration="100"/>
<frame tileid="35" duration="100"/>
<frame tileid="36" duration="100"/>
<frame tileid="37" duration="100"/>
<frame tileid="38" duration="100"/>
<frame tileid="39" duration="100"/>
<frame tileid="48" duration="100"/>
<frame tileid="49" duration="100"/>
<frame tileid="50" duration="100"/>
<frame tileid="51" duration="100"/>
<frame tileid="52" duration="100"/>
<frame tileid="53" duration="100"/>
</animation>
</tile>
<tile id="72">
<tile id="104">
<properties>
<property name="walk" value="left"/>
<property name="walk" value="top_left"/>
</properties>
<animation>
<frame tileid="72" duration="100"/>
<frame tileid="73" duration="100"/>
<frame tileid="74" duration="100"/>
<frame tileid="75" duration="100"/>
<frame tileid="76" duration="100"/>
<frame tileid="77" duration="100"/>
<frame tileid="78" duration="100"/>
<frame tileid="79" duration="100"/>
<frame tileid="88" duration="100"/>
<frame tileid="89" duration="100"/>
<frame tileid="90" duration="100"/>
<frame tileid="91" duration="100"/>
<frame tileid="104" duration="100"/>
<frame tileid="105" duration="100"/>
<frame tileid="106" duration="100"/>
<frame tileid="107" duration="100"/>
<frame tileid="108" duration="100"/>
<frame tileid="109" duration="100"/>
<frame tileid="110" duration="100"/>
<frame tileid="111" duration="100"/>
<frame tileid="120" duration="100"/>
<frame tileid="121" duration="100"/>
<frame tileid="122" duration="100"/>
<frame tileid="123" duration="100"/>
</animation>
</tile>
<tile id="96">
<tile id="112">
<properties>
<property name="idle" value="top_left"/>
</properties>
Expand All @@ -149,66 +107,26 @@
<frame tileid="117" duration="100"/>
</animation>
</tile>
<tile id="104">
<properties>
<property name="walk" value="top_left"/>
</properties>
<animation>
<frame tileid="104" duration="100"/>
<frame tileid="105" duration="100"/>
<frame tileid="106" duration="100"/>
<frame tileid="107" duration="100"/>
<frame tileid="108" duration="100"/>
<frame tileid="109" duration="100"/>
<frame tileid="110" duration="100"/>
<frame tileid="111" duration="100"/>
<frame tileid="120" duration="100"/>
<frame tileid="121" duration="100"/>
<frame tileid="122" duration="100"/>
<frame tileid="123" duration="100"/>
</animation>
</tile>
<tile id="128">
<properties>
<property name="idle" value="right"/>
</properties>
<animation>
<frame tileid="128" duration="100"/>
<frame tileid="129" duration="100"/>
<frame tileid="130" duration="100"/>
<frame tileid="131" duration="100"/>
<frame tileid="132" duration="100"/>
<frame tileid="133" duration="100"/>
<frame tileid="134" duration="100"/>
<frame tileid="135" duration="100"/>
<frame tileid="144" duration="100"/>
<frame tileid="145" duration="100"/>
<frame tileid="146" duration="100"/>
<frame tileid="147" duration="100"/>
<frame tileid="148" duration="100"/>
<frame tileid="149" duration="100"/>
</animation>
</tile>
<tile id="136">
<tile id="168">
<properties>
<property name="walk" value="right"/>
<property name="walk" value="top_right"/>
</properties>
<animation>
<frame tileid="136" duration="100"/>
<frame tileid="137" duration="100"/>
<frame tileid="138" duration="100"/>
<frame tileid="139" duration="100"/>
<frame tileid="140" duration="100"/>
<frame tileid="141" duration="100"/>
<frame tileid="142" duration="100"/>
<frame tileid="143" duration="100"/>
<frame tileid="152" duration="100"/>
<frame tileid="153" duration="100"/>
<frame tileid="154" duration="100"/>
<frame tileid="155" duration="100"/>
<frame tileid="168" duration="100"/>
<frame tileid="169" duration="100"/>
<frame tileid="170" duration="100"/>
<frame tileid="171" duration="100"/>
<frame tileid="172" duration="100"/>
<frame tileid="173" duration="100"/>
<frame tileid="174" duration="100"/>
<frame tileid="175" duration="100"/>
<frame tileid="184" duration="100"/>
<frame tileid="185" duration="100"/>
<frame tileid="186" duration="100"/>
<frame tileid="187" duration="100"/>
</animation>
</tile>
<tile id="160">
<tile id="176">
<properties>
<property name="idle" value="top_right"/>
</properties>
Expand All @@ -229,26 +147,26 @@
<frame tileid="181" duration="100"/>
</animation>
</tile>
<tile id="168">
<tile id="200">
<properties>
<property name="walk" value="top_right"/>
<property name="walk" value="bottom_right"/>
</properties>
<animation>
<frame tileid="168" duration="100"/>
<frame tileid="169" duration="100"/>
<frame tileid="170" duration="100"/>
<frame tileid="171" duration="100"/>
<frame tileid="172" duration="100"/>
<frame tileid="173" duration="100"/>
<frame tileid="174" duration="100"/>
<frame tileid="175" duration="100"/>
<frame tileid="184" duration="100"/>
<frame tileid="185" duration="100"/>
<frame tileid="186" duration="100"/>
<frame tileid="187" duration="100"/>
<frame tileid="200" duration="100"/>
<frame tileid="201" duration="100"/>
<frame tileid="202" duration="100"/>
<frame tileid="203" duration="100"/>
<frame tileid="204" duration="100"/>
<frame tileid="205" duration="100"/>
<frame tileid="206" duration="100"/>
<frame tileid="207" duration="100"/>
<frame tileid="216" duration="100"/>
<frame tileid="217" duration="100"/>
<frame tileid="218" duration="100"/>
<frame tileid="219" duration="100"/>
</animation>
</tile>
<tile id="192">
<tile id="208">
<properties>
<property name="idle" value="bottom_right"/>
</properties>
Expand All @@ -269,25 +187,6 @@
<frame tileid="213" duration="100"/>
</animation>
</tile>
<tile id="200">
<properties>
<property name="walk" value="bottom_right"/>
</properties>
<animation>
<frame tileid="200" duration="100"/>
<frame tileid="201" duration="100"/>
<frame tileid="202" duration="100"/>
<frame tileid="203" duration="100"/>
<frame tileid="204" duration="100"/>
<frame tileid="205" duration="100"/>
<frame tileid="206" duration="100"/>
<frame tileid="207" duration="100"/>
<frame tileid="216" duration="100"/>
<frame tileid="217" duration="100"/>
<frame tileid="218" duration="100"/>
<frame tileid="219" duration="100"/>
</animation>
</tile>
<tile id="224">
<properties>
<property name="hit" value="bottom_left"/>
Expand All @@ -314,19 +213,6 @@
<frame tileid="235" duration="100"/>
</animation>
</tile>
<tile id="240">
<properties>
<property name="hit" value="left"/>
</properties>
<animation>
<frame tileid="240" duration="100"/>
<frame tileid="241" duration="100"/>
<frame tileid="242" duration="100"/>
<frame tileid="243" duration="100"/>
<frame tileid="244" duration="100"/>
<frame tileid="245" duration="100"/>
</animation>
</tile>
<tile id="246">
<properties>
<property name="hit" value="top_right"/>
Expand All @@ -341,27 +227,27 @@
</animation>
</tile>
</tileset>
<layer name="Capa de Patrones 1" width="4" height="5">
<layer name="Tile Layer 1" width="4" height="5">
<data>
<tile gid="1"/>
<tile gid="33"/>
<tile gid="65"/>
<tile gid="97"/>
<tile gid="129"/>
<tile gid="161"/>
<tile gid="193"/>
<tile gid="49"/>
<tile gid="113"/>
<tile gid="177"/>
<tile gid="209"/>
<tile gid="231"/>
<tile gid="247"/>
<tile gid="25"/>
<tile gid="225"/>
<tile gid="41"/>
<tile gid="73"/>
<tile gid="105"/>
<tile gid="137"/>
<tile gid="169"/>
<tile gid="201"/>
<tile gid="225"/>
<tile gid="241"/>
<tile gid="231"/>
<tile gid="247"/>
<tile gid="9"/>
<tile gid="25"/>
<tile gid="17"/>
<tile gid="0"/>
<tile gid="0"/>
<tile gid="0"/>
<tile gid="0"/>
<tile gid="0"/>
<tile gid="0"/>
<tile gid="0"/>
</data>
</layer>
Expand Down
0 ...ts/textures/characters/Animals/Braham.png → ...res/characters/Animals/Animals_Braham.png
View file
File renamed without changes
Loading

0 comments on commit 4e50f01

Please sign in to comment.