Commit Graph

8 Commits

Author SHA1 Message Date
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
91c5ca4e98 Added entities images 2020-04-05 23:14:56 +02:00
Wirus
5446217628 add rabbit.png 2020-04-05 22:20:01 +02:00
Wirus
c98d8870a8 add some images and venv to gitignore 2020-04-05 15:44:03 +02:00
cad65b8ed7 Added temporary player texture 2020-04-04 20:53:54 +02:00