Commit Graph

6 Commits

Author SHA1 Message Date
Wirus
752284a90d transparent textures 2020-04-06 00:43:20 +02:00
Wirus
b2b7c7810d delete ',' after false 2020-04-06 00:07:13 +02:00
Wirus
e8e9cca0bb Merge remote-tracking branch 'origin/passingEvents' into passingEvents
# Conflicts:
#	data/mapdata/mapEntities.json
2020-04-06 00:03:06 +02:00
Wirus
38b6adc8a1 add bush and rabbit in mapEntities 2020-04-06 00:01:16 +02:00
jonspacz
c7793f5c43 added rock as a non-pickupable entity 2020-04-05 23:59:07 +02:00
617ee0c2c2 Added sample entities 2020-04-05 23:14:34 +02:00