Commit graph

112 commits

Author SHA1 Message Date
Rekku 56ef6b89e7 Merge branch 'cooker' of https://github.com/monkeyx-net/RetroDECK_UK into cooker
Conflicts:
	config/retrodeck/reference_lists/features.json
	tools/configurator/components/bios_check/bios_check.gd
	tools/configurator/locales/interface.de.translation
	tools/configurator/locales/interface.en.translation
	tools/configurator/locales/interface.it.translation
	tools/configurator/locales/interface.ja.translation
	tools/configurator/locales/interface.sv.translation
	tools/configurator/locales/interface.ua.translation
	tools/configurator/locales/interface.zh.translation
	tools/configurator/main.gd
	tools/configurator/main.tscn
	tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
	tools/configurator/scripts/data_handler.gd
	tools/configurator/scripts/emulator.gd

 All conflicts fixed but you are still merging.
 Changes to be committed:
	modified:   config/retrodeck/reference_lists/features.json
	modified:   tools/configurator/TabContainer.gd
	modified:   tools/configurator/components/bios_check/bios_check.gd
	modified:   tools/configurator/components/bios_check/bios_popup_content.tscn
	modified:   tools/configurator/components/popup.gd
	modified:   tools/configurator/components/popup.tscn
	new file:   tools/configurator/components/popup_dialogue.gd
	new file:   tools/configurator/components/popup_dialogue.tscn
	new file:   tools/configurator/controller_guide.gd
	deleted:    tools/configurator/locales/interface.de.translation
	deleted:    tools/configurator/locales/interface.en.translation
	deleted:    tools/configurator/locales/interface.it.translation
	deleted:    tools/configurator/locales/interface.ja.translation
	deleted:    tools/configurator/locales/interface.sv.translation
	deleted:    tools/configurator/locales/interface.ua.translation
	deleted:    tools/configurator/locales/interface.zh.translation
	modified:   tools/configurator/main.gd
	modified:   tools/configurator/main.tscn
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
	new file:   tools/configurator/scripts/SystemTab.gd
	modified:   tools/configurator/scripts/data_handler.gd
	modified:   tools/configurator/scripts/emulator.gd
