Zeronaut/BeagleRescue
Template
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolved merge conflicts on README and gitignore

Browse Source
This commit is contained in:
Alan Youngblood 2021-01-29 21:36:19 -05:00
commit e89d9c577f
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -48,7 +48,6 @@
# Linker output
*.ilk
#*.map
*.exp
# Precompiled Headers

9
README.md
View File

@ -1,7 +1,3 @@
# README.md
===
<<<<<<< HEAD
# Beagle Rescue Game
---
Global Game Jam 2021 theme: Lost and Found
@ -9,8 +5,3 @@ A 2D platformer where you rescue lost puppies
By:
Alan Youngblood
Simon Zaleski
=======
# Graveyard Shift Game
---
This is a project that was originally started with the Q3 2019 ClockworkPi Game Jam. The theme was "Shift" and this game idea is essentially a tower defense where you play as an owl that sets traps during the day then during the "Graveyard Shift" at night robber rodents try to steal treasure from the burial sites. The owl can also do a swoop attack to scare off the rodents during the night time. Traps can only be set during the day.
>>>>>>> origin/master