Skip to content

Commit

Permalink
Temp logo (#63)
Browse files Browse the repository at this point in the history
* Track file as LFS

* Add Potato logo

* Cleanup README a bit

* Try to avoid triggering CI for documentation update
  • Loading branch information
Sean Middleditch committed Apr 13, 2019
1 parent 0a64b60 commit 331429a
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 37 deletions.
12 changes: 11 additions & 1 deletion .gitattributes
@@ -1,3 +1,13 @@
* text=auto
*.bat text eol=crlf
*.sh text eol=lf
*.sh text eol=lf
*.png filter=lfs diff=lfs merge=lfs -text
*.obj filter=lfs diff=lfs merge=lfs -text
*.dll filter=lfs diff=lfs merge=lfs -text
*.o filter=lfs diff=lfs merge=lfs -text
*.lib filter=lfs diff=lfs merge=lfs -text
*.a filter=lfs diff=lfs merge=lfs -text
*.svg filter=lfs diff=lfs merge=lfs -text
*.tga filter=lfs diff=lfs merge=lfs -text
*.bin filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
24 changes: 15 additions & 9 deletions README.md
@@ -1,11 +1,23 @@
The Engine Formerly Known as Grimm
The Game Engine Formerly Known as Grimm <br>
Possibly Known as UnderPotatoes
Also goes by Bob

<img title="Powered by a Potato" src="./documentation/images/potato.svg" width="128"/>

Documentation
-------------

- [Getting Started](./documentation/getting-started.md)
- [Coding Guidelines](./documentation/coding-style.md)

Status
------

[![Build Status](https://seanmiddleditch.visualstudio.com/grimm/_apis/build/status/Build%20Grimm?branchName=master)](https://seanmiddleditch.visualstudio.com/grimm/_build/latest?definitionId=5&branchName=master)

Authors
-------

- Sean Middleditch <sean.middleditch+grimm@gmail.com>
Sean Middleditch (sean.middleditch+grimm@gmail.com)

License
-------
Expand All @@ -16,9 +28,3 @@ The above copyright notice and this permission notice shall be included in all c

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.

Documentation
-------------

- [Getting Started](./documentation/getting-started.md)
- [Coding Guidelines](./documentation/coding-style.md)

5 changes: 4 additions & 1 deletion azure-pipelines.yml
Expand Up @@ -6,7 +6,10 @@ trigger:
- releases/*
paths:
exclude:
- ci/
- documentation/
- resources/
- README.md
- License.txt

pr:
autoCancel: true
Expand Down
3 changes: 3 additions & 0 deletions documentation/images/potato.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 3 additions & 26 deletions resources/meshes/cube.obj
Git LFS file not shown
Binary file modified resources/textures/test.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 331429a

Please sign in to comment.