Sappharad
|
c93697baee
|
Merge branch 'master' into mono-portable
Conflicts:
.gitignore
BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj
BizHawk.Client.Common/BizHawk.Client.Common.csproj
BizHawk.Client.Common/lua/LuaSandbox.cs
BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
BizHawk.Client.Common/tools/Cheat.cs
BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs
BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs
BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
BizHawk.Client.EmuHawk/MainForm.cs
BizHawk.Client.EmuHawk/movie/RecordMovie.cs
BizHawk.Client.EmuHawk/tools/GameShark.cs
BizHawk.Emulation.Common/Interfaces/IInputPollable.cs
BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs
BizHawk.Emulation.Cores/Computers/Commodore64/C64.IInputPollable.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibmGBA.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ITraceable.c
s
BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs
BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
Dist/changelog.txt
output/Lua/Genesis/Earthworm Jim 2.lua
output/Lua/SNES/Super Mario World.lua
output/dll/mgba.dll
quicknes/bizinterface.cpp
quicknes/mingw/Makefile
|
2016-03-07 20:34:23 -06:00 |
|
zeromus
|
d8554ee536
|
move assorting junk from the Output directory to Assets; add build step to copy them from Assets to the appropriate 32/64 output directory
|
2016-02-28 21:59:17 -06:00 |
|
Sappharad
|
ed88569221
|
Merge branch 'master' into mono-portable
Conflicts:
BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
BizHawk.Client.EmuHawk/movie/RecordMovie.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
|
2016-02-15 18:38:48 -06:00 |
|
feos
|
485d1e53d0
|
jim 2 lua: small fixes.
|
2015-12-28 19:15:53 +03:00 |
|
feos
|
a0f7caf686
|
jum 2 lua script: added bg and hitboxes
|
2015-12-27 23:25:29 +03:00 |
|
feos
|
df8929ea55
|
added jim 2 script.
|
2015-12-15 21:58:08 +03:00 |
|
feos
|
173b9e9d76
|
new lua script, relying on recent features.
show frame when rewinding.
|
2015-12-07 21:43:32 +03:00 |
|
ConHuevosGuey
|
69d8e68411
|
Added USA version of splatterhouse 2 collision viewer.
|
2015-07-20 07:52:11 -05:00 |
|
ConHuevosGuey
|
2c00be2522
|
Splatterhouse 2 (JP) collision viewer.
|
2015-07-20 07:20:38 -05:00 |
|
adelikat
|
206b00252f
|
fix a bunch of genesis lua scripts
|
2015-02-05 00:28:36 +00:00 |
|
adelikat
|
cd856a0011
|
move output folder up one level
|
2013-11-03 14:06:46 +00:00 |