Merge remote-tracking branch 'origin/serduszka'

Browse Source

# Conflicts:
#	CMakeLists.txt
#	headers/Actor.h
#	headers/Plansza.h
#	headers/Player.h
#	sources/Plansza.cpp
#	sources/Player.cpp

...

This commit is contained in:

Andrii Solianyk

2024-12-13 19:48:39 +01:00

parent 8b4b25747e da33fcc718

commit fdf67f4bc2

10 changed files with 242 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

assets/img/hearts/heart_gray.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 958 B