Commit Graph

296 Commits

Author SHA1 Message Date
Sappharad 71e34339a3 Merge branch 'master' into mono-portable
# Conflicts:
#	BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
#	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
2017-06-16 22:57:52 -05:00
alyosha-tas 5b3c742f0d Add files via upload 2017-06-11 18:31:25 -04:00
Sappharad 5573409fad Merge branch 'master' into mono-portable
# Conflicts:
#	BizHawk.Client.Common/Extensions.cs
#	BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs
#	BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
#	BizHawk.Client.EmuHawk/MainForm.Events.cs
#	BizHawk.Client.EmuHawk/MainForm.cs
#	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
#	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
#	BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs
#	BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
#	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
2017-05-23 20:32:48 -05:00
nattthebear c2fa9070a3 I guess this might help us someday, if we support other environments... 2017-05-16 20:55: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 13ca76f3f8 UI for changing SNES controller configurations 2017-04-15 20:34:32 -05:00
Sappharad d68d961ef8 Merge branch 'master' into mono-portable 2017-04-02 20:03:31 -05:00
J.D. Purcell 33d42152a8 Fix N64 audio weirdness in AVI recording. 2017-03-22 23:00:37 -04: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 0ec0910207 tastudio: move screenshot popup to yet another control to allow fading
avoid false branch 0 hover when entering branch view from the top

todo: hide screenshot when moving upwards to header cell
2017-03-08 16:31:49 +03:00
zeromus 3bb1d0849d remove noise from csproj 2017-03-06 05:21:35 -06:00
alyosha-tas b415eb48e7 Update BizHawk.Client.EmuHawk.csproj 2017-03-01 11:18:18 +08:00
alyosha-tas 4fbd7ff033 Add files via upload 2017-03-01 10:57:59 +08:00
Sappharad 25fd0fdb9a Merge branch 'master' into mono-portable
Conflicts:
	BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
	BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
	BizHawk.Client.EmuHawk/MainForm.cs
	BizHawk.Client.EmuHawk/tools/GameShark.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
2017-01-31 21:59:37 -06:00
feos d8d0c62adf tastodio: completely redo branch screenshot popup just to avoid cropping
moved it to ToolTip, which feels like the proper way to do it
2017-01-22 17:46:54 +03:00
J.D. Purcell cabf27f5d9 Move a few files related to sound output from BizHawk.Emulation.Common to BizHawk.Client.EmuHawk. 2016-12-15 19:25:09 -05:00
J.D. Purcell d95edc273e Sound cleanup. 2016-12-14 23:26:01 -05:00
Sappharad e0d2a88f07 Merge branch 'master' into mono-portable
Conflicts:
	BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs
	BizHawk.Emulation.Common/Sound/Utilities/SpeexResampler.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
2016-12-12 20:29:18 -06:00
adelikat b7e616482d Intellivision - movie mnemonics and virtual pads 2016-12-06 20:16:22 -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 5665de1797 Intellivision - add a "Fake analog" controller as the default controller for easier binding for casual play, but also leave a boolean option as well for more precise (TAS) control. Add a controller config dialog to select them. 2016-12-03 17:44:25 -06:00
adelikat bb8bac3fb3 NesHawk - UI for setting VS dipswitches 2016-11-05 17:32:58 -05:00
Sappharad 3cf4d3464d Merge branch 'master' into mono-portable
Conflicts:
	BizHawk.Client.EmuHawk/tools/TraceLogger.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
2016-08-23 21:21:57 -05:00
feos 640911db33 make gameshark image and icon properly transparent 2016-08-11 23:46:28 +03: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
zeromus 8e92371178 fix gif palette rgb ordering. separate commit because the bitfield fiddling is a bit mysterious and required guessing. also forgot to commit csproj 2016-04-10 03:00:26 -05:00
zeromus 10272b4857 add alternate vsync method for d3d display method, in case youre the lucky owner of a system that sucks 2016-03-27 04:49:17 -05: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
Adam Michaud 2db8f7e14c Expanded drag and drop
Allows dragging-and-dropping of multiple files onto a running BizHawk
window.

