Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,406 Commits 1 Branch 0 Tags
1f95ed004a3268cf04b3e6903b6ea3d362f56c09
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Parlane 7a99312687 Merge pull request #3873 from JosJuice/argh 
Undo the addition of a translatable string during the string freeze
 2016-05-31 08:46:25 +12:00
Matthew Parlane 25f88bf751 Merge pull request #3823 from Summate/development 
Piping the wxMsgAlert through netplay window during netplay ...
 2016-05-21 11:16:19 +12:00
Matthew Parlane 24ea2dc2da Merge pull request #3842 from rukai/dolphinQtVSkeepBinaryClean 
[Qt] VS build no longer adds all of Data to Binary
 2016-05-19 20:49:35 +12:00
Matthew Parlane 2d41f129cd Merge pull request #3849 from Tsunamical/codecleanup 
[Android] Reduce code redundancy and catch a leak
 2016-05-19 20:46:48 +12:00
Matthew Parlane 0283ce2a7c Merge pull request #3837 from rukai/dolphinQtFixVS 
Brings visual studio build files up to date with recent Qt changes
 2016-05-13 07:45:14 +12:00
Matthew Parlane ec40b38484 Merge pull request #3571 from rukai/dolphinQtVisualStudio 
DolphinQt2 Builds on Visual Studio
 2016-05-12 22:27:18 +12:00
Matthew Parlane 356f709537 Merge pull request #3810 from mathieui/fix-adapter-recording-savestate 
Fix loading save states with input recording with the adapter
 2016-05-12 20:53:04 +12:00
Matthew Parlane 48c0c2ace6 Merge pull request #3830 from Lionel07/qt-settings-window 
[Qt] Settings Window for Qt
 2016-05-11 16:43:43 +12:00
Matthew Parlane 670a1c2694 Merge pull request #3532 from rukai/enterOpenGame 
Qt - Enter key opens selected game in the game list.
 2016-05-11 08:45:29 +12:00
Matthew Parlane 3f012df6d5 Merge pull request #3615 from rukai/qtCrash 
DolphinQt2: Fix crash related to loading gameini
 2016-05-11 08:40:00 +12:00
Matthew Parlane bb6a04dc8e Merge pull request #3713 from stenzek/d3d12-more-fixes 
D3D12: Bug fixes, implement bbox, realxfb, perfquery
 2016-05-10 21:34:27 +12:00
Matthew Parlane 1e1fce1a03 Merge pull request #3815 from degasus/scm 
SCM: Use std::string.
 2016-05-07 20:24:59 +12:00
Matthew Parlane 461a48f8e3 Merge pull request #3820 from Lionel07/netplay-elf-title-regression 
Fix regression for .elf files in Netplay Game Selector
 2016-05-07 19:47:13 +12:00
Matthew Parlane 48237b38e8 Merge pull request #3817 from Lionel07/qt-mac 
[UI] Enable Qt on Mac
 2016-05-06 13:28:11 +12:00
Matthew Parlane 1cfeacd5b6 Merge pull request #3793 from mathieui/netplay-disc-num 
Add information about disc number in the netplay setup
 2016-05-06 09:19:54 +12:00
Matthew Parlane dbd67c6b06 Merge pull request #3809 from Lionel07/netplay-gui-updates 
[UI] Make NetPlay UI bigger and neater
 2016-05-04 08:45:48 +12:00
Matthew Parlane 74f0c91860 Merge pull request #3783 from Pringo/description 
Update CPack Package Description
 2016-05-03 22:55:18 +12:00
Matthew Parlane ea82fcc24f Merge pull request #3658 from Tilka/helpers 
Interpreter: simplify some helpers
 2016-05-03 22:44:27 +12:00
Matthew Parlane 1634948b6e Merge pull request #3742 from phire/dither 
Implement Dithering for video software
 2016-05-03 22:41:39 +12:00