2024-09-06 13:21:34 +01:00
MonkeyX d1ccc36067
Feat/godot (#929)
* 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

* Generic Save experiment
 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

* Let it flow

 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 feat/godot
 Changes to be committed:
	modified:   .github/workflows/build-godot.yml

* FLow 2.0

* Flow 2.1

* Flow 2.2

* Flow 2.3

* Flow 2.4

* Flow 2.5

* Flow 2.6

* Flow 2.7

* Flow 2.8

* Flow 2.9

* Flow 2.9

* Flow 2.91

* Flow 2.92

* Emualtor==System

* FFS revert!

* Progress on Cores at last!

* Progress on Cores at lastgit add .!

* Functions

* Bios change

* Removed need for BIOS tmp file for Godot

* Rotten the core!

* Push TEst

* fixed duplicate

* fixed duplicate

* Tidied Bios reading

* Rekku assistant

* Icons and System Tab work

* Generic buttons please

* Generic buttons pleases

* Generic buttons please2

* Rekku gets the saw

* Dialogues

* Fixed link to json file

* Feat/godot (#927)

* Tidied parameter code

* Tricky bios dialogue!

* Mini change

* Tidying icons

* And then there were 5!

* Time to Cook

* INITOOL: added

* SET_SETTING_VALUE: edited to use initool

* Revert "SET_SETTING_VALUE: edited to use initool"

This reverts commit b56916c2b0.

* Revert "INITOOL: added"

This reverts commit 127bcdb6cd.

* POST_UPDATE: update_rd_conf to include steam_sync

* INJECT_FRAMEWORK: added force args [skip ci]

* Progress buttons

* Reset!

---------

Co-authored-by: Rekku <rekku@retrodeck.net>
Co-authored-by: XargonWan <XargonWan@gmail.com>

---------

Co-authored-by: Rekku <rekku@retrodeck.net>
Co-authored-by: XargonWan <XargonWan@gmail.com>
2024-09-05 16:04:36 +01:00
monkeyx-net c17c6bc1f7 Generic buttons pleases 2024-08-27 20:14:24 +01:00
monkeyx-net 2eda3dbbc2 Icons and System Tab work 2024-08-27 14:41:16 +01:00
monkeyx-net 5062b70e22 Rekku assistant 2024-08-27 11:16:52 +01:00
monkeyx-net c9d8a34dff Tidied Bios reading 2024-08-26 21:18:53 +01:00
monkeyx-net 7efc73bd5b Push TEst 2024-08-26 15:06:09 +01:00
Rekku 2454422225 Rotten the core! 2024-08-25 08:03:25 +01:00
Rekku 3d37adc2b2 Bios change 2024-08-25 01:08:37 +01:00
Rekku cc3dbf6bd8 Functions 2024-08-24 21:52:27 +01:00
Rekku 787e7458ba Progress on Cores at last! 2024-08-24 18:47:51 +01:00
Rekku f37d5a04c8 FFS revert! 2024-08-24 17:48:06 +01:00
Rekku 9d01e9a1cc Emualtor==System 2024-08-24 11:39:56 +01:00
Rekku dfbe24f8a3 Flow 2.9 2024-08-23 18:54:20 +01:00
Rekku c51ee9f636 Flow 2.9 2024-08-23 18:47:50 +01:00
Rekku 75ffa58d47 Flow 2.7 2024-08-23 18:16:52 +01:00
Rekku 4eb80aafbe Let it flow
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
2024-08-23 09:52:43 +01:00
MonkeyX d741ecc531
Cooker Godot Update (#911)
* 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>
2024-08-23 02:25:55 +02:00
Rekku 20771bf59a Generic Save experiment
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
2024-08-23 00:51:07 +01:00
Rekku 766a376cf5 Merge branch 'cooker' of https://github.com/monkeyx-net/RetroDECK_UK into cooker 2024-08-22 20:58:44 +01:00
Rekku 5226ebaef6 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
2024-08-22 20:53:33 +01:00
Rekku 87bf75f6e4 Sliding Rekku
On branch cooker
 Changes to be committed:
	modified:   tools/configurator/Rekku.gd
	modified:   tools/configurator/main.gd
	modified:   tools/configurator/main.tscn
2024-08-22 16:44:14 +01:00
Rekku 1c97e52799 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
2024-08-22 15:28:49 +01:00
Rekku 5f4dee8e36 s 2024-08-22 14:37:19 +01:00
Rekku 71d150ca18 Signal test 2024-08-21 16:55:00 +01:00
Rekku e466e52e05 Fixed reference to json file
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
2024-08-21 04:22:17 +01:00
Rekku f7394feed7 Tidying up 2024-08-21 03:44:09 +01:00
Rekku 6ca691887d Create cooker on own repo
On branch feat/godot
 Changes to be committed:
	new file:   .github/workflows/cooker-monkeyx.yml
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
2024-08-21 02:24:57 +01:00
Rekku 419b5bf2c5 Tabbed icons
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
2024-08-21 00:01:52 +01:00
Rekku e6632da2f1 Removed example data from json file.
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
2024-08-20 21:57:49 +01:00
Rekku d5d9c3f2f2 Icons icons icons! 2024-08-19 20:07:25 +01:00
Rekku 1483ad10fc Buttons!
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
2024-08-19 16:20:32 +01:00
Rekku b48a68d170 Icon test
On branch cooker
 Changes to be committed:
	new file:   tools/configurator/assets/icons/gamegear.png
	new file:   tools/configurator/assets/icons/gamegear.png.import
	modified:   tools/configurator/main.tscn
	modified:   tools/configurator/project.godot
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
2024-08-19 15:26:44 +01:00
Rekku e2efab6e2f Further updates
On branch cooker
 Changes to be committed:
	new file:   tools/configurator/assets/icons/pixelitos/LICENSE
	new file:   tools/configurator/assets/icons/pixelitos/README.md
	modified:   tools/configurator/main.tscn
	modified:   tools/configurator/project.godot
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
2024-08-19 14:57:00 +01:00
Rekku bbdad2b120 Godot 4.3 test
On branch cooker
 Changes to be committed:
	modified:   tools/configurator/main.tscn
	modified:   tools/configurator/project.godot
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
2024-08-19 12:58:19 +01:00
Rekku ab4a7f1c0a Dynamic buttons
On branch feat/godot
 Changes to be committed:
	modified:   tools/configurator/main.gd
	modified:   tools/configurator/main.tscn
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
	modified:   tools/configurator/tk_about.gd
2024-08-19 12:47:46 +01:00
Rekku 971d93b158 A tidier classroom 2024-08-18 22:42:40 +01:00
Rekku 3bb3d9fa3d Make my day! 2024-08-18 18:31:57 +01:00
Rekku aa5cced82d 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
2024-08-17 20:25:12 +01:00
Rekku a4ff9443fb Moving back to feat to enable SteamDeck testing
On branch cooker
 Changes to be committed:
	modified:   config/retrodeck/reference_lists/features.json
	modified:   tools/configurator/export_presets.cfg
	modified:   tools/configurator/project.godot
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
2024-08-17 20:12:10 +01:00
Rekku e3a0d23dd9 Found the spacing issue at last on theme!
Another attempt to merge?

 On branch feat/godot
 Changes to be committed:
	modified:   config/retrodeck/reference_lists/features.json
	modified:   tools/configurator/TabContainer.gd
	modified:   tools/configurator/components/bios_check/bios_popup_content.tscn
	modified:   tools/configurator/components/popup.tscn
	modified:   tools/configurator/main.tscn
	modified:   tools/configurator/project.godot
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
	modified:   tools/configurator/tk_about.gd
2024-08-17 18:54:02 +01:00
monkeyx-net 2d3c3c4dc4 Resize Rekku
On branch feat/godot
 Changes to be committed:
	modified:   config/retrodeck/reference_lists/features.json
	modified:   tools/configurator/main.tscn
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
2024-08-16 16:05:16 +01:00
monkeyx-net 4ee11f5a48 On branch feat/godot
Changes to be committed:
	new file:   .github/workflows/build-configurator.yml
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
2024-08-16 15:15:58 +01:00
monkeyx-net 9d526399ff Layout changes to reflect Rekku
On branch cooker
 Changes to be committed:
	modified:   config/retrodeck/reference_lists/features.json
	new file:   tools/configurator/assets/graphics/space_bground.png
	new file:   tools/configurator/assets/graphics/space_bground.png.import
	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/project.godot
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
2024-08-16 14:34:48 +01:00
monkeyx-net 6b33250b4f On branch cooker
Changes to be committed:
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
2024-08-16 10:29:46 +01:00
monkeyx-net 4718e16141 On branch cooker
Changes to be committed:
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
2024-08-16 09:54:30 +01:00
monkeyx-net 477c2a120c Back button support Rekku and pop up
On branch godot-data-demo
 Changes to be committed:
	modified:   tools/configurator/Rekku.gd
	modified:   tools/configurator/TabContainer.gd
	modified:   tools/configurator/components/bios_check/bios_popup_content.tscn
	modified:   tools/configurator/components/popup.gd
	modified:   tools/configurator/main.gd
	modified:   tools/configurator/main.tscn
	modified:   tools/configurator/project.godot
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
2024-08-15 21:34:11 +01:00
monkeyx-net e26a5956f2 Finally tidy before merge to Cooker
On branch godot-data-demo
 Changes to be committed:
	modified:   tools/configurator/main.gd
	modified:   tools/configurator/main.tscn
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
	modified:   tools/configurator/scripts/data_handler.gd
	modified:   tools/configurator/scripts/link.gd
	modified:   tools/configurator/tk_about.gd
2024-08-15 17:10:50 +01:00
monkeyx-net 95a4b2de95 Icons and buttons 2024-08-15 14:38:09 +01:00
monkeyx-net 342b1ea56f Came back to fix the original version!
On branch godot-data-demo
 Changes to be committed:
	modified:   config/retrodeck/reference_lists/features.json
	modified:   tools/configurator/main.gd
	modified:   tools/configurator/main.tscn
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
	modified:   tools/configurator/scripts/data_handler.gd
	modified:   tools/configurator/scripts/emulator.gd
	deleted:    tools/configurator/scripts/emulator_option.gd
	modified:   tools/configurator/tk_about.gd
2024-08-14 23:15:10 +01:00