On branch feat/godot-configurator
All conflicts fixed but you are still merging.
Changes to be committed:
modified: automation_tools/automation_task_list.cfg
modified: functions/checks.sh
modified: functions/global.sh
modified: net.retrodeck.retrodeck.yml
modified: retrodeck.sh
modified: tools/configurator.sh
Changes to be committed:
modified: net.retrodeck.retrodeck.yml
new file: tools/configurator/assets/icons/128/app.xemu.xemu.png
new file: tools/configurator/assets/icons/128/app.xemu.xemu.png.import
new file: tools/configurator/assets/icons/128/duckstation-nogui.png
new file: tools/configurator/assets/icons/128/duckstation-nogui.png.import
new file: tools/configurator/assets/icons/128/duckstation.png
new file: tools/configurator/assets/icons/128/duckstation.png.import
new file: tools/configurator/assets/icons/128/net.kuribo64.melonDS.png
new file: tools/configurator/assets/icons/128/net.kuribo64.melonDS.png.import
new file: tools/configurator/assets/icons/128/net.pcsx2.PCSX2.png
new file: tools/configurator/assets/icons/128/net.pcsx2.PCSX2.png.import
new file: tools/configurator/assets/icons/128/net.retrodeck.retrodeck.png
new file: tools/configurator/assets/icons/128/net.retrodeck.retrodeck.png.import
new file: tools/configurator/assets/icons/128/net.rpcs3.RPCS3.png
new file: tools/configurator/assets/icons/128/net.rpcs3.RPCS3.png.import
new file: tools/configurator/assets/icons/128/org.DolphinEmu.dolphin-emu.png
new file: tools/configurator/assets/icons/128/org.DolphinEmu.dolphin-emu.png.import
new file: tools/configurator/assets/icons/128/org.citra_emu.citra.png
new file: tools/configurator/assets/icons/128/org.citra_emu.citra.png.import
new file: tools/configurator/assets/icons/128/org.mamedev.MAME.png
new file: tools/configurator/assets/icons/128/org.mamedev.MAME.png.import
new file: tools/configurator/assets/icons/128/org.ppsspp.PPSSPP.png
new file: tools/configurator/assets/icons/128/org.ppsspp.PPSSPP.png.import
new file: tools/configurator/assets/icons/128/org.ppsspp.PPSSPP_.png
new file: tools/configurator/assets/icons/128/org.ppsspp.PPSSPP_.png.import
new file: tools/configurator/assets/icons/128/org.ryujinx.Ryujinx.png
new file: tools/configurator/assets/icons/128/org.ryujinx.Ryujinx.png.import
new file: tools/configurator/assets/icons/128/org.zdoom.GZDoom.png
new file: tools/configurator/assets/icons/128/org.zdoom.GZDoom.png.import
new file: tools/configurator/assets/icons/128/retroarch.png
new file: tools/configurator/assets/icons/128/retroarch.png.import
new file: tools/configurator/assets/icons/16/app.xemu.xemu.png
new file: tools/configurator/assets/icons/16/app.xemu.xemu.png.import
new file: tools/configurator/assets/icons/16/duckstation-nogui.png
new file: tools/configurator/assets/icons/16/duckstation-nogui.png.import
new file: tools/configurator/assets/icons/16/duckstation.png
new file: tools/configurator/assets/icons/16/duckstation.png.import
new file: tools/configurator/assets/icons/16/net.pcsx2.PCSX2.png
new file: tools/configurator/assets/icons/16/net.pcsx2.PCSX2.png.import
new file: tools/configurator/assets/icons/16/net.retrodeck.retrodeck.png
new file: tools/configurator/assets/icons/16/net.retrodeck.retrodeck.png.import
new file: tools/configurator/assets/icons/16/net.rpcs3.RPCS3.png
new file: tools/configurator/assets/icons/16/net.rpcs3.RPCS3.png.import
new file: tools/configurator/assets/icons/16/org.DolphinEmu.dolphin-emu.png
new file: tools/configurator/assets/icons/16/org.DolphinEmu.dolphin-emu.png.import
new file: tools/configurator/assets/icons/16/org.gnome.Yelp.png
new file: tools/configurator/assets/icons/16/org.gnome.Yelp.png.import
new file: tools/configurator/assets/icons/16/org.mamedev.MAME.png
new file: tools/configurator/assets/icons/16/org.mamedev.MAME.png.import
new file: tools/configurator/assets/icons/16/org.ppsspp.PPSSPP.png
new file: tools/configurator/assets/icons/16/org.ppsspp.PPSSPP.png.import
new file: tools/configurator/assets/icons/16/org.ppsspp.PPSSPP_.png
new file: tools/configurator/assets/icons/16/org.ppsspp.PPSSPP_.png.import
new file: tools/configurator/assets/icons/16/org.ryujinx.Ryujinx.png
new file: tools/configurator/assets/icons/16/org.ryujinx.Ryujinx.png.import
new file: tools/configurator/assets/icons/16/org.xfce.session.png
new file: tools/configurator/assets/icons/16/org.xfce.session.png.import
new file: tools/configurator/assets/icons/16/org.zdoom.GZDoom.png
new file: tools/configurator/assets/icons/16/org.zdoom.GZDoom.png.import
new file: tools/configurator/assets/icons/16/retroarch.png
new file: tools/configurator/assets/icons/16/retroarch.png.import
new file: tools/configurator/assets/icons/16/security-medium.png
new file: tools/configurator/assets/icons/16/security-medium.png.import
new file: tools/configurator/assets/icons/32/retroarch.png
new file: tools/configurator/assets/icons/32/retroarch.png.import
new file: tools/configurator/assets/icons/dolphin-emu (1).svg
new file: tools/configurator/assets/icons/dolphin-emu (1).svg.import
new file: tools/configurator/assets/icons/dolphin-emu (2).svg
new file: tools/configurator/assets/icons/dolphin-emu (2).svg.import
new file: tools/configurator/assets/icons/dolphin-emu.svg
new file: tools/configurator/assets/icons/dolphin-emu.svg.import
new file: tools/configurator/assets/icons/retroarch (1).svg
new file: tools/configurator/assets/icons/retroarch (1).svg.import
new file: tools/configurator/assets/icons/retroarch (2).svg
new file: tools/configurator/assets/icons/retroarch (2).svg.import
new file: tools/configurator/assets/icons/retroarch.svg
new file: tools/configurator/assets/icons/retroarch.svg.import
new file: tools/configurator/assets/icons/retroarch2.svg
new file: tools/configurator/assets/icons/retroarch2.svg.import
new file: tools/configurator/assets/icons/retroarch_invert.svg
new file: tools/configurator/assets/icons/retroarch_invert.svg.import
modified: tools/configurator/main.gd
modified: tools/configurator/main.tscn
modified: tools/configurator/project.godot
modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
with '#' will be ignored, and an empty message aborts the commit.
On branch feat/godot-configurator
Changes to be committed:
modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
* ES-DE: outsourced
* RetroArch: migrated to AppImage
* XEMU: migrated to AppImage
* MELONDS: migrated to AppImage
* RPCS3: migrated to AppImage
* MANIFEST: avoid overwriting native libraries
* MANIFEST: fixing ES-DE
* MANIFEST: fixed and normalized /app with FLATPAK_DEST
* MANIFEST: cleanup
* MANIFEST: fixed RetroArch
* PPSSPP: added wanted sdl module
* ES-DE: moved repo
* PPSSPP: outsourced
* PPSSPP: fixed link
* MANIFEST: fixing copy actions
* PCSX2: removing troublesome file
* DOLPHIN: outsourced
* SOLARUS: outsourced
* MANIFEST: lowercased rpcs3 sha
* MANIFEST: trying to figure out automation_task_list
* MANIFEST: fixed primehack placeholders
* REVERT ME: RUNNER CHANGED
* XEMU: moved on the bottom just to see if something changes
* DUCKSTATION: wrong cp target
* MANFEST: moved thir party libraries in /app/usr/local/lib
* MANFEST: removing dolphin debug libraries
* MANFEST: removing primehack debug libraries
* MANFEST: removing primehack pkgconfig libraries
* MANFEST: removing cemu lib
* SOLARUS: removing errored libs
* MAME: reverted to its original state as it's not coming with libraries
* RYUJINX: fixing chmod command
* GZDOOM: outsourced
* MANIFEST: added debug for checking out where tf is our icon
* Submodules cleanup
* GZDOOM: cleanup
* FRAMEWORK: moved third party libs into /app/retrodeck/lib
* MANIFEST: added retrodeck-pre-build commands
* MANIFEST: module renamed
* ES-DE: re-removed 'files/lib/girepository-1.0'
* GLOBAL: pathing the retrodeck components provided libraries
* RPCS3: moved bufgix in the proper module
* MANIFEST: moved component libraries into /app/retrodeck/lib
* MANIFEST: removing some debug cleanups
* MANIFEST: desktop file don't need to be executable
* ES-DE: re-adding libpoppler
* ES--DE: moved to the end to overwrite older libraries
* RYUJINX: fixed manifest
* MANIFEST: injecting needed libraries and discarding the troublesome ones
* MANIFEST: injecting needed libraries and discarding the troublesome ones - adding more
* MelonDS: outsourced but self built in QT6
* MANIFEST: automated the third party libs manager
* MANIFEST: fixed melonds build
* Ryujinx: downgraded to the older but working version
* MANIFEST: removed debug code
* WORKFLOW: running on self-hosted again
* MANIFEST: including debug and pkgconfig's librareis
* MANIFEST: removing pkgconfig's librareis
* MANIFEST: cannot move so copy and remove
* MANIFEST: cannot move so copy and remove - fix
* Toying with automation file to make it work again
* PRE_BUILD_AUTOMATION: testing a different script
* PRE_BUILD_AUTOMATION: adding new sha function
* MAME: fixing link
* MANIFEST: tweaks
* ATL: fixing ES-DE entry
* PPSSPP: fixed hash
* SOLARUS: fixing debug libs copy command
* APDATA: updated
* SOLARUS: that's not the library you're looking for
* GZDOOM: removing debug even here
* Revamped codename wordlist
* MANIFEST: following symlinks during library copy
* WORKFLOW: moving down the artifact preparation for fltahub as we don't even need it in cooker
* Manually adding missing libraries
* More codenames
* CEMU: added wrapper + RPCS3 fixes
* THE GREAT FOLDER MOVE (aka let's see how much things I can break in a single commit)
* emu: fixed dest filename for the wrapper
* Cemu: fixing wrapper installation
* MANIFEST: trying to add LLVM to solve PCSX2, Duckstation issues
* MANIFEST: adding llvm doesn't change the situation, removed
* MANIFEST: trying to add vulkan
* MANIFEST: trying to add vulkan - removed as it should be already in (and that's broken)
* VULKAN: testing some libraries
* VULKAN: trying to add shaderc
* Manifest: renaming es-de module to stick with the repo name for updating purposes
* Migrated to the new latest links
* MAME: frixed url
* PCSX2: updated to 2.1.55
* Reverting workfolw edits
* WORKFLOW: targetting the old repo for the release
* WORKFLOW: updated some actions to a newever version to avoid deprecation at the end of the year
* MISSING_LIBS: trying to fetch libshaderc
* MAIN_WORKLFOW: updating actions versions [skip ci]
On branch feat/godot-configurator
Changes to be committed:
deleted: tools/configurator/basic
new file: tools/configurator/data.json
modified: tools/configurator/data_list.json
modified: tools/configurator/main.gd
modified: tools/configurator/project.godot
modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
new file: tools/configurator/scripts/app_data.gd
modified: tools/configurator/scripts/class_functions.gd
new file: tools/configurator/scripts/data_handler.gd
new file: tools/configurator/scripts/emulator.gd
new file: tools/configurator/scripts/emulator_option.gd
new file: tools/configurator/scripts/emulator_property.gd
new file: tools/configurator/scripts/link.gd
new file: tools/configurator/scripts/save_manager.gd
Changes to be committed:
deleted: configurator/assets/data_lists/tk_about.Description.translation
deleted: configurator/assets/data_lists/tk_about.URL.translation
deleted: configurator/assets/data_lists/tk_about.csv.import
new file: configurator/export/configurator.console.exe
new file: configurator/export/configurator.exe
new file: configurator/export/configurator.pck
new file: configurator/export/configurator.sh
new file: configurator/export/configurator.x86_64
renamed: configurator/assets/data_lists/tk_about.csv -> configurator/export/tk_about.txt
modified: configurator/export_presets.cfg
modified: configurator/tk_about.gd
new file: configurator/tk_about.txt
On branch feat/godot-configurator
Changes to be committed:
new file: tools/configurator/assets/data_lists/tk_about.Description.translation
new file: tools/configurator/assets/data_lists/tk_about.URL.translation
new file: tools/configurator/assets/data_lists/tk_about.csv
new file: tools/configurator/assets/data_lists/tk_about.csv.import
modified: tools/configurator/emu_list.yml
modified: tools/configurator/main.tscn
modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
modified: tools/configurator/scripts/class_functions.gd
new file: tools/configurator/tk_about.gd
On branch feat/godot-configurator
Changes to be committed:
new file: tools/configurator/assets/graphics/retrodeck_base.png
new file: tools/configurator/assets/graphics/retrodeck_base.png.import
new file: tools/configurator/assets/graphics/retrodeck_base_anim.png
new file: tools/configurator/assets/graphics/retrodeck_base_anim.png.import
new file: tools/configurator/assets/graphics/retrodeck_base_anim.xcf
new file: tools/configurator/assets/graphics/retrodeck_base_shake0.png
new file: tools/configurator/assets/graphics/retrodeck_base_shake0.png.import
new file: tools/configurator/assets/graphics/retrodeck_base_shake1.png
new file: tools/configurator/assets/graphics/retrodeck_base_shake1.png.import
new file: tools/configurator/assets/graphics/retrodeck_base_shake2.png
new file: tools/configurator/assets/graphics/retrodeck_base_shake2.png.import
new file: tools/configurator/assets/graphics/retrodeck_base_shake3.png
new file: tools/configurator/assets/graphics/retrodeck_base_shake3.png.import
new file: tools/configurator/assets/graphics/retrodeck_base_shake4.png
new file: tools/configurator/assets/graphics/retrodeck_base_shake4.png.import
new file: tools/configurator/rekku_animated.tscn
modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
Changes to be committed:
modified: tools/configurator/main.gd
modified: tools/configurator/main.tscn
modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
On branch feat/godot-configurator
Changes to be committed:
modified: tools/configurator/main.gd
modified: tools/configurator/main.tscn
modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
On branch feat/godot-configurator
Changes to be committed:
new file: tools/configurator/assets/fonts/OpenDyslexic3/OpenDyslexic3-Bold.ttf
new file: tools/configurator/assets/fonts/OpenDyslexic3/OpenDyslexic3-Bold.ttf.import
new file: tools/configurator/assets/fonts/OpenDyslexic3/OpenDyslexic3-Regular.ttf
new file: tools/configurator/assets/fonts/OpenDyslexic3/OpenDyslexic3-Regular.ttf.import
new file: tools/configurator/assets/fonts/akrobat/Akrobat-Black.otf
new file: tools/configurator/assets/fonts/akrobat/Akrobat-Black.otf.import
new file: tools/configurator/assets/fonts/akrobat/Akrobat-Bold.otf
new file: tools/configurator/assets/fonts/akrobat/Akrobat-Bold.otf.import
new file: tools/configurator/assets/fonts/akrobat/Akrobat-ExtraLight.otf
new file: tools/configurator/assets/fonts/akrobat/Akrobat-ExtraLight.otf.import
new file: tools/configurator/assets/fonts/akrobat/Akrobat-Light.otf
new file: tools/configurator/assets/fonts/akrobat/Akrobat-Light.otf.import
new file: tools/configurator/assets/fonts/akrobat/Akrobat-Regular.otf
new file: tools/configurator/assets/fonts/akrobat/Akrobat-Regular.otf.import
new file: tools/configurator/assets/fonts/akrobat/Akrobat-SemiBold.otf
new file: tools/configurator/assets/fonts/akrobat/Akrobat-SemiBold.otf.import
new file: tools/configurator/assets/fonts/akrobat/akrobat-extrabold-webfont.ttf
new file: tools/configurator/assets/fonts/akrobat/akrobat-extrabold-webfont.ttf.import
new file: tools/configurator/assets/fonts/munro/munro-narrow.ttf
new file: tools/configurator/assets/fonts/munro/munro-narrow.ttf.import
new file: tools/configurator/assets/fonts/munro/munro-small.ttf
new file: tools/configurator/assets/fonts/munro/munro-small.ttf.import
new file: tools/configurator/assets/fonts/munro/munro.ttf
new file: tools/configurator/assets/fonts/munro/munro.ttf.import
new file: tools/configurator/assets/graphics/Rekku/Rekku-test.xcf
new file: tools/configurator/assets/graphics/Rekku/base.png
new file: tools/configurator/assets/graphics/Rekku/base.png.import
new file: tools/configurator/assets/graphics/Rekku/blink1.png
new file: tools/configurator/assets/graphics/Rekku/blink1.png.import
new file: tools/configurator/assets/graphics/Rekku/blink2.png
new file: tools/configurator/assets/graphics/Rekku/blink2.png.import
new file: tools/configurator/assets/graphics/Rekku/eyes-open.png
new file: tools/configurator/assets/graphics/Rekku/eyes-open.png.import
new file: tools/configurator/assets/graphics/Rekku/mouth-A.png
new file: tools/configurator/assets/graphics/Rekku/mouth-A.png.import
new file: tools/configurator/assets/graphics/Rekku/mouth-O.png
new file: tools/configurator/assets/graphics/Rekku/mouth-O.png.import
new file: tools/configurator/assets/graphics/Rekku/mouth-base.png
new file: tools/configurator/assets/graphics/Rekku/mouth-base.png.import
new file: tools/configurator/assets/graphics/Rekku/rekku-blink-down.png
new file: tools/configurator/assets/graphics/Rekku/rekku-blink-down.png.import
new file: tools/configurator/assets/graphics/Rekku/rekku-blink-up.png
new file: tools/configurator/assets/graphics/Rekku/rekku-blink-up.png.import
new file: tools/configurator/assets/graphics/Rekku/rekku-idle.png
new file: tools/configurator/assets/graphics/Rekku/rekku-idle.png.import
new file: tools/configurator/assets/graphics/Rekku/rekku-speak1.png
new file: tools/configurator/assets/graphics/Rekku/rekku-speak1.png.import
new file: tools/configurator/assets/graphics/Rekku/rekku-speak2.png
new file: tools/configurator/assets/graphics/Rekku/rekku-speak2.png.import
new file: tools/configurator/assets/graphics/retrodeck.png
new file: tools/configurator/assets/graphics/retrodeck.png.import
new file: tools/configurator/assets/themes/accesible_theme.tres
new file: tools/configurator/assets/themes/default_theme.tres
new file: tools/configurator/assets/themes/modern_theme.tres
new file: tools/configurator/assets/themes/retro_theme.tres
modified: tools/configurator/components/bios_check/bios_check.gd
modified: tools/configurator/main.gd
modified: tools/configurator/main.tscn
modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
Added github workflow to build configurator
On branch feat/godot-configurator
Changes to be committed:
new file: .github/workflows/build-configurator.yml
new file: tools/configurator/basic
modified: tools/configurator/components/bios_check/bios_check.gd
modified: tools/configurator/main.gd
modified: tools/configurator/main.tscn
modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
modified: tools/configurator/scripts/class_functions.gd
Added BIOS check (both basic and expert)
Blocking godot until bios files are checked (to check if ok)
Calling function wrapper
Added conditions to check for runtime dir env var
Changed fallback dir