Commit graph

3744 commits

Author SHA1 Message Date
Markus Wick
aabcd441d9 Merge pull request #3381 from Armada651/revert-3076
Revert "Merge pull request #3076 from void-ghost/stereo3d_presets"
2015-12-28 10:18:32 +01:00
Markus Wick
cec1a75976 Merge pull request #3296 from sepalani/r_menu
DebuggerViews: Fixed nullptr dereferences
2015-12-28 10:02:53 +01:00
Sepalani
4d3f05ddf8 DebuggerViews: Fixed nullptr dereferences 2015-12-27 19:57:58 +04:00
Jules Blok
8bda12bcfd Revert "Merge pull request #3076 from void-ghost/stereo3d_presets"
This reverts commit 81414b4fa2, reversing
changes made to b926061f64.

Conflicts:
	Source/Core/DolphinWX/Frame.cpp
	Source/Core/VideoCommon/VideoConfig.cpp
	Source/Core/VideoCommon/VideoConfig.h
2015-12-23 00:35:19 +01:00
Jules Blok
9a1b2f68cc ISOProperties: Replace the ConvergenceMinimum option by the Convergence option.
The ConvergenceMinimum was replaced by Convergence in the GameINI.
2015-12-22 23:16:27 +01:00
Scott Mansell
ebe3c49c5f Merge pull request #3332 from degasus/master
MSAA: Store samples in ini files.
2015-12-19 01:37:10 +13:00
JosJuice
b4b1844fe8 DolphinWX: Change "AM-Baseboard" string to "AM Baseboard"
It's so that the string in ControllerConfigDiag will match the string
in GameCubeConfigPane. Right now, it unnecessarily appears twice in
the list of strings to translate.
2015-12-17 22:25:15 +01:00
Christian Widmer
9dd9a75dbe DolphinWX: Fix items vanishing from toolbar
Commit 33487ab5f2 introduced a regression
where items would vanish from the toolbar. This adds a call to Realize()
after the reinsertions of the play/pause button as required per
documentation.

Thanks to Simonwayneee for noticing this!
2015-12-16 00:18:04 +01:00
Markus Wick
c310b3f0e6 Merge pull request #3309 from JosJuice/reload-banner-without-volume
Don't read from volume when reloading Wii banners
2015-12-15 18:48:49 +01:00
Markus Wick
e4b83d17bf Merge pull request #3270 from JosJuice/more-translations
Mark more strings for translation
2015-12-15 18:13:26 +01:00
Markus Wick
556371b2bc Merge pull request #3333 from ShadowsFriend/pausebutton_fix
DolphinWX: Fix label change for the play/pause button
2015-12-15 17:40:25 +01:00
degasus
e26d9f7c35 MSAA: Store samples in ini files. 2015-12-15 09:41:01 +01:00
Jules Blok
3f7bf5ca93 VideoConfigDiag: Snap the convergence slider. 2015-12-13 22:58:38 +01:00
Jules Blok
ee657c04fe VideoConfig: Change convergence setting to percentage value. 2015-12-13 22:58:16 +01:00
Christian Widmer
33487ab5f2 DolphinWX: Fix label change for the play/pause button
This fixes changing the play/pause button's label depending on the
emulation state. Before, wxToolBarToolBase's SetLabel() function was
used. This function, however, is not implemented in wxGTK which leads to
the label not changing on linux when the button is clicked. Although the preferred
method (according to the wxWidgets documentation) to change the properties
of a tool is to use the toolbar's setters, there is no such setter for
the label. Therefore, this implements a workaround where the
button is deleted and readded afterwards with the updated properties.

Thanks to linkmauve for noticing this!
2015-12-12 23:28:34 +01:00
JosJuice
a27610ff17 MainAndroid: Fix size logging 2015-12-08 12:37:51 +01:00
Bartosz Kaszubowski
4655cd01fa minor General Config GUI improvements
- theme and language selectors wrapped into one GridBagSizer for better
appearance
- missing left padding added to checkbox on Advanced Pane
2015-12-08 02:13:32 +01:00
Lioncash
edbbf493f8 DiscIO: Make factory methods return unique_ptrs
Rather than rely on the developer to do the right thing,
just make the default behavior safely deallocate resources.

