Compare commits
No commits in common. "master" and "easterhack-bremen" have entirely different histories.
master
...
easterhack
|
|
@ -0,0 +1,2 @@
|
||||||
|
# Auto detect text files and perform LF normalization
|
||||||
|
* text=auto
|
||||||
|
|
@ -1,40 +0,0 @@
|
||||||
name: Optimize map and deploy
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- master
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
|
|
||||||
deploy:
|
|
||||||
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
|
|
||||||
- name: Optimize map
|
|
||||||
uses: thecodingmachine/map-optimizer-action@master
|
|
||||||
|
|
||||||
- name: Bash
|
|
||||||
run: |
|
|
||||||
ls -al
|
|
||||||
git config --global user.email "d.negrier@thecodingmachine.com"
|
|
||||||
git config --global user.name "David Négrier"
|
|
||||||
git checkout master
|
|
||||||
git commit -am "Adding files"
|
|
||||||
|
|
||||||
- name: Deploy
|
|
||||||
uses: JamesIves/github-pages-deploy-action@releases/v3
|
|
||||||
with:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
BRANCH: gh-pages # The branch the action should deploy to.
|
|
||||||
FOLDER: . # The folder the action should deploy.
|
|
||||||
BASE_BRANCH: master
|
|
||||||
|
|
||||||
- name: Bash2
|
|
||||||
run: |
|
|
||||||
ls -al
|
|
||||||
|
|
@ -0,0 +1,68 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<tileset version="1.4" tiledversion="1.4.3" name="Chaosmentoren_Tileset" tilewidth="32" tileheight="32" tilecount="1024" columns="32">
|
||||||
|
<image source="Chaospatinnen_Tileset/Chaosmentoren_Tileset.png" width="1024" height="1024"/>
|
||||||
|
<tile id="224">
|
||||||
|
<animation>
|
||||||
|
<frame tileid="192" duration="600"/>
|
||||||
|
<frame tileid="200" duration="600"/>
|
||||||
|
<frame tileid="208" duration="600"/>
|
||||||
|
<frame tileid="200" duration="600"/>
|
||||||
|
</animation>
|
||||||
|
</tile>
|
||||||
|
<tile id="225">
|
||||||
|
<animation>
|
||||||
|
<frame tileid="193" duration="600"/>
|
||||||
|
<frame tileid="201" duration="600"/>
|
||||||
|
<frame tileid="209" duration="600"/>
|
||||||
|
<frame tileid="201" duration="600"/>
|
||||||
|
</animation>
|
||||||
|
</tile>
|
||||||
|
<tile id="226">
|
||||||
|
<animation>
|
||||||
|
<frame tileid="194" duration="600"/>
|
||||||
|
<frame tileid="202" duration="600"/>
|
||||||
|
<frame tileid="210" duration="600"/>
|
||||||
|
<frame tileid="202" duration="600"/>
|
||||||
|
</animation>
|
||||||
|
</tile>
|
||||||
|
<tile id="227">
|
||||||
|
<animation>
|
||||||
|
<frame tileid="195" duration="600"/>
|
||||||
|
<frame tileid="203" duration="600"/>
|
||||||
|
<frame tileid="211" duration="600"/>
|
||||||
|
<frame tileid="203" duration="600"/>
|
||||||
|
</animation>
|
||||||
|
</tile>
|
||||||
|
<tile id="228">
|
||||||
|
<animation>
|
||||||
|
<frame tileid="196" duration="600"/>
|
||||||
|
<frame tileid="204" duration="600"/>
|
||||||
|
<frame tileid="212" duration="600"/>
|
||||||
|
<frame tileid="204" duration="600"/>
|
||||||
|
</animation>
|
||||||
|
</tile>
|
||||||
|
<tile id="229">
|
||||||
|
<animation>
|
||||||
|
<frame tileid="197" duration="600"/>
|
||||||
|
<frame tileid="205" duration="600"/>
|
||||||
|
<frame tileid="213" duration="600"/>
|
||||||
|
<frame tileid="205" duration="600"/>
|
||||||
|
</animation>
|
||||||
|
</tile>
|
||||||
|
<tile id="230">
|
||||||
|
<animation>
|
||||||
|
<frame tileid="198" duration="600"/>
|
||||||
|
<frame tileid="206" duration="600"/>
|
||||||
|
<frame tileid="214" duration="600"/>
|
||||||
|
<frame tileid="206" duration="600"/>
|
||||||
|
</animation>
|
||||||
|
</tile>
|
||||||
|
<tile id="231">
|
||||||
|
<animation>
|
||||||
|
<frame tileid="199" duration="600"/>
|
||||||
|
<frame tileid="207" duration="600"/>
|
||||||
|
<frame tileid="215" duration="600"/>
|
||||||
|
<frame tileid="207" duration="600"/>
|
||||||
|
</animation>
|
||||||
|
</tile>
|
||||||
|
</tileset>
|
||||||
|
|
@ -0,0 +1,4 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<tileset version="1.4" tiledversion="1.4.3" name="Chaosmentoren_Tileset_solid" tilewidth="32" tileheight="32" tilecount="1024" columns="32">
|
||||||
|
<image source="../Chaospatinnen_Tileset/Chaosmentoren_Tileset.png" width="1024" height="1024"/>
|
||||||
|
</tileset>
|
||||||
|
After Width: | Height: | Size: 29 KiB |
|
After Width: | Height: | Size: 23 KiB |
|
After Width: | Height: | Size: 2.1 KiB |
|
After Width: | Height: | Size: 509 B |
|
After Width: | Height: | Size: 21 KiB |
|
After Width: | Height: | Size: 42 KiB |
|
After Width: | Height: | Size: 31 KiB |
|
After Width: | Height: | Size: 157 KiB |
|
After Width: | Height: | Size: 7.2 KiB |
|
After Width: | Height: | Size: 290 KiB |
|
After Width: | Height: | Size: 9.8 KiB |
|
After Width: | Height: | Size: 80 KiB |
|
After Width: | Height: | Size: 13 KiB |
|
After Width: | Height: | Size: 3.9 KiB |
|
After Width: | Height: | Size: 62 KiB |
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 85 KiB After Width: | Height: | Size: 85 KiB |
|
After Width: | Height: | Size: 28 KiB |
|
After Width: | Height: | Size: 56 KiB |
|
After Width: | Height: | Size: 2.6 KiB |
|
After Width: | Height: | Size: 3.1 KiB |
|
After Width: | Height: | Size: 14 KiB |
|
After Width: | Height: | Size: 1.7 KiB |
|
After Width: | Height: | Size: 76 KiB |
|
After Width: | Height: | Size: 25 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 3.0 KiB |
|
After Width: | Height: | Size: 13 KiB |
|
After Width: | Height: | Size: 3.7 KiB |
|
After Width: | Height: | Size: 147 KiB |
|
After Width: | Height: | Size: 159 KiB |
|
After Width: | Height: | Size: 678 B |
|
After Width: | Height: | Size: 4.4 KiB |
|
|
@ -0,0 +1,68 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<tileset version="1.4" tiledversion="1.4.3" name="Chaosmentoren_Tileset" tilewidth="32" tileheight="32" tilecount="1024" columns="32">
|
||||||
|
<image source="../Chaospatinnen_Tileset/Chaosmentoren_Tileset.png" width="1024" height="1024"/>
|
||||||
|
<tile id="224">
|
||||||
|
<animation>
|
||||||
|
<frame tileid="192" duration="600"/>
|
||||||
|
<frame tileid="200" duration="600"/>
|
||||||
|
<frame tileid="208" duration="600"/>
|
||||||
|
<frame tileid="200" duration="600"/>
|
||||||
|
</animation>
|
||||||
|
</tile>
|
||||||
|
<tile id="225">
|
||||||
|
<animation>
|
||||||
|
<frame tileid="193" duration="600"/>
|
||||||
|
<frame tileid="201" duration="600"/>
|
||||||
|
<frame tileid="209" duration="600"/>
|
||||||
|
<frame tileid="201" duration="600"/>
|
||||||
|
</animation>
|
||||||
|
</tile>
|
||||||
|
<tile id="226">
|
||||||
|
<animation>
|
||||||
|
<frame tileid="194" duration="600"/>
|
||||||
|
<frame tileid="202" duration="600"/>
|
||||||
|
<frame tileid="210" duration="600"/>
|
||||||
|
<frame tileid="202" duration="600"/>
|
||||||
|
</animation>
|
||||||
|
</tile>
|
||||||
|
<tile id="227">
|
||||||
|
<animation>
|
||||||
|
<frame tileid="195" duration="600"/>
|
||||||
|
<frame tileid="203" duration="600"/>
|
||||||
|
<frame tileid="211" duration="600"/>
|
||||||
|
<frame tileid="203" duration="600"/>
|
||||||
|
</animation>
|
||||||
|
</tile>
|
||||||
|
<tile id="228">
|
||||||
|
<animation>
|
||||||
|
<frame tileid="196" duration="600"/>
|
||||||
|
<frame tileid="204" duration="600"/>
|
||||||
|
<frame tileid="212" duration="600"/>
|
||||||
|
<frame tileid="204" duration="600"/>
|
||||||
|
</animation>
|
||||||
|
</tile>
|
||||||
|
<tile id="229">
|
||||||
|
<animation>
|
||||||
|
<frame tileid="197" duration="600"/>
|
||||||
|
<frame tileid="205" duration="600"/>
|
||||||
|
<frame tileid="213" duration="600"/>
|
||||||
|
<frame tileid="205" duration="600"/>
|
||||||
|
</animation>
|
||||||
|
</tile>
|
||||||
|
<tile id="230">
|
||||||
|
<animation>
|
||||||
|
<frame tileid="198" duration="600"/>
|
||||||
|
<frame tileid="206" duration="600"/>
|
||||||
|
<frame tileid="214" duration="600"/>
|
||||||
|
<frame tileid="206" duration="600"/>
|
||||||
|
</animation>
|
||||||
|
</tile>
|
||||||
|
<tile id="231">
|
||||||
|
<animation>
|
||||||
|
<frame tileid="199" duration="600"/>
|
||||||
|
<frame tileid="207" duration="600"/>
|
||||||
|
<frame tileid="215" duration="600"/>
|
||||||
|
<frame tileid="207" duration="600"/>
|
||||||
|
</animation>
|
||||||
|
</tile>
|
||||||
|
</tileset>
|
||||||
|
|
@ -0,0 +1,4 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<tileset version="1.4" tiledversion="1.4.3" name="Chaosmentoren_Tileset_solid" tilewidth="32" tileheight="32" tilecount="1024" columns="32">
|
||||||
|
<image source="../Chaospatinnen_Tileset/Chaosmentoren_Tileset.png" width="1024" height="1024"/>
|
||||||
|
</tileset>
|
||||||
|
|
@ -0,0 +1,4 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<tileset version="1.4" tiledversion="1.4.3" name="floortileset" tilewidth="32" tileheight="32" tilecount="64" columns="8">
|
||||||
|
<image source="../Other_Tilesets/floortileset.png" width="256" height="256"/>
|
||||||
|
</tileset>
|
||||||
|
|
@ -0,0 +1,4 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<tileset version="1.4" tiledversion="1.4.3" name="furniture" tilewidth="32" tileheight="32" tilecount="1024" columns="16">
|
||||||
|
<image source="../Other_Tilesets/furniture.png" width="512" height="2048"/>
|
||||||
|
</tileset>
|
||||||
|
|
@ -0,0 +1,4 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<tileset version="1.4" tiledversion="1.4.3" name="mapUtilies" tilewidth="32" tileheight="32" tilecount="9" columns="9">
|
||||||
|
<image source="../Other_Tilesets/mapUtilities.png" width="288" height="32"/>
|
||||||
|
</tileset>
|
||||||
|
|
@ -0,0 +1,4 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<tileset version="1.4" tiledversion="1.4.3" name="misc" tilewidth="32" tileheight="32" tilecount="1024" columns="16">
|
||||||
|
<image source="../Other_Tilesets/misc.png" width="512" height="2048"/>
|
||||||
|
</tileset>
|
||||||
|
|
@ -0,0 +1,4 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<tileset version="1.4" tiledversion="1.4.3" name="misc_set" tilewidth="32" tileheight="32" tilecount="52" columns="2">
|
||||||
|
<image source="../Other_Tilesets/misc_set.png" width="64" height="832"/>
|
||||||
|
</tileset>
|
||||||
|
|
@ -0,0 +1,4 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<tileset version="1.4" tiledversion="1.4.3" name="rc3_style_set" tilewidth="32" tileheight="32" tilecount="28" columns="4">
|
||||||
|
<image source="../Other_Tilesets/rc3_style_set.png" width="128" height="224"/>
|
||||||
|
</tileset>
|
||||||