ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,306 Commits 95 Branches 91 Tags 2.5 GiB
Commit Graph

72 Commits

Author SHA1 Message Date
Sappharad ee84e5981c Merge remote-tracking branch 'origin/1.x' into mono-portable 
# Conflicts:
#	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
#	libmupen64plus/mupen64plus-win32-deps
#	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
 2019-10-03 21:33:28 -05:00
feos 9a3c9fc7cb update release info 2018-06-09 17:55:28 +03:00
Sappharad 3226717067 Merge branch '1.x' of https://github.com/TASVideos/BizHawk into mono-portable 
# Conflicts:
#	BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
#	BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IEmulator.cs
#	BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Maria.cs
#	BizHawk.Emulation.Cores/Consoles/Nintendo/NES/APU.cs
#	BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.run.cs
#	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
 2017-06-25 17:29:23 -05:00
adelikat 93fc9245da update version info 2017-06-25 09:41:45 -05:00
adelikat d96c4ab899 update release info 2017-06-03 13:19:24 -05:00
adelikat 18a2c3327d update version info 2017-05-03 09:10:37 -05:00
adelikat 2f05c5d6af Merge branch 'master' into release 2017-05-03 08:58:50 -05:00
J.D. Purcell 1946db8791 Whitespace, to reduce difference with master. 2017-05-02 23:12:37 -04:00
Sappharad 7f5aa0ae77 Merge branch 'master' into mono-portable 
Conflicts:
	.gitignore
	BizHawk.Client.Common/PathManager.cs
	BizHawk.Client.Common/lua/LuaSandbox.cs
	BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs
	BizHawk.Client.EmuHawk/AVOut/SynclessRecordingTools.cs
	BizHawk.Client.EmuHawk/CustomControls/VirtualListView.cs
	BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
	BizHawk.Client.EmuHawk/GLManager.cs
	BizHawk.Client.EmuHawk/Program.cs
	BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs
	BizHawk.Client.EmuHawk/movie/PlayMovie.cs
	BizHawk.Emulation.Common/Sound/Utilities/SpeexResampler.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi_CMD.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
	BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.ITraceable.cs
	BizHawk.Emulation.Cores/LibretroOld/LibRetro.cs
	Version/VersionInfo.cs
	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
 2017-05-02 20:38:56 -05:00
adelikat b98d428a64 cleanup VersionInfo.cs 2017-04-27 11:30:22 -05:00
adelikat 76b9367378 more misc cleanups 2017-04-24 07:43:02 -05:00
adelikat 1b7bec1687 update version info 2017-03-30 10:20:55 -05:00
adelikat 08a0e8a979 Merge branch 'master' into release 2017-03-30 10:17:23 -05:00
Sappharad ecd9800968 Merge branch 'master' into mono-portable 
Conflicts:
	BizHawk.Client.DiscoHawk/DiscoHawk.cs
	BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
 2017-03-14 20:36:35 -05:00
feos 4a52b60ca5 Version: add a dummy source file so that some versions of csc.exe won't give error 2008, killing the build scripts 2017-02-24 14:03:12 +03:00
Sappharad cf68d9a850 Fresh build of libgpgx, and the updated version number. 2017-02-21 20:33:29 -06:00
adelikat 0ccb739640 update version info for the 1.12.0 release 2017-02-21 17:20:14 -06:00
Sappharad c6eb2dbb47 Merge branch 'master' into mono-portable 
Conflicts:
	BizHawk.Client.EmuHawk/MainForm.Events.cs
	BizHawk.Client.EmuHawk/MainForm.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
 2016-12-05 21:47:31 -06:00
adelikat ff10ce2cb4 update VersionInfo on release branch 2016-12-02 15:02:25 -06:00
adelikat 6626b56b4e Merge branch 'master' into release 
Conflicts:
	Dist/BuildAndPackage.bat
	Version/VersionInfo.cs
	output/dll/mgba.dll
	output64/dll/mgba.dll
 2016-12-02 14:56:14 -06:00
zeromus c7b639be28 apply ArcadePit idea: Let user change the string in the emulator title bar via a file 
(but changed the format of the string to be more generally useful, and changed it to dll/custombuild.txt)
 2016-11-12 18:49:03 -06:00
