Compare commits

merge into: franconian:main

Branches Tags

franconian:main

franconian:staging

franconian:doom

franconian:oldMainLastStand

franconian:master

franconian:rc21_end_snapshot

franconian:linterHappy_mapOnline

...

pull from: franconian:doom

Branches Tags

franconian:main

franconian:staging

franconian:doom

franconian:oldMainLastStand

franconian:master

franconian:rc21_end_snapshot

franconian:linterHappy_mapOnline

10 Commits

main ... doom

Author	SHA1	Message	Date
legion	16111b737e	Change stream	2021-12-30 20:01:54 +01:00
legion	c5f174a9b1	Fix dungeon	2021-12-30 19:40:38 +01:00
legion	60cebee6c6	bones	2021-12-30 19:35:55 +01:00
legion	081063b864	Doomed	2021-12-30 17:54:56 +01:00
legion	8d21298e30	Fix	2021-12-30 17:39:41 +01:00
legion	ca83fc1a77	Move bomb	2021-12-30 17:37:22 +01:00
legion	a84e6019f0	Add bomb	2021-12-30 17:35:53 +01:00
legion	41e23fa20f	Add blocking	2021-12-30 17:25:09 +01:00
legion	e9186be807	Add gems	2021-12-30 16:37:57 +01:00
legion	15979e5c87	Add doom	2021-12-30 16:32:41 +01:00

4 changed files with 645 additions and 40 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Expand all files Collapse all files

BIN

bomb.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 826 KiB

2

dungeon.json

View File

File diff suppressed because one or more lines are too long

683

main.json

View File

File diff suppressed because one or more lines are too long

BIN

tiles_png/Top_Down_Adventure_Pack_v.1.0/Overworld_Tilesetx2.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 45 KiB After Width:  |  Height:  |  Size: 48 KiB