On branch feat/godot
All conflicts fixed but you are still merging.
Changes to be committed:
modified: config/retrodeck/reference_lists/features.json
modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
On branch feat/godot
Changes to be committed:
new file: .github/workflows/build-godot.yml
modified: tools/configurator/main.tscn
modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
* On branch cooker
Changes to be committed:
modified: ../config/retrodeck/reference_lists/features.json
modified: configurator.sh
modified: configurator/TabContainer.gd
modified: configurator/assets/themes/accesible_theme.tres
modified: configurator/assets/themes/modern_theme.tres
modified: configurator/assets/themes/retro_theme.tres
modified: configurator/main.tscn
modified: configurator/res/pixel_ui_theme/RetroDECKTheme.tres
* Signal test
* s
* Oops Data Recovery
On branch cooker
Changes to be committed:
modified: tools/configurator/main.gd
modified: tools/configurator/main.tscn
modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
* Sliding Rekku
On branch cooker
Changes to be committed:
modified: tools/configurator/Rekku.gd
modified: tools/configurator/main.gd
modified: tools/configurator/main.tscn
* Using less tabs?
On branch cooker
Changes to be committed:
modified: tools/configurator/main.gd
modified: tools/configurator/main.tscn
modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
---------
Co-authored-by: Rekku <rekku@retrodeck.net>
On branch cooker
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 cooker
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 cooker
Changes to be committed:
modified: tools/configurator/Rekku.gd
modified: tools/configurator/main.gd
modified: tools/configurator/main.tscn
On branch cooker
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 cooker
Changes to be committed:
modified: config/retrodeck/reference_lists/features.json
modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
modified: tools/configurator/scripts/data_handler.gd
modified: tools/configurator/tk_about.gd
On branch feat/godot
Changes to be committed:
new file: .github/workflows/cooker-monkeyx.yml
modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
On branch feat/godot
Changes to be committed:
modified: tools/configurator/TabContainer.gd
modified: tools/configurator/main.tscn
modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
Added icons for About us
Further work on Graphics tab
On branch cooker
Changes to be committed:
modified: config/retrodeck/reference_lists/features.json
new file: tools/configurator/assets/icons/pixelitos/vcs-grey.svg
new file: tools/configurator/assets/icons/pixelitos/vcs-grey.svg.import
modified: tools/configurator/assets/themes/default_theme.tres
modified: tools/configurator/components/bios_check/bios_check.gd
modified: tools/configurator/components/bios_check/bios_popup_content.tscn
modified: tools/configurator/components/popup.tscn
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
modified: tools/configurator/scripts/data_handler.gd
modified: tools/configurator/scripts/link.gd
modified: tools/configurator/tk_about.gd
On branch cooker
Changes to be committed:
modified: tools/configurator/assets/themes/default_theme.tres
modified: tools/configurator/main.tscn
modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
modified: tools/configurator/res/pixel_ui_theme/m5x7.ttf.import