From 1de8b5b1a35ed479dda608334463a2c2ae26bb58 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Fri, 26 Mar 2021 17:39:35 -0400 Subject: [PATCH] Copyright & attribution update --- LICENSE | 3 ++- src/Editor/CAboutDialog.ui | 2 +- src/Editor/CMakeLists.txt | 2 +- .../io.github.arukibree.PrimeWorldEditor.appdata.xml.in | 2 +- src/Editor/icons/mac/Info.plist.in | 4 ++-- src/Editor/main.cpp | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/LICENSE b/LICENSE index bec38e78..d7a7a5d7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ MIT License -Copyright (c) 2018 Aruki +Copyright (c) 2015-2019 Aruki +Copyright (c) 2019-2021 AxioDL Team Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/Editor/CAboutDialog.ui b/src/Editor/CAboutDialog.ui index 985d27c7..f4f1629a 100644 --- a/src/Editor/CAboutDialog.ui +++ b/src/Editor/CAboutDialog.ui @@ -23,7 +23,7 @@ - <html><head/><body><p><span style=" font-size:12pt; font-weight:600;">%APP_FULL_NAME%</span></p><p>%APP_NAME% is developed by <span style=" font-weight:600;">Aruki</span>.<br/>All the games it edits are developed by <span style=" font-weight:600;">Retro Studios</span> and published by <span style=" font-weight:600;">Nintendo</span>.</p><p>Special thanks to:</p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The community at <span style=" font-weight:600;">Metroid2002</span> that contributed to reverse engineering the game and documenting its internals and file formats; in particular, <span style=" font-weight:600;">Antidote</span> and <span style=" font-weight:600;">jackoalan</span>, among others!</li><li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Claris: </span>In addition to helping reverse engineer a few formats (in particular MLVL and MREA), also contributed greatly to putting together the script object templates and documenting object properties.</li><li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Bearborg:</span> Lots of testing and feedback, plus the UI icons and some script object assets.</li><li style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Omega: </span>Script object assets.</li></ul><p>Check the <a href="http://www.metroid2002.com/retromodding/wiki/Retro_Modding_Wiki"><span style=" text-decoration: underline; color:#007af4;">Retro Modding Wiki</span></a> for file format documentation.</p><p>%APP_NAME% uses <span style=" font-weight:600;">Assimp</span> (Open Asset Import Library).<br/>Copyright © 2006-2015 assimp team<br/>All rights reserved.</p></body></html> + <html><head/><body><p><span style=" font-size:12pt; font-weight:600;">%APP_FULL_NAME%</span></p><p>%APP_NAME% was originally developed by <span style=" font-weight:600;">Aruki,</span> and is now maintained by the <a href="https://axiodl.com"><span style=" text-decoration: underline; color:#419cff;">AxioDL</span></a><span style=" font-weight:600;"> team</span>.<br/>All the games it edits are developed by <span style=" font-weight:600;">Retro Studios</span> and published by <span style=" font-weight:600;">Nintendo</span>.</p><p>Special thanks to:</p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The community at <span style=" font-weight:600;">Metroid2002</span> that contributed to reverse engineering the game and documenting its internals and file formats; in particular, <span style=" font-weight:600;">Antidote</span> and <span style=" font-weight:600;">jackoalan</span>, among others!</li><li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Claris: </span>In addition to helping reverse engineer a few formats (in particular MLVL and MREA), also contributed greatly to putting together the script object templates and documenting object properties.</li><li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Bearborg:</span> Lots of testing and feedback, plus the UI icons and some script object assets.</li><li style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Omega: </span>Script object assets.</li></ul><p>Check the <a href="https://wiki.axiodl.com/w/Retro_Modding_Wiki"><span style=" text-decoration: underline; color:#007af4;">Retro Modding Wiki</span></a> for file format documentation.</p><p>%APP_NAME% uses <span style=" font-weight:600;">Assimp</span> (Open Asset Import Library).<br/>Copyright © 2006-2015 assimp team<br/>All rights reserved.</p></body></html> true diff --git a/src/Editor/CMakeLists.txt b/src/Editor/CMakeLists.txt index 98962356..d18cddd9 100644 --- a/src/Editor/CMakeLists.txt +++ b/src/Editor/CMakeLists.txt @@ -75,7 +75,7 @@ if (WIN32) ICON ${CMAKE_CURRENT_SOURCE_DIR}/icons/win/AppIcon.ico VERSION_MAJOR ${pwe_editor_VERSION_MAJOR} VERSION_MINOR ${pwe_editor_VERSION_MINOR} VERSION_PATCH ${pwe_editor_VERSION_PATCH} VERSION_REVISION ${pwe_editor_VERSION_TWEAK} - COMPANY_NAME "Aruki" COMMENTS "${PWE_APP_NAME} ${PWE_WC_DESCRIBE}" + COMPANY_NAME "AxioDL" COMMENTS "${PWE_APP_NAME} ${PWE_WC_DESCRIBE}" ORIGINAL_FILENAME "PrimeWorldEditor.exe") set(PLAT_SRCS ${rc_file} icons/win/PrimeWorldEditor.manifest) elseif (APPLE) diff --git a/src/Editor/icons/freedesktop/metainfo/io.github.arukibree.PrimeWorldEditor.appdata.xml.in b/src/Editor/icons/freedesktop/metainfo/io.github.arukibree.PrimeWorldEditor.appdata.xml.in index e7984508..7e1bc774 100644 --- a/src/Editor/icons/freedesktop/metainfo/io.github.arukibree.PrimeWorldEditor.appdata.xml.in +++ b/src/Editor/icons/freedesktop/metainfo/io.github.arukibree.PrimeWorldEditor.appdata.xml.in @@ -1,5 +1,5 @@ - + io.github.arukibree.PrimeWorldEditor FSFAP diff --git a/src/Editor/icons/mac/Info.plist.in b/src/Editor/icons/mac/Info.plist.in index 6e347fea..9ff248a9 100644 --- a/src/Editor/icons/mac/Info.plist.in +++ b/src/Editor/icons/mac/Info.plist.in @@ -9,11 +9,11 @@ CFBundleShortVersionString @PWE_WC_DESCRIBE@ NSHumanReadableCopyright - @CURRENT_YEAR@ Aruki + @CURRENT_YEAR@ AxioDL Team CFBundleIconFile mainicon.icns CFBundleIdentifier - com.aruki.PrimeWorldEditor + com.axiodl.PrimeWorldEditor CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/src/Editor/main.cpp b/src/Editor/main.cpp index 2f908189..e3f91e73 100644 --- a/src/Editor/main.cpp +++ b/src/Editor/main.cpp @@ -96,7 +96,7 @@ public: CEditorApplication App(argc, argv); App.setApplicationName(QStringLiteral("PrimeWorldEditor")); App.setApplicationVersion( APP_VERSION ); - App.setOrganizationName(QStringLiteral("Aruki")); + App.setOrganizationName(QStringLiteral("AxioDL")); App.setWindowIcon(QIcon(QStringLiteral(":/icons/win/AppIcon.ico"))); // Create UI relay