Compare commits

..

12 commits

Author SHA1 Message Date
79e59b6ba6 fixed warnings 2021-12-29 22:22:05 +01:00
6ff1dd004f fixed warnings 2021-12-29 22:17:23 +01:00
53a1d377fd fixed warnings 2021-12-29 22:16:03 +01:00
7d0525daf1 fixed warnings 2021-12-29 22:15:05 +01:00
1b0697fc00 added exit to lobby 2021-12-29 22:12:00 +01:00
a428e939b3 bugfix 2021-12-27 21:09:39 +01:00
607be716ea bugfix 2021-12-27 20:46:24 +01:00
9bd17fcd14 tilesetCopyright 2021-12-27 20:42:50 +01:00
ef20af90ff tilesetCopyright 2021-12-27 20:41:23 +01:00
3542ed95cd tilesetCopyright 2021-12-27 20:39:05 +01:00
48374d88fc exits 2021-12-27 20:37:11 +01:00
7e21eb5903 tilesetCopyright 2021-12-27 20:35:29 +01:00
10 changed files with 227 additions and 70 deletions

View file

@ -186,7 +186,7 @@
{ {
"name":"exitUrl", "name":"exitUrl",
"type":"string", "type":"string",
"value":"{<lobby>\/maps\/erfas-spaces-north.json#start_labstelle511}" "value":"world:\/\/lobby\/punchcard.json#start_leinestelle511"
}], }],
"type":"tilelayer", "type":"tilelayer",
"visible":true, "visible":true,
@ -228,7 +228,7 @@
"nextobjectid":1, "nextobjectid":1,
"orientation":"orthogonal", "orientation":"orthogonal",
"renderorder":"right-down", "renderorder":"right-down",
"tiledversion":"1.4.3", "tiledversion":"1.5.0",
"tileheight":32, "tileheight":32,
"tilesets":[ "tilesets":[
{ {
@ -239,10 +239,25 @@
"imagewidth":512, "imagewidth":512,
"margin":0, "margin":0,
"name":"office_1", "name":"office_1",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"unknown"
}],
"spacing":0, "spacing":0,
"tilecount":256, "tilecount":256,
"tileheight":32, "tileheight":32,
"tiles":[ "tiles":[
{
"id":0,
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"unknown"
}]
},
{ {
"id":1, "id":1,
"properties":[ "properties":[
@ -964,6 +979,12 @@
"imagewidth":256, "imagewidth":256,
"margin":0, "margin":0,
"name":"floortileset", "name":"floortileset",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"unknown"
}],
"spacing":0, "spacing":0,
"tilecount":64, "tilecount":64,
"tileheight":32, "tileheight":32,
@ -987,6 +1008,12 @@
"imagewidth":128, "imagewidth":128,
"margin":0, "margin":0,
"name":"floors_leinelab", "name":"floors_leinelab",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"unknown"
}],
"spacing":0, "spacing":0,
"tilecount":16, "tilecount":16,
"tileheight":32, "tileheight":32,
@ -1055,6 +1082,12 @@
"imagewidth":256, "imagewidth":256,
"margin":0, "margin":0,
"name":"kallax_leinelab", "name":"kallax_leinelab",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"unknown"
}],
"spacing":0, "spacing":0,
"tilecount":64, "tilecount":64,
"tileheight":32, "tileheight":32,
@ -1222,6 +1255,12 @@
"imagewidth":256, "imagewidth":256,
"margin":0, "margin":0,
"name":"drinks_leinelab", "name":"drinks_leinelab",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"unknown"
}],
"spacing":0, "spacing":0,
"tilecount":64, "tilecount":64,
"tileheight":32, "tileheight":32,
@ -1461,6 +1500,12 @@
"imagewidth":256, "imagewidth":256,
"margin":0, "margin":0,
"name":"objects_leinelab", "name":"objects_leinelab",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"unknown"
}],
"spacing":0, "spacing":0,
"tilecount":64, "tilecount":64,
"tileheight":32, "tileheight":32,
@ -1736,6 +1781,12 @@
"imagewidth":64, "imagewidth":64,
"margin":0, "margin":0,
"name":"worldExit", "name":"worldExit",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"CC0 by Mullana"
}],
"spacing":0, "spacing":0,
"tilecount":4, "tilecount":4,
"tileheight":32, "tileheight":32,
@ -1743,6 +1794,6 @@
}], }],
"tilewidth":32, "tilewidth":32,
"type":"map", "type":"map",
"version":1.4, "version":1.5,
"width":29 "width":29
} }

File diff suppressed because one or more lines are too long