adelikat 45ffd93755 VersionInfo on release branch 2016-10-25 17:35:40 -05:00
Sappharad dbc41a97dd Merge branch 'master' into mono-portable 2016-10-23 22:13:36 -05:00
adelikat f386a97886 Update version info on release branch 2016-10-23 17:25:30 -05:00
adelikat 420d8452f4 update version info on master branch 2016-10-22 11:58:26 -05:00
adelikat 97a38ddba5 versionInfo update on release branch for the 1.11.8 release 2016-10-22 09:36:34 -05:00
Sappharad 07a1709dbb Merge branch 'master' into mono-portable 
Conflicts:
	BizHawk.Client.EmuHawk/tools/GameShark.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs
 2016-10-18 18:23:07 -05:00
adelikat 89d857aee6 put back DeveloperBuild = true 2016-09-02 11:48:01 -04:00
feos 869f7519f9 proper date and version 2016-09-01 22:49:56 +03:00
hegyak 8be0c6fe51 Update Version/VersionInfo.cs 2016-08-29 10:46:25 -04:00
hegyak 4bd8f93c03 Update VersionInfo.cs to 1.11.6 and Merge Commit 9e3d57341f 2016-08-29 10:46:24 -04:00
hegyak 4687f29edc Merged d4f2eae8eb into Branch/RELEASE 
Updated VersionInfo.cs to 1.11.5
 2016-08-29 10:45:07 -04:00
Sappharad 2e4720cae9 Merged branch 'master' into mono-portable 
Conflicts:
	BizHawk.Client.Common/BizHawk.Client.Common.csproj
	BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
	BizHawk.Common/InstanceDll.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
	vbanext/instance.cpp
 2016-05-03 21:51:47 -05:00
hegyak c575328350 Update Version/VersionInfo.cs 2016-04-16 06:31:54 -07:00
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
nattthebear 2a0e859a85 Add 64 bit build (doesn't work yet), move SlimDX.dll 2016-02-28 15:06:03 -05:00
Sappharad df7c3c31e5 Fix for Version project so it builds under MSBuild via MonoDevelop. Provided by "scubed" on the forum. 
- Works on my machine.
 2016-01-02 12:16:13 -06:00
Sappharad d2a6542c6e Merge branch 'master' into mono-portable 
Conflicts:
	.gitignore
	BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs
	BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
	BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
	BizHawk.Client.EmuHawk/GLManager.cs
	BizHawk.Client.EmuHawk/MainForm.cs
	BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
	libsnes/bsnes/target-libsnes/libsnes.cpp
	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
 2015-12-21 21:58:13 -06:00
hegyak 41ba4b6927 This is a DeveloperBuild. 2015-12-20 14:41:17 -08:00
hegyak c53c841d94 Update the ReleaseDate to be the 20th of December 2015-12-20 14:40:03 -08:00
hegyak b25f7d65e2 Version 1.11.4 2015-12-20 12:46:37 -08:00
hegyak 55eef165aa Add one to the VersionInfo.cs 2015-12-20 12:44:50 -08:00
Hathor86 f70a2c8c6c Merge from TASVideo 2015-11-01 22:01:19 +01:00
Sappharad ec75dbf587 Merge branch 'master' into mono-portable 2015-10-14 20:49:51 -05:00
adelikat 105cd1c61f Update version info for 1.11.3 2015-10-14 19:11:25 -04:00
Sappharad 4fd45964c0 Merge branch 'master' into mono-portable 
Hopefully I didn't botch this, I'm not good at how git handles conflicts yet.
 2015-10-12 21:34:13 -05:00
Hathor86 b55a175556 Merge remote-tracking branch 'refs/remotes/TASVideos/master' into NewrRelease 
Conflicts:
	Version/VersionInfo.cs
 2015-10-11 19:51:03 +02:00
Hathor86 8f123527e8 Merge remote-tracking branch 'refs/remotes/TASVideos/master' into NewrRelease 2015-10-11 19:40:46 +02:00
adelikat a44cf5a067 Update version info for the 1.11.2 release 2015-10-10 10:09:30 -04:00
zeromus e5de3bdaa7 make aboutboxes more informational while simultaneously removing svn revision 2015-10-03 20:26:30 -05:00