Commit Graph

3 Commits

Author SHA1 Message Date
CocoSimone
aff00bdca3 We do a little saving (Widget + json serialization) 2022-12-17 02:34:42 +01:00
CocoSimone
c1b57403cd Merge branch 'master' into dynarec
# Conflicts:
#	.github/workflows/build.yml
#	src/CMakeLists.txt
#	src/frontend/imgui/Window.cpp
#	src/n64/Core.cpp
#	src/n64/core/interpreter/cop/cop1instructions.cpp
#	src/n64/core/interpreter/decode.cpp
#	src/n64/core/registers/Cop1.cpp
2022-12-16 23:23:27 +01:00
CocoSimone
35b4d5ab9e preliminary dynarec work 2022-11-03 12:39:51 +01:00