Zeronaut/KaijuSaveEarth
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up various files

Browse Source
This commit is contained in:
Alan Youngblood 2023-08-01 16:58:06 -04:00
parent d51cd1d65c
commit 9d61bcf621
3 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitignore vendored
View File

@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
# ---> KDevelop4 # ---> KDevelop4
#*.kdev4 #*.kdev4
#.kdev4/ #.kdev4/
@ -7,7 +5,6 @@
# ---> build artifacts # ---> build artifacts
build/* build/*
>>>>>>> master
# ---> C++ # ---> C++
# Prerequisites # Prerequisites
*.d *.d
@ -54,10 +51,7 @@ build/*
# Linker output # Linker output
*.ilk *.ilk
<<<<<<< HEAD
*.map *.map
=======
>>>>>>> master
*.exp *.exp
# Precompiled Headers # Precompiled Headers
@ -99,7 +93,6 @@ Module.symvers
Mkfile.old Mkfile.old
dkms.conf dkms.conf
<<<<<<< HEAD
# ---> CMake # ---> CMake
CMakeLists.txt.user CMakeLists.txt.user
CMakeCache.txt CMakeCache.txt
@ -112,8 +105,6 @@ install_manifest.txt
compile_commands.json compile_commands.json
CTestTestfile.cmake CTestTestfile.cmake
_deps _deps
=======
# CMake artifacts # CMake artifacts
CMakeCache.txt CMakeCache.txt
>>>>>>> master

15
LICENSE
View File

@ -1,15 +1,7 @@
<<<<<<< HEAD =======
MIT License MIT License
Copyright (c) <year> <copyright holders> Copyright (c) 2023 Alan Youngblood
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
=======
MIT License Copyright (c) 2023 Alan Youngblood
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
@ -28,4 +20,5 @@ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>>>>>>> master
=======

7
README.md
View File

@ -1,9 +1,3 @@
<<<<<<< HEAD
# KaijuSaveEarth
LowRezJam 2023
Kaiju Save Earth
A game where you play as a giant monster trying to save as many humans as possible before they destroy themselves and the world!
======= =======
# Kaiju Save Earth # Kaiju Save Earth
--- ---
@ -13,4 +7,3 @@ A game where you play as a giant monster (Kaiju) who must save all the humans fr
By: By:
Alan Youngblood Alan Youngblood
>>>>>>> master