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

4851 commits

This branch
This branch
All branches
Author SHA1 Message Date
MonkeyX ce25273646
On branch feat/godot (#935) 
Changes to be committed:
	modified:   tools/configurator/main.tscn
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
	modified:   tools/configurator/scripts/SystemTab.gd

Co-authored-by: Rekku <rekku@retrodeck.net>
 2024-09-06 19:38:29 +01:00
Rekku ee913e02c5 Merge branch 'cooker' into feat/godot 
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
 2024-09-06 16:15:18 +01:00
Rekku d1e633f9fd Launch button change 2024-09-06 15:54:24 +01:00
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
XargonWan 8bdd08cd74 STEAM_SYNC_SH: code cleanup 2024-09-05 22:28:10 +09:00
XargonWan 27e5b237bf STEAM_SYNC_SH: updated userConfigurations.json [skip ci] 2024-09-05 21:45:48 +09:00
XargonWan 4993dbf93b STEAM_SYNC_SH: moved it on retrodeck quit instead of retrodeck start [skip ci] 2024-09-05 21:11:12 +09:00
XargonWan 8809e338f7 STEAM_SYNC_SH: code cleanup [skip ci] 2024-09-05 21:07:47 +09:00
XargonWan ff4205632d STEAM_SYNC_SH: added prepare_component [skip ci] 2024-09-05 21:03:33 +09:00
Rekku 9a5f292fe8 Progress buttons 2024-09-05 12:32:13 +01:00
XargonWan 61ecec25fc STEAM_SYNC_SH: fixed launcher with correct command [skip ci] 2024-09-05 16:53:42 +09:00
XargonWan 6bd82c4b7e STEAM_SYNC_SH: removed deprecated commands [skip ci] 2024-09-05 15:05:00 +09:00
XargonWan 9a24f04546 STEAM_SYNC_SH: fixed game names, unified in a single function, code cleanup 2024-09-05 14:54:21 +09:00
XargonWan 6a8f186c59 INJECT_FRAMEWORK: added force args [skip ci] 2024-09-05 12:09:01 +09:00
XargonWan 2bc6d89d48 STEAM_SYNC_SH: fixed bad launcher filename generation 2024-09-05 12:05:28 +09:00
XargonWan 87564fb7b5 STEAM_SYNC_SH: checkpoint, addToSteam is working 2024-09-05 11:44:54 +09:00
XargonWan 463abe9aaf Merge branch 'cooker' into feat/steam-rom-manager 2024-09-04 22:22:40 +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 e5ea37f291 Merge branch 'feat/steam-rom-manager' of https://github.com/RetroDECK/RetroDECK into feat/steam-rom-manager 2024-09-04 21:41:56 +09:00
XargonWan 6901f48e40 Merge branch 'cooker' into feat/steam-rom-manager 2024-09-04 21:41:38 +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
XargonWan 0f00605453 Merge branch 'cooker' into feat/steam-rom-manager 2024-09-04 16:29:41 +09:00
Lx32 939bac2bf4
Revert missing entrypoint 2024-09-03 22:19:24 +02:00
Lx32 78fe802e4e
Added reset userExceptions 2024-09-03 22:16:07 +02:00
Lx32 d355e56e65
Uploaded standard exception 2024-09-03 22:15:21 +02: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
XargonWan 9b6b8d1c05 Triggering build 2024-09-01 09:04:33 +09:00
XargonWan b62f0b6556 Merge branch 'cooker' into feat/shadps4 2024-08-31 20:15:12 +09: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