If shared semantics are ever needed in the future, the
constructor that takes a unique_ptr for shared_ptr can
be used.
2015-12-07 05:57:37 -05:00
JosJuice
a0cd753060 Don't read from volume when reloading Wii banners
Should make loading cached Wii games that lack banners slightly faster.
2015-12-03 17:29:59 +01:00
Scott Mansell
a759883ae5 Merge pull request #3126 from phire/remove-logging-lock
Refactor logging code to get rid of a mutex.
2015-12-03 13:32:07 +13:00
Markus Wick
6425ddcbe7 Merge pull request #3253 from Phatcat/master
More wiimote controls (+extensions) for android
2015-12-02 22:50:29 +01:00
Phatcat
ca9c9b7135 Wiimote + Extensions for Android 2015-12-02 21:58:54 +01:00
Markus Wick
abbc25f662 Merge pull request #2788 from TurboK234/3d_hotkeys
Added hotkeys for toggling different stereoscopy modes
2015-12-02 15:24:59 +01:00
Markus Wick
a3433e162a Merge pull request #3149 from ShadowsFriend/fname_column
DolphinWX: Add a filename column
2015-12-02 15:04:36 +01:00
Markus Wick
ec6a48ff76 Merge pull request #2876 from CastellaFactory/master
[Netplay] Add "Force Netplay Listen Port" feature that was in old netplay branch
2015-12-02 14:20:47 +01:00
Markus Wick
b0dbb6ef46 Merge pull request #3067 from JosJuice/cheat-manager-regression
Fix Cheat Manager not saving created codes
2015-12-02 14:08:32 +01:00
Markus Wick
4a40e7b405 Merge pull request #3111 from JosJuice/wx-banner-scaling
DolphinWX: Improve HBC banner scaling
2015-12-02 13:59:13 +01:00
Markus Wick
02d5981b22 Merge pull request #3290 from JosJuice/compression-condition
DolphinWX: Correct a compression condition
2015-11-30 13:53:50 +01:00
Brian Bowman
507b7920e9 Fix typo in anti-aliasing dropdown description 2015-11-29 14:28:26 -06:00
JosJuice
b5f32b9699 DolphinWX: Correct a compression condition
The volume type check didn't handle DOL/ELF files, and the blob type
check didn't handle formats like CISO and relied on filename extensions.
2015-11-28 09:24:15 +01:00
Scott Mansell
5a1729877e Merge pull request #3211 from JosJuice/themes-to-resources
Move nobanner and fileplatform from Themes to Resources
2015-11-27 23:47:44 +13:00
JosJuice
9b2fe62bc9 Move nobanner and fileplatform from Themes to Resources
fileplatform is moved so it's in the same place as the other platform
icons, and nobanner is moved just because it fits better in Resources.
Both of them were identical in all of Dolphin's themes.
2015-11-27 11:09:20 +01:00
JosJuice
4249d9ef77 ISOFile/GameFile: Simplify IsElfOrDol 2015-11-27 10:50:19 +01:00
Scott Mansell
211169e307 Merge pull request #3269 from JosJuice/purge-cache
Rename "Purge Cache" to "Purge Game List Cache"
2015-11-24 14:17:49 +13:00
Chris Burgener
1ea9b36e3b Fix Frame Advance Hold Delay Changes
Fixes the issues of modifying the frame advance speed increase/decrease not actually doing anything
2015-11-23 13:53:14 -05:00
Lioncash
35b02db39d ISOFile: Get rid of explicit deletes 2015-11-21 21:15:01 -05:00
JosJuice
74ea765427 Mark more strings for translation 2015-11-20 11:33:47 +01:00
Pierre Bourdon
f571bdd7e3 Merge pull request #3274 from JosJuice/menu-capitalization
DolphinWX: More consistent capitalization in menus
2015-11-19 14:00:46 +01:00
JosJuice
3778793df5 DolphinWX: More consistent capitalization in menus 2015-11-19 12:25:17 +01:00
Lioncash
b9975694ab InputConfig: Clean up controller management 2015-11-19 02:41:33 -05:00
JosJuice
1c8938cd59 Rename "Purge Cache" to "Purge Game List Cache"
Users who have heard about the shader cache but not the game list cache
might think that "Purge Cache" will affect the shader cache.
2015-11-18 19:08:19 +01:00
Markus Wick
0b123605de Merge pull request #3235 from JosJuice/ssaa-checkbox
Remove SSAA checkbox and add SSAA to AA dropdown
2015-11-18 10:36:11 +01:00
JosJuice
eeda056490 ISOFile/GameFile: Clean up includes 2015-11-15 17:15:16 +01:00
TurboK234
6b9f4f5115 Added hotkeys for toggling different stereoscopy modes 2015-11-14 17:22:48 +02:00
James Cowgill
386159c74e Remove uses of __DATE__ and __TIME__ 2015-11-14 00:52:41 +00:00
Scott Mansell
973118511a Merge pull request #2742 from AdmiralCurtiss/display-savestate-stats
Display Savestate information in Overlay and Menu.
2015-11-08 02:20:56 +13:00
Tillmann Karras
81d9cce70c VideoCommon: rename TextureCache to TextureCacheBase 2015-11-06 15:43:58 +01:00
JosJuice
a0b99cfc51 Remove SSAA checkbox and add SSAA to AA dropdown
The checkbox is removed, and the dropdown now looks like this:

None
2x MSAA
4x MSAA
8x MSAA
2x SSAA
4x SSAA
8x SSAA
2015-11-06 11:22:53 +01:00
flacs
fd6b093a7e Merge pull request #3234 from JosJuice/createintegerlabel
DolphinWX: Remove FifoPlayerDlg::CreateIntegerLabel
2015-11-05 12:42:15 +01:00
JosJuice
da603b7665 DolphinWX: Remove FifoPlayerDlg::CreateIntegerLabel
Being forced to have the number first and being forced to add the
same string for all pluralizations is terrible for localisation.
2015-11-05 11:35:13 +01:00