Currently, dragging-and-dropping multiple files of the same
classification is disabled.  Classifications are listed in the
LoadOrdering Enum, and include the order in which those types of files
should be loaded (no state before ROM, etc.)
The current ordering is ROM, state, watch, CDL file, Lua session, Lua
script, cheat file, [movie file and legacy movie file].

The next thing to do is allow dropping archives and extracting the
relevant files from it, but the current hurdle is that any such loaded
file would have to be read-only, as re-saving into the archive could be
problematic.  Furthermore, all of the existing functions (copied and
split into the Loaders region) accept filenames and not streams, which
means that much of the rest of the code needs refactoring to allow
archive loading.
2016-03-02 23:09:44 -05:00
zeromus 1b32d02ac8 visualstudio keeps wanting to edit this, so ill let it 2016-03-01 22:07:16 -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
nattthebear a87096fb85 Move around LuaInterface.dll as well in preparation for 64 bit build 2016-02-28 16:10:18 -05:00
nattthebear 2a0e859a85 Add 64 bit build (doesn't work yet), move SlimDX.dll 2016-02-28 15:06:03 -05:00
feos 26997dd32a save tracer column widths. 2016-02-27 19:30:47 +03:00
pjgat09 252dbe62ce Fixed the build tool to accept spaces in the path. 2016-02-21 21:27:49 -05:00
Sappharad 9a050b672b Fix portable-branch specific errors caused by the merge process. 2016-02-15 18:54:59 -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
zeromus 362f672abd use that tool in emuhawk 2016-02-14 16:43:05 -06:00
nattthebear 510dc20823 Try activating Large Address Aware (>2GB) support for EmuHawk. Someone needs to test this. 2016-02-13 18:20:08 -05:00
adelikat 36b82c3563 Lua Console - add a button that installs auto-complete for all bizhawk's lua library to Sublime Text 2's lua syntax, still todo - notepad++ 2016-02-07 08:27:57 -05:00
zeromus 3b9796232c MoviesOnDisk: now ready for primetime; hooked up as option in customize config dialog 2016-02-06 15:07:58 -06:00
hegyak 73e705f0f3 Added Multiline Cheat Code handling for all supported cores. Added GBA Slide code handling. 2016-02-03 14:01:57 -08:00
zeromus 74eba9209c visualstudio keeps trying to change this project 2016-01-31 02:41:36 -06:00
zeromus 0da6e745e5 move EnvironmentSandbox and LuaSandbox to Client.Common 2016-01-30 18:37:30 -06:00
zeromus 192458a190 try catching some missing prereqs in emuhawk startup and print a report about it 2016-01-14 01:50:41 -06:00
adelikat 60692450e8 New Hex Editor - add the plumbing for the HexView widget, that will use the GDIRenderer as the basis for the drawing. 2015-12-24 11:15:29 -05:00
adelikat d470703a40 Add an Experimental Tools submenu that only shows in Developer Builds and move autohawk there. Add a NewHexEditor tool (in the experimental section), which is currently just a bare bones winform with all the necessary plumbing set up 2015-12-23 21:11:25 -05: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
feos fbd1d6d8e2 Lua: autoload recent scripts too (unless there's a recent session to autoload).
pixelText bg tweak.
2015-11-29 13:29:48 +03:00
feos 128c09e7b4 progress with lua:
- added fceux and gens/snes9x pixelated fonts
- added gui.pixelFont() function for them (no resizing, so perfectly scalable)
- added background to drawText and pixelText (halo was painfully slow, so just a box)
- reordered fore and back colors for gui.text (no need to specify back every time we want to change fore). thought its back color was shadow, that is obsoleted by halo now, whose color we can't change. anyway, it's way slower than simple text functions, so they should be used mostly.
- option to toggle all scripts if none is selected. greatly reduces routine when heavily tweaking a script, and is just generally pretty.
2015-11-28 22:19:15 +03:00