Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ajeszny
Ajeszny committed May 11, 2024
2 parents dbb8cd9 + f64a743 commit 687ff3c
Show file tree
Hide file tree
Showing 44 changed files with 3,539 additions and 1 deletion.
Binary file added Sprites/bot_attack_up1.bmp
View file
Binary file not shown.
Binary file added Sprites/bot_attack_up2.bmp
View file
Binary file not shown.
Binary file added Sprites/bot_attack_up_0.bmp
View file
Binary file not shown.
Binary file added Sprites/bot_down1.bmp
View file
Binary file not shown.
Binary file added Sprites/bot_down2.bmp
View file
Binary file not shown.
Binary file added Sprites/stand1.bmp
View file
Binary file not shown.
Binary file added Sprites/stand2.bmp
View file
Binary file not shown.
Empty file added cmake-build-release/.cmake/api/v1/query/cache-v2
View file
Empty file.
Empty file added cmake-build-release/.cmake/api/v1/query/cmakeFiles-v1
View file
Empty file.
Empty file added cmake-build-release/.cmake/api/v1/query/codemodel-v2
View file
Empty file.
Empty file added cmake-build-release/.cmake/api/v1/query/toolchains-v1
View file
Empty file.
1,131 changes: 1,131 additions & 0 deletions cmake-build-release/.cmake/api/v1/reply/cache-v2-aac299427d0e4ece2325.json
View file

Large diffs are not rendered by default.

116 changes: 116 additions & 0 deletions cmake-build-release/.cmake/api/v1/reply/cmakeFiles-v1-263ad0c7ed9a38994aab.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
{
"inputs" :
[
{
"path" : "CMakeLists.txt"
},
{
"isGenerated" : true,
"path" : "cmake-build-release/CMakeFiles/3.23.2/CMakeSystem.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/share/cmake-3.23/Modules/CMakeSystemSpecificInitialize.cmake"
},
{
"isGenerated" : true,
"path" : "cmake-build-release/CMakeFiles/3.23.2/CMakeCCompiler.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/share/cmake-3.23/Modules/CMakeSystemSpecificInformation.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/share/cmake-3.23/Modules/CMakeGenericSystem.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/share/cmake-3.23/Modules/CMakeInitializeConfigs.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/share/cmake-3.23/Modules/Platform/Windows.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/share/cmake-3.23/Modules/Platform/WindowsPaths.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/share/cmake-3.23/Modules/CMakeCInformation.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/share/cmake-3.23/Modules/CMakeLanguageInformation.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/share/cmake-3.23/Modules/Compiler/GNU-C.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/share/cmake-3.23/Modules/Compiler/GNU.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/share/cmake-3.23/Modules/Compiler/CMakeCommonCompilerMacros.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/share/cmake-3.23/Modules/Platform/Windows-GNU-C.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/share/cmake-3.23/Modules/Platform/Windows-GNU.cmake"
},
{
"isGenerated" : true,
"path" : "cmake-build-release/CMakeFiles/3.23.2/CMakeRCCompiler.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/share/cmake-3.23/Modules/CMakeRCInformation.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/share/cmake-3.23/Modules/Platform/Windows-windres.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/share/cmake-3.23/Modules/Platform/Windows-GNU-C-ABI.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/share/cmake-3.23/Modules/CMakeCommonLanguageInclude.cmake"
}
],
"kind" : "cmakeFiles",
"paths" :
{
"build" : "C:/Users/vdoro/CLionProjects/GameJam/cmake-build-release",
"source" : "C:/Users/vdoro/CLionProjects/GameJam"
},
"version" :
{
"major" : 1,
"minor" : 0
}
}
60 changes: 60 additions & 0 deletions cmake-build-release/.cmake/api/v1/reply/codemodel-v2-10d3db35ae7202d9092f.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
"configurations" :
[
{
"directories" :
[
{
"build" : ".",
"jsonFile" : "directory-.-Release-d0094a50bb2071803777.json",
"minimumCMakeVersion" :
{
"string" : "3.23"
},
"projectIndex" : 0,
"source" : ".",
"targetIndexes" :
[
0
]
}
],
"name" : "Release",
"projects" :
[
{
"directoryIndexes" :
[
0
],
"name" : "GameJam",
"targetIndexes" :
[
0
]
}
],
"targets" :
[
{
"directoryIndex" : 0,
"id" : "GameJam::@6890427a1f51a3e7e1df",
"jsonFile" : "target-GameJam-Release-34df60d375442fc75471.json",
"name" : "GameJam",
"projectIndex" : 0
}
]
}
],
"kind" : "codemodel",
"paths" :
{
"build" : "C:/Users/vdoro/CLionProjects/GameJam/cmake-build-release",
"source" : "C:/Users/vdoro/CLionProjects/GameJam"
},
"version" :
{
"major" : 2,
"minor" : 4
}
}
14 changes: 14 additions & 0 deletions cmake-build-release/.cmake/api/v1/reply/directory-.-Release-d0094a50bb2071803777.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"backtraceGraph" :
{
"commands" : [],
"files" : [],
"nodes" : []
},
"installers" : [],
"paths" :
{
"build" : ".",
"source" : "."
}
}
108 changes: 108 additions & 0 deletions cmake-build-release/.cmake/api/v1/reply/index-2024-05-11T14-32-42-0934.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
{
"cmake" :
{
"generator" :
{
"multiConfig" : false,
"name" : "Ninja"
},
"paths" :
{
"cmake" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/bin/cmake.exe",
"cpack" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/bin/cpack.exe",
"ctest" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/bin/ctest.exe",
"root" : "C:/Program Files (x86)/CLion 2022.2.4/bin/cmake/win/share/cmake-3.23"
},
"version" :
{
"isDirty" : false,
"major" : 3,
"minor" : 23,
"patch" : 2,
"string" : "3.23.2",
"suffix" : ""
}
},
"objects" :
[
{
"jsonFile" : "codemodel-v2-10d3db35ae7202d9092f.json",
"kind" : "codemodel",
"version" :
{
"major" : 2,
"minor" : 4
}
},
{
"jsonFile" : "cache-v2-aac299427d0e4ece2325.json",
"kind" : "cache",
"version" :
{
"major" : 2,
"minor" : 0
}
},
{
"jsonFile" : "cmakeFiles-v1-263ad0c7ed9a38994aab.json",
"kind" : "cmakeFiles",
"version" :
{
"major" : 1,
"minor" : 0
}
},
{
"jsonFile" : "toolchains-v1-53c07ddc39d483be6882.json",
"kind" : "toolchains",
"version" :
{
"major" : 1,
"minor" : 0
}
}
],
"reply" :
{
"cache-v2" :
{
"jsonFile" : "cache-v2-aac299427d0e4ece2325.json",
"kind" : "cache",
"version" :
{
"major" : 2,
"minor" : 0
}
},
"cmakeFiles-v1" :
{
"jsonFile" : "cmakeFiles-v1-263ad0c7ed9a38994aab.json",
"kind" : "cmakeFiles",
"version" :
{
"major" : 1,
"minor" : 0
}
},
"codemodel-v2" :
{
"jsonFile" : "codemodel-v2-10d3db35ae7202d9092f.json",
"kind" : "codemodel",
"version" :
{
"major" : 2,
"minor" : 4
}
},
"toolchains-v1" :
{
"jsonFile" : "toolchains-v1-53c07ddc39d483be6882.json",
"kind" : "toolchains",
"version" :
{
"major" : 1,
"minor" : 0
}
}
}
}
Loading

0 comments on commit 687ff3c

Please sign in to comment.