Commit graph

19239 commits

Author SHA1 Message Date
JosJuice
f41990af38 Remove incorrect usage of _trans
It only marks a string for translation. It doesn't actually do anything
at runtime, so the message will always be displayed in English. Even if
we would've had a way to make the translation work, we shouldn't
translate this, because OSD doesn't support non-ASCII characters.

Caused by the recent merge 1c95cd5.
2015-12-02 17:13:04 +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
3ed29cce0c Merge pull request #2733 from AdmiralCurtiss/string-from-float
IniFile: Fix floating point number locale issues.
2015-12-02 15:22:42 +01:00
Markus Wick
1c95cd5ad5 Merge pull request #2745 from AdmiralCurtiss/wiimote-disconnect-message
Display a message on screen when the emulated software disconnects a Wiimote.
2015-12-02 15:13:29 +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
3dcfb7d71c Merge pull request #3304 from Pringo/update-error-message
Update Error Log to Remove Old Issue Tracker URL
2015-12-02 13:25:47 +01:00
Pringo
d8d6c0122e Update Error Log to Remove Old Issue Tracker URL 2015-12-01 19:57:10 -08:00
Markus Wick
52204c7296 Merge pull request #3299 from phire/JJ_Abrams
Fix lens flares in Mario Kart Wii.
2015-12-01 09:07:09 +01:00
Markus Wick
8322040c47 Merge pull request #3301 from awickham/patch-1
Make cast from int to float explicit in shader
2015-11-30 23:58:06 +01:00
Andrew Wickham
d9f1523a7b Make cast from int to float explicit in shader
This should fix this panic message I saw when playing Super Mario Strikers:

Failed to compile pixel shader [...]: error C7011: implicit cast from "int" to "float"
2015-11-30 13:35:46 -08:00
Scott Mansell
03461915a7 Fix lens flares in Mario Kart Wii. 2015-12-01 05:25:38 +13: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
Markus Wick
5eabbd0c1e Merge pull request #3298 from Sonicadvance1/max_texture_buffer_size
Make sure not to use a GL texture buffer past the max size.
2015-11-30 10:02:06 +01:00
Ryan Houdek
21b708106c Make sure not to use a GL texture buffer past the max size.
The spec says that vendors can set the max texture size to be 65KB and we want 1MB.
Check the maximum supported and drop to the max if it is less than 1MB
2015-11-30 01:18:03 -06:00
Mathew Maidment
73c904f0d0 Merge pull request #3297 from Seeker14491/patch-1
Fix typo in anti-aliasing dropdown description
2015-11-29 16:09:13 -05:00
Brian Bowman
507b7920e9 Fix typo in anti-aliasing dropdown description 2015-11-29 14:28:26 -06:00
Scott Mansell
97231aa221 Merge pull request #3294 from spxtr/DQt2-GameProxyModel
DolphinQt2: Use a proxy model for the GameList
2015-11-30 07:48:54 +13:00
spxtr
59bdeb411c Use a proxy model for the GameList.
This lets us sort by the underlying integers while only displaying the
icons. Currently, in both DolphinQt and DolphinQt2, we display both the
icon and the integer, but cut off the column width to not show the
integer. We also currently sort by the size's formatted string, not by
the size itself, which leads to "1 MB" sorting to less than "2 KB". This
commit fixes these issues.

