diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 2d65970b0a..12aba9d390 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -45,14 +45,6 @@ Copyright: 2014-present, Godot Engine contributors 2007-2014, Juan Linietsky, Ariel Manzur License: Expat -Files: icon.png - icon.svg - logo.png - logo.svg -Comment: Godot Engine logo -Copyright: 2017, Andrea Calabró -License: CC-BY-4.0 - Files: core/math/convex_hull.cpp core/math/convex_hull.h Comment: Bullet Continuous Collision Detection and Physics Library @@ -66,6 +58,11 @@ Comment: Linux AppStream Metadata File Copyright: 2017-2022, Rémi Verschelde License: CC0-1.0 +Files: misc/logo/* +Comment: Godot Engine logo +Copyright: 2017, Andrea Calabró +License: CC-BY-4.0 + Files: modules/betsy/alpha_stitch.glsl modules/betsy/bc1.glsl modules/betsy/bc4.glsl diff --git a/README.md b/README.md index 1df1a587a7..68947d32ef 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

- Godot Engine logo + Godot Engine logo

diff --git a/doc/Doxyfile b/doc/Doxyfile index bd1c940ba7..afcd4a1b3e 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -51,7 +51,7 @@ PROJECT_BRIEF = "Game Engine MIT" # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy # the logo to the output directory. -PROJECT_LOGO = ../logo.png +PROJECT_LOGO = ../misc/logo/logo.png # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is diff --git a/misc/dist/icon_console.svg b/misc/dist/windows/icon_console.svg similarity index 100% rename from misc/dist/icon_console.svg rename to misc/dist/windows/icon_console.svg diff --git a/LOGO_LICENSE.txt b/misc/logo/LICENSE.txt similarity index 100% rename from LOGO_LICENSE.txt rename to misc/logo/LICENSE.txt diff --git a/icon.png b/misc/logo/icon.png similarity index 100% rename from icon.png rename to misc/logo/icon.png diff --git a/icon.svg b/misc/logo/icon.svg similarity index 100% rename from icon.svg rename to misc/logo/icon.svg diff --git a/icon_outlined.png b/misc/logo/icon_outlined.png similarity index 100% rename from icon_outlined.png rename to misc/logo/icon_outlined.png diff --git a/icon_outlined.svg b/misc/logo/icon_outlined.svg similarity index 100% rename from icon_outlined.svg rename to misc/logo/icon_outlined.svg diff --git a/logo.png b/misc/logo/logo.png similarity index 100% rename from logo.png rename to misc/logo/logo.png diff --git a/logo.svg b/misc/logo/logo.svg similarity index 100% rename from logo.svg rename to misc/logo/logo.svg diff --git a/logo_outlined.png b/misc/logo/logo_outlined.png similarity index 100% rename from logo_outlined.png rename to misc/logo/logo_outlined.png diff --git a/logo_outlined.svg b/misc/logo/logo_outlined.svg similarity index 100% rename from logo_outlined.svg rename to misc/logo/logo_outlined.svg diff --git a/misc/scripts/make_icons.sh b/misc/scripts/make_icons.sh index cbb9266055..7e7d5ec3c8 100755 --- a/misc/scripts/make_icons.sh +++ b/misc/scripts/make_icons.sh @@ -6,7 +6,7 @@ for s in 16 24 32 48 64 128 256 512 1024; do convert -resize ${s}x$s -antialias \ -background transparent \ - ../../icon.svg icon$s.png + ../../misc/logo/icon.svg icon$s.png done # 16px tga file for library diff --git a/platform/web/emscripten_helpers.py b/platform/web/emscripten_helpers.py index 37029054f4..612e3e87bb 100644 --- a/platform/web/emscripten_helpers.py +++ b/platform/web/emscripten_helpers.py @@ -81,7 +81,7 @@ def create_template_zip(env, js, wasm, side): # And logo/favicon in_files.append("#misc/dist/html/logo.svg") out_files.append(zip_dir.File("logo.svg")) - in_files.append("#icon.png") + in_files.append("#misc/logo/icon.png") out_files.append(zip_dir.File("favicon.png")) # PWA service_worker = env.Substfile( diff --git a/tests/core/io/test_pck_packer.cpp b/tests/core/io/test_pck_packer.cpp index 4fbe65844d..e3c683486c 100644 --- a/tests/core/io/test_pck_packer.cpp +++ b/tests/core/io/test_pck_packer.cpp @@ -92,13 +92,13 @@ TEST_CASE("[PCKPacker] Pack a PCK file with some files and directories") { pck_packer.add_file("version.py", base_dir.path_join("../version.py"), "version.py") == OK, "Adding a file to the PCK should return an OK error code."); CHECK_MESSAGE( - pck_packer.add_file("some/directories with spaces/to/create/icon.png", base_dir.path_join("../icon.png")) == OK, + pck_packer.add_file("some/directories with spaces/to/create/icon.png", base_dir.path_join("../misc/logo/icon.png")) == OK, "Adding a file to a new subdirectory in the PCK should return an OK error code."); CHECK_MESSAGE( - pck_packer.add_file("some/directories with spaces/to/create/icon.svg", base_dir.path_join("../icon.svg")) == OK, + pck_packer.add_file("some/directories with spaces/to/create/icon.svg", base_dir.path_join("../misc/logo/icon.svg")) == OK, "Adding a file to an existing subdirectory in the PCK should return an OK error code."); CHECK_MESSAGE( - pck_packer.add_file("some/directories with spaces/to/create/icon.png", base_dir.path_join("../logo.png")) == OK, + pck_packer.add_file("some/directories with spaces/to/create/icon.png", base_dir.path_join("../misc/logo/logo.png")) == OK, "Overriding a non-flushed file to an existing subdirectory in the PCK should return an OK error code."); CHECK_MESSAGE( pck_packer.add_file_from_buffer("buffer/new.txt", String("Hello world!").to_utf8_buffer()) == OK,