Matthew Parlane c32ba0fc06 Merge pull request #3744 from degasus/videosw 
VideoSW: Fix special case.
 2016-05-03 22:34:00 +12:00
Matthew Parlane e0a5f1bb75 Merge pull request #3791 from spxtr/mw-timer 
Use CoreTiming for MemoryWatcher.
 2016-05-03 22:30:51 +12:00
Matthew Parlane b7795044bb Merge pull request #3768 from JosJuice/game-inis-2016-04-03 
Game INI updates
 2016-05-01 23:45:25 +12:00
Matthew Parlane a78787ba75 Merge pull request #3730 from lioncash/noncopy 
NonCopyable: Minor changes
 2016-05-01 11:46:08 +12:00
Matthew Parlane 05e1406e89 Merge pull request #3795 from EmptyChaos/fix-diskreader 
DriveReader: Fix View > Show Drives
 2016-05-01 11:43:30 +12:00
Matthew Parlane 3d375592a2 Merge pull request #3798 from phire/goto_dino 
Fix handling of Wii NAND's /tmp directory during savestate loads.
 2016-05-01 11:37:33 +12:00
Matthew Parlane e629727572 Merge pull request #3792 from mathieui/netplay-rumble 
Fix netplay rumble
 2016-04-30 23:06:37 +12:00
Matthew Parlane 3df4b09a94 Merge pull request #3797 from phire/casually_delete_some_code 
Fix netplay desync when using wii-u adapter.
 2016-04-30 17:55:06 +12:00
Matthew Parlane 763ca7151e Merge pull request #3777 from RisingFog/patch-1 
Only copy relevant files for Windows builds
 2016-04-13 08:57:22 +12:00
Matthew Parlane 73739696ef Merge pull request #3548 from sigmabeta/android-fix-builds 
[Android] Fix android builds
 2016-01-22 19:05:11 +13:00
Matthew Parlane f92a36d86c Merge pull request #3283 from RisingFog/patch-1 
Fix Frame Advance Hold Delay Changes
 2015-11-24 10:44:52 +13:00
Matthew Parlane 0e258d4621 Merge pull request #3152 from ShadowsFriend/ipl_checksum 
Use CRC32 for IPL checks and update hashes
 2015-11-20 14:37:13 +13:00
Matthew Parlane 1124be0568 Merge pull request #3256 from Parlane/net_fix_poll 
Don't send return-only events to poll
 2015-11-16 16:13:49 +13:00
Matthew Parlane e023fddc96 Don't send return-only events to poll 
Fixes some network issues where the game/system asked for POLLHUP specifically.
 2015-11-14 09:10:55 +13:00
Matthew Parlane 400a737ef9 Merge pull request #3154 from lioncash/fallback 
DSPEmitter: Rename Default() to FallBackToInterpreter()
 2015-10-09 11:31:48 +13:00
Matthew Parlane 6aa230c247 Merge pull request #3143 from sepalani/fixWSAGetLastError 
WSAGetLastError: fix return value
 2015-10-06 12:08:10 +13:00
Matthew Parlane ba96ca289d Merge pull request #3034 from waddlesplash/new-qt 
QtCompile.props: Update for Qt 5.5.
 2015-09-28 15:17:17 +13:00
Matthew Parlane 45aeeee699 Fix aniso filtering on d3d to not set aniso filter when using 1x 2015-06-19 20:55:32 +12:00
Matthew Parlane 6d9711c02c Merge pull request #2599 from Sonicadvance1/aarch64_clean_cpudetect 
[AArch64] Clean up our CPUDetect.
 2015-06-14 15:19:03 +10:00
Matthew Parlane b39014eac5 Merge pull request #2590 from endrift/fix-freebsd-build 
Fix FreeBSD
 2015-06-14 15:18:26 +10:00
Matthew Parlane 252c719515 Merge pull request #2600 from Sonicadvance1/Android_remove_dialog 
[Android] Remove dialog telling individuals that their drivers are terrible.
 2015-06-14 15:17:03 +10:00