In the future, we can use the filter methods here to allow for
searching for games.
2015-11-28 10:00:03 -08:00
Scott Mansell
97cd723492 Merge pull request #3286 from jloehr/Wiimote-Rumble-LED-Fix
Fix Prepare (Set LEDs and Rumble) on Connect and Refresh
2015-11-29 00:58:18 +13:00
Julian Löhr
31a4b2ed03 Fix Prepare (Set LEDs and Rumble) on Connect and Refresh
m_need_prepare needs to be set before the Device thread is started.
Otherwise the thread blocks on IORead and the LEDs and Rumble is executed
after the user presses a button on the Wiimote.
Also the Prepare-Call on Refresh doesn't need to reset the Index, because it is
set once on the initial Connect/Prepare. Therefore the index assignment
was refactored.
2015-11-28 12:38:19 +01:00
Scott Mansell
861bd98e3a Merge pull request #3291 from JosJuice/memset-error-check
Memmap: More error checking for Memset
2015-11-28 22:38:24 +13:00
Scott Mansell
4b4b753cc4 Merge pull request #3293 from JosJuice/volumedirectory-plainfilereader
DiscIO: Don't use PlainFileReader in VolumeDirectory
2015-11-28 22:32:12 +13:00
JosJuice
0cb5c4637a Memmap: Replace ValidCopyRange with GetPointerForRange 2015-11-28 09:26:48 +01: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
JosJuice
f9af58a388 DiscIO: Don't use PlainFileReader in VolumeDirectory
Blobs are not for regular file reading.
2015-11-28 09:18:22 +01:00
JosJuice
2e3735b772 Memmap: More error checking for Memset
It now uses the same error checking as CopyFromEmu and CopyToEmu.
2015-11-27 18:28:53 +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
Scott Mansell
df4c1d680e Merge pull request #3264 from JosJuice/simplify-iselfordol
ISOFile/GameFile: Simplify IsElfOrDol
2015-11-27 23:10:45 +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
f33a9ed439 Merge pull request #3261 from spxtr/DolphinQt
DolphinQt Rewrite
2015-11-27 22:06:31 +13:00
spxtr
949f25175b DolphinQt2 2015-11-27 00:33:07 -08:00
Scott Mansell
e1fe2db7d9 Merge pull request #3289 from waddlesplash/dolphin-qt-fixup
DolphinQt: Get rid of unneeded abbreviation macros.
2015-11-27 09:56:51 +13:00
waddlesplash
4acd90d570 DolphinQt: Get rid of unneeded abbreviation macros. 2015-11-25 23:16:54 -05:00
Markus Wick
662e4fcca0 Merge pull request #3276 from degasus/videocommon
Videocommon API cleanup
2015-11-25 07:53:58 +01:00
degasus
0b02dc4f81 FramebufferManager: check for g_framebuffer_manager 2015-11-24 22:48:56 +01:00
degasus
0f26cdd31b FramebufferManager: Allow CreateXFBSource to return nullptr 2015-11-24 22:48:55 +01:00
degasus
c9dc5fb376 TextureCache: Allow the backends to return nullptr for textures. 2015-11-24 22:48:55 +01:00
degasus
fc00598785 NativeVertexFormat: Inline Initialize in contructor
They were only called at once, so no need to seperate them.

This also removes the only dereference of the NativeVertexFormat in VideoCommon, so backends may just return nullptr.
2015-11-24 22:48:49 +01:00
degasus
df799dd124 VideoCommon: Create default implementation for state setters
It's fine to pull those within the backends, so there is no need to enforce them to implement this interface.
2015-11-24 22:39:10 +01:00
Markus Wick
f560e8e283 Merge pull request #3285 from jloehr/Wiimote-Index-LED-Fix
Fix Wiimote Index LED
2015-11-24 18:31:57 +01:00
Markus Wick
8212f402d4 Merge pull request #3287 from stenzek/d3d-texture-crash
D3D: Fix crash on some drivers with small textures
2015-11-24 14:28:19 +01:00
Stenzek
d1b132731d D3D: Remove redundant cast, move pitch calculation to caller 2015-11-24 21:54:19 +10:00
Stenzek
6be4608a0d D3D: Fix crash on some drivers with small textures 2015-11-24 21:15:19 +10: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
Scott Mansell
83bda3be46 Merge pull request #1474 from phire/DSPHLE_cleanups
DSPHLE: Remove individual byteswaps and replace with generic function.
2015-11-24 13:33:59 +13:00
Julian Löhr
aace2f694f Fix Wiimote Index LED 2015-11-23 23:24:49 +01:00