Commit Graph

115 Commits

Author SHA1 Message Date
YoshiRulz ae12b0e23c
Revert some changes from #1237 and #1380 that aren't needed anymore 2019-11-04 19:53:14 +10:00
J.D. Purcell fec63fb66a Spaces -> tabs, fix mixed newlines. 2019-11-03 20:58:36 -05:00
adelikat 6c7653e158 Merge branch 'master' into MoreUnixMonoCompatWork
This doesn't compile because of Input.cs, didn't know what to do. Also search for Merge TODO for some commenting things that probably need to be deleted
# Conflicts:
#	BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
#	BizHawk.Client.EmuHawk/CustomControls/InputRoll.Drawing.cs
#	BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
#	BizHawk.Client.EmuHawk/Program.cs
#	BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
#	BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
#	BizHawk.Client.EmuHawk/tools/ToolHelpers.cs
#	BizHawk.Client.EmuHawk/tools/ToolManager.cs
#	BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs
#	BizHawk.Client.EmuHawk/tools/TraceLogger.cs
#	BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs
#	BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
#	BizHawk.Common/BizInvoke/DynamicLibraryImportResolver.cs
2019-10-31 17:01:19 -05:00
YoshiRulz f8379d9fd4
Bump ReSharper analysis to C# 8.0 2019-10-31 03:30:00 +10:00
J.D. Purcell 69edada441 Set LangVersion to 8.0. Requires Visual Studio 2019 with 16.3+ update installed. 2019-10-27 12:14:19 -04:00
adelikat 924618ee8f Set resharper language level to 7, add some emulator lingo to the resharper dictionary 2019-10-27 10:54:29 -05:00
YoshiRulz 4e5b763c38
Reenable OpenTK gamepad functionality 2019-10-07 03:08:41 +10:00
James Groom 067477ce18
Merge branch 'master' into clean_docs 2019-06-14 13:28:39 +00:00
YoshiRulz 3d097e3f04
Run jpegoptim on *.jpg and oxipng -so6 on *.png 2019-06-10 19:09:26 +10:00
YoshiRulz 2642ef4049
Remove empty docs 2019-06-06 16:41:10 +10:00
zeromus ab020cfad2 fix crash disposing unavailable pipelines (was already done in GL display method but not d3d.) fixes #1546 without walls of text discussion and KBs of pointless diffs 2019-04-20 14:52:32 -04:00
James Groom 779975f689
Use nameof 2019-03-28 14:17:14 +11:00
YoshiRulz d64df5a030
Use string interpolation 2019-03-20 14:41:19 +10:00
alyosha-tas ee45e3114e manually revert 'allow alpha in screenshots' 2019-02-12 17:17:08 -06:00
adelikat 5b26300e50
Merge pull request #1419 from upthorn/master
Extend APIHawk with a lua-like system of api libraries
2019-01-19 17:24:08 -06:00
zeromus ca9385c3c8 add some little fragments i meant for the user display cropping stuff but didnt use 2019-01-18 00:59:23 -05:00
upthorn 8395193aee Allow alpha to matter in screenshots. 2018-12-21 22:38:03 -08:00
zeromus 88ce214670 remove junk accidentally added bizwareGL ClassDiagram 2018-11-30 09:08:44 -06:00
zeromus 9d6997692f Merge remote-tracking branch 'remotes/peeweek/retroizer' 2018-11-18 11:09:53 -05:00
James Groom ca021d96cc Allow bizhawk to be built and run w/ MSBuild and Wine+Mono on GNU+Linux (#1237)
- Update to latest OpenTK, add input code from `mono-stable` branch
(kudos), and fix bugs arisen from version differences
- Move some functionality into Win-specific classes and add Wine+Mono
implementation where simple
- Add conditions to main loop so some things only run on Windows
2018-11-04 20:05:20 +03:00
Asnivor c0fcac5ab1 CPCHawk: Port IO changes, Interrupt generation, i8255 PPI chip, PSG IO & Keyboard/Joysticks 2018-07-18 08:12:44 +01:00
adelikat 22d1818641 DoSettings file for all project to explicitely set language level to C#6 2018-06-23 13:06:13 -05:00
frequem 71ba3024b7 Fixed linux build 2018-02-21 20:19:33 -05:00
vadosnaprimer 761c1532e0 fix single-line messaged 2018-01-02 22:46:24 +03:00
vadosnaprimer 81f681bcd8 account for linebreaks when measuring message string 2018-01-02 21:25:07 +03:00
peeweek 8c503f0e7e Retroizer Shader + Time uniform in custom shaders 2017-10-23 23:31:56 +02:00
zeromus fd63acd644 ogl display method: dont crash when disposing if user's system can't compile shaders. also print some diagnostics for cgc failures to console 2017-07-20 17:18:18 -05:00
zeromus 3336c80818 fix bizware output directories 2017-06-27 17:23:33 -05:00
zeromus cad5f441dd fix build paths to output 2017-06-26 17:57:50 -05:00
zeromus 0085729392 delete x64 build configuration, use anycpu instead. take care to set Prefer32Bit false in exe csproj, since visualstudio's gui preference doesn't work. 2017-06-26 17:47:51 -05:00
zeromus 0942d4f498 remove x86 project configurations 2017-06-12 01:24:35 -05:00
adelikat 5fec117b68 Roll back to .NET 4.6.1 (instead of 4.6.2) to avoid a dependency on Windows 10 Anniversary Update for Windows 10 users 2017-06-06 10:24:21 -05:00
adelikat 7d84946daa BitmapBuff - fix exception from 32bit ASSumptions 2017-05-28 18:21:55 -05:00
nattthebear 76022f66f9 update to framework 4.6.2. Since Windows XP 64 was very rarely used, there's no loss in switching to this if we're going to 64 bit. Add `FrameworkZipWriter` based on the 4.5 framework's built in zip writer. It shaves a decent amount of time off savestate save time, but rolling our own off of DeflateStream would be even faster. 2017-05-27 18:15:15 -04:00
nattthebear ebe789eed2 heh 2017-05-10 07:45:23 -04:00
J.D. Purcell ed3bf0e62b Fix mixed line endings. 2017-04-15 15:53:02 -04:00
J.D. Purcell b2a28339d1 Use 'nameof' operator. 2017-04-10 08:36:42 -04:00
J.D. Purcell 0322ca5bad Cleanup Direct3D device reset code. 2017-04-09 12:55:11 -04:00
J.D. Purcell 1eaaaa64e1 Remove old workaround. 2017-04-08 18:01:03 -04:00
J.D. Purcell f17e1c3f2a Fix in OpenGL cleanup. 2017-04-08 15:31:02 -04:00
J.D. Purcell bf8d981952 Fix comment 2017-04-08 15:20:33 -04:00
J.D. Purcell 0b81463408 Make sure Direct3D objects get disposed. Fixes all SlimDX warnings when exiting. 2017-04-08 15:18:55 -04:00
zeromus 8cfb46caa7 fix #796 2017-02-11 07:30:12 -06:00
zeromus a0495b5090 d3d display method: fix 2nd ctrl alt del 2016-12-19 21:22:39 -06:00
zeromus 1aa4382d21 d3d display method: survive ctrl+alt+del (should fix #522) 2016-04-20 14:29:54 -05:00
zeromus c30817abbf AUGH. re-fix "fix flashes of garbage while changing vsync toggle (includes when fast-forwarding) on d3d display method"
by

Revert "tidy d3d display method a tiny bit, i guess"

so sensitive.

This reverts commit b8fd885d3f.
2016-03-27 15:46:43 -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
zeromus b8fd885d3f tidy d3d display method a tiny bit, i guess 2016-03-27 01:43:24 -05:00
zeromus 5ce0ace1cd fix flashes of garbage while changing vsync toggle (includes when fast-forwarding) on d3d display method 2016-03-26 12:39:31 -05:00
nattthebear 2a0e859a85 Add 64 bit build (doesn't work yet), move SlimDX.dll 2016-02-28 15:06:03 -05:00