Matthew Parlane 2d8fdb791e Merge pull request #2603 from JosJuice/move-getcompany 
Move GetCompany() to ISOFile.h/GameFile.h
 2015-06-14 15:16:20 +10:00
Matthew Parlane 0ca955a14c Merge pull request #2605 from dolphin-emu/revert-2358-pie 
Revert "x64: build a Position-Independent Executable (PIE)"
 2015-06-14 14:44:42 +10:00
Matthew Parlane f32cede086 Revert "x64: build a Position-Independent Executable (PIE)" 2015-06-14 16:06:26 +12:00
Matthew Parlane 5cce640f48 Anisotropic Filtering option is now correct in D3D 
Values are saved/loaded as 0,1,2,3,4 but need to be used as 1,2,4,8,16
This was correct for OGL but not D3D
 2015-06-10 22:32:46 +12:00
Matthew Parlane 39155007c7 Merge pull request #2545 from Tilka/accurate_nans 
Jit64: optionally accurate NaNs
 2015-06-09 17:53:28 +10:00
Matthew Parlane 42d5b5b48c Merge pull request #2568 from Sonicadvance1/aarch64_crc32_hash 
[AArch64] Implement CRC32 texture hashing.
 2015-06-09 10:39:52 +10:00
Matthew Parlane 5a0daef7f0 Merge pull request #2403 from JosJuice/short-titles 
DolphinQt: Use short GC game titles in grid view
 2015-06-08 20:15:29 +10:00
Matthew Parlane bfeb79620d Merge pull request #2565 from dolphin-emu/revert-2530-sdl_quit 
Revert "SDL: handle SDL_QUIT event"
 2015-06-08 12:09:52 +10:00
Matthew Parlane 9e1aab663f Revert "SDL: handle SDL_QUIT event" 2015-06-08 13:43:39 +12:00
Matthew Parlane cf8f049c4d Merge pull request #2518 from degasus/hotkeys 
Hotkeys: Drop old GUI
 2015-06-07 20:10:10 +10:00
Matthew Parlane d286c69ec4 Merge pull request #2546 from Parlane/fix_trans 
Fixed translation of strings at runtime.
 2015-06-07 19:17:08 +10:00
Matthew Parlane 1aa829c03c Fixed translation of strings at runtime. 
Static strings can not be translated until wxLocale is initialised.

This reverts commit 0004b6004b.

Conflicts:
	Source/Core/DolphinWX/VideoConfigDiag.cpp
 2015-06-07 20:38:36 +12:00
Matthew Parlane 4e4aa1f4ad Merge pull request #2525 from rohit-n/build-pch 
Fix building with PCH disabled.
 2015-06-05 12:12:02 +10:00
Matthew Parlane 787b861121 Merge pull request #2462 from rohit-n/build-pch 
Fix building with PCH disabled.
 2015-05-27 14:30:22 +10:00
Matthew Parlane 3135b4f3e4 Merge pull request #2461 from lioncash/barrier 
Thread: Remove unused Barrier class
 2015-05-27 13:21:14 +10:00
Matthew Parlane 34cd2b0299 Merge pull request #2435 from sigmabeta/android-native-autodetect 
Android: Have build.gradle figure out what ABI and Toolchain to use.
 2015-05-25 10:11:52 +10:00
Matthew Parlane 5213d85118 Merge pull request #2445 from lioncash/mixer 
AudioCommon: Construct the mixer inside the SoundStream base class.
 2015-05-24 19:54:21 +10:00
Matthew Parlane 8f12cc5bc3 Merge pull request #2433 from lioncash/leak 
WII_IPC_HLE_Device_net: Fix a leak with getaddrinfo
 2015-05-23 19:27:06 +10:00
Matthew Parlane 08ce0ca5c0 Merge pull request #2424 from sigmabeta/android-emulation-activity 
Android: Implement new EmulationActivity.
 2015-05-22 12:18:56 +10:00
