From 721a3f34dda9754cc49ff65886a81ab4d1d5721a Mon Sep 17 00:00:00 2001 From: Austin Morlan Date: Tue, 2 Aug 2022 09:43:33 -0700 Subject: [PATCH 1/2] Update README --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index d47301b..834f3a4 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,15 @@ Game created to learn more about game design, gameplay programming, and asset creation. +The [master branch](https://code.austinmorlan.com/austin/untitled-game/src/branch/master) contains +the code as it was on May 15th with highly game-specific code for the gameplay. + +The [engine-work branch](https://code.austinmorlan.com/austin/untitled-game/src/branch/engine-work) +contains many engine and Blender export changes in anticipation of making things more generic and +usable in future projects. + Here are some blog posts about it: + * [Pre-Production](https://austinmorlan.com/posts/untitled_game_devlog_0/) * [Four Week Update](https://austinmorlan.com/posts/untitled_game_devlog_1/) * [Eight Week Update](https://austinmorlan.com/posts/untitled_game_devlog_2/) From 4c584102e632976e5a7d0c17b42a5e22952536d2 Mon Sep 17 00:00:00 2001 From: Austin Morlan Date: Thu, 4 Aug 2022 16:25:32 -0700 Subject: [PATCH 2/2] Add license --- LICENSE | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e392149 --- /dev/null +++ b/LICENSE @@ -0,0 +1,22 @@ +MIT License + +Copyright (c) 2022 Austin Morlan + +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 (including the next +paragraph) 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. +