View file

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="1"> <map version="1.4" tiledversion="1.4.2" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="1">
<tileset firstgid="1" source="tilesets/open_tileset.tsx"/> <tileset firstgid="1" source="open_tileset.tsx"/>
<tileset firstgid="1711" source="tilesets/tilesets_deviant_milkian_1.tsx"/> <tileset firstgid="1711" source="tilesets_deviant_milkian_1.tsx"/>
<tileset firstgid="1967" source="tilesets/Inside_A2.tsx"/> <tileset firstgid="1967" source="Inside_A2.tsx"/>
<tileset firstgid="2159" source="tilesets/modern_office.tsx"/>
<layer id="2" name="start" width="100" height="100"> <layer id="2" name="start" width="100" height="100">
<properties> <properties>
<property name="startLayer" type="bool" value="true"/> <property name="startLayer" type="bool" value="true"/>
@ -591,8 +590,8 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2445,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2461,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,

View file

@ -1,11 +1,4 @@
{ "compressionlevel":-1, { "compressionlevel":-1,
"editorsettings":
{
"export":
{
"target":"."
}
},
"height":100, "height":100,
"infinite":false, "infinite":false,
"layers":[ "layers":[
@ -91,7 +84,7 @@
{ {
"name":"exitUrl", "name":"exitUrl",
"type":"string", "type":"string",
"value":"{<lobby>\/maps\/erfas-spaces-north.json#start_labstelle511}" "value":"world:\/\/lobby\/punchcard.json#start_leinestelle511"
}], }],
"type":"tilelayer", "type":"tilelayer",
"visible":true, "visible":true,
@ -265,12 +258,12 @@
"orientation":"orthogonal", "orientation":"orthogonal",
"properties":[ "properties":[
{ {
"name":"startLayer", "name":"mapCopyright",
"type":"bool", "type":"string",
"value":true "value":"leitstelle511"
}], }],
"renderorder":"right-down", "renderorder":"right-down",
"tiledversion":"1.4.3", "tiledversion":"1.5.0",
"tileheight":32, "tileheight":32,
"tilesets":[ "tilesets":[
{ {
@ -281,6 +274,12 @@
"imagewidth":1440, "imagewidth":1440,
"margin":0, "margin":0,
"name":"open_tileset", "name":"open_tileset",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"unknown"
}],
"spacing":0, "spacing":0,
"tilecount":1710, "tilecount":1710,
"tileheight":32, "tileheight":32,
@ -475,6 +474,12 @@
"imagewidth":512, "imagewidth":512,
"margin":0, "margin":0,
"name":"tilesets_deviant_milkian_1", "name":"tilesets_deviant_milkian_1",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"unknown"
}],
"spacing":0, "spacing":0,
"tilecount":256, "tilecount":256,
"tileheight":32, "tileheight":32,
@ -759,6 +764,12 @@
"imagewidth":512, "imagewidth":512,
"margin":0, "margin":0,
"name":"Inside_A2", "name":"Inside_A2",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"unknown"
}],
"spacing":0, "spacing":0,
"tilecount":192, "tilecount":192,
"tileheight":32, "tileheight":32,
@ -772,6 +783,12 @@
"imagewidth":512, "imagewidth":512,
"margin":0, "margin":0,
"name":"food_and_drinks", "name":"food_and_drinks",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"unknown"
}],
"spacing":0, "spacing":0,
"tilecount":1024, "tilecount":1024,
"tileheight":32, "tileheight":32,
@ -785,6 +802,12 @@
"imagewidth":512, "imagewidth":512,
"margin":0, "margin":0,
"name":"misc", "name":"misc",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"unknown"
}],
"spacing":0, "spacing":0,
"tilecount":1024, "tilecount":1024,
"tileheight":32, "tileheight":32,
@ -798,6 +821,12 @@
"imagewidth":512, "imagewidth":512,
"margin":0, "margin":0,
"name":"furniture", "name":"furniture",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"unknown"
}],
"spacing":0, "spacing":0,
"tilecount":1024, "tilecount":1024,
"tileheight":32, "tileheight":32,
@ -811,6 +840,12 @@
"imagewidth":64, "imagewidth":64,
"margin":0, "margin":0,
"name":"worldExit", "name":"worldExit",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"CC0 by Mullana"
}],
"spacing":0, "spacing":0,
"tilecount":4, "tilecount":4,
"tileheight":32, "tileheight":32,
@ -824,6 +859,12 @@
"imagewidth":256, "imagewidth":256,
"margin":0, "margin":0,
"name":"drinks_leinelab", "name":"drinks_leinelab",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"unknown"
}],
"spacing":0, "spacing":0,
"tilecount":64, "tilecount":64,
"tileheight":32, "tileheight":32,
@ -837,6 +878,12 @@
"imagewidth":352, "imagewidth":352,
"margin":0, "margin":0,
"name":"Dungeon_Crawler_Sheet", "name":"Dungeon_Crawler_Sheet",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"unknown"
}],
"spacing":0, "spacing":0,
"tilecount":99, "tilecount":99,
"tileheight":32, "tileheight":32,
@ -844,6 +891,6 @@
}], }],
"tilewidth":32, "tilewidth":32,
"type":"map", "type":"map",
"version":1.4, "version":1.5,
"width":100 "width":100
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 175 KiB

