Commit Graph

10 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
c46745f8c0 Merge remote-tracking branch 'origin/MapNew' into EntityCreator 2020-04-05 23:15:28 +02:00
617ee0c2c2 Added sample entities 2020-04-05 23:14:34 +02:00
Wirus
55fb38aa0a add water texture to Map 2020-04-05 21:46:04 +02:00
Wirus
cceb1d50c6 add sand texture to map 2020-04-05 22:07:37 +02:00
Mateusz Tylka
5b60ddb8da add all folders 2020-04-03 19:49:53 +02:00