Skip to content

Commit 10ed651

Browse files
committed
Merge pull request #1 from Hathor86/NewrRelease
Newrrelease
2 parents 29767ba + b55a175 commit 10ed651

File tree

76 files changed

+5280
-4593
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+5280
-4593
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@
246246
/References/*.xml
247247
/output/ELFSharp.dll
248248
/output/dll/ELFSharp.dll
249+
/output/GameTools/*.dll
249250
*.opensdf
250251
*.user
251252
*.suo

BizHawk.Client.Common/RomLoader.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ public bool LoadRom(string path, CoreComm nextComm, bool forceAccurateCore = fal
672672
nextEmulator = new Atari7800(nextComm, game, rom.RomData, gamedbpath);
673673
break;
674674
case "C64":
675-
var c64 = new C64(nextComm, game, rom.RomData, rom.Extension);
675+
var c64 = new C64(nextComm, game, rom.RomData, rom.Extension, GetCoreSettings<C64>(), GetCoreSyncSettings<C64>());
676676
nextEmulator = c64;
677677
break;
678678
case "GBA":

BizHawk.Client.Common/config/PathEntry.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,9 @@ public static List<PathEntry> DefaultValues
157157
new PathEntry { System = "Global_NULL", SystemDisplayName="Global", Type = "Macros", Path = Path.Combine(".", "Movies", "Macros"), Ordinal = 10 },
158158
new PathEntry { System = "Global_NULL", SystemDisplayName="Global", Type = "TAStudio states", Path = Path.Combine(".", "Movies", "TAStudio states"), Ordinal = 11 },
159159
new PathEntry { System = "Global_NULL", SystemDisplayName="Global", Type = "Multi-Disk Bundles", Path = Path.Combine(".", "Tools"), Ordinal = 12 },
160+
new PathEntry { System = "Global_NULL", SystemDisplayName="Global", Type = "GameTools", Path = Path.Combine(".", "GameTools"), Ordinal = 13 },
160161

161-
new PathEntry { System = "INTV", SystemDisplayName="Intellivision", Type = "Base", Path = Path.Combine(".", "Intellivision"), Ordinal = 0 },
162+
new PathEntry { System = "INTV", SystemDisplayName="Intellivision", Type = "Base", Path = Path.Combine(".", "Intellivision"), Ordinal = 0 },
162163
new PathEntry { System = "INTV", SystemDisplayName="Intellivision", Type = "ROM", Path = ".", Ordinal = 1 },
163164
new PathEntry { System = "INTV", SystemDisplayName="Intellivision", Type = "Savestates", Path= Path.Combine(".", "State"), Ordinal = 2 },
164165
new PathEntry { System = "INTV", SystemDisplayName="Intellivision", Type = "Save RAM", Path = Path.Combine(".", "SaveRAM"), Ordinal = 3 },

0 commit comments

Comments
 (0)