61813767c7
Get rid of #define PAGE_MASK and round_page, which conflict with OS X headers
2016-06-26 00:49:46 -04:00
bc354277ca
Merge pull request #3940 from lioncash/tie
...
Device: Use std::tie for operator==
2016-06-26 06:40:14 +02:00
3d72fe3173
Merge pull request #3942 from comex/osx-build-fix
...
Fix in-tree build (cmake .) on OS X.
2016-06-26 00:35:00 -04:00
659d079d5c
Fix in-tree build (cmake .) on OS X.
...
OS X uses a case insensitive filesystem by default: when I try to build,
a system header does #include <assert.h>, which picks up
Source/Core/Common/Assert.h. This only happens because CMakeLists adds
'${PROJECT_BINARY_DIR}/Source/Core/Common' as an include directory: in
an out-of-tree build, that directory contains no other source files, but
in an in-tree build PROJECT_BINARY_DIR is just the source root.
This is only used for scmrev.h. Change the include directory to
'${PROJECT_BINARY_DIR}/Source/Core' and the include to
"Common/scmrev.h", which is more consistent with normal headers anyway.
2016-06-25 23:57:17 -04:00
55916b963d
Device: Use std::tie for DeviceQualifier's operator==
2016-06-25 23:45:37 -04:00
3a26167148
Merge pull request #3931 from dhustkoder/master
...
constexpr added to BitSet.h. conflicts solved
2016-06-26 14:42:46 +12:00
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
131c65c41e
NullVideo: Fix up Visual studio solution.
...
Turns out visual studio really wants tabs in it's solutions.
2016-06-26 14:30:14 +12:00
c1fa1e6749
Merge pull request #3923 from leoetlino/ciface-small-cleanup
...
ControllerInterface: Small cleanup
2016-06-26 04:03:33 +02:00
e31a4d1f07
Merge pull request #3813 from degasus/null_video
...
Null: Initial release of null video backend
2016-06-25 20:14:28 -04:00
5ba3e641ea
Merge pull request #3933 from delroth/fixed-size-queue
...
FixedSizeQueue: modernize (std::array, std::move)
2016-06-26 10:31:07 +12:00
fdbda7b7dd
Null: Create Visual Studio project file.
...
Why is this so stupid on linux.....
2016-06-25 22:40:23 +02:00
59e4882af3
nullvideo: initial release of null video backend
2016-06-25 22:40:23 +02:00
8678133e87
ControllerInterface: Switch to std::shared_ptr
...
Small cleanup by using std::shared_ptr and getting rid of
ciface.Devices() which just returned the m_devices (which defeats the
point of making m_devices protected).
Incidentally, this should make the code safer when we have
different threads accessing devices in the future (for hotplug?).
A lot of code use Device references directly so there is
no easy way to remove FindDevice() and make those unique_ptrs.
2016-06-25 21:46:39 +02:00
10682dbf58
Merge pull request #3934 from JosJuice/comment-formatting
...
Undo some comment formatting changes from b5104a7
2016-06-25 18:45:53 +02:00
1878605d77
Undo some comment formatting changes from b5104a7
2016-06-25 18:07:10 +02:00
9081d029e3
FixedSizeQueue: modernize (std::array, std::move)
2016-06-25 17:39:54 +02:00
64cf74abb4
Merge pull request #3678 from rukai/dolphinQtPropertiesDialog
...
DQt2: properties dialog - info tab
2016-06-25 10:31:46 -05:00
384637bdb8
Merge pull request #3740 from rukai/dolphinQtToolbarWidth
...
DolphinQt2: Set a minimum width for toolbar buttons + fix stop button
2016-06-25 10:16:46 -05:00
b5104a79f1
GCVolume: supports reading all opening.bnr information
...
DQT2: Game properties dialog contains info tab giving information about the selected iso.
2016-06-26 00:03:59 +10:00
b707e199c2
constexpr added to BitSet.h. conflicts solved
2016-06-25 10:58:53 -03:00
e82e4a62c1
DQt2: Set a minimum width for toolbar buttons + fix stop button
...
Using a minimum width is a good compromise between
setting all buttons to the same width
and letting them all decide their own width.
This is because the small buttons are kept tidy and regular
while allowing the biggest buttons to fit their contents.
2016-06-25 23:58:04 +10:00
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
a7448271a9
Merge pull request #3892 from leoetlino/ciface-synchronisation
...
ControllerInterface: Add synchronisation
2016-06-26 00:17:08 +12:00
9b075556ea
Fix a small formatting issue
2016-06-25 13:46:53 +02:00
d3e2ae35ff
ControllerInterface: Add synchronisation
...
Since we may have to add/access devices from different threads, this
adds synchronisation to anything that touches m_devices.
2016-06-25 13:46:53 +02:00
fd29e5c4cc
ControllerInterface: Don't pass m_devices to the backends
...
Previously, the devices vector would be passed to all backends. They
would then manually push_back to it to add new devices. This was fine
but caused issues when trying to add synchronisation.
Instead, backends now call AddDevice() to fill m_devices so that it is
not accessible from the outside.
2016-06-25 13:46:53 +02:00
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
92c572a83d
Change Bluetooth device discovery on Linux to use LIAC
...
This changes Bluetooth device discovery on Linux to use LIAC (Limited
Dedicated Inquiry Access Code) since third-party Wiimotes (such as Rock
Candy Wiimotes) are not discovered without it.
Also added accessor function in IONix class to help with checking if
the discovered Wiimote has already been found.
[leoetlino: code review suggested changes, remove unused variable,
commit message formatting fixes, and build fix]
2016-06-25 12:34:45 +02:00
dba9d86b55
Merge pull request #3888 from RisingFog/remove_cpack_txt
...
Remove cpack_package_description.txt from Windows builds
2016-06-24 21:13:27 -04:00
cbd6fda5e3
Merge pull request #3929 from spider-mario/android-button-manager
...
Fix configStrings in Android’s ButtonManager
2016-06-24 22:38:28 +02:00
9e82694071
Fix configStrings in Android’s ButtonManager
...
The bug was exposed by clang-format.
2016-06-24 22:36:15 +02:00
b330214387
Merge pull request #3928 from rohit-n/build-pch
...
Fix building with PCH disabled.
2016-06-24 19:23:03 +02:00
84cd57f99b
Fix building with PCH disabled.
2016-06-24 11:46:48 -05:00
8a1bbaa563
lint: bash is hard, actually return errors
2016-06-24 14:27:35 +02:00
2fdfacd6d9
Add clang-format markers around fragile header inclusions.
2016-06-24 13:24:10 +02:00
3af8f71472
linter: run clang-format and fail on diffs
2016-06-24 13:23:10 +02:00
e1c65406dc
linter: Stop checking for include ordering (inconsistent with clang-format)
2016-06-24 13:14:41 +02:00
43d0d692f9
Fix D3D12 headers missing includes.
2016-06-24 11:14:10 +00:00
5fcb4bb3ab
Further fixes to the formatting change. WX sucks.
2016-06-24 12:16:10 +02:00
3570c7f03a
Reformat all the things. Have fun with merge conflicts.
2016-06-24 10:43:46 +02:00
2115e8a4a6
Add annotations for code sections that need to remain manually formatted.
2016-06-24 10:41:46 +02:00
e901533298
Add new clang-format config.
2016-06-24 10:41:05 +02:00
ac267a2940
5.0 release
2016-06-24 10:09:07 +02:00
0e12bee9c7
Automatic translation resources update from Transifex
2016-06-24 08:03:53 +00:00
7804f388ae
Merge pull request #3924 from hthh/osx-gui-fix
...
OS X GUI: Fix truncated text
2016-06-23 15:24:30 -04:00
439e537fb4
Merge pull request #3925 from Toasty27/Toasty27-rpm-spec-update
...
Replaced pixmap entry with icon entries in spec file
2016-06-23 09:52:05 -04:00
45ad585baf
GUI: Fix truncated text on OS X
2016-06-23 22:17:53 +10:00
49dd4a9f1e
Automatic translation resources update from Transifex
2016-06-23 11:07:44 +00:00
1f95ed004a
Automatic translation resources update from Transifex
2016-06-23 07:48:23 +00:00
comex