From b01c1117f82d11eff3ed337bb480969b7561a044 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 31 Dec 2022 19:33:03 +0100 Subject: [PATCH] Cleaned up / updated the license files. --- COPYRIGHT.txt | 21 +++++---------------- LOGO_LICENSE.md | 3 ++- thirdparty/README.md | 45 -------------------------------------------- 3 files changed, 7 insertions(+), 62 deletions(-) diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 77b0d29b4..e2ddd0eb5 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -43,17 +43,18 @@ Source: https://github.com/godotengine/godot Files: * Comment: Pandemonium Engine -Copyright: Copyright (c) 2022 Péter Magyar. - 2007-2022, Juan Linietsky, Ariel Manzur. +Copyright: 2007-2022, Juan Linietsky, Ariel Manzur. 2014-2022, Godot Engine contributors. + 2022-2023, Péter Magyar. License: Expat Files: ./icon.png ./icon.svg ./logo.png ./logo.svg -Comment: Godot Engine logo -Copyright: 2017, Andrea Calabró +Comment: Pandemonium Engine logo +Copyright: 2017, Andrea Calabró. + 2022, Péter Magyar. License: CC-BY-4.0 Files: ./core/math/convex_hull.cpp @@ -64,13 +65,6 @@ Copyright: 2011, Ole Kniemeyer, MAXON, www.maxon.net 2014-2022, Godot Engine contributors. License: Expat and Zlib -Files: ./modules/fbx/fbx_parser/ -Comment: Open Asset Import Library (FBX parser) -Copyright: 2006-2020, assimp team - 2007-2022, Juan Linietsky, Ariel Manzur. - 2014-2022, Godot Engine contributors. -License: BSD-3-clause - Files: ./platform/android/java/lib/aidl/com/android/vending/licensing/ ./platform/android/java/lib/res/layout/status_bar_ongoing_event_progress_bar.xml ./platform/android/java/lib/src/com/google/android/vending/expansion/downloader/ @@ -140,11 +134,6 @@ Copyright: 2007, Starbreeze Studios 2014-2022, Godot Engine contributors. License: Expat and Zlib -Files: ./thirdparty/bullet/ -Comment: Bullet Continuous Collision Detection and Physics Library -Copyright: 2003-2013, Erwin Coumans -License: Zlib - Files: ./thirdparty/certs/ca-certificates.crt Comment: CA certificates Copyright: Mozilla Contributors diff --git a/LOGO_LICENSE.md b/LOGO_LICENSE.md index 52ee37fb2..f3fc3efeb 100644 --- a/LOGO_LICENSE.md +++ b/LOGO_LICENSE.md @@ -1,5 +1,6 @@ -Godot Engine Logo +Pandemonium Engine Logo Copyright (c) 2017 Andrea Calabró +Copyright (c) 2022 Péter Magyar This work is licensed under a Creative Commons Attribution 4.0 International License (CC-BY-4.0 International) . diff --git a/thirdparty/README.md b/thirdparty/README.md index 669309921..a5cf5733c 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -5,20 +5,6 @@ respective folder names. Use two empty lines to separate categories for readability. -## bullet - -- Upstream: https://github.com/bulletphysics/bullet3 -- Version: 3.21 (6a59241074720e9df119f2f86bc01765917feb1e, 2021) -- License: zlib - -Files extracted from upstream source: - -- `src/*` apart from CMakeLists.txt and premake4.lua files -- `LICENSE.txt`, and `VERSION` as `VERSION.txt` - -Includes some patches in the `patches` folder which have been sent upstream. - - ## certs - Upstream: Mozilla, via https://github.com/bagder/ca-bundle @@ -325,37 +311,6 @@ Files extracted from the upstream source: library. -## oidn - -- Upstream: https://github.com/OpenImageDenoise/oidn -- Version: 1.1.0 (c58c5216db05ceef4cde5a096862f2eeffd14c06, 2019) -- License: Apache 2.0 - -Files extracted from upstream source: - -common/* (except tasking.* and CMakeLists.txt) -core/* -include/OpenImageDenoise/* (except version.h.in) -LICENSE.txt -mkl-dnn/include/* -mkl-dnn/src/* (except CMakeLists.txt) -weights/rtlightmap_hdr.tza -scripts/resource_to_cpp.py - -Modified files: -Modifications are marked with `// -- PANDEMONIUM start --` and `// -- PANDEMONIUM end --`. -Patch files are provided in `oidn/patches/`. - -core/autoencoder.cpp -core/autoencoder.h -core/common.h -core/device.cpp -core/device.h -core/transfer_function.cpp - -scripts/resource_to_cpp.py (used in modules/denoise/resource_to_cpp.py) - - ## opus - Upstream: https://opus-codec.org