From b2f629d8d3eaef9d239e9c9bb35d70d79df99228 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Mon, 11 Jan 2021 14:26:03 +0100 Subject: Logo improvements --- CMakeLists.txt | 10 ++-- LICENSE.txt | 8 +-- builtin/client/cheats.lua | 2 +- misc/Info.plist | 2 +- misc/dragonfire-icon-24x24.png | Bin 0 -> 1248 bytes misc/dragonfire-icon.icns | Bin 0 -> 108878 bytes misc/dragonfire-icon.ico | Bin 0 -> 11479 bytes misc/dragonfire-icon.ico.png | Bin 0 -> 11325 bytes misc/dragonfire-xorg-icon-128.png | Bin 0 -> 5053 bytes misc/dragonfire.svg | 118 +++++++++++++++++++++++++++++++++++++ misc/minetest-icon-24x24.png | Bin 1165 -> 0 bytes misc/minetest-icon.icns | Bin 108878 -> 0 bytes misc/minetest-icon.ico | Bin 14265 -> 0 bytes misc/minetest-xorg-icon-128.png | Bin 5486 -> 0 bytes misc/minetest.svg | 117 ------------------------------------ misc/net.minetest.minetest.desktop | 3 +- misc/winresource.rc | 2 +- src/client/renderingengine.cpp | 7 +-- textures/base/pack/logo.png | Bin 12188 -> 135512 bytes 19 files changed, 135 insertions(+), 134 deletions(-) create mode 100644 misc/dragonfire-icon-24x24.png create mode 100644 misc/dragonfire-icon.icns create mode 100644 misc/dragonfire-icon.ico create mode 100644 misc/dragonfire-icon.ico.png create mode 100644 misc/dragonfire-xorg-icon-128.png create mode 100644 misc/dragonfire.svg delete mode 100644 misc/minetest-icon-24x24.png delete mode 100644 misc/minetest-icon.icns delete mode 100644 misc/minetest-icon.ico delete mode 100644 misc/minetest-xorg-icon-128.png delete mode 100644 misc/minetest.svg mode change 100644 => 100755 misc/net.minetest.minetest.desktop diff --git a/CMakeLists.txt b/CMakeLists.txt index 65ad47102..997e8518f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -186,14 +186,14 @@ if(UNIX AND NOT APPLE) install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6") install(FILES "misc/net.minetest.minetest.desktop" DESTINATION "${XDG_APPS_DIR}") install(FILES "misc/net.minetest.minetest.appdata.xml" DESTINATION "${APPDATADIR}") - install(FILES "misc/minetest.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps") - install(FILES "misc/minetest-xorg-icon-128.png" + install(FILES "misc/dragonfire.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps") + install(FILES "misc/dragonfire-xorg-icon-128.png" DESTINATION "${ICONDIR}/hicolor/128x128/apps" - RENAME "minetest.png") + RENAME "dragonfire.png") endif() if(APPLE) - install(FILES "misc/minetest-icon.icns" DESTINATION "${SHAREDIR}") + install(FILES "misc/dragonfire-icon.icns" DESTINATION "${SHAREDIR}") install(FILES "misc/Info.plist" DESTINATION "${BUNDLE_PATH}/Contents") endif() @@ -279,7 +279,7 @@ if(WIN32) set(CPACK_CREATE_DESKTOP_LINKS ${PROJECT_NAME}) set(CPACK_PACKAGING_INSTALL_PREFIX "/${PROJECT_NAME_CAPITALIZED}") - set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/misc/minetest-icon.ico") + set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/misc/dragonfire-icon.ico") # Supported languages can be found at # http://wixtoolset.org/documentation/manual/v3/wixui/wixui_localization.html #set(CPACK_WIX_CULTURES "ar-SA,bg-BG,ca-ES,hr-HR,cs-CZ,da-DK,nl-NL,en-US,et-EE,fi-FI,fr-FR,de-DE") diff --git a/LICENSE.txt b/LICENSE.txt index 9b8ee851a..27b30323a 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -33,10 +33,10 @@ rubenwardy, paramat: textures/base/pack/start_icon.png textures/base/pack/end_icon.png -erlehmann: - misc/minetest-icon-24x24.png - misc/minetest-icon.ico - misc/minetest.svg +EliasFleckenstein03: + misc/dragonfire-icon-24x24.png + misc/dragonfire-icon.ico + misc/dragonfire.svg textures/base/pack/logo.png JRottm diff --git a/builtin/client/cheats.lua b/builtin/client/cheats.lua index d158b9fbc..e4cace744 100644 --- a/builtin/client/cheats.lua +++ b/builtin/client/cheats.lua @@ -1,7 +1,7 @@ core.cheats = { ["Combat"] = { ["AntiKnockback"] = "antiknockback", - ["AttachmentFloat"] = "float_above_parent", + ["AttachmentFloat"] = "float_above_parent", }, ["Movement"] = { ["Freecam"] = "freecam", diff --git a/misc/Info.plist b/misc/Info.plist index 1498ee474..b80ae9d7c 100644 --- a/misc/Info.plist +++ b/misc/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable minetest CFBundleIconFile - minetest-icon.icns + dragonfire-icon.icns CFBundleIdentifier net.minetest.minetest diff --git a/misc/dragonfire-icon-24x24.png b/misc/dragonfire-icon-24x24.png new file mode 100644 index 000000000..0edc90e20 Binary files /dev/null and b/misc/dragonfire-icon-24x24.png differ diff --git a/misc/dragonfire-icon.icns b/misc/dragonfire-icon.icns new file mode 100644 index 000000000..bb20daf38 Binary files /dev/null and b/misc/dragonfire-icon.icns differ diff --git a/misc/dragonfire-icon.ico b/misc/dragonfire-icon.ico new file mode 100644 index 000000000..3ac1f5c81 Binary files /dev/null and b/misc/dragonfire-icon.ico differ diff --git a/misc/dragonfire-icon.ico.png b/misc/dragonfire-icon.ico.png new file mode 100644 index 000000000..6c04cf7ee Binary files /dev/null and b/misc/dragonfire-icon.ico.png differ diff --git a/misc/dragonfire-xorg-icon-128.png b/misc/dragonfire-xorg-icon-128.png new file mode 100644 index 000000000..b1ed4522f Binary files /dev/null and b/misc/dragonfire-xorg-icon-128.png differ diff --git a/misc/dragonfire.svg b/misc/dragonfire.svg new file mode 100644 index 000000000..350492649 --- /dev/null +++ b/misc/dragonfire.svg @@ -0,0 +1,118 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/misc/minetest-icon-24x24.png b/misc/minetest-icon-24x24.png deleted file mode 100644 index 39c5b8e5f..000000000 Binary files a/misc/minetest-icon-24x24.png and /dev/null differ diff --git a/misc/minetest-icon.icns b/misc/minetest-icon.icns deleted file mode 100644 index bb20daf38..000000000 Binary files a/misc/minetest-icon.icns and /dev/null differ diff --git a/misc/minetest-icon.ico b/misc/minetest-icon.ico deleted file mode 100644 index 53308b356..000000000 Binary files a/misc/minetest-icon.ico and /dev/null differ diff --git a/misc/minetest-xorg-icon-128.png b/misc/minetest-xorg-icon-128.png deleted file mode 100644 index 9cf15a00a..000000000 Binary files a/misc/minetest-xorg-icon-128.png and /dev/null differ diff --git a/misc/minetest.svg b/misc/minetest.svg deleted file mode 100644 index a95f5d973..000000000 --- a/misc/minetest.svg +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - diff --git a/misc/net.minetest.minetest.desktop b/misc/net.minetest.minetest.desktop old mode 100644 new mode 100755 index ca493c44e..737dfb29e --- a/misc/net.minetest.minetest.desktop +++ b/misc/net.minetest.minetest.desktop @@ -1,3 +1,4 @@ +#!/usr/bin/env xdg-open [Desktop Entry] Name=Minetest GenericName=Minetest @@ -9,7 +10,7 @@ Comment[ja]=マルチプレイに対応した、無限の世界のブロック Comment[ru]=Игра-песочница с безграничным миром, состоящим из блоков Comment[tr]=Tek-Çok oyuncuyla küplerden sonsuz dünyalar inşa et Exec=minetest -Icon=minetest +Icon=dragonfire Terminal=false Type=Application Categories=Game;Simulation; diff --git a/misc/winresource.rc b/misc/winresource.rc index e1e82581b..bd93be91d 100644 --- a/misc/winresource.rc +++ b/misc/winresource.rc @@ -14,7 +14,7 @@ #endif LANGUAGE 0, SUBLANG_NEUTRAL -130 ICON "minetest-icon.ico" +130 ICON "dragonfire-icon.ico" ///////////////////////////////////////////////////////////////////////////// // diff --git a/src/client/renderingengine.cpp b/src/client/renderingengine.cpp index f5aca8f58..22c8a8102 100644 --- a/src/client/renderingengine.cpp +++ b/src/client/renderingengine.cpp @@ -347,15 +347,14 @@ bool RenderingEngine::setWindowIcon() #if defined(XORG_USED) #if RUN_IN_PLACE return setXorgWindowIconFromPath( - porting::path_share + "/misc/" PROJECT_NAME "-xorg-icon-128.png"); + porting::path_share + "/misc/dragonfire-xorg-icon-128.png"); #else // We have semi-support for reading in-place data if we are // compiled with RUN_IN_PLACE. Don't break with this and // also try the path_share location. return setXorgWindowIconFromPath( - ICON_DIR "/hicolor/128x128/apps/" PROJECT_NAME ".png") || - setXorgWindowIconFromPath(porting::path_share + "/misc/" PROJECT_NAME - "-xorg-icon-128.png"); + ICON_DIR "/hicolor/128x128/apps/dragonfire.png") || + setXorgWindowIconFromPath(porting::path_share + "/misc/dragonfire-xorg-icon-128.png"); #endif #elif defined(_WIN32) HWND hWnd; // Window handle diff --git a/textures/base/pack/logo.png b/textures/base/pack/logo.png index 48793678f..5284900b2 100644 Binary files a/textures/base/pack/logo.png and b/textures/base/pack/logo.png differ -- cgit v1.2.3