Matthew Parlane c58e94cf95 Merge pull request #2331 from lioncash/access 
DolphinWX: Make some UI functions/members private
 2015-04-28 15:42:52 +12:00
Matthew Parlane 42ebf5b3bf Merge pull request #2333 from lioncash/virt 
InputCommon/Core: Get rid of some virtual destructor warnings
 2015-04-28 15:41:48 +12:00
Matthew Parlane 1634f98953 Merge pull request #2335 from lioncash/header 
TextureDecoder_Common: Add missing algorithm include
 2015-04-28 15:41:31 +12:00
Matthew Parlane 5091a18369 Merge pull request #2334 from lioncash/uninit 
Interpreter_LoadStorePaired: Silence uninitialized variable warnings
 2015-04-28 14:57:49 +12:00
Matthew Parlane 392b9abece Merge pull request #2016 from RisingFog/splash 
Update About Dolphin Screen
 2015-04-25 21:50:40 +12:00
Matthew Parlane d662fffb8c Merge pull request #2309 from lioncash/header 
DiscIO: Add a missing header to Volume.h
 2015-04-21 13:29:55 +12:00
Matthew Parlane 571eee8648 Merge pull request #2225 from JosJuice/remove-volumehandler 
Get rid of VolumeHandler
 2015-04-21 11:18:57 +12:00
Matthew Parlane a86f2fe2e7 Merge pull request #2199 from skidau/remove-controls-lock 
Cleaned up the controller locking mechanism
 2015-04-21 11:13:30 +12:00
Matthew Parlane 82bbada352 Merge pull request #2257 from RachelBryk/battery 
Add an option for wiimote battery.
 2015-04-21 11:12:12 +12:00
Matthew Parlane f35277f215 Merge pull request #2267 from Stevoisiak/soundStream 
(Visual Studio) Categorize SoundStream.h with other SoundStream files
 2015-04-21 11:10:49 +12:00
Matthew Parlane b0db4f53cc Merge pull request #2307 from lioncash/crash 
Core: Don't display on-screen messages via DisplayMessage until emulation has begun
 2015-04-21 11:08:07 +12:00
Matthew Parlane aa54931780 Merge pull request #2275 from degasus/strings 
Common: Remove TLS usage in GetLastErrorMsg
 2015-04-08 10:55:48 +12:00
Matthew Parlane 9044834c52 Change JC4E01.ini to use ascii single quote 2015-01-21 15:51:51 +13:00
Matthew Parlane b3474c8218 Merge pull request #1796 from Stevoisiak/cacheRevisionNote 
Added CACHE_REVISION warnings
 2015-01-13 08:36:50 +13:00
Matthew Parlane cf8333abd2 Merge pull request #1876 from Parlane/is_dir_fileio_fix 
Don't open a file handle for a directory in FileIO
 2015-01-13 08:29:23 +13:00
Matthew Parlane 729a827372 Don't open a file handle for a directory in FileIO 2015-01-12 13:25:39 +13:00
Matthew Parlane 8cd23f5334 Merge pull request #1753 from FioraAeterna/fixredundantmov 
JIT: Fix redundant MOVs in x86 trampolines
 2014-12-22 11:30:01 +13:00
Matthew Parlane f4ab1443fa Merge pull request #1725 from Sonicadvance1/update_gradle 
Updates the gradle build file to the latest needed for Android Studio.
 2014-12-21 14:31:05 +13:00
Matthew Parlane 6a785af280 Merge pull request #1704 from phire/wii_ssl_segfault 
De-memsetify Wii_SSL and fix segfault.
 2014-12-20 21:16:55 +13:00
Matthew Parlane 3b6c49c8db Merge pull request #1575 from waddlesplash/patch-1 
Add a notice about licensing to CONTRIBUTING.md
 2014-11-22 12:58:02 +13:00
