Commit graph

43 commits

Author SHA1 Message Date
c058ed4fee fix licenses and cleanup 2021-12-30 04:37:39 +01:00
5acb664e83 Merge branch 'master' of https://git.it-syndikat.org/IT-Syndikat/rc3-its-assembly-2021.git 2021-12-30 02:15:58 +01:00
022eec0ca5 Merge branch 'master' of https://git.it-syndikat.org/IT-Syndikat/rc3-its-assembly-2021.git
# Conflicts:
#	main.json --> choose remote
2021-12-30 02:15:42 +01:00
a94f089b09 fixup: copyright 2021-12-30 01:37:21 +01:00
a959660ae3 fixup: copyright 2021-12-30 01:22:30 +01:00
18be5ad6fa finish 2nd floor 2021-12-30 01:06:32 +01:00
dd2f096633 added laser and BBB Area 2021-12-30 00:55:15 +01:00
c73950511e Merge branch 'master' of https://git.it-syndikat.org/IT-Syndikat/rc3-its-assembly-2021.git 2021-12-30 00:03:50 +01:00
d823a1c67a refine second floor 2021-12-30 00:03:43 +01:00
dd997db87d fixup: small gfx changes 2021-12-29 23:37:22 +01:00
23aa407871 added a room and played a bit with the layers 2021-12-29 22:57:12 +01:00
4ebe4878c3 fixup: rm collides property in layers, fix 2nd floor description 2021-12-29 03:39:03 +01:00
6ddddddd8c add early version of second floor of the dungeon 2021-12-29 02:40:34 +01:00
f86a2cfb53 add first floor of dungeon 2021-12-29 02:14:44 +01:00
89235dc0cc extract tliesets (sets must be still embedded) 2021-12-29 02:14:19 +01:00
49ff8105bc fixup! debug copyright and layer properties 2021-12-28 06:41:50 +01:00
42501e43ff fixup! debug layer properties 2021-12-28 06:29:59 +01:00
d8ec490a13 fix copyright 2021-12-28 06:25:51 +01:00
3070785b4e animate traffic light, add stub for dungeon, some cleanup
* moved Krita images to sub folder
2021-12-28 06:16:34 +01:00
Romedius Weiss
da312df7dd fix bbb 2021-12-27 14:33:57 +01:00
Romedius Weiss
f1e2e4e261 add BBB 2021-12-27 14:14:30 +01:00
Romedius Weiss
0c7ca7c663 fix license 2021-12-27 14:01:39 +01:00
Romedius Weiss
ab0c62d2d5 add floor 2021-12-27 13:28:33 +01:00
Romedius Weiss
b874a1259d add collides to limit oom temporarily 2021-12-27 12:46:51 +01:00
1460d7cdd7 updated traffic light 2021-12-27 03:52:37 +01:00
7450fcc9a4 inserted boundaries (only couch area reachable) 2021-12-27 01:05:31 +01:00
2027499801 include community content into the repository - rc3.world doesn't update recursively 2021-12-27 00:48:21 +01:00
1d97b88c89 Test: without tilesets from world-tiles 2021-12-26 23:53:51 +01:00
eee7d1fff4 updated traffic light (still without animation) 2021-12-26 23:44:39 +01:00
07822c0c92 BUG: duplicated laxer exit_map 2021-12-26 23:41:22 +01:00
0c8c1ca027 insert exit url 2021-12-26 23:14:21 +01:00
8ccbce4841 set tileset copyright and some other properties 2021-12-26 23:12:16 +01:00
9963acd4a3 add start and exit, debug property entries 2021-12-26 22:18:04 +01:00
50481f2c9c ignore autosaves 2021-12-26 22:17:29 +01:00
4e01506b70 embed all tilesets into main.json 2021-12-26 21:33:44 +01:00
2f6dc5a949 rename main 2021-12-26 20:57:57 +01:00
caa7824a18 traffic light - intermediate version for placement 2021-12-26 20:57:22 +01:00
810501f657 update paths 2021-12-26 15:03:01 +01:00
8fb6bc637c add https://git.cccv.de/rc3/world-tiles.git as a submodule
* world-tiles contains submodules
2021-12-26 14:51:08 +01:00
f04ee174f3 rename examplemap and insert blinkenwall 2021-12-24 04:44:36 +01:00
a6a9accf2f classic blinkenwall with its logo anomation 2021-12-24 04:43:02 +01:00
7a29c90d45 ignore backup files 2021-12-24 04:41:48 +01:00
0a87ae94f7 small example of couch area for scaling 2021-12-21 20:36:34 +01:00