commit 197a34ce72533feb900ebf39175dc1b0d1976a58 (HEAD -> gameplay, origin/master, origin/gameplay, origin/HEAD, master)
Author: Hudriwudri <33928114+jpichler11@users.noreply.github.com>
Date:   Mon Oct 21 22:58:36 2019 +0200

    HUD - Energy Bar

commit 4349899f54a6e820aa2aa06474c4cea4bf322388 (origin/tilemap)
Author: Kajetan Johannes Hammerle <kajetan@hammerle.me>
Date:   Mon Oct 21 13:10:14 2019 +0200

    added mountains to texture atlas, setable map seed, forest generation

commit df5be530ea3ef37921d5fc6e1763843a1d970e6b
Author: Hudriwudri <33928114+jpichler11@users.noreply.github.com>
Date:   Sun Oct 20 15:18:56 2019 +0200

    HUD-Minus fuer gehen

commit 5468c2169b8ca506539393d96032d948a81a5bad
Author: Hudriwudri <33928114+jpichler11@users.noreply.github.com>
Date:   Fri Oct 18 11:30:32 2019 +0200

    HUD - Objective Tracker

commit 09bbee05c885ce50b93b1a62e0c60c537acb9d2f
Author: Hudriwudri <33928114+jpichler11@users.noreply.github.com>
Date:   Tue Oct 15 16:20:45 2019 +0200

    adapt speed to tile

commit 5ae672fbce0c3b4ebdf28112a6da23e33953daec
Author: Hudriwudri <33928114+jpichler11@users.noreply.github.com>
Date:   Mon Oct 14 01:24:25 2019 +0200

    added energy system

commit 71c82986654e38492b4ea099a4d48e9edf847072
Author: Kajetan Johannes Hammerle <kajetan@hammerle.me>
Date:   Sun Oct 13 11:15:29 2019 +0200

    integration of highmap, basic map generator, prevent map rendering
    artifacts, registered new tiles and their renderers, updated texture
    atlas

commit 6327e9a5e545ff86aa00ba0a411d2cd148e4d706
Merge: 466f0c6 efcd7da
Author: Kajetan Johannes Hammerle <kajetan@hammerle.me>
Date:   Sun Oct 13 09:48:41 2019 +0200

    Merge branch 'master' of git.hammerle.me:kjhammerle/path-game into tilemap

commit efcd7da9fcaf720d40ab6a148f4b2aa5d8d388e7
Author: Hudriwudri <33928114+jpichler11@users.noreply.github.com>
Date:   Tue Oct 8 15:22:34 2019 +0200

    improve controls, map scrolling depending on player position, zoom, map border, player renderer, refactoring