Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2024-11-22 22:15:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
RetroDECK/tools/configurator
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
..
assets Feat/godot (#929) 2024-09-05 16:04:36 +01:00
components Feat/godot (#929) 2024-09-05 16:04:36 +01:00
locales Merge branch 'cooker' of https://github.com/monkeyx-net/RetroDECK_UK into cooker 2024-09-06 13:21:34 +01:00
res Merge branch 'cooker' of https://github.com/monkeyx-net/RetroDECK_UK into cooker 2024-09-06 13:21:34 +01:00
scripts Merge branch 'cooker' of https://github.com/monkeyx-net/RetroDECK_UK into cooker 2024-09-06 13:21:34 +01:00
controller_guide.gd Feat/godot (#929) 2024-09-05 16:04:36 +01:00
data_list.json feat/ruffle (#904) 2024-08-23 16:28:49 +02:00
data_list.yml feat/godot configurator (#866) 2024-08-08 16:46:53 +02:00
emu_list.yml feat/godot configurator (#866) 2024-08-08 16:46:53 +02:00
ENG-DESCRIPTIONS-TEMP.txt feat/godot configurator (#866) 2024-08-08 16:46:53 +02:00
export_presets.cfg Feat/godot (#929) 2024-09-05 16:04:36 +01:00
helper_text.gd Godot cooker update (#885) 2024-08-14 06:14:28 +02:00
icon.svg feat/godot configurator (#866) 2024-08-08 16:46:53 +02:00
icon.svg.import feat/godot configurator (#866) 2024-08-08 16:46:53 +02:00
main.gd Merge branch 'cooker' of https://github.com/monkeyx-net/RetroDECK_UK into cooker 2024-09-06 13:21:34 +01:00
main.tscn Merge branch 'cooker' of https://github.com/monkeyx-net/RetroDECK_UK into cooker 2024-09-06 13:21:34 +01:00
popup_content_test.tscn feat/godot configurator (#866) 2024-08-08 16:46:53 +02:00
progress_file.sh feat/godot configurator (#866) 2024-08-08 16:46:53 +02:00
project.godot Feat/godot (#929) 2024-09-05 16:04:36 +01:00
Rekku.gd Cooker Godot Update (#911) 2024-08-23 02:25:55 +02:00
retrodeck.json Godot cooker update (#885) 2024-08-14 06:14:28 +02:00
TabContainer.gd Feat/godot (#929) 2024-09-05 16:04:36 +01:00
tilemap_packed.png Godot cooker update (#885) 2024-08-14 06:14:28 +02:00
tilemap_packed.png.import Godot cooker update (#885) 2024-08-14 06:14:28 +02:00
tk_about.gd Feat/godot (#929) 2024-09-05 16:04:36 +01:00
tk_about.txt feat/godot configurator (#866) 2024-08-08 16:46:53 +02:00
touch_external.sh feat/godot configurator (#866) 2024-08-08 16:46:53 +02:00