|
|
748e317e2e
|
Merge remote-tracking branch 'origin/development'
# Conflicts:
# environment.md
|
2020-04-06 12:37:01 +02:00 |
|
Wirus
|
6e96b1dfd6
|
Merge remote-tracking branch 'origin/master'
|
2020-04-06 12:23:12 +02:00 |
|
Wirus
|
3e3a393886
|
add image adventure.png needed to raport
|
2020-04-06 12:22:54 +02:00 |
|
Wirus
|
3f07785fbc
|
add structure.pdf and environment.md 80% progress in raport
|
2020-04-06 12:11:25 +02:00 |
|
|
|
605bf55ebf
|
Changed player texture
|
2020-04-06 11:56:06 +02:00 |
|
|
|
5a600eff11
|
Added gravestone texture
|
2020-04-06 11:51:35 +02:00 |
|
|
|
82081212ac
|
More level design
|
2020-04-06 11:12:31 +02:00 |
|
|
|
e49ef3013c
|
Firepit regenerates more stamina
|
2020-04-06 11:07:20 +02:00 |
|
|
|
4a33b6e761
|
Level design i guess
|
2020-04-06 10:55:47 +02:00 |
|
|
|
60baa30aee
|
Added tree texture
|
2020-04-06 10:55:38 +02:00 |
|
|
|
2b9a9d3c0c
|
Added drinkable river
|
2020-04-06 10:47:10 +02:00 |
|
|
|
02ca45748a
|
Added firepit that replenishes your stamina
|
2020-04-06 10:40:39 +02:00 |
|
Wirus
|
f68445bb3c
|
remove ugly rock texture
|
2020-04-06 01:01:20 +02:00 |
|
|
|
49666ee664
|
Changed entity effect values
|
2020-04-06 00:53:20 +02:00 |
|
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 |
|
|
|
91c5ca4e98
|
Added entities images
|
2020-04-05 23:14:56 +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
|
5446217628
|
add rabbit.png
|
2020-04-05 22:20:01 +02:00 |
|
Wirus
|
cceb1d50c6
|
add sand texture to map
|
2020-04-05 22:07:37 +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 |
|
Mateusz Tylka
|
5b60ddb8da
|
add all folders
|
2020-04-03 19:49:53 +02:00 |
|
|
|
14fac73279
|
Implemented screen initialization
|
2020-04-02 16:49:03 +02:00 |
|
|
|
5e33e55396
|
initialized pygame
|
2020-04-02 15:50:47 +02:00 |
|
|
|
1c28b3a644
|
Initialized classes & file structure
|
2020-03-31 21:47:09 +02:00 |
|
