ynerant 53d090a9c8 Merge branch 'master' into 'mouse_interaction' ...

# Conflicts:
#   squirrelbattle/display/display_manager.py
#   squirrelbattle/display/menudisplay.py
#   squirrelbattle/entities/items.py

2020-12-11 18:38:13 +01:00

..

__init__.py

Declare the license, we use GNU GPL

2020-11-27 16:33:17 +01:00

friendly.py

Add a InventoryHolder superclass for player and merchants

2020-12-11 17:20:50 +01:00

items.py

Merge branch 'master' into 'mouse_interaction'

2020-12-11 18:38:13 +01:00

monsters.py

New pathfinding that avoids most of the mobs getting stuck, closes #35

2020-12-10 22:21:09 +01:00

player.py

Merge branch 'village' into 'master'

2020-12-11 18:23:10 +01:00