Skip to content

Commit 2dc7042

Browse files
authored
Merge pull request #3 from kolyaka32/Dev-branch
Music update
2 parents f7f9687 + 5d8fbf8 commit 2dc7042

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+470
-260
lines changed

.gitignore

100644100755
Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
.vscode/
55

66
# Build folder
7-
build/.cmake
8-
build/CMakeFiles
9-
build/cmake_install.cmake
10-
build/CMakeCache.txt
11-
build/compile_commands.json
12-
build/Makefile
13-
build/Testing
14-
*.ini
7+
build/
8+
9+
# Adding create-archieve files in build folder
10+
!build/create-data-file.sh
11+
!build/create-data-file.bat
1512

1613
# Old include libraries
1714
i686-w64-mingw32/
@@ -50,13 +47,14 @@ include/
5047
# Executables
5148
*.exe
5249

50+
# Settings and data file of program
51+
*.dat
52+
*.ini
53+
5354
# Archives
5455
*.7z
5556
*.zip
5657

57-
# Data files
58-
*.dat
59-
6058
# CppCheck folders
6159
codeTester-cppcheck-build-dir/
6260
*.cppcheck

build/create-archieve.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
zip -9u build-tic-tac-toe-unix.zip Chess *.dat
1+
zip -9u build-tic-tac-toe-unix.zip Tic-tak-toe *.dat *.so

img/game/screamer.png

154 KB
Loading

mus/main-calm.mp3

869 KB
Binary file not shown.

mus/main-combat.mp3

806 KB
Binary file not shown.

mus/menu.mp3

1.02 MB
Binary file not shown.

snd/disconnect.wav

261 KB
Binary file not shown.

snd/laugh.wav

59.5 KB
Binary file not shown.

snd/reset.wav

200 KB
Binary file not shown.

snd/turn.wav

17.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)