Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2024-11-22 05:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
RetroDECK/config
History
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
..
cemu feat/lighter manifest (#844) 2024-08-05 03:45:21 +02:00
citra feat/lighter manifest (#844) 2024-08-05 03:45:21 +02:00
dolphin feat/lighter manifest (#844) 2024-08-05 03:45:21 +02:00
duckstation feat/lighter manifest (#844) 2024-08-05 03:45:21 +02:00
ecwolf feat/lighter manifest (#844) 2024-08-05 03:45:21 +02:00
es-de ES-DE: theme was set not correctly 2024-08-11 21:53:36 +09:00
gzdoom feat/lighter manifest (#844) 2024-08-05 03:45:21 +02:00
mame feat/lighter manifest (#844) 2024-08-05 03:45:21 +02:00
melonds feat/lighter manifest (#844) 2024-08-05 03:45:21 +02:00
patches/updates feat/lighter manifest (#844) 2024-08-05 03:45:21 +02:00
PCSX2 feat/lighter manifest (#844) 2024-08-05 03:45:21 +02:00
pico-8 feat/lighter manifest (#844) 2024-08-05 03:45:21 +02:00
ppssppsdl feat/lighter manifest (#844) 2024-08-05 03:45:21 +02:00
primehack feat/lighter manifest (#844) 2024-08-05 03:45:21 +02:00
retroarch RETROARCH: fixed core info path 2024-08-15 10:32:56 +09:00
retrodeck Merge branch 'cooker' of https://github.com/monkeyx-net/RetroDECK_UK into cooker 2024-09-06 13:21:34 +01:00
rpcs3 feat/lighter manifest (#844) 2024-08-05 03:45:21 +02:00
ruffle feat/ruffle (#904) 2024-08-23 16:28:49 +02:00
ryujinx feat/lighter manifest (#844) 2024-08-05 03:45:21 +02:00
vita3k feat/lighter manifest (#844) 2024-08-05 03:45:21 +02:00
xemu feat/lighter manifest (#844) 2024-08-05 03:45:21 +02:00
yuzu feat/lighter manifest (#844) 2024-08-05 03:45:21 +02:00