Matthew Parlane 1f7dbbef07 Merge pull request #1567 from comex/remove-android-ndk-hack 
Remove Android <ucontext.h> hack.
 2014-11-21 19:56:28 +13:00
Matthew Parlane 4ef0ab2731 Merge pull request #1534 from FioraAeterna/fixd3dtex1x1 
D3D: fix issues with multi-level 1x1 textures on D3D
 2014-11-21 19:12:58 +13:00
Matthew Parlane 21e4e035cc Merge pull request #1281 from Stevoisiak/RenameEuRGB60 
Renamed EuRGB to PAL60
 2014-11-21 19:09:42 +13:00
Matthew Parlane 974dd21019 Merge pull request #1524 from Parlane/fix_nogui_install 
Install nogui executable to bindir
 2014-11-10 20:54:43 +13:00
Matthew Parlane b1d8ca4730 Install nogui executable to bindir 2014-11-10 07:53:11 +00:00
Matthew Parlane 893c36eebe Merge pull request #1461 from phire/net_ssl_string_cleanup 
Wii Net SSL: Use std::string for hostname.
 2014-11-01 23:43:19 +13:00
Matthew Parlane cf82972961 Merge pull request #848 from shuffle2/msvc-improvements 
msvc: skip copying Data dir and precompiled dlls to Binary dir if they are already there (unless the source files are newer).
 2014-08-21 12:25:47 +12:00
Matthew Parlane 7246ea9616 Merge pull request #792 from booto/dsp-cleanup 
DSP cleanup
 2014-08-19 20:28:51 +12:00
Matthew Parlane 5516b0382c Merge pull request #699 from lioncash/enum 
Core: Use an enum for the Gekko exception flags instead of defines
 2014-07-30 13:53:58 +12:00
Matthew Parlane a3ca3b0424 Merge pull request #696 from lioncash/more-forward-decls 
Convert some more header inclusions into forward declarations
 2014-07-30 13:53:48 +12:00
Matthew Parlane 3554a15180 Merge pull request #680 from lioncash/fakepoll-removal 
Remove fakepoll.h
 2014-07-28 21:06:37 +12:00
Matthew Parlane 86db0040b7 Merge pull request #682 from lioncash/style-oversight 
Fix a style guide oversight
 2014-07-28 11:39:01 +12:00
Matthew Parlane 008b907bf0 Merge pull request #655 from lioncash/crashes 
Fix two possible crashes related to the debugger.
 2014-07-23 21:24:03 +12:00
Matthew Parlane cee07ff16e Use new stick/trigger constants for Classic.cpp 2014-07-22 12:16:34 +12:00
Matthew Parlane 82ee68663f Add stick and trigger radius/center/range consts 2014-07-22 12:14:47 +12:00
Matthew Parlane e30f4576c9 Revert "Use new stick/trigger constants for Classic.cpp" 
Added using github, Parlane is an idiot.
This reverts commit 954e61949f.
 2014-07-22 00:08:10 +00:00
Matthew Parlane 954e61949f Use new stick/trigger constants for Classic.cpp 2014-07-22 11:57:12 +12:00
Matthew Parlane 38d5197a2c Merge pull request #646 from lioncash/warnings 
Core: Fix warnings in JitRegCache
 2014-07-21 20:43:41 +12:00
Matthew Parlane 5dc7c8ad31 Remove weird buffering from WII_IPC_HLE_Device_sdio_slot0.cpp 2014-06-30 03:39:40 +00:00
Matthew Parlane 91502b4fc8 Merge pull request #514 from jordan-woyak/input-diag-win-crash 
Fix InputConfigDiag crash on Windows. (GCode issue 7384)
 2014-06-20 13:38:57 +12:00
Matthew Parlane 07fbb13bba Merge pull request #290 from Linktothepast/gameini_updates 
Gameini updates.
 2014-05-04 11:45:14 +12:00