Commit Graph
100 Commits
Author SHA1 Message Date
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
Matthew Parlane 1ab8cedfce Merge pull request #280 from magumagu/d3d-texture-encoder-rounding
D3D11 backend: fix rounding in texture encoder.
2014-04-16 19:49:15 +12:00
Matthew Parlane 1f0da63cbe Merge pull request #276 from neobrain/master
PixelShaderGen: Color combiner compare mode fix and simplification
2014-04-16 09:56:29 +12:00
Matthew Parlane 4e0b7260b6 Merge pull request #263 from Sonicadvance1/DetermineMaliVersion
Add Mali driver version check and support of checking for Mali-T7xx
2014-04-14 19:20:04 +12:00
Matthew Parlane 13119e6755 Merge pull request #240 from Sonicadvance1/GLSLES310_binding
Add initial support for GLSL ES 3.10.
2014-04-04 08:43:20 +13:00
Matthew Parlane 2e119af086 Merge pull request #230 from Parlane/libogc_ios_fix
Fixes Wiimotes for libogc.
2014-03-30 12:07:02 +13:00
Matthew Parlane cb319ba1da Fixes Wiimotes for libogc.
Caused by USB not writing back expected values.
Fixes Issue 7109
2014-03-30 11:04:30 +13:00
Matthew Parlane 6351f28ab4 Merge pull request #200 from lioncash/unused-param
Remove an unused parameter from UpdateDebugger_MapLoaded.
2014-03-25 09:20:23 +13:00
Matthew Parlane b8f469dedd Merge pull request #195 from Sonicadvance1/RuntimeExtendedInfo
Allow the user to enable the extended information string like the old days.
2014-03-23 18:32:37 +13:00
Matthew Parlane 36eb806e4a Merge pull request #192 from lioncash/final
Mark the PPCDebugInterface and DSPDebugInterface as final.
2014-03-23 18:32:11 +13:00
Matthew Parlane b57949131d Merge pull request #196 from Sonicadvance1/gradle-buildoptions
Pass our signing information to gradle by argument.
2014-03-23 01:36:14 +13:00
Matthew Parlane 8f0fa997cb Merge pull request #187 from Sonicadvance1/android-clang-fix
Fix the Android build when using clang 3.4
2014-03-18 11:58:57 +13:00
Matthew Parlane 8e45783d54 Merge pull request #186 from Sonicadvance1/gradle-fix
Fix building the release APK with gradle.
2014-03-18 11:08:44 +13:00
Matthew Parlane 6445e02d53 Merge pull request #159 from Tilka/misc
Cleanup stuff
2014-03-17 17:43:20 +13:00
Matthew Parlane d3e9702cec Merge pull request #181 from lioncash/unused-core-func
Remove unused function PanicAlertToVideo from Core.cpp.
2014-03-17 14:14:15 +13:00
Matthew Parlane 63a09b76f9 Merge pull request #169 from RachelBryk/extract-dol
Fix extracting dols.
2014-03-15 14:27:56 +13:00
Matthew Parlane efac8d5a5e Merge pull request #161 from lioncash/func-names
Make WiiSocket function names conform to the coding style.
2014-03-15 13:45:12 +13:00
Matthew Parlane 12c2e345a3 Merge pull request #168 from RachelBryk/extract-files
Fix extracting files on partition > 0.
2014-03-15 12:57:46 +13:00
Matthew Parlane 76e3a74c5c Merge pull request #165 from delroth/mi-mmio-fix
MemoryInterface: properly register region MMIOs.
2014-03-15 12:57:01 +13:00
Matthew Parlane 79ae3c1510 Use correct capitalization for SoundTouch.h in CMakeLists.txt
Fixes Issue 7074:	Typo in CMakeLists.txt
2014-03-11 00:39:30 +13:00
Matthew Parlane 31cfc73a09 Fixes spacing for "for", "while", "switch" and "if"
Also moved && and || to ends of lines instead of start.
Fixed misc vertical alignments and some { needed newlining.
2014-03-11 00:35:07 +13:00
Matthew Parlane e05eca71ea Merge pull request #149 from lioncash/filemonitor-song-types
Add more sound file extensions to FileMonitor's IsSoundFile.
2014-03-10 13:45:23 +13:00
Matthew Parlane 633dc75e85 Merge pull request #142 from Tilka/clang-modernize
Run clang-modernize and manually fix the result
2014-03-10 09:24:09 +13:00
Matthew Parlane d1610cf45f Merge pull request #143 from lioncash/no-comment
[Android] Remove unnecessary comment from VideoSettingsFragment.
2014-03-09 13:09:51 +13:00
Matthew Parlane 25341f88ef Fixes include order of TextureConversionShader.cpp 2014-03-09 12:38:29 +13:00
Matthew Parlane 2e70ff2441 Add missing functional include caused by PR111 2014-03-09 12:28:58 +13:00
Matthew Parlane d9ca5c83c9 Fix bug in PrintCallstack caused by trying to use MMIO
Also tidy up methods in Debugger_SymbolMap.cpp
2014-03-09 12:23:30 +13:00
Matthew Parlane 886060aaf7 Merge pull request #96 from lioncash/remove-console-correctly
Remove console correctly
2014-03-08 15:54:06 +13:00
Matthew Parlane 6704832f3d Merge pull request #139 from lioncash/wx-clean
Remove some superfluous arguments from some wx control creations
2014-03-08 15:50:34 +13:00
Matthew Parlane ca6946bcbf Merge pull request #138 from Tilka/sw_fix
SW renderer: add missing ClearCurrent()
2014-03-08 15:50:05 +13:00
Matthew Parlane 57f2eda130 Fix MAC address reading on Windows. 2014-03-07 21:40:59 +13:00
Matthew Parlane e5b250fa79 Merge pull request #122 from lioncash/rename-default
Rename the JIT function Default() to FallBackToInterpreter(). Communicates intent way better in terms of telling the reader what's going on.
2014-03-06 12:13:54 +13:00
Matthew Parlane 8557e9665a Merge pull request #137 from RachelBryk/isoproperties
Fix reading revision specific default game inis in ISOProperties.
2014-03-06 11:38:02 +13:00
Matthew Parlane fce9ac84e7 Merge pull request #134 from shuffle2/fix-vs-build
Allow VS builds to be speedy again
2014-03-06 08:21:17 +13:00
Matthew Parlane 0c613a5f5b Merge pull request #132 from Sonicadvance1/Arch-clean
OS X likes to be different. It reports the host processor type as i386 i...
2014-03-05 10:01:12 +13:00
Matthew Parlane 09212d4912 Merge pull request #120 from Sonicadvance1/Arch-clean
Make our architecture defines less stupid.
2014-03-05 09:26:02 +13:00
Matthew Parlane bd99e4a689 Merge pull request #126 from delroth/master
UnitTests: ensure the Binaries/Tests directory exists before linking.
2014-03-03 16:05:41 +13:00
Matthew Parlane 3d281593ba Merge pull request #125 from delroth/master
Unittests: Always use GTest from Externals (recommended way from GTest FAQ).
2014-03-03 15:49:17 +13:00
Matthew Parlane 2d6810be9f Merge pull request #124 from delroth/master
Do not hard fail when running 'make unittests' without GTest.
2014-03-03 15:15:13 +13:00
Matthew Parlane 6176424ac4 Merge pull request #119 from delroth/unittests
Add support for GTest based UnitTests
2014-03-03 14:53:24 +13:00
Matthew Parlane 70b3749d4b Merge pull request #109 from lioncash/file-io-clarifications
Eliminate the magic constants in the switch statement in WII_IPC_HLE_Device_FileIO.cpp's Seek function.
2014-03-02 18:29:48 +13:00
Matthew Parlane c68cd3a8ea Randomise the mac address and store it in the config.
This stops error 20115 when trying to go online.
2014-02-28 22:53:00 +13:00
Matthew Parlane 17ea34f617 Makes the detection of shared PolarSSL more inline with usage. 2014-02-28 20:12:37 +13:00
Matthew Parlane e1ec4729b4 Initialise entropy correctly for ssl. 2014-02-27 21:46:14 +13:00
Matthew Parlane 698bf8f2d3 Merge pull request #110 from Tilka/polarssl1.3
CMake: remove USE_SHARED_POLARSSL_LIBRARY
2014-02-27 08:52:29 +13:00
Matthew Parlane 2e4d42fe91 Merge pull request #104 from Sonicadvance1/Fix-EGL
Fix the nogui build when building with EGL
2014-02-24 21:42:09 +13:00
Matthew Parlane a8ca2c6cc2 Merge pull request #84 from lioncash/adjust-vs-for-mmio
Remove the leftover VS folder filter for Wii IO bridge. Files were removed in the mmio merge.
2014-02-17 15:12:18 +13:00
Matthew Parlane 7ac5b1f2f8 Merge pull request #83 from lioncash/remove-console
Fix the linux build. Turns out Windows-specific files were in the Linux build files.
2014-02-17 14:58:12 +13:00
Matthew Parlane 96272c89bc Merge pull request #74 from Sonicadvance1/arbitrary-exit
Arbitrary exits but actually fixed
2014-02-16 16:51:26 +13:00
Matthew Parlane 48798d8d34 Merge pull request #70 from lioncash/fifo-unsigned
Kill off some casting in the FifoPlayer.
2014-02-15 20:42:15 +13:00
Matthew Parlane 8e5067500b Merge pull request #67 from jordan-woyak/master
Fixed issue 7020. CISO >4GB failure. Caused by integer overflow.
2014-02-14 11:16:39 +13:00
Matthew Parlane 06329e2453 Merge pull request #65 from Tilka/nits
Small changes
2014-02-13 21:10:27 +13:00
Matthew Parlane 88526be3b5 Merge pull request #50 from Parlane/inifile_tidy
Fix IniFile to use string& instead of char*
2014-02-13 19:04:27 +13:00
Matthew Parlane 3fe05e0a9f Fix IniFile to use string& instead of char*
Also removes .c_str() usages where found.
2014-02-13 17:06:30 +13:00