From 17907bd17d05dfd8ac1832e6fc417e832e772a6a Mon Sep 17 00:00:00 2001 From: Justin Spahr-Summers Date: Mon, 1 Jul 2024 21:28:16 +0100 Subject: [PATCH] Move all asset licenses/acknowledgments to a single top-level file --- LICENSE | 21 ---- LICENSE.md | 117 ++++++++++++++++++ celestials/planets/assets/license.txt | 3 - celestials/stars/assets/license.txt | 3 - .../explosions/assets/textures/LICENSE.txt | 7 -- effects/hyperspace/hyperspace.ogg.import | 19 --- ...{hyperspace.ogg => teleport_02_slowed.ogg} | Bin .../hyperspace/teleport_02_slowed.ogg.import | 19 +++ galaxy/assets/LICENSE.txt | 3 - galaxy/galaxy_map/galaxy_map_hyperlane.tscn | 2 +- galaxy/galaxy_map/galaxy_map_system.tscn | 2 +- game.tscn | 4 +- .../font/Exo2-VariableFont_wght.ttf | Bin .../font/Exo2-VariableFont_wght.ttf.import | 6 +- gui/generic_sounds/LICENSE.txt | 3 - gui/nesia_assets/LICENSE.txt | 3 - .../{Splash.png => Background.png} | Bin ...plash.png.import => Background.png.import} | 0 gui/nesia_assets/font/OFL.txt | 93 -------------- gui/nesia_assets/font/README.txt | 81 ------------ gui/theme.tres | 2 +- project.godot | 2 +- ships/audio/LICENSE.txt | 1 - weapons/blaster/blaster_bolt.tscn | 2 +- weapons/blaster/blaster_fire.mp3.import | 19 --- .../blaster/{blaster_fire.mp3 => laser4.mp3} | Bin weapons/blaster/laser4.mp3.import | 19 +++ 27 files changed, 165 insertions(+), 266 deletions(-) delete mode 100644 LICENSE create mode 100644 LICENSE.md delete mode 100644 celestials/planets/assets/license.txt delete mode 100644 celestials/stars/assets/license.txt delete mode 100644 effects/explosions/assets/textures/LICENSE.txt delete mode 100644 effects/hyperspace/hyperspace.ogg.import rename effects/hyperspace/{hyperspace.ogg => teleport_02_slowed.ogg} (100%) create mode 100644 effects/hyperspace/teleport_02_slowed.ogg.import delete mode 100644 galaxy/assets/LICENSE.txt rename gui/{nesia_assets => }/font/Exo2-VariableFont_wght.ttf (100%) rename gui/{nesia_assets => }/font/Exo2-VariableFont_wght.ttf.import (62%) delete mode 100644 gui/generic_sounds/LICENSE.txt delete mode 100644 gui/nesia_assets/LICENSE.txt rename gui/nesia_assets/backgrounds/{Splash.png => Background.png} (100%) rename gui/nesia_assets/backgrounds/{Splash.png.import => Background.png.import} (100%) delete mode 100644 gui/nesia_assets/font/OFL.txt delete mode 100644 gui/nesia_assets/font/README.txt delete mode 100644 ships/audio/LICENSE.txt delete mode 100644 weapons/blaster/blaster_fire.mp3.import rename weapons/blaster/{blaster_fire.mp3 => laser4.mp3} (100%) create mode 100644 weapons/blaster/laser4.mp3.import diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 8e8c21df..00000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2024 Justin Spahr-Summers - -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 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. diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 00000000..42155526 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,117 @@ +# Code license + +The Merc code is copyright (c) 2024 [Justin Spahr-Summers](https://github.com/jspahrsummers), +and released under the MIT license: + +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 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. + +# Asset licenses + +[Starfield background](https://opengameart.org/content/stars-parallax-backgrounds) created by [Bonsaiheldin](https://opengameart.org/users/bonsaiheldin), licensed under [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/): +- starfield + +--- + +[Ship models and textures](https://v-ktor.itch.io/space-ships) created by [Viktor Hahn](https://v-ktor.itch.io/) (Viktor.Hahn@web.de), licensed under [CC BY 4.0](http://creativecommons.org/licenses/by/4.0/): +- corvette01 +- frigate03 + +--- + +[Star sprites](https://v-ktor.itch.io/star-sprites) created by [Viktor Hahn](https://v-ktor.itch.io/) (Viktor.Hahn@web.de), licensed under [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/): +- star_orange02 +- star_orange03 +- star_red01 +- star_red02 +- star_red03 + +--- + +[Planet sprites](https://v-ktor.itch.io/planet-sprites) created by [Viktor Hahn](https://v-ktor.itch.io/) (Viktor.Hahn@web.de), licensed under [CC BY-SA 4.0 license](https://creativecommons.org/licenses/by-sa/4.0/): +- planet_02 +- planet_04 +- planet_23 +- planet_37 + +--- + +[Explosion sprites](https://matty77.itch.io/explosion-sprite-asset-pack) created by [Matt Lloyd](https://matty77.itch.io/), released with the license: +> - You CAN use this asset pack for commercial and/or personal projects; +> - You CAN edit and modify all content of this asset pack to suit your needs; +> - You CANNOT resell and/or redistribute this asset pack; +- explosion001 +- explosion002 + +--- + +[Chunky Explosion](https://opengameart.org/content/chunky-explosion) sound effect created by [Joth](https://opengameart.org/users/joth), licensed under [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/): +- chunky_explosion + +--- + +[Digital sound effects](https://opengameart.org/content/50-cc0-sci-fi-sfx) created by [rubberduck](https://opengameart.org/users/rubberduck), licensed under [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/): +- explosion_01 +- teleport_02 + +--- + +[Space panorama galaxy](https://pixabay.com/photos/space-panorama-galaxy-cosmos-2638158/) created by [Alex Myers](https://pixabay.com/users/myersalex216-4979749/), licensed under the [Pixabay Content License](https://pixabay.com/service/license-summary/): +- galaxy-panorama + +--- + +[Sci-fi computer sounds and beeps](https://opengameart.org/content/9-sci-fi-computer-sounds-and-beeps) created by Michel Baradari, licensed under [CC BY 3.0](https://creativecommons.org/licenses/by/3.0/): +- itempick1 + +--- + +[UI Sci-Fi Minimalism #03](https://wenrexa.itch.io/nesia03) released by [Wenrexa](https://wenrexa.itch.io/), licensed under [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/): +- IconEnergy +- IconHull +- IconShield + +--- + +[UI Space Minimalism](https://wenrexa.itch.io/nesia04) released by [Wenrexa](https://wenrexa.itch.io/), licensed under [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/): +- Background + +--- + +[Exo 2 font](https://ndiscover.com/exo-2-0/) created by [Natanael Gama](https://ndiscover.com), licensed under the [SIL Open Font License (OFL) version 1.1](https://openfontlicense.org/): +- Exo2-VariableFont_wght + +--- + +[Spaceship Sounds](https://benvibrant.itch.io/spaceship-sounds) created by [Ben Vibrant](https://linktr.ee/benvibrant), purchased for use in this project: +- THRUSTER LOW + +--- + +[Laser Bullets Pack 2020](https://wenrexa.itch.io/laser2020) released by [Wenrexa](https://wenrexa.itch.io/), licensed under [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/): +- blaster_bolt + +--- + +[Digital sound effects](https://opengameart.org/content/63-digital-sound-effects-lasers-phasers-space-etc) created by [Kenney](https://www.kenney.nl/), licensed under [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/): +- laser4 + +--- + +Icon created by [Justin Spahr-Summers](https://github.com/jspahrsummers) for this project, using [Claude](https://claude.ai): +- icon.svg diff --git a/celestials/planets/assets/license.txt b/celestials/planets/assets/license.txt deleted file mode 100644 index 562b9f23..00000000 --- a/celestials/planets/assets/license.txt +++ /dev/null @@ -1,3 +0,0 @@ -This work, made by Viktor Hahn (Viktor.Hahn@web.de), is licensed under the -Creative Commons Attribution-ShareAlike 4.0 International License (CC BY-SA 4.0). -https://creativecommons.org/licenses/by-sa/4.0/ diff --git a/celestials/stars/assets/license.txt b/celestials/stars/assets/license.txt deleted file mode 100644 index 562b9f23..00000000 --- a/celestials/stars/assets/license.txt +++ /dev/null @@ -1,3 +0,0 @@ -This work, made by Viktor Hahn (Viktor.Hahn@web.de), is licensed under the -Creative Commons Attribution-ShareAlike 4.0 International License (CC BY-SA 4.0). -https://creativecommons.org/licenses/by-sa/4.0/ diff --git a/effects/explosions/assets/textures/LICENSE.txt b/effects/explosions/assets/textures/LICENSE.txt deleted file mode 100644 index 625a7afb..00000000 --- a/effects/explosions/assets/textures/LICENSE.txt +++ /dev/null @@ -1,7 +0,0 @@ -https://matty77.itch.io/explosion-sprite-asset-pack - -LICENSE: - - You CAN use this asset pack for commercial and/or personal projects; - You CAN edit and modify all content of this asset pack to suit your needs; - You CANNOT resell and/or redistribute this asset pack; diff --git a/effects/hyperspace/hyperspace.ogg.import b/effects/hyperspace/hyperspace.ogg.import deleted file mode 100644 index 5d7e1781..00000000 --- a/effects/hyperspace/hyperspace.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://cmjfgigj57eie" -path="res://.godot/imported/hyperspace.ogg-23a900d19de925350bb7c01a47982826.oggvorbisstr" - -[deps] - -source_file="res://effects/hyperspace/hyperspace.ogg" -dest_files=["res://.godot/imported/hyperspace.ogg-23a900d19de925350bb7c01a47982826.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0.0 -bpm=0.0 -beat_count=0 -bar_beats=4 diff --git a/effects/hyperspace/hyperspace.ogg b/effects/hyperspace/teleport_02_slowed.ogg similarity index 100% rename from effects/hyperspace/hyperspace.ogg rename to effects/hyperspace/teleport_02_slowed.ogg diff --git a/effects/hyperspace/teleport_02_slowed.ogg.import b/effects/hyperspace/teleport_02_slowed.ogg.import new file mode 100644 index 00000000..48f6e2e0 --- /dev/null +++ b/effects/hyperspace/teleport_02_slowed.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://cmjfgigj57eie" +path="res://.godot/imported/teleport_02_slowed.ogg-a9498f4fae9db85b3bc1070c636fe8dd.oggvorbisstr" + +[deps] + +source_file="res://effects/hyperspace/teleport_02_slowed.ogg" +dest_files=["res://.godot/imported/teleport_02_slowed.ogg-a9498f4fae9db85b3bc1070c636fe8dd.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0.0 +bpm=0.0 +beat_count=0 +bar_beats=4 diff --git a/galaxy/assets/LICENSE.txt b/galaxy/assets/LICENSE.txt deleted file mode 100644 index 443f73cd..00000000 --- a/galaxy/assets/LICENSE.txt +++ /dev/null @@ -1,3 +0,0 @@ -https://pixabay.com/photos/space-panorama-galaxy-cosmos-2638158/ -Created by https://pixabay.com/users/myersalex216-4979749/ -Released under the Pixabay Content License: https://pixabay.com/service/license-summary/ diff --git a/galaxy/galaxy_map/galaxy_map_hyperlane.tscn b/galaxy/galaxy_map/galaxy_map_hyperlane.tscn index f600e751..66d83d4a 100644 --- a/galaxy/galaxy_map/galaxy_map_hyperlane.tscn +++ b/galaxy/galaxy_map/galaxy_map_hyperlane.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=6 format=3 uid="uid://d3lphosly5y8b"] [ext_resource type="Script" path="res://galaxy/galaxy_map/galaxy_map_hyperlane.gd" id="1_qtr5l"] -[ext_resource type="FontFile" uid="uid://cwgggkla4xejt" path="res://gui/nesia_assets/font/Exo2-VariableFont_wght.ttf" id="2_htujy"] +[ext_resource type="FontFile" uid="uid://cwgggkla4xejt" path="res://gui/font/Exo2-VariableFont_wght.ttf" id="2_htujy"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_t1fyw"] diff --git a/galaxy/galaxy_map/galaxy_map_system.tscn b/galaxy/galaxy_map/galaxy_map_system.tscn index 792dc354..8c9497f4 100644 --- a/galaxy/galaxy_map/galaxy_map_system.tscn +++ b/galaxy/galaxy_map/galaxy_map_system.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=7 format=3 uid="uid://ckdnlnrybk4mh"] [ext_resource type="Script" path="res://galaxy/galaxy_map/galaxy_map_system.gd" id="1_jbywj"] -[ext_resource type="FontFile" uid="uid://cwgggkla4xejt" path="res://gui/nesia_assets/font/Exo2-VariableFont_wght.ttf" id="1_yuwvg"] +[ext_resource type="FontFile" uid="uid://cwgggkla4xejt" path="res://gui/font/Exo2-VariableFont_wght.ttf" id="1_yuwvg"] [ext_resource type="Material" uid="uid://wjykkjty1dt5" path="res://galaxy/galaxy_map/galaxy_map_current_mat.tres" id="2_ddy2j"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_j7i3l"] diff --git a/game.tscn b/game.tscn index 12e8f1c2..0e82a1d8 100644 --- a/game.tscn +++ b/game.tscn @@ -7,7 +7,7 @@ [ext_resource type="Resource" uid="uid://bcva4l4cpt70c" path="res://galaxy/main_galaxy.tres" id="3_j76v0"] [ext_resource type="Material" uid="uid://tpd4rufhhe4h" path="res://celestials/starfield/starfield.tres" id="3_vksuy"] [ext_resource type="Script" path="res://effects/hyperspace/hyperspace_effect.gd" id="4_bmy66"] -[ext_resource type="AudioStream" uid="uid://cmjfgigj57eie" path="res://effects/hyperspace/hyperspace.ogg" id="5_jhe1g"] +[ext_resource type="AudioStream" uid="uid://cmjfgigj57eie" path="res://effects/hyperspace/teleport_02_slowed.ogg" id="5_jhe1g"] [ext_resource type="PackedScene" uid="uid://cqxv07b8bwiev" path="res://ships/corvette01/corvette01.tscn" id="6_8inyn"] [ext_resource type="Resource" uid="uid://cew4x137v08q" path="res://galaxy/sol.tres" id="6_es1br"] [ext_resource type="Environment" uid="uid://b7t3opwr35xen" path="res://effects/environment.tres" id="6_srnxb"] @@ -15,7 +15,7 @@ [ext_resource type="PackedScene" uid="uid://2mdsbbko7baw" path="res://galaxy/star_systems/sol.tscn" id="10_vhe4b"] [ext_resource type="Theme" uid="uid://r4w2xa3q1twa" path="res://gui/theme.tres" id="11_x7io4"] [ext_resource type="Script" path="res://gui/control_scheme_button.gd" id="12_ti545"] -[ext_resource type="FontFile" uid="uid://cwgggkla4xejt" path="res://gui/nesia_assets/font/Exo2-VariableFont_wght.ttf" id="13_8snbk"] +[ext_resource type="FontFile" uid="uid://cwgggkla4xejt" path="res://gui/font/Exo2-VariableFont_wght.ttf" id="13_8snbk"] [ext_resource type="Script" path="res://gui/in_game_gui.gd" id="14_hh3no"] [ext_resource type="Script" path="res://gui/system_name.gd" id="14_lhpn8"] [ext_resource type="Script" path="res://gui/jump_destination_name.gd" id="15_xo6uu"] diff --git a/gui/nesia_assets/font/Exo2-VariableFont_wght.ttf b/gui/font/Exo2-VariableFont_wght.ttf similarity index 100% rename from gui/nesia_assets/font/Exo2-VariableFont_wght.ttf rename to gui/font/Exo2-VariableFont_wght.ttf diff --git a/gui/nesia_assets/font/Exo2-VariableFont_wght.ttf.import b/gui/font/Exo2-VariableFont_wght.ttf.import similarity index 62% rename from gui/nesia_assets/font/Exo2-VariableFont_wght.ttf.import rename to gui/font/Exo2-VariableFont_wght.ttf.import index 5b3e201d..57e432a5 100644 --- a/gui/nesia_assets/font/Exo2-VariableFont_wght.ttf.import +++ b/gui/font/Exo2-VariableFont_wght.ttf.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://cwgggkla4xejt" -path="res://.godot/imported/Exo2-VariableFont_wght.ttf-f13794652e81c5784d24091952f6def5.fontdata" +path="res://.godot/imported/Exo2-VariableFont_wght.ttf-d76156a0d61c410d18a2641da7e8748a.fontdata" [deps] -source_file="res://gui/nesia_assets/font/Exo2-VariableFont_wght.ttf" -dest_files=["res://.godot/imported/Exo2-VariableFont_wght.ttf-f13794652e81c5784d24091952f6def5.fontdata"] +source_file="res://gui/font/Exo2-VariableFont_wght.ttf" +dest_files=["res://.godot/imported/Exo2-VariableFont_wght.ttf-d76156a0d61c410d18a2641da7e8748a.fontdata"] [params] diff --git a/gui/generic_sounds/LICENSE.txt b/gui/generic_sounds/LICENSE.txt deleted file mode 100644 index bab90290..00000000 --- a/gui/generic_sounds/LICENSE.txt +++ /dev/null @@ -1,3 +0,0 @@ -Author: Michel Baradari -CC-BY 3.0 -https://opengameart.org/content/9-sci-fi-computer-sounds-and-beeps diff --git a/gui/nesia_assets/LICENSE.txt b/gui/nesia_assets/LICENSE.txt deleted file mode 100644 index 709c4c0f..00000000 --- a/gui/nesia_assets/LICENSE.txt +++ /dev/null @@ -1,3 +0,0 @@ -https://wenrexa.itch.io/nesia03 -https://wenrexa.itch.io/nesia04 -Creative Commons Zero v1.0 Universal diff --git a/gui/nesia_assets/backgrounds/Splash.png b/gui/nesia_assets/backgrounds/Background.png similarity index 100% rename from gui/nesia_assets/backgrounds/Splash.png rename to gui/nesia_assets/backgrounds/Background.png diff --git a/gui/nesia_assets/backgrounds/Splash.png.import b/gui/nesia_assets/backgrounds/Background.png.import similarity index 100% rename from gui/nesia_assets/backgrounds/Splash.png.import rename to gui/nesia_assets/backgrounds/Background.png.import diff --git a/gui/nesia_assets/font/OFL.txt b/gui/nesia_assets/font/OFL.txt deleted file mode 100644 index 4d5027df..00000000 --- a/gui/nesia_assets/font/OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright (c) 2013, Natanael Gama (www.ndiscovered.com . info(at)ndiscovered.com), with Reserved Font Name 'Exo' - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/gui/nesia_assets/font/README.txt b/gui/nesia_assets/font/README.txt deleted file mode 100644 index f2d6e4b6..00000000 --- a/gui/nesia_assets/font/README.txt +++ /dev/null @@ -1,81 +0,0 @@ -Exo 2 Variable Font -=================== - -This download contains Exo 2 as both variable fonts and static fonts. - -Exo 2 is a variable font with this axis: - wght - -This means all the styles are contained in these files: - Exo2-VariableFont_wght.ttf - Exo2-Italic-VariableFont_wght.ttf - -If your app fully supports variable fonts, you can now pick intermediate styles -that aren’t available as static fonts. Not all apps support variable fonts, and -in those cases you can use the static font files for Exo 2: - static/Exo2-Thin.ttf - static/Exo2-ExtraLight.ttf - static/Exo2-Light.ttf - static/Exo2-Regular.ttf - static/Exo2-Medium.ttf - static/Exo2-SemiBold.ttf - static/Exo2-Bold.ttf - static/Exo2-ExtraBold.ttf - static/Exo2-Black.ttf - static/Exo2-ThinItalic.ttf - static/Exo2-ExtraLightItalic.ttf - static/Exo2-LightItalic.ttf - static/Exo2-Italic.ttf - static/Exo2-MediumItalic.ttf - static/Exo2-SemiBoldItalic.ttf - static/Exo2-BoldItalic.ttf - static/Exo2-ExtraBoldItalic.ttf - static/Exo2-BlackItalic.ttf - -Get started ------------ - -1. Install the font files you want to use - -2. Use your app's font picker to view the font family and all the -available styles - -Learn more about variable fonts -------------------------------- - - https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts - https://variablefonts.typenetwork.com - https://medium.com/variable-fonts - -In desktop apps - - https://theblog.adobe.com/can-variable-fonts-illustrator-cc - https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts - -Online - - https://developers.google.com/fonts/docs/getting_started - https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide - https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts - -Installing fonts - - MacOS: https://support.apple.com/en-us/HT201749 - Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux - Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows - -Android Apps - - https://developers.google.com/fonts/docs/android - https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts - -License -------- -Please read the full license text (OFL.txt) to understand the permissions, -restrictions and requirements for usage, redistribution, and modification. - -You can use them freely in your products & projects - print or digital, -commercial or otherwise. - -This isn't legal advice, please consider consulting a lawyer and see the full -license for all details. diff --git a/gui/theme.tres b/gui/theme.tres index 4b74ba21..bc147716 100644 --- a/gui/theme.tres +++ b/gui/theme.tres @@ -1,6 +1,6 @@ [gd_resource type="Theme" load_steps=2 format=3 uid="uid://r4w2xa3q1twa"] -[ext_resource type="FontFile" uid="uid://cwgggkla4xejt" path="res://gui/nesia_assets/font/Exo2-VariableFont_wght.ttf" id="1_3xdqw"] +[ext_resource type="FontFile" uid="uid://cwgggkla4xejt" path="res://gui/font/Exo2-VariableFont_wght.ttf" id="1_3xdqw"] [resource] default_font = ExtResource("1_3xdqw") diff --git a/project.godot b/project.godot index 8f398fce..e9f83f2a 100644 --- a/project.godot +++ b/project.godot @@ -15,7 +15,7 @@ run/main_scene="res://game.tscn" config/use_custom_user_dir=true config/features=PackedStringArray("4.2", "GL Compatibility") boot_splash/bg_color=Color(0.0509804, 0.0666667, 0.101961, 1) -boot_splash/image="res://gui/nesia_assets/backgrounds/Splash.png" +boot_splash/image="res://gui/nesia_assets/backgrounds/Background.png" config/icon="res://icon.svg" [autoload] diff --git a/ships/audio/LICENSE.txt b/ships/audio/LICENSE.txt deleted file mode 100644 index 11543a6a..00000000 --- a/ships/audio/LICENSE.txt +++ /dev/null @@ -1 +0,0 @@ -https://benvibrant.itch.io/spaceship-sounds diff --git a/weapons/blaster/blaster_bolt.tscn b/weapons/blaster/blaster_bolt.tscn index d1270b6b..4b3be000 100644 --- a/weapons/blaster/blaster_bolt.tscn +++ b/weapons/blaster/blaster_bolt.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" path="res://weapons/blaster/blaster_bolt.gd" id="1_lhj56"] [ext_resource type="PackedScene" uid="uid://cp0b07jvhi5a" path="res://effects/explosions/explosion001.tscn" id="2_lqot8"] [ext_resource type="Texture2D" uid="uid://lyur31oafltf" path="res://weapons/blaster/blaster_bolt.png" id="3_c2tch"] -[ext_resource type="AudioStream" uid="uid://cscjfy7e1dy78" path="res://weapons/blaster/blaster_fire.mp3" id="4_we7w6"] +[ext_resource type="AudioStream" uid="uid://cscjfy7e1dy78" path="res://weapons/blaster/laser4.mp3" id="4_we7w6"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_5b1vh"] diff --git a/weapons/blaster/blaster_fire.mp3.import b/weapons/blaster/blaster_fire.mp3.import deleted file mode 100644 index d06a321f..00000000 --- a/weapons/blaster/blaster_fire.mp3.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -uid="uid://cscjfy7e1dy78" -path="res://.godot/imported/blaster_fire.mp3-1eebd30979a046047db1d84652b401b2.mp3str" - -[deps] - -source_file="res://weapons/blaster/blaster_fire.mp3" -dest_files=["res://.godot/imported/blaster_fire.mp3-1eebd30979a046047db1d84652b401b2.mp3str"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/weapons/blaster/blaster_fire.mp3 b/weapons/blaster/laser4.mp3 similarity index 100% rename from weapons/blaster/blaster_fire.mp3 rename to weapons/blaster/laser4.mp3 diff --git a/weapons/blaster/laser4.mp3.import b/weapons/blaster/laser4.mp3.import new file mode 100644 index 00000000..c1d62a62 --- /dev/null +++ b/weapons/blaster/laser4.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://cscjfy7e1dy78" +path="res://.godot/imported/laser4.mp3-c6d415d764851a32b7a19b98b78f636a.mp3str" + +[deps] + +source_file="res://weapons/blaster/laser4.mp3" +dest_files=["res://.godot/imported/laser4.mp3-c6d415d764851a32b7a19b98b78f636a.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4