Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,150 Commits 1 Branch 0 Tags
440a2f832cc412837d9c88706a9134dedc3c7772
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Parlane 8227994f6c Merge pull request #4638 from leoetlino/ios-device-type 
IOS HLE: Replace is_hardware with a proper device type
 2017-01-10 09:12:55 +13:00
Matthew Parlane 0869c63048 Merge pull request #4634 from leoetlino/probably-pointless-ios-fixes 
IOS HLE: Minor changes to match IOS behaviour
 2017-01-09 13:49:32 +13:00
Matthew Parlane 3212300dd4 Merge pull request #4635 from lioncash/const 
CodeBlock: Const correctness for IsInSpace
 2017-01-09 13:49:05 +13:00
Matthew Parlane 5135445298 Merge pull request #4627 from leoetlino/naming-cleanup 
IOS HLE: Naming cleanup
 2017-01-09 09:08:50 +13:00
Matthew Parlane 7a4464c3e0 Merge pull request #4599 from stenzek/point-uvs 
GeometryShaderGen: Use lower-left origin for point texture coordinates
 2017-01-08 13:40:55 +13:00
Matthew Parlane 7a5fe4b7ed Merge pull request #4624 from leoetlino/jit-warning-fixes 
Add the g_ prefix to the jit global
 2017-01-08 13:19:16 +13:00
Matthew Parlane c89aa79380 Merge pull request #4626 from lioncash/size 
CodeBlock: Get rid of implicit sign-conversion in AllocCodeSpace
 2017-01-08 13:14:02 +13:00
Matthew Parlane 27d7c265e5 Merge pull request #4625 from leoetlino/remove-unneeded 
IOS HLE: Remove unneeded code
 2017-01-08 13:12:51 +13:00
Matthew Parlane 7847ca41e2 Merge pull request #4607 from leoetlino/execute 
IOS HLE: Refactor ExecuteCommand
 2017-01-08 11:20:49 +13:00
Matthew Parlane 82e003ebb6 Merge pull request #4620 from JosJuice/android-byteswap 
Don't use generic byteswapping on Android
 2017-01-07 14:01:33 +13:00
Matthew Parlane 1ab99ee22c Merge pull request #4098 from rohit-n/build-pch 
Fix building with PCH disabled.
 2016-08-07 18:59:27 +12:00
Matthew Parlane 7b9e17b72d Merge pull request #4035 from lioncash/si-constness 
SI_DeviceKeyboard: const correctness
 2016-07-20 12:35:10 +12:00
Matthew Parlane 63f9677fea Merge pull request #4031 from EmptyChaos/cmake-findbacktrace 
CMake: Bundle FindBacktrace since its missing from older versions.
 2016-07-19 15:47:10 +12:00
Matthew Parlane 320e0d101b Merge pull request #4025 from bentley/desktop 
Install manpages and XDG files on OpenBSD.
 2016-07-18 16:13:36 +12:00
Matthew Parlane a51c992e61 Merge pull request #4018 from bentley/openbsd-ifdefs 
Openbsd ifdefs
 2016-07-18 16:12:06 +12:00
Matthew Parlane 4b9173ca62 Merge pull request #4017 from bentley/openbsd-libs 
OpenBSD neither provides nor requires libdl and librt.
 2016-07-18 12:42:14 +12:00
Matthew Parlane c23d38c2c4 Merge pull request #4021 from bentley/mdoc 
Convert manuals to use semantic mdoc macros.
 2016-07-18 12:28:29 +12:00
Matthew Parlane b9246cf5e1 Merge pull request #4019 from bentley/posix-includes 
POSIX includes portability
 2016-07-18 09:19:20 +12:00
Matthew Parlane 0b19975fe5 Merge pull request #4022 from leoetlino/about-links 
DolphinWX: Center the links in the About dialog
 2016-07-18 09:14:51 +12:00
Matthew Parlane a97a546bd6 Merge pull request #3594 from lioncash/threads-a-joke-about 
Core: Use the thread_local keyword
 2016-07-15 08:50:54 +12:00
Matthew Parlane b101f8fe7e Merge pull request #4008 from Pringo/master 
Finish Menu Capitalization Fixes
 2016-07-14 16:23:12 +12:00
Matthew Parlane ca8484cb72 Merge pull request #3936 from Pringo/fix-menu-capitalization 
Fix Menu Capitalization
 2016-07-14 14:19:34 +12:00
Matthew Parlane baf9abe911 Merge pull request #3980 from JosJuice/changedisc-threading-simplification 
DVDInterface: Simplify calling ChangeDisc from CPU thread
 2016-07-13 22:48:47 +12:00
Matthew Parlane 3f9a98ddf2 Merge pull request #3979 from JosJuice/use-g_want_determinism 
Use g_want_determinism more
 2016-07-13 18:56:23 +12:00
Matthew Parlane ebf10d38dd Merge pull request #3978 from JosJuice/frameskipping-determinism 
Movie: Fix FrameSkipping determinism condition
 2016-07-13 18:54:51 +12:00
Matthew Parlane 4d2df0a8ce Merge pull request #3989 from JosJuice/insert-sd-thread 
Don't ScheduleEvent from wrong thread when inserting SD card
 2016-07-13 18:44:50 +12:00
Matthew Parlane 7ad74832e6 Revert "Undo the addition of a translatable string during the string freeze" 2016-07-05 21:44:38 +12:00
Matthew Parlane 2776bcbf55 Merge pull request #3903 from leoetlino/wiimote-disconnect 
Disconnect real Wiimotes when disconnected by games (not on all platforms)
 2016-06-26 18:33:09 +12:00
Matthew Parlane 3a26167148 Merge pull request #3931 from dhustkoder/master 
constexpr added to BitSet.h. conflicts solved
 2016-06-26 14:42:46 +12:00
Matthew Parlane 711ea97333 Merge pull request #3939 from phire/VS-is-anal-about-tabs 
NullVideo: Fix up Visual studio solution.
 2016-06-26 14:33:22 +12:00
Matthew Parlane 5ba3e641ea Merge pull request #3933 from delroth/fixed-size-queue 
FixedSizeQueue: modernize (std::array, std::move)
 2016-06-26 10:31:07 +12:00
Matthew Parlane afa202738e Merge pull request #3865 from leoetlino/third-party-wiimotes 
Change Bluetooth device discovery on Linux to use LIAC (updated #3327)
 2016-06-26 00:17:57 +12:00
Matthew Parlane a7448271a9 Merge pull request #3892 from leoetlino/ciface-synchronisation 
ControllerInterface: Add synchronisation
 2016-06-26 00:17:08 +12:00
Matthew Parlane 2f9a911c54 Merge pull request #3913 from rukai/dolphinQtVSDLL 
VS can now run dolphinQt directly without DLL errors
 2016-06-25 23:36:01 +12:00
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