Skip to content

Commit

Permalink
large clean & refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
florianvazelle committed Nov 1, 2024
1 parent 67446ca commit e7c04af
Show file tree
Hide file tree
Showing 98 changed files with 2,828 additions and 1,182 deletions.
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ GODOT_VERSION=4.3-stable

# Game

GAME_NAME=Greeter
GAME_NAME=GraveyardInvaders
GAME_VERSION=0.1.0
GAME_ITCHIO_KEY=greeter
GAME_ITCHIO_KEY=graveyard-invaders
33 changes: 32 additions & 1 deletion .reuse/dep5
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Greeter
Upstream-Name: GraveyardInvaders
Upstream-Contact: Florian Vazelle <[email protected]>
Source: https://github.com/MechanicalFlower/game-template

Files: *
Copyright: 2024 Florian Vazelle
License: MIT

Files: **/*.import
Copyright: none
License: CC0-1.0

# Addons

Files: addons/gd-plug/*
Expand Down Expand Up @@ -39,20 +43,36 @@ Copyright: 2019 HungryProton
License: MIT
Source: https://github.com/HungryProton/scatter

Files: addons/beehave/*
Copyright: 2023 bitbrain
License: MIT
Source: https://github.com/bitbrain/beehave

# Models

Files: assets/models/graveyard/*
Copyright: 2022 Kenney
License: CC0-1.0
Source: https://www.kenney.nl/

Files: assets/models/smashed_characters/*
Copyright: 2022 Kenney
License: CC0-1.0
Source: https://www.kenney.nl/
Note: Edited by me in blender with Cell Fracture

# Textures

Files: assets/textures/icons/*
Copyright: 2023 Icons8
License: LicenseRef-linksware
Source: https://icons8.com/

Files: assets/textures/bars/*
Copyright: 2014 Kenney
License: CC0-1.0
Source: https://www.kenney.nl/

# Files: assets/icon.png
# Copyright: 2024 Pro_Rookie_Gamer
# License:
Expand Down Expand Up @@ -93,3 +113,14 @@ Files: shaders/highlight.gdshader
Copyright: 2022 OzMaister
License: MIT
Source: https://godotshaders.com/shader/collectable-item-shining-highlight/

Files: shaders/blink.gdshader
Copyright: 2024 Gherghetta
License: CC0-1.0
Source: https://godotshaders.com/shader/blinking-bomb-countdown/
Note: Edited by me

Files: shaders/sky.gdshader
Copyright: 2022 afk
License: CC0-1.0
Source: https://godotshaders.com/shader/sokpop-skybox/
5 changes: 0 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,9 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

## [Unreleased]
### Added
- Add web deploy ([#8](https://github.com/MechanicalFlower/godot-template/pull/8))
- Automating Godot updates with renovate ([#12](https://github.com/MechanicalFlower/godot-template/pull/12))
### Changed
- Use Justfile as command runner ([#7](https://github.com/MechanicalFlower/godot-template/pull/7))
### Deprecated
### Removed
### Fixed
### Security
### Dependencies

[Unreleased]: https://github.com/MechanicalFlower/godot-template/compare/0.1.0...HEAD
5 changes: 5 additions & 0 deletions CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
- "[addons/destruction/*](https://github.com/Jummit/godot-destruction-plugin)" by **Jummit and contributors** licensed under [MIT](./LICENSES/MIT.txt)
- "[addons/post_processing/*](https://github.com/ItsKorin/Godot-Post-Process-Plugin)" by **Korin** licensed under [MIT](./LICENSES/MIT.txt)
- "[addons/proton_scatter/*](https://github.com/HungryProton/scatter)" by **HungryProton** licensed under [MIT](./LICENSES/MIT.txt)
- "[addons/beehave/*](https://github.com/bitbrain/beehave)" by **bitbrain** licensed under [MIT](./LICENSES/MIT.txt)
## Models
- "[assets/models/graveyard/*](https://www.kenney.nl/)" by **Kenney** licensed under [CC0-1.0](./LICENSES/CC0-1.0.txt)
- "[assets/models/smashed_characters/*](https://www.kenney.nl/)" by **Kenney** licensed under [CC0-1.0](./LICENSES/CC0-1.0.txt)
## Textures
- "[assets/textures/icons/*](https://icons8.com/)" by **Icons8** licensed under [LicenseRef-linksware](./LICENSES/LicenseRef-linksware.txt)
- "[assets/textures/bars/*](https://www.kenney.nl/)" by **Kenney** licensed under [CC0-1.0](./LICENSES/CC0-1.0.txt)
## Fonts
- "[assets/fonts/bad.ttf](https://www.dafont.com/fr/bad.font)" by **Santiago Merino** licensed under [CC0-1.0](./LICENSES/CC0-1.0.txt)
## Sounds
Expand All @@ -20,3 +23,5 @@
- "[assets/sounds/sfx/hit/*.ogg](https://opengameart.org/content/5-hit-sounds-dying)" by **TinyWorlds** licensed under [CC0-1.0](./LICENSES/CC0-1.0.txt)
## Shaders
- "[shaders/highlight.gdshader](https://godotshaders.com/shader/collectable-item-shining-highlight/)" by **OzMaister** licensed under [MIT](./LICENSES/MIT.txt)
- "[shaders/blink.gdshader](https://godotshaders.com/shader/blinking-bomb-countdown/)" by **Gherghetta** licensed under [CC0-1.0](./LICENSES/CC0-1.0.txt)
- "[shaders/sky.gdshader](https://godotshaders.com/shader/sokpop-skybox/)" by **afk** licensed under [CC0-1.0](./LICENSES/CC0-1.0.txt)
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright © 2022-present Florian Vazelle
Copyright © 2024-present Florian Vazelle

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:

Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@

<div align="center">

# 🕯️ MelonCrusade
# 🕯️ Graveyard Invaders

![Godot Badge](https://img.shields.io/badge/godot-4.3-blue?logo=Godot-Engine&logoColor=white)
![license](https://img.shields.io/badge/license-MIT-green?logo=open-source-initiative&logoColor=white)
![reuse](./.reuse/REUSE-compliant.svg)

A boss rush game, made with [Godot Engine](https://godotengine.org/).

<a href="https://github.com/mechanicalflower/MelonCrusade/releases/" target="_blank"><img src="public/publishing/store/github.webp" alt="Download on Github" height="40px" ></a>
<a href="https://mechanical-flower.itch.io/meloncrusade" target="_blank"><img src="public/publishing/store/itchio.webp" alt="Download on itch.io" height="40px" ></a>
<a href="https://github.com/mechanicalflower/GraveyardInvaders/releases/" target="_blank"><img src="public/publishing/store/github.webp" alt="Download on Github" height="40px" ></a>
<a href="https://mechanical-flower.itch.io/graveyardinvaders" target="_blank"><img src="public/publishing/store/itchio.webp" alt="Download on itch.io" height="40px" ></a>

</div>

## About

Dodge traffic on a busy road, then cross a river by jumping on floating logs and climb a rock to reach the melon.
Dodge, attack, and survive against spooky monsters!

## Installation

Expand All @@ -27,9 +27,9 @@ on the Github repository, in the release section.

Download the zip archive, accordingly to your OS, and unzip it.

- **Windows**: Double click on `MelonCrusade.exe`.
- **MacOS**: Double click on `MelonCrusade.app`.
- **Linux**: In a terminal, run `./MelonCrusade.x86_64`.
- **Windows**: Double click on `GraveyardInvaders.exe`.
- **MacOS**: Double click on `GraveyardInvaders.app`.
- **Linux**: In a terminal, run `./GraveyardInvaders.x86_64`.

### From source

Expand All @@ -39,7 +39,7 @@ Download the zip archive, accordingly to your OS, and unzip it.
Clone the source locally:
```
git clone https://github.com/MechanicalFlower/MelonCrusade.git
git clone https://github.com/MechanicalFlower/GraveyardInvaders.git
```

You need to install addons first:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://ttxp3qmptw23"
path.s3tc="res://.godot/imported/colormap.png-1ad00174e3487624ac61d35c0894422c.s3tc.ctex"
path.etc2="res://.godot/imported/colormap.png-1ad00174e3487624ac61d35c0894422c.etc2.ctex"
path.s3tc="res://.godot/imported/colormap.png-9e52a184fb7384ac07173d538bbec0b7.s3tc.ctex"
path.etc2="res://.godot/imported/colormap.png-9e52a184fb7384ac07173d538bbec0b7.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}

[deps]

source_file="res://assets/models/graveyard/Textures/colormap.png"
dest_files=["res://.godot/imported/colormap.png-1ad00174e3487624ac61d35c0894422c.s3tc.ctex", "res://.godot/imported/colormap.png-1ad00174e3487624ac61d35c0894422c.etc2.ctex"]
source_file="res://assets/models/graveyard/textures/colormap.png"
dest_files=["res://.godot/imported/colormap.png-9e52a184fb7384ac07173d538bbec0b7.s3tc.ctex", "res://.godot/imported/colormap.png-9e52a184fb7384ac07173d538bbec0b7.etc2.ctex"]

[params]

Expand Down
2 changes: 2 additions & 0 deletions assets/models/map/graveyard.mtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Blender 3.6.17 MTL File: 'map.blend'
# www.blender.org
Loading

0 comments on commit e7c04af

Please sign in to comment.