View file

@ -1,11 +0,0 @@
FREE VERSION LICENSE:
CAN:
YOU CAN USE THE ASSET IN NON COMMERCIAL PROJECTS
YOU CAN EDIT THE SPRITES AND USE THEM IN NON COMMERCIAL PROJECTS
CAN'T:
YOU CAN'T USE THE ASSET IN COMMERCIAL PROJECTS
YOU CAN'T EDIT THE SPRITES AND USE THEM IN COMMERCIAL PROJECTS
YOU CAN'T EDIT AND RESELL THE SPRITES

View file

@ -1,11 +0,0 @@
MODERN OFFICE LICENSE
-
YOU CAN:
-Edit and use the asset in any commercial or non commercial project
-Use the asset in any commercial or non commercial project
-
YOU CAN'T:
- Resell or distribute the asset to others
- Edit and resell the asset to others
-
- Credits are appreciated

Binary file not shown.

Before

Width:  |  Height:  |  Size: 110 KiB

View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.4" tiledversion="1.4.3" name="modern_office" tilewidth="32" tileheight="32" tilecount="848" columns="16">
<image source="Modern_Office_32x32.png" width="512" height="1696"/>
</tileset>

View file

@ -1,11 +1,4 @@
{ "compressionlevel":-1, { "compressionlevel":-1,
"editorsettings":
{
"export":
{
"target":"."
}
},
"height":100, "height":100,
"infinite":false, "infinite":false,
"layers":[ "layers":[
@ -109,7 +102,7 @@
{ {
"name":"exitUrl", "name":"exitUrl",
"type":"string", "type":"string",
"value":"{<lobby>\/maps\/erfas-spaces-north.json#start_labstelle511}" "value":"world:\/\/lobby\/punchcard.json#start_leinestelle511"
}], }],
"type":"tilelayer", "type":"tilelayer",
"visible":true, "visible":true,
@ -143,8 +136,24 @@
"nextlayerid":10, "nextlayerid":10,
"nextobjectid":1, "nextobjectid":1,
"orientation":"orthogonal", "orientation":"orthogonal",
"properties":[
{
"name":"mapCopyright",
"type":"string",
"value":"leitstelle511"
},
{
"name":"mapDescription",
"type":"string",
"value":"Hub for LeineLab and Leitstelle511"
},
{
"name":"mapName",
"type":"string",
"value":"Choose a place in Hanover"
}],
"renderorder":"right-down", "renderorder":"right-down",
"tiledversion":"1.4.3", "tiledversion":"1.5.0",
"tileheight":32, "tileheight":32,
"tilesets":[ "tilesets":[
{ {
@ -155,6 +164,12 @@
"imagewidth":1440, "imagewidth":1440,
"margin":0, "margin":0,
"name":"open_tileset", "name":"open_tileset",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"unknown"
}],
"spacing":0, "spacing":0,
"tilecount":1710, "tilecount":1710,
"tileheight":32, "tileheight":32,
@ -546,6 +561,12 @@
"imagewidth":512, "imagewidth":512,
"margin":0, "margin":0,
"name":"tilesets_deviant_milkian_1", "name":"tilesets_deviant_milkian_1",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"unknown"
}],
"spacing":0, "spacing":0,
"tilecount":256, "tilecount":256,
"tileheight":32, "tileheight":32,
@ -559,6 +580,12 @@
"imagewidth":64, "imagewidth":64,
"margin":0, "margin":0,
"name":"worldExit", "name":"worldExit",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"CC0 by Mullana"
}],
"spacing":0, "spacing":0,
"tilecount":4, "tilecount":4,
"tileheight":32, "tileheight":32,
@ -572,6 +599,12 @@
"imagewidth":128, "imagewidth":128,
"margin":0, "margin":0,
"name":"Portal", "name":"Portal",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"unknown"
}],
"spacing":0, "spacing":0,
"tilecount":8, "tilecount":8,
"tileheight":32, "tileheight":32,
@ -634,6 +667,12 @@
"imagewidth":96, "imagewidth":96,
"margin":0, "margin":0,
"name":"Signs", "name":"Signs",
"properties":[
{
"name":"tilesetCopyright",
"type":"string",
"value":"unknown"
}],
"spacing":0, "spacing":0,
"tilecount":6, "tilecount":6,
"tileheight":32, "tileheight":32,
@ -641,6 +680,6 @@
}], }],
"tilewidth":32, "tilewidth":32,
"type":"map", "type":"map",
"version":1.4, "version":1.5,
"width":100 "width":100
} }