Commit Graph
100 Commits
Author SHA1 Message Date
shuffle2 9be6f38988 Merge pull request #4292 from shuffle2/fix-saving-log-settings
Restore saving logger settings to .ini
2016-10-04 17:16:51 -07:00
Shawn Hoffman 55af20a439 Remove '\n' from OSD messages; they would be converted to '?' 2016-10-04 03:52:13 -07:00
Shawn Hoffman 7de9ff10a8 Restore saving logger settings to .ini 2016-10-04 02:02:07 -07:00
shuffle2 ea33405feb Merge pull request #4270 from stenzek/vulkan-defer-fix
Vulkan: Miscellaneous minor fixes
2016-10-04 01:47:59 -07:00
shuffle2 037f0a1803 Merge pull request #4290 from EmptyChaos/varwidth-fonts
WxDebugger: Fix variable width fonts in Code/Memory views
2016-10-04 01:39:27 -07:00
shuffle2 7b29b3c571 Merge pull request #4289 from shuffle2/fix-build
Fix static_assert raised by commit 789975e3
2016-10-04 00:59:13 -07:00
Shawn Hoffman fead9a05bc Fix static_assert raised by commit 789975e350 2016-10-04 00:56:02 -07:00
shuffle2 ab01dec178 Merge pull request #3806 from degasus/idle
ConfigManager: Drop SkipIdle option.
2016-10-03 23:59:38 -07:00
shuffle2 6bff97ea30 Merge pull request #4287 from shuffle2/typo-fix
Follow-up for OSD cleanup
2016-10-03 20:43:44 -07:00
Shawn Hoffman c11aba296c Follow-up for OSD cleanup:
people probably want to see decimal instead of hex...
2016-10-03 20:42:04 -07:00
shuffle2 5c0fa4db4f Merge pull request #4286 from shuffle2/Aestek-clean-osd
Clean OSD messages code
2016-10-03 20:09:35 -07:00
shuffle2 b8731eb818 Merge pull request #4068 from EmptyChaos/wx-hidpi
WX: Comprehensive HiDPI Patch
2016-10-03 20:06:08 -07:00
Shawn Hoffman fa5fa8e094 Clean OSD messages code
Some OSD messages were displayed in RenderBase.cpp using global variables and some code duplicated
in OnScreeDisplay.cpp.
Now all messages are displayed using functions in the OSD namepace.

* OSDChoice and OSDTime global variables are gone
* All OSD logic is kept at the same place
* All messages are properly aligned
* Clean characters for all OSD messages

Original commit:

commit f0ec61c05707c9657baaad096e21cf60abd267f9
Author: Aestek <[email protected]>
Date:   Sun Aug 7 16:08:41 2016 +0200
2016-10-03 19:37:18 -07:00
shuffle2 4573cc89fa Merge pull request #4285 from RisingFog/its_a_curse_to_recurse
Fix frame dump crash when resolution changes
2016-10-03 18:49:44 -07:00
shuffle2 20ebf03804 Merge pull request #4279 from shuffle2/Aestek-feature/netplay-oneclick
Aestek feature/netplay oneclick
2016-10-03 16:13:29 -07:00
Shawn Hoffman 2b0f7d2669 Re-add saving position of netplay window. 2016-10-03 15:57:32 -07:00
Shawn Hoffman 41e7c43d0d NetPlay: add one click host
Add a context menu entry in main game list to host a netplay game
based on saved settings.

Original commit:
commit 91aaa958e6af0275c07b63443938a0be471e0669
Author: Aestek <[email protected]>
Date:   Sun Jul 24 14:51:37 2016 +0200
2016-10-03 15:34:49 -07:00
shuffle2 46b6a32b46 Merge pull request #4281 from shuffle2/Tilka-jit_bitwise
Jit64: use domain-appropriate instructions
2016-10-03 15:05:33 -07:00
shuffle2 05d6157c9b Merge pull request #4284 from leoetlino/memview-crash-fix
MemoryView: Don't segfault if Core isn't running
2016-10-03 15:04:41 -07:00
shuffle2 be6aeaad33 Merge pull request #4150 from Pringo/master
Externals: Update libusb to version 1.0.20
2016-10-03 14:32:26 -07:00
shuffle2 6ec756980d Merge pull request #4195 from leoetlino/direct-hci
Add ability to passthrough a Bluetooth adapter
2016-10-03 14:22:47 -07:00
shuffle2 2c66f5bdc0 Merge pull request #4283 from leoetlino/misc-warning-fixes
Fix a few warnings
2016-10-03 12:03:52 -07:00
shuffle2 f63b767f78 Merge pull request #4280 from shuffle2/lioncash-misc
VideoCommon: Minor changes
2016-10-03 12:03:00 -07:00
Shawn Hoffman f000bb7590 Jit64: use domain-appropriate instructions
Original commit:
commit 62d3423ccf090da95b0caae1652e8fbb248c4b99
Author: Tillmann Karras <[email protected]>
Date:   Wed Nov 18 20:32:20 2015 +0100
2016-10-03 07:15:26 -07:00
Shawn Hoffman 86112c7258 VideoCommon: Minor changes
Make Renderer::GetMaxTextureSize return u32 instead of int.
2016-10-03 06:51:46 -07:00
shuffle2 cc66f0336f Merge pull request #3963 from JosJuice/banner-loaded-failure
VolumeGC: Set m_banner_loaded when banner loading fails
2016-10-03 06:33:52 -07:00
shuffle2 f121fa07c2 Merge pull request #2868 from sepalani/dolphin_ssl
Dolphin new Dump SSL features
2016-10-03 06:16:49 -07:00
shuffle2 e38ddfd787 Merge pull request #4111 from EmptyChaos/startup-perf-langs
InputCommon: Fix slow startup on some Windows systems with language packs (Issue 9744)
2016-10-03 04:02:54 -07:00
shuffle2 b650552fb4 Merge pull request #4278 from shuffle2/sc-quickfix
quick fix to prevent heap corruption in sysconf code
2016-10-03 03:46:14 -07:00
Shawn Hoffman b7dbc58c27 quick fix to prevent heap corruption by overwriting 4bytes of 1byte sysconf element 2016-10-03 03:43:01 -07:00
shuffle2 2db2e88620 Merge pull request #4010 from leoetlino/relative-input
Add relative input for the Wiimote IR
2016-10-03 03:26:04 -07:00
shuffle2 4b62d41728 Merge pull request #4090 from leoetlino/hidapi
WiimoteReal: Add a hidapi IO implementation
2016-10-03 03:20:17 -07:00
shuffle2 2747fd3a0d Merge pull request #4102 from ligfx/quartz_input
Add Quartz/CoreGraphics controller interface for default k&m events
2016-10-03 03:13:58 -07:00
shuffle2 5045fc869c Merge pull request #4188 from degasus/dynamic-bat
Dynamic bat: Merge failure and small cleanup
2016-10-03 02:37:33 -07:00
shuffle2 d42db5aa7d Merge pull request #4277 from EmptyChaos/hle-warn
HLE: Fix warnings
2016-10-03 02:34:12 -07:00
shuffle2 d139659ea2 Merge pull request #4276 from lioncash/code
GeckoCode: Provide operator== and operator!= overloads
2016-10-03 00:01:23 -07:00
shuffle2 332c9b514b Merge pull request #4275 from lioncash/net
NetPlaySetupFrame: Use an anonymous namespace instead of static
2016-10-02 22:59:35 -07:00
shuffle2 09fd2fd8e2 Merge pull request #4015 from EmptyChaos/wx-misc-fixes
WX: Fix pop-under (win) / game list garbage (win) / language support (Linux)
2016-10-02 22:46:14 -07:00
shuffle2 fba6801851 Merge pull request #4216 from EmptyChaos/geckocodes-cleanup
GeckoCodes: Don't run PPC code in CoreTiming callbacks
2016-10-02 22:37:51 -07:00
shuffle2 bd1218a3c4 Merge pull request #4250 from leoetlino/hle-patch-fix
HLE_OS: Minor fixes (function patching, output encoding)
2016-10-02 22:13:15 -07:00
shuffle2 8107a19ddc Merge pull request #4048 from EmptyChaos/wx-cheat-notice
WX: ISOProperties: Add notice when cheats are disabled (Issue 9690)
2016-10-02 22:06:26 -07:00
shuffle2 0789499bf0 Merge pull request #4181 from ntt4/patch-1
[GameINI] Set MSAA and MaxAnisotropy to 0 for Sonic Heroes
2016-10-02 21:56:21 -07:00
shuffle2 39f75d64d6 Merge pull request #4119 from mbc07/drop-4.0-ini-hack
Drop some INI hacks from 4.0-era
2016-10-02 21:23:50 -07:00
shuffle2 0082fa527b Merge pull request #4117 from JosJuice/wx-language-code
Save GUI language as string instead of wxLanguage enum
2016-10-02 21:23:36 -07:00
shuffle2 f71966866b Merge pull request #4230 from ligfx/build_vendored_libusb
Build vendored libusb with CMake if on Apple or not available system-wide
2016-10-02 21:17:01 -07:00
shuffle2 5a8abb4f93 Merge pull request #4127 from jloehr/FixDialogClosingButtons
Fix dialog closing buttons
2016-10-02 21:16:24 -07:00
shuffle2 0e3f91d88b Merge pull request #4148 from RisingFog/frame_dump_fixes
Fix frame dump issues where frame dumping stops before next drawn frame
2016-10-02 21:10:35 -07:00
shuffle2 0e7179b538 Merge pull request #4154 from JosJuice/gettextize-pipe
gettextize: Pipe list of file names to xgettext
2016-10-02 21:03:31 -07:00
shuffle2 81be83bc85 Merge pull request #4159 from Enverex/patch-1
SSX Tricky requires real XFB to display videos
2016-10-02 21:00:53 -07:00
shuffle2 7f4106646e Merge pull request #4271 from ligfx/audiofix
OpenAL: Don't request samples if buffers are full
2016-10-02 21:00:10 -07:00
shuffle2 25f983cb21 Merge pull request #4176 from phire/fix_wii_input_display_string
Movie: Fix null pointer dereference.
2016-10-02 20:59:30 -07:00
shuffle2 07f672f81b Merge pull request #4187 from sepalani/debug_ascii_symbol
MemoryView: Symbols shown in ASCII view
2016-10-02 20:57:59 -07:00
shuffle2 c62bfeba07 Merge pull request #4255 from ligfx/portaudio_build_externals
Build portaudio from Externals when not available on system
2016-10-02 20:53:54 -07:00
shuffle2 a61c6c6e2f Merge pull request #4274 from lioncash/log
LogWindow: Minor changes
2016-10-02 20:43:31 -07:00
shuffle2 2c917da5cd Merge pull request #4254 from ligfx/check_errors_postprocessing
Check for errors when postprocessing macOS app bundle
2016-10-02 20:42:39 -07:00
shuffle2 456d869791 Merge pull request #4200 from EmptyChaos/jit64-dispatch-bug
Jit64: Fix Dispatcher ABI error
2016-10-02 20:41:39 -07:00
shuffle2 53cb04f07e Merge pull request #4260 from lioncash/debugger
RegisterView: Minor changes
2016-10-02 20:34:10 -07:00
shuffle2 17aef319e8 Merge pull request #4240 from lioncash/include
Software: Clean out unnecessary includes/fwd decls
2016-10-02 20:31:35 -07:00
shuffle2 5e8bc4aa1d Merge pull request #4244 from leoetlino/stm-shutdown
Shut down Wii software gracefully
2016-10-02 20:25:13 -07:00
shuffle2 8fcc3b04e0 Merge pull request #4227 from ligfx/clean_objc
Don't force compile everything as Objective-C++ on macOS
2016-10-02 19:42:04 -07:00
shuffle2 5e4554df42 Merge pull request #3786 from EmptyChaos/vi-uninited
VideoInterface: Fix registers not being initialized
2016-04-17 14:56:53 -07:00
shuffle2 c63ef18fcc Merge pull request #3760 from lioncash/vs
pch: Update Visual Studio version check
2016-04-03 17:14:45 -07:00
shuffle2 799fce0b03 Merge pull request #3512 from jloehr/Fix-SCMRevGen
Fix SCMRevGen by running system native CScript
2016-01-15 23:56:31 -08:00
shuffle2 f26b3708e7 Merge pull request #3217 from dolphin-emu/shuffle2-patch-1
Add patch for ucrtbase 10.0.10240.16390 (Win8)
2015-11-05 15:37:19 -08:00
shuffle2 baf438fc9f Merge pull request #3213 from phire/bitfield
Bitfield: Add .natvis for easier debugging of BitFields in Visual Studio
2015-11-01 23:06:21 -08:00
shuffle2 bfffd997cd Update ucrtFreadWorkaround.cpp 2015-11-01 10:52:33 -08:00
shuffle2 34d46d6910 Merge pull request #3178 from shuffle2/ucrt-fread-workaround
patch win7 ucrtbase, and note versions
2015-10-17 05:02:18 -07:00
shuffle2 0acac35d77 patch win7 ucrtbase, and note versions 2015-10-17 04:24:20 -07:00
Shawn Hoffman ca31c62c01 exchange XSaveWorkaround (which was fixed in VS2015) for ucrtFreadWorkaround (which was broken in VS2015). 2015-10-16 20:26:34 -07:00
shuffle2 ec28d7df92 Merge pull request #3144 from lioncash/dsp
DSPIntCCUtil: Minor changes
2015-10-06 13:03:11 -07:00
shuffle2 1c97da4942 Merge pull request #3132 from sepalani/fix_mbedtls
mbedTLS: fix blocking read
2015-10-06 13:01:57 -07:00
shuffle2 3b1375f78c Merge pull request #3134 from lioncash/namespace
CPU: Convert CCPU into a namespace
2015-10-04 14:22:50 -07:00
shuffle2 55ea9e77e6 Merge pull request #3135 from lioncash/dsp
DSPCore: Convert defines over to enums
2015-10-04 14:22:02 -07:00
shuffle2 552c1f51d8 Merge pull request #3068 from mickdermack/pr-block-input
Block WX input when detecting controls
2015-10-04 14:19:44 -07:00
shuffle2 6d4128ddcc Merge pull request #3128 from lioncash/unique
ControllerEmu: Use make_unique over raw new
2015-10-03 19:08:00 -07:00
shuffle2 569d25d9b4 Merge pull request #3129 from lioncash/mailbox
DSPHWInterface: Use an enum for indicating mailbox type
2015-10-03 19:04:35 -07:00
shuffle2 eb07038723 Merge pull request #3130 from rohit-n/sign-compare
VideoCommon: Silence -Wsign-compare warnings.
2015-10-03 18:49:38 -07:00
shuffle2 0fdaacc7e0 Merge pull request #2738 from lioncash/bitfield
Common: Fix BitField mask generation.
2015-10-03 18:21:24 -07:00
shuffle2 81414b4fa2 Merge pull request #3076 from void-ghost/stereo3d_presets
Stereo3d presets
2015-10-03 18:10:23 -07:00
shuffle2 b926061f64 Merge pull request #3095 from void-ghost/savestate_race_condition_fix
SaveState: Fix for race condition in SaveAs(...)
2015-10-03 18:08:33 -07:00
shuffle2 4fb90bf9f6 Merge pull request #3115 from lioncash/ifx
DSPCore: Minor changes
2015-10-03 18:03:26 -07:00
shuffle2 06379cc3a0 Merge pull request #3113 from lioncash/input
InputCommon: Get rid of multiple identical define macros
2015-10-03 18:01:36 -07:00
shuffle2 43879ebc1e Merge pull request #3103 from Linktothepast/master
Game INI Updates
2015-10-03 18:01:09 -07:00
shuffle2 a6f04b0e15 Merge pull request #3091 from Tilka/mbedtls
Update mbed TLS (PolarSSL)
2015-10-03 18:00:58 -07:00
shuffle2 8bb35c8588 Merge pull request #3083 from JosJuice/ipc-ticks
Use correct GetTicksPerSecond() value in IPC delays
2015-10-03 17:56:57 -07:00
shuffle2 9878004871 Merge pull request #3105 from phire/dont_block
ALSA: Don't block on Clear() call.
2015-10-03 17:55:26 -07:00
shuffle2 91d805fbec Merge pull request #3119 from JosJuice/patch-1
Correct Windows version requirement in Readme.md
2015-10-03 17:53:54 -07:00
shuffle2 f5c88fc1a9 Merge pull request #3125 from JosJuice/di-callback-pointer
Simplify getting DI pointer in IOCtl callback
2015-10-03 17:52:58 -07:00
shuffle2 b4be34bc68 Merge pull request #3124 from dolphin-emu/shuffle2-patch-1
Fix WiiSockMan::DecodeError
2015-10-03 14:59:20 -07:00
shuffle2 f33fae574f Fix WiiSockMan::DecodeError 2015-10-03 01:56:42 -07:00
shuffle2 2cb5c41fed HostGetString: Actually fill a string with data 2015-09-28 05:40:52 +02:00
shuffle2 4218fb4eea Merge pull request #2916 from lioncash/wx
DolphinWX: Minor changes to Main
2015-09-03 22:59:29 -07:00
shuffle2 9a92ff5238 Merge pull request #2926 from lioncash/wx-mc
MemcardManager: Remove explicit delete and new
2015-09-03 22:58:06 -07:00
shuffle2 272302be82 Merge pull request #2950 from lioncash/bf
BitField: Enable ifdef'd out code for Windows
2015-09-03 22:56:55 -07:00
shuffle2 061364b51a Merge pull request #2951 from lioncash/readme
Readme: Specify that VS 2015 is to be used instead of VS 2013
2015-09-03 22:56:43 -07:00
shuffle2 a09b9bef8d Merge pull request #2952 from lioncash/constexpr
CommonFuncs: Replace ArraySize define with constexpr equivalent
2015-09-03 22:56:25 -07:00
shuffle2 f83f3cf594 Merge pull request #2762 from shuffle2/vs14
Move to Visual Studio 2015
2015-09-03 16:30:37 -07:00
Shawn Hoffman 399083ac8a Drop the old msvcrt files. 2015-09-03 06:10:01 -07:00
Shawn Hoffman 66a3951c3b [windows] Add workaround(HACK) for vs2015 implementating a conformant std::is_trivially_copyable...
see https://github.com/dolphin-emu/dolphin/pull/2218
2015-09-03 04:39:06 -07:00
Shawn Hoffman bea18eedc4 [windows] remove various workarounds which were required for vs2013 2015-09-03 04:39:05 -07:00