Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2024-11-27 00:05:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4647 commits 20 branches 230 tags 440 MiB
Commit graph

22 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 f623d7906f Generic buttons please2 2024-08-27 21:05:59 +01:00
monkeyx-net d85aca13a8 Generic buttons please 2024-08-27 16:57:12 +01:00
Rekku 2454422225 Rotten the core! 2024-08-25 08:03:25 +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 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 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 971d93b158 A tidier classroom 2024-08-18 22:42:40 +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
monkeyx-net e47b3116b8 On branch feat/godot-configurator 
Changes to be committed:
	modified:   tools/configurator/components/logs.tscn
	renamed:    tools/configurator/components/logs/logs_popup_content.tscn -> tools/configurator/components/logs_view/logs_popup_content.tscn
	new file:   tools/configurator/components/logs_view/view_log.gd
	modified:   tools/configurator/components/popup.gd
	modified:   tools/configurator/components/popup.tscn
	modified:   tools/configurator/data_list.json
	modified:   tools/configurator/main.gd
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
	new file:   tools/configurator/retrodeck.json
	modified:   tools/configurator/scripts/class_functions.gd
	modified:   tools/configurator/scripts/data_handler.gd
	modified:   tools/configurator/tk_about.gd
 2024-08-04 19:45:51 +01:00
monkeyx-net beb5aff71d On branch feat/godot-configurator 
Changes to be committed:
	modified:   tools/configurator/main.gd
	modified:   tools/configurator/main.tscn
	modified:   tools/configurator/scripts/data_handler.gd
	modified:   tools/configurator/tk_about.gd
 2024-08-02 20:08:14 +01:00
monkeyx-net df56d1900c On branch feat/godot-configurator 
Changes to be committed:
	deleted:    tools/configurator/data.json
	modified:   tools/configurator/main.gd
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
	modified:   tools/configurator/scripts/data_handler.gd
 2024-08-02 18:48:29 +01:00
monkeyx-net a7bbe16884 Tidying up 
On branch feat/godot-configurator
 Changes to be committed:
	modified:   tools/configurator/main.gd
	modified:   tools/configurator/project.godot
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
	modified:   tools/configurator/scripts/data_handler.gd
	deleted:    tools/configurator/scripts/save_manager.gd
 2024-08-02 18:44:31 +01:00
monkeyx-net d20b4dbf5d Now includes modify json. Need cleaning up! 
On branch feat/godot-configurator
 Changes to be committed:
	modified:   tools/configurator/data_list.json
	modified:   tools/configurator/export/configurator.pck
	modified:   tools/configurator/main.gd
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
	modified:   tools/configurator/scripts/data_handler.gd
 2024-08-01 17:27:36 +01:00
monkeyx-net ec5059b6ea On branch feat/godot-configurator 
Changes to be committed:
 modified:   tools/configurator/data_list.json
	modified:   tools/configurator/export/configurator.pck
	deleted:    tools/configurator/export/tk_about.txt
	modified:   tools/configurator/main.gd
	modified:   tools/configurator/project.godot
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
	modified:   tools/configurator/scripts/data_handler.gd
	modified:   tools/configurator/scripts/emulator_property.gd
	modified:   tools/configurator/tk_about.gd

	tools/configurator/export/data_list.json
 2024-08-01 17:03:20 +01:00
monkeyx-net 058fe166c5 Adding json support and supporting class 
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
 2024-08-01 14:33:58 +01:00