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

4714 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rekku 6e6ae0f804 Merge branch 'feat/godot' into cooker 2024-09-06 13:29:27 +01:00
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
Rekku e3477aef0f Feedback changes and 16 bit icons 2024-09-06 12:40:29 +01:00
Rekku 5ff1e645a7 Bug fixes and code tidy 2024-09-05 19:04:56 +01:00
Rekku 80aafdc16c Fix focus on Back in System 2024-09-05 16:38:42 +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
Rekku 904cb039e2 Fixed Reset Text 2024-09-05 15:32:17 +01:00
Rekku 009f7449e3 Merge branch 'cooker' into feat/godot 2024-09-05 15:12:42 +01:00
Rekku 2f8997345c Merge branch 'cooker' of https://github.com/monkeyx-net/RetroDECK_UK into cooker 2024-09-05 15:12:15 +01:00
Rekku 1f4355908a Reset! 2024-09-05 15:11:02 +01:00
Rekku 9a5f292fe8 Progress buttons 2024-09-05 12:32:13 +01:00
XargonWan 6a8f186c59 INJECT_FRAMEWORK: added force args [skip ci] 2024-09-05 12:09:01 +09:00
XargonWan a1887d546d POST_UPDATE: update_rd_conf to include steam_sync 2024-09-04 22:21:59 +09:00
XargonWan 97848cd486 Revert "INITOOL: added" 
This reverts commit 127bcdb6cd.
 2024-09-04 22:21:10 +09:00
XargonWan a589e20725 Revert "SET_SETTING_VALUE: edited to use initool" 
This reverts commit b56916c2b0.
 2024-09-04 22:21:06 +09:00
XargonWan b56916c2b0 SET_SETTING_VALUE: edited to use initool 2024-09-04 20:58:52 +09:00
XargonWan 127bcdb6cd INITOOL: added 2024-09-04 20:58:21 +09:00
Rekku 689f130dc3 Time to Cook 2024-09-02 11:46:25 +01:00
Rekku 3c1a58ae02 And then there were 5! 2024-09-01 21:34:35 +01:00
Rekku 30977adc71 Tidying icons 2024-09-01 21:26:44 +01:00
Rekku a4c26e8575 Mini change 2024-09-01 20:54:20 +01:00
Rekku 04852c04a7 Tricky bios dialogue! 2024-09-01 19:49:04 +01:00
Rekku 29f251596b Tidied parameter code 2024-09-01 17:44:16 +01:00
Rekku 6d78624075 Fixed link to json file 2024-08-30 10:51:08 +01:00
Rekku 24af607de1 Merge branch 'cooker' into feat/godot 2024-08-29 19:50:01 +01:00
Rekku 04ace444b1 Dialogues 2024-08-29 17:37:17 +01:00
Rekku ec211d0290 New version of features.json and Godot updates 2024-08-29 10:24:19 +01:00
Rekku ac599cb3ea Merged upstream 2024-08-29 10:19:30 +01:00
XargonWan 43c99f2e33 WORKFLOW: enhanced for outside runs, removed artifact for flathub as not needed in cooker [skip ci] 2024-08-28 21:10:49 +09:00
monkeyx-net e2626b8d5f Rekku gets the saw 2024-08-28 11:10:27 +01:00
monkeyx-net f623d7906f Generic buttons please2 2024-08-27 21:05:59 +01:00
monkeyx-net c17c6bc1f7 Generic buttons pleases 2024-08-27 20:14:24 +01:00
monkeyx-net d85aca13a8 Generic buttons please 2024-08-27 16:57:12 +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 699f5b9f38 fixed duplicate 2024-08-26 19:34:28 +01:00
monkeyx-net 02fbffd761 fixed duplicate 2024-08-26 19:32:45 +01:00
monkeyx-net 49673decc0 Merge of feat/godot 2024-08-26 19:27:47 +01:00
monkeyx-net e183bfd34d Merge branch 'cooker' of https://github.com/monkeyx-net/RetroDECK_UK into cooker 2024-08-26 19:17:39 +01:00
monkeyx-net 7efc73bd5b Push TEst 2024-08-26 15:06:09 +01:00
XargonWan de743a3e23 WORKFLOW: tentative solution for PRs - try#8 [skip ci] 2024-08-25 20:56:43 +09:00
XargonWan dac75b31b2 WORKFLOW: tentative solution for PRs - try#5 [skip ci] 2024-08-25 18:10:40 +09:00
XargonWan 5bad19fb35 WORKFLOW: tentative solution for PRs - try#4 [skip ci] 2024-08-25 18:03:38 +09:00
XargonWan 11877adc38 WORKFLOW: simplyfing PR name [skip ci] 2024-08-25 17:56:21 +09:00
XargonWan 2cfc71b588 WORKFLOW: tentative solution for PRs - try#3 [skip ci] 2024-08-25 17:52:19 +09:00
XargonWan 056179c629 WORKFLOW: tentative solution for PRs - try#2 [skip ci] 2024-08-25 17:42:50 +09:00
Rekku 71a16154bc Merge branch 'cooker' of https://github.com/XargonWan/RetroDECK into cooker 2024-08-25 08:37:47 +01:00
Rekku 2454422225 Rotten the core! 2024-08-25 08:03:25 +01:00
XargonWan bf619738f8 WORKFLOW: tentative solution for PRs [skip ci] 2024-08-25 14:18:01 +09:00