.kdev4/BeagleRescue.git.kdev4

@@ -1,6 +1,5 @@
-<<<<<<< HEAD
 [Buildset]
-BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00 \x00B\x00e\x00a\x00g\x00l\x00e\x00R\x00e\x00s\x00c\x00u\x00e\x00.\x00g\x00i\x00t)
+BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00\x18\x00B\x00e\x00a\x00g\x00l\x00e\x00R\x00e\x00s\x00c\x00u\x00e)
 
 [CMake]
 Build Directory Count=1
@@ -13,7 +12,7 @@ CMake Binary=/usr/bin/cmake
 CMake Executable=/usr/bin/cmake
 Environment Profile=
 Extra Arguments=
-Install Directory=
+Install Directory=/usr/local
 Runtime=Host System
 
 [CustomDefinesAndIncludes][ProjectPath0]
@@ -61,34 +60,3 @@ isExecutable=true
 
 [Project]
 VersionControlSupport=kdevgit
-||||||| 8aa7974
-=======
-[Buildset]
-BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00 \x00B\x00e\x00a\x00g\x00l\x00e\x00R\x00e\x00s\x00c\x00u\x00e\x00.\x00g\x00i\x00t)
-
-[CMake]
-Build Directory Count=1
-Current Build Directory Index-Host System=0
-
-[CMake][CMake Build Directory 0]
-Build Directory Path=/home/ayoungblood/projects/BeagleRescue.git/build
-Build Type=Release
-CMake Binary=/usr/bin/cmake
-CMake Executable=/usr/bin/cmake
-Environment Profile=
-Extra Arguments=
-Install Directory=
-Runtime=Host System
-
-[Launch]
-Launch Configurations=Launch Configuration 0
-
-[Launch][Launch Configuration 0]
-Configured Launch Modes=execute
-Configured Launchers=nativeAppLauncher
-Name=New Compiled Binary Launcher
-Type=Native Application
-
-[Project]
-VersionControlSupport=kdevgit
->>>>>>> a3d13f32a5f0e4e11c618a4c3d524fd52fc0ed08

BeagleRescue.git.kdev4

@@ -0,0 +1,4 @@
+[Project]
+CreatedFrom=CMakeLists.txt
+Manager=KDevCMakeManager
+Name=BeagleRescue

BeagleRescue.kdev4

@@ -1,5 +1,5 @@
 [Project]
 CreatedFrom=CMakeLists.txt
 Manager=KDevCMakeManager
-Name=KaijuSaveEarth
+Name=BeagleRescue
 VersionControl=%{VERSIONCONTROLPLUGIN}

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.25.1)
-project(KaijuSaveEarth VERSION 1.0.0 )
+project(BeagleRescue VERSION 1.0.0 )
 
 #set(CMAKE_CXX_STANDARD 11) # old requirements
 set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to be used") # new requirements for tileson
@@ -15,13 +15,43 @@ PKG_SEARCH_MODULE(SDL2MIXER REQUIRED SDL2_mixer>=2.0.0)
 # Point to our own cmake modules
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/sdl2)
 
+# Find SDL2
+# find_package(SDL2 REQUIRED)
+#find_file(SDL2_INCLUDE_DIR NAME SDL.h HINTS SDL2)
+#find_library(SDL2_LIBRARY NAME SDL2)
+#find_package(SDL2_image REQUIRED)
+#find_package(SDL2_mixer REQUIRED)
+
+#add_subdirectory(libtmx-parser)
+#add_library(libtmx-parser)
+#       target_sources(libtmx-parser
+#       PRIVATE
+#                    $(CMAKE_CURRENT_LIST_DIR)/libtmx-parser/src/base64.h
+#                    $(CMAKE_CURRENT_LIST_DIR)/libtmx-parser/src/base64.cpp
+#                    $(CMAKE_CURRENT_LIST_DIR)/libtmx-parser/src/tmxparser.cpp
+#       PUBLIC
+#                    $(CMAKE_CURRENT_LIST_DIR)/libtmx-parser/src/tmxparser.h
+#       )
+
+#set(TMXPARSER "tmxparser")
+#FetchContent_Declare(
+#                    tmxparser
+#                    GIT_REPOSITORY "https://github.com/halsafar/libtmx-parser"
+#                    GIT_TAG "master"
+#                    )
+#FetchContent_MakeAvailable(tmxparser)
+
 # Add global definitions
 add_definitions("-Wall")
 include_directories(${PROJECT_NAME} ${SDL2_INCLUDE_DIRS} ${SDL2IMAGE_INCLUDE_DIRS} ${SDL2MIXER_INCLUDE_DIRS})
 #add_custom_target(${TMXPARSER})
 
+# add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libtmx-parser/)
+
 file(GLOB_RECURSE CSOURCES src/cjson/*.c)
 file(GLOB_RECURSE CPPSOURCES src/*.cpp)
+# file(GLOB_RECURSE TMXSOURCES libtmx-parser/src/*.cpp)
+#add_dependencies(${PROJECT_NAME} ${TMXPARSER})
 
 add_executable(${PROJECT_NAME} ${CSOURCES} ${CPPSOURCES})
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)

LICENSE

@@ -1,4 +1,4 @@
-MIT License Copyright (c) 2023 Alan Youngblood
+MIT License Copyright (c) <year> <copyright holders>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,8 +1,7 @@
-# Kaiju Save Earth
+# Beagle Rescue Game
 ---
-Low Rez Jam 2023
-
-A game where you play as a giant monster (Kaiju) who must save all the humans from destroying themselves and the world by catching them and safely stowing them on your back. 
-
+Global Game Jam 2021 theme: Lost and Found
+A 2D platformer where you rescue lost puppies
 By:
 Alan Youngblood
+Simon Zaleski