diff options
| author | Timothée Floure | 2016-04-25 13:01:23 +0200 |
|---|---|---|
| committer | Timothée Floure | 2016-04-25 13:01:23 +0200 |
| commit | 7de040f5ca6556cad35433997d53f7589f585b25 (patch) | |
| tree | b05aea0b9bbb7ce31035eb52e10598673e83e10b | |
| parent | 7e3beef9efa53abe448130585aee97c4c9158411 (diff) | |
| parent | bd7c60725cdd0ad94f4854b67adf89dda5e4af57 (diff) | |
| download | xblast-7de040f5ca6556cad35433997d53f7589f585b25.tar.gz | |
Merge branch '07_state_painter' into 'master'
07 state painter
See merge request !7
113 files changed, 336 insertions, 0 deletions
diff --git a/images/block/000_iron_floor.png b/images/block/000_iron_floor.png new file mode 100644 index 0000000..bf2c3fb --- /dev/null +++ b/images/block/000_iron_floor.png | |||
| Binary files differ | |||
diff --git a/images/block/001_iron_floor_S.png b/images/block/001_iron_floor_S.png new file mode 100644 index 0000000..64a8eb0 --- /dev/null +++ b/images/block/001_iron_floor_S.png | |||
| Binary files differ | |||
diff --git a/images/block/002_dark_block.png b/images/block/002_dark_block.png new file mode 100644 index 0000000..363bb46 --- /dev/null +++ b/images/block/002_dark_block.png | |||
| Binary files differ | |||
diff --git a/images/block/003_extra.png b/images/block/003_extra.png new file mode 100644 index 0000000..bc57d88 --- /dev/null +++ b/images/block/003_extra.png | |||
| Binary files differ | |||
diff --git a/images/block/004_extra_O.png b/images/block/004_extra_O.png new file mode 100644 index 0000000..87f0a57 --- /dev/null +++ b/images/block/004_extra_O.png | |||
| Binary files differ | |||
diff --git a/images/block/005_bomb.png b/images/block/005_bomb.png new file mode 100644 index 0000000..621e852 --- /dev/null +++ b/images/block/005_bomb.png | |||
| Binary files differ | |||
diff --git a/images/block/006_range.png b/images/block/006_range.png new file mode 100644 index 0000000..05e57f0 --- /dev/null +++ b/images/block/006_range.png | |||
| Binary files differ | |||
diff --git a/images/explosion/000_nesw.png b/images/explosion/000_nesw.png new file mode 100644 index 0000000..4c20513 --- /dev/null +++ b/images/explosion/000_nesw.png | |||
| Binary files differ | |||
diff --git a/images/explosion/001_nesW.png b/images/explosion/001_nesW.png new file mode 100644 index 0000000..139db6c --- /dev/null +++ b/images/explosion/001_nesW.png | |||
| Binary files differ | |||
diff --git a/images/explosion/002_neSw.png b/images/explosion/002_neSw.png new file mode 100644 index 0000000..e8cac5c --- /dev/null +++ b/images/explosion/002_neSw.png | |||
| Binary files differ | |||
diff --git a/images/explosion/003_neSW.png b/images/explosion/003_neSW.png new file mode 100644 index 0000000..6b46391 --- /dev/null +++ b/images/explosion/003_neSW.png | |||
| Binary files differ | |||
diff --git a/images/explosion/004_nEsw.png b/images/explosion/004_nEsw.png new file mode 100644 index 0000000..0294918 --- /dev/null +++ b/images/explosion/004_nEsw.png | |||
| Binary files differ | |||
diff --git a/images/explosion/005_nEsW.png b/images/explosion/005_nEsW.png new file mode 100644 index 0000000..5fc69ff --- /dev/null +++ b/images/explosion/005_nEsW.png | |||
| Binary files differ | |||
diff --git a/images/explosion/006_nESw.png b/images/explosion/006_nESw.png new file mode 100644 index 0000000..0a5df41 --- /dev/null +++ b/images/explosion/006_nESw.png | |||
| Binary files differ | |||
diff --git a/images/explosion/007_nESW.png b/images/explosion/007_nESW.png new file mode 100644 index 0000000..f12d3bd --- /dev/null +++ b/images/explosion/007_nESW.png | |||
| Binary files differ | |||
diff --git a/images/explosion/008_Nesw.png b/images/explosion/008_Nesw.png new file mode 100644 index 0000000..f782db2 --- /dev/null +++ b/images/explosion/008_Nesw.png | |||
| Binary files differ | |||
diff --git a/images/explosion/009_NesW.png b/images/explosion/009_NesW.png new file mode 100644 index 0000000..3f6c110 --- /dev/null +++ b/images/explosion/009_NesW.png | |||
| Binary files differ | |||
diff --git a/images/explosion/010_NeSw.png b/images/explosion/010_NeSw.png new file mode 100644 index 0000000..5b6befb --- /dev/null +++ b/images/explosion/010_NeSw.png | |||
| Binary files differ | |||
diff --git a/images/explosion/011_NeSW.png b/images/explosion/011_NeSW.png new file mode 100644 index 0000000..605bbaf --- /dev/null +++ b/images/explosion/011_NeSW.png | |||
| Binary files differ | |||
diff --git a/images/explosion/012_NEsw.png b/images/explosion/012_NEsw.png new file mode 100644 index 0000000..8a63db0 --- /dev/null +++ b/images/explosion/012_NEsw.png | |||
| Binary files differ | |||
diff --git a/images/explosion/013_NEsW.png b/images/explosion/013_NEsW.png new file mode 100644 index 0000000..97e2608 --- /dev/null +++ b/images/explosion/013_NEsW.png | |||
| Binary files differ | |||
diff --git a/images/explosion/014_NESw.png b/images/explosion/014_NESw.png new file mode 100644 index 0000000..be99891 --- /dev/null +++ b/images/explosion/014_NESw.png | |||
| Binary files differ | |||
diff --git a/images/explosion/015_NESW.png b/images/explosion/015_NESW.png new file mode 100644 index 0000000..ead300c --- /dev/null +++ b/images/explosion/015_NESW.png | |||
| Binary files differ | |||
diff --git a/images/explosion/020_bomb.png b/images/explosion/020_bomb.png new file mode 100644 index 0000000..9fe0e68 --- /dev/null +++ b/images/explosion/020_bomb.png | |||
| Binary files differ | |||
diff --git a/images/explosion/021_bomb_white.png b/images/explosion/021_bomb_white.png new file mode 100644 index 0000000..b13f2c6 --- /dev/null +++ b/images/explosion/021_bomb_white.png | |||
| Binary files differ | |||
diff --git a/images/player/000_P1_N0.png b/images/player/000_P1_N0.png new file mode 100644 index 0000000..8de0c4e --- /dev/null +++ b/images/player/000_P1_N0.png | |||
| Binary files differ | |||
diff --git a/images/player/001_P1_N1.png b/images/player/001_P1_N1.png new file mode 100644 index 0000000..07c1c6e --- /dev/null +++ b/images/player/001_P1_N1.png | |||
| Binary files differ | |||
diff --git a/images/player/002_P1_N2.png b/images/player/002_P1_N2.png new file mode 100644 index 0000000..6b8810c --- /dev/null +++ b/images/player/002_P1_N2.png | |||
| Binary files differ | |||
diff --git a/images/player/003_P1_E0.png b/images/player/003_P1_E0.png new file mode 100644 index 0000000..fb09b3d --- /dev/null +++ b/images/player/003_P1_E0.png | |||
| Binary files differ | |||
diff --git a/images/player/004_P1_E1.png b/images/player/004_P1_E1.png new file mode 100644 index 0000000..eb93776 --- /dev/null +++ b/images/player/004_P1_E1.png | |||
| Binary files differ | |||
diff --git a/images/player/005_P1_E2.png b/images/player/005_P1_E2.png new file mode 100644 index 0000000..340642d --- /dev/null +++ b/images/player/005_P1_E2.png | |||
| Binary files differ | |||
diff --git a/images/player/006_P1_S0.png b/images/player/006_P1_S0.png new file mode 100644 index 0000000..9844b6c --- /dev/null +++ b/images/player/006_P1_S0.png | |||
| Binary files differ | |||
diff --git a/images/player/007_P1_S1.png b/images/player/007_P1_S1.png new file mode 100644 index 0000000..3a71f7b --- /dev/null +++ b/images/player/007_P1_S1.png | |||
| Binary files differ | |||
diff --git a/images/player/008_P1_S2.png b/images/player/008_P1_S2.png new file mode 100644 index 0000000..7a9e7a5 --- /dev/null +++ b/images/player/008_P1_S2.png | |||
| Binary files differ | |||
diff --git a/images/player/009_P1_W0.png b/images/player/009_P1_W0.png new file mode 100644 index 0000000..c825f35 --- /dev/null +++ b/images/player/009_P1_W0.png | |||
| Binary files differ | |||
diff --git a/images/player/010_P1_W1.png b/images/player/010_P1_W1.png new file mode 100644 index 0000000..880edb5 --- /dev/null +++ b/images/player/010_P1_W1.png | |||
| Binary files differ | |||
diff --git a/images/player/011_P1_W2.png b/images/player/011_P1_W2.png new file mode 100644 index 0000000..b6a4843 --- /dev/null +++ b/images/player/011_P1_W2.png | |||
| Binary files differ | |||
diff --git a/images/player/012_P1_losing-life.png b/images/player/012_P1_losing-life.png new file mode 100644 index 0000000..c4b1210 --- /dev/null +++ b/images/player/012_P1_losing-life.png | |||
| Binary files differ | |||
diff --git a/images/player/013_P1_dying.png b/images/player/013_P1_dying.png new file mode 100644 index 0000000..e3ce107 --- /dev/null +++ b/images/player/013_P1_dying.png | |||
| Binary files differ | |||
diff --git a/images/player/020_P2_N0.png b/images/player/020_P2_N0.png new file mode 100644 index 0000000..559b348 --- /dev/null +++ b/images/player/020_P2_N0.png | |||
| Binary files differ | |||
diff --git a/images/player/021_P2_N1.png b/images/player/021_P2_N1.png new file mode 100644 index 0000000..a6c7025 --- /dev/null +++ b/images/player/021_P2_N1.png | |||
| Binary files differ | |||
diff --git a/images/player/022_P2_N2.png b/images/player/022_P2_N2.png new file mode 100644 index 0000000..d40b300 --- /dev/null +++ b/images/player/022_P2_N2.png | |||
| Binary files differ | |||
diff --git a/images/player/023_P2_E0.png b/images/player/023_P2_E0.png new file mode 100644 index 0000000..f443a11 --- /dev/null +++ b/images/player/023_P2_E0.png | |||
| Binary files differ | |||
diff --git a/images/player/024_P2_E1.png b/images/player/024_P2_E1.png new file mode 100644 index 0000000..1e210ae --- /dev/null +++ b/images/player/024_P2_E1.png | |||
| Binary files differ | |||
diff --git a/images/player/025_P2_E2.png b/images/player/025_P2_E2.png new file mode 100644 index 0000000..42f53c5 --- /dev/null +++ b/images/player/025_P2_E2.png | |||
| Binary files differ | |||
diff --git a/images/player/026_P2_S0.png b/images/player/026_P2_S0.png new file mode 100644 index 0000000..ab3a67d --- /dev/null +++ b/images/player/026_P2_S0.png | |||
| Binary files differ | |||
diff --git a/images/player/027_P2_S1.png b/images/player/027_P2_S1.png new file mode 100644 index 0000000..066c151 --- /dev/null +++ b/images/player/027_P2_S1.png | |||
| Binary files differ | |||
diff --git a/images/player/028_P2_S2.png b/images/player/028_P2_S2.png new file mode 100644 index 0000000..306a0f9 --- /dev/null +++ b/images/player/028_P2_S2.png | |||
| Binary files differ | |||
diff --git a/images/player/029_P2_W0.png b/images/player/029_P2_W0.png new file mode 100644 index 0000000..bb85bce --- /dev/null +++ b/images/player/029_P2_W0.png | |||
| Binary files differ | |||
diff --git a/images/player/030_P2_W1.png b/images/player/030_P2_W1.png new file mode 100644 index 0000000..8681ecf --- /dev/null +++ b/images/player/030_P2_W1.png | |||
| Binary files differ | |||
diff --git a/images/player/031_P2_W2.png b/images/player/031_P2_W2.png new file mode 100644 index 0000000..dfca39a --- /dev/null +++ b/images/player/031_P2_W2.png | |||
| Binary files differ | |||
diff --git a/images/player/032_P2_losing-life.png b/images/player/032_P2_losing-life.png new file mode 100644 index 0000000..e69ca0d --- /dev/null +++ b/images/player/032_P2_losing-life.png | |||
| Binary files differ | |||
diff --git a/images/player/033_P2_dying.png b/images/player/033_P2_dying.png new file mode 100644 index 0000000..e3ce107 --- /dev/null +++ b/images/player/033_P2_dying.png | |||
| Binary files differ | |||
diff --git a/images/player/040_P3_N0.png b/images/player/040_P3_N0.png new file mode 100644 index 0000000..a9945a6 --- /dev/null +++ b/images/player/040_P3_N0.png | |||
| Binary files differ | |||
diff --git a/images/player/041_P3_N1.png b/images/player/041_P3_N1.png new file mode 100644 index 0000000..fd4166d --- /dev/null +++ b/images/player/041_P3_N1.png | |||
| Binary files differ | |||
diff --git a/images/player/042_P3_N2.png b/images/player/042_P3_N2.png new file mode 100644 index 0000000..d57e516 --- /dev/null +++ b/images/player/042_P3_N2.png | |||
| Binary files differ | |||
diff --git a/images/player/043_P3_E0.png b/images/player/043_P3_E0.png new file mode 100644 index 0000000..474d2e1 --- /dev/null +++ b/images/player/043_P3_E0.png | |||
| Binary files differ | |||
diff --git a/images/player/044_P3_E1.png b/images/player/044_P3_E1.png new file mode 100644 index 0000000..96266f8 --- /dev/null +++ b/images/player/044_P3_E1.png | |||
| Binary files differ | |||
diff --git a/images/player/045_P3_E2.png b/images/player/045_P3_E2.png new file mode 100644 index 0000000..fd6d0d5 --- /dev/null +++ b/images/player/045_P3_E2.png | |||
| Binary files differ | |||
diff --git a/images/player/046_P3_S0.png b/images/player/046_P3_S0.png new file mode 100644 index 0000000..215b271 --- /dev/null +++ b/images/player/046_P3_S0.png | |||
| Binary files differ | |||
diff --git a/images/player/047_P3_S1.png b/images/player/047_P3_S1.png new file mode 100644 index 0000000..6a5c82a --- /dev/null +++ b/images/player/047_P3_S1.png | |||
| Binary files differ | |||
diff --git a/images/player/048_P3_S2.png b/images/player/048_P3_S2.png new file mode 100644 index 0000000..c13626e --- /dev/null +++ b/images/player/048_P3_S2.png | |||
| Binary files differ | |||
diff --git a/images/player/049_P3_W0.png b/images/player/049_P3_W0.png new file mode 100644 index 0000000..39fdc54 --- /dev/null +++ b/ |
