Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BuH fight update #49

Merged
merged 4 commits into from
Oct 6, 2024
Merged

BuH fight update #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41c19ca
buh fight update
TinyTakinTeller Oct 1, 2024
3addc4a
end scene
TinyTakinTeller Oct 6, 2024
513e4e3
Merge branch 'master' into buh_fight
TinyTakinTeller Oct 6, 2024
70edfc8
resolve conflict
TinyTakinTeller Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Project License(s) (Mixes)
## Project License(s) (MIXED)

See various licenses listed in this file.
See various licenses listed in this file.

See details of individual licenses in their respective *.txt files (see project files).

Expand Down Expand Up @@ -56,6 +56,7 @@ SEE VARIOUS LICENSES CONTAINED WITHIN RESPECTIVE DIRECTORIES UNDER "resources/"
- resource "2D Radial Distortion – Fisheye/Barrel" (radial_distortion.gdshader) by jamesfrize licensed under CC0 1.0 (https://creativecommons.org/publicdomain/zero/1.0/)
- resource "Chromatic Aberration" (chromatic_abberation_radial.gdshader) by hayden licensed under CC0 1.0 (https://creativecommons.org/publicdomain/zero/1.0/)
- resource "Cracked Glass" (cracked_glass.gdshader) by rupti licensed under CC0 1.0 (https://creativecommons.org/publicdomain/zero/1.0/)
- resource "Starry Sky" (starry_sky.gdshader) by breadpack licensed under MIT (https://opensource.org/license/mit)



Expand Down Expand Up @@ -89,4 +90,7 @@ audio music tracks ["axes_arr_mstr_loop.mp3", "forest_arr_mstr_loop.mp3", "stron

## Godot License(s)

- https://godotengine.org/license/
- https://godotengine.org/license/



Loading
Loading