97475e5e6a
Merge pull request #3482 from Sonicadvance1/fix_9225
...
Fix assert on reset button hit.
2016-01-09 18:50:14 +01:00
54e4d90b6d
Fix assert on reset button hit.
...
Fixes issue 9225.
2016-01-09 11:23:22 -06:00
5db10d83f7
Merge pull request #3477 from mmastrac/memorywatcher_crash
...
MemoryWatcher: Initialize m_running
2016-01-09 16:11:42 +01:00
6e8cbff338
Merge pull request #3473 from Tilka/videosw
...
VideoSW: fix some warnings
2016-01-09 16:08:41 +01:00
98ea1f773a
VideoSW: fix some warnings
2016-01-09 10:38:07 +01:00
dbe7e6634d
Merge pull request #3412 from skidau/CheatSearch-Prev-Value
...
Added the ability to search on previous value in the Cheat Search.
2016-01-09 06:06:02 +01:00
39971ec039
Merge pull request #3472 from phire/TVs_dont_have_pixels
...
Rework the aspect ratio calculation (Fixes 240p mode)
2016-01-09 04:27:16 +01:00
c49a82bf0a
Rework aspect ratio calculations.
...
They are now based on signal timings rather than pixels, as it
didn't make a lot of sense to do things with pixels.
Now handles all 240i/240p/480i/480p modes without any special
casing.
Despite the diffrent equaions, this should result in the exact same aspect
ratio as the previous code.
2016-01-09 14:30:46 +13:00
af9beecc10
Merge pull request #3469 from Linktothepast/master
...
Gameini updates.
2016-01-09 01:04:55 +01:00
bf1c53a6e8
Merge pull request #3451 from RisingFog/libav
...
Use ffmpeg for Windows Video Dumping instead of VFW
2016-01-09 01:01:05 +01:00
a60b24c937
MemoryWatcher: Initialize m_running to false to prevent crashes on OSX in the dtor when it picks up the wrong initial value
2016-01-08 12:20:35 -07:00
66595b0ac9
Force XVID FourCC for MPEG4 output
2016-01-08 10:22:19 -05:00
6d279153f3
More gameini updates.
...
Conflict: Desert Storm II and Rock Band 3 gameinis updated.
2016-01-08 15:55:59 +02:00
9c0dae47ca
Normalize aspect ratio calculations to 4:3
...
Video Interface simply isn't aware about widescreen.
Instead, the render class can multiply by 1.3333333 to get
the 16:9 aspect ratio.
2016-01-08 13:31:48 +13:00
c34fb3edf0
Use ffmpeg for Windows Video Dumping instead of VFW
2016-01-07 18:37:58 -05:00
b56a084b0b
Merge pull request #3470 from Armada651/stereo-msaa
...
FrameBufferManager: Fix typo in stereoscopic MSAA shader.
2016-01-07 20:15:06 +01:00
db551c55a2
FrameBufferManager: Fix typo in stereoscopic MSAA shader.
2016-01-07 20:05:12 +01:00
0c7f49308a
Gameini updates.
...
Updates for Sonic Adventure 2 Battle, Surf's Up, Drawn to Life The Next
Chapter, Boogie, Boogie SuperStar, Quantum of Solace, Tiger Woods PGA
Tour 08, Call of Duty: Black Ops.
Fixes issues 9123, 9191, 9204, 9205, 9206, 9050, 9183.
2016-01-07 12:21:58 +02:00
dd1192b709
Merge pull request #3449 from freelancer42/android_finish_main_activity_after_autostartfile
...
StartupHandler.java: Finish main activity if AutoStartFile is specified in intent
2016-01-07 00:50:47 +01:00
89bb4b1288
Merge pull request #3460 from JosJuice/platform-icon-padding
...
Adjust the size of the Wii platform icon and padding of all platform icons
2016-01-07 00:50:06 +01:00
bff79df363
Merge pull request #3429 from sepalani/debug_vector_fix
...
Debug Builds: Fixed vector assertion
2016-01-07 00:48:40 +01:00
e668fd7a02
Merge pull request #3465 from Sonicadvance1/Android_move_jni
...
Move Android JNI bits from DolphinWX to the Android folder.
2016-01-07 00:47:39 +01:00
7c91dbe239
Merge pull request #3467 from mathieui/netplay_version_commit_hash
...
Use the current commit hash in the netplay version
2016-01-07 00:45:11 +01:00
22555312de
Merge pull request #3464 from Armada651/stereo-warnings
...
VideoConfig: Don't give warnings for per-game stereoscopy parameters.
2016-01-07 00:35:14 +01:00
4553f723ff
Merge pull request #3466 from JosJuice/game-list-empty-condition
...
DolphinWX: Unify the condition for the game list being empty
2016-01-07 00:33:32 +01:00
ccd646dad0
Merge pull request #3468 from JosJuice/dk-bongos
...
Use the English name for DK Bongos in the English version of Dolphin
2016-01-07 00:30:41 +01:00
40c7a2fb7d
Use the current commit hash in the netplay version
...
So that it contains the current commit and not an arbitrary date that
may or may not be up-to-date. This will cause tears as people will not
be able to use netplay with one diverging commit that does not touch
anything related. On the other hand, users can’t be trusted.
2016-01-07 00:17:05 +01:00
85ab84935a
Use the English name for DK Bongos in the English version of Dolphin
...
Tarukonga is Japanese. People who don't speak Japanese are unlikely to
understand it.
2016-01-07 00:12:25 +01:00
3c65a7dd7f
Merge pull request #3156 from degasus/videosw2
...
VideoSW: Use VideoCommon framework and drop redundant code
2016-01-06 23:29:51 +01:00
74478addeb
Move Android JNI bits from DolphinWX to the Android folder.
2016-01-06 15:36:44 -06:00
dcde91cdd8
DolphinWX: Unify the condition for the game list being empty
...
When there are no games to display in the game list, DolphinWX shows a
message instead. Clicking the message will perform an action. If the game
list truly is empty, the message and action are for opening a browse
dialog, but if the user has hidden some games, they are instead for
unhiding all games. However, the condition for checking which message to
display lacked some parts that are in the condition for checking which
action to use, so the two could be different in rare cases. This PR fixes
that by breaking out the two conditions to a new unified function.
2016-01-06 22:25:30 +01:00
1e111421e9
VideoConfig: Don't give warnings for per-game stereoscopy parameters.
2016-01-06 22:21:12 +01:00
efbe5bc4b6
VideoSW: Use more VideoCommon
...
Now we require lots of empty functions, but this removes by far more duplicated code.
2016-01-06 22:10:29 +01:00
7fcb5a803b
Merge pull request #3359 from degasus/ini
...
VideoConfig: Use "GFX.ini" for both D3D and OGL.
2016-01-06 16:02:23 -05:00
05fdf0398b
Merge pull request #3313 from degasus/videosw
...
VideoSW: Clear Vertex data before usage
2016-01-06 21:56:02 +01:00
ad1f7576ad
VideoConfig: Use "GFX.ini" for both D3D and OGL.
...
They share the same format, so there is no need to separate their configs.
2016-01-06 21:43:11 +01:00
e3da564418
Merge pull request #3440 from Sonicadvance1/Android_WiiU_Adapter
...
[Android] Disable screen lock when a title is running.
2016-01-06 15:42:25 -05:00
d41821b49e
Change the size of the Wii platform icon
...
In DolphinWX, the right edge of the Wii platform icon used to be bit
too close to the banner.
2016-01-06 21:26:53 +01:00
0a42a0ab1b
Merge pull request #3428 from Sonicadvance1/proper_glextensions
...
Make GLExtensions no longer require slghtly modified GL headers
2016-01-06 15:24:47 -05:00
342496563d
Merge pull request #3455 from Sonicadvance1/GC_adapter_android
...
[Android] Add support for the Wii U Gamecube adapter under Android.
2016-01-06 15:07:09 -05:00
e6cee3a130
DolphinWX: Re-add some padding for platform icons
...
The padding on the right was changed from 3px to 0px by fd2d505
2016-01-06 21:06:36 +01:00
87e753b104
Merge pull request #3459 from JosJuice/custom-texture-all-regions-2
...
HiresTextures: Refactor getting directory
2016-01-06 14:19:33 -05:00
b49683b2e8
Merge pull request #3357 from JosJuice/no-xpm
...
DolphinWX: Stop using XPM images
2016-01-06 13:37:03 -05:00
03091ce180
HiresTextures: Refactor getting directory
2016-01-06 19:35:16 +01:00
adffa5fbec
Merge pull request #3457 from booto/si-sampling
...
[RFC] SI: Base SI sampling on VSync & horiz lines
2016-01-06 13:02:38 -05:00
1a207b06ae
[Android] Fix enabling and disabling Gamecube controllers.
2016-01-06 11:54:46 -06:00
a1db1a2082
SI: Base SI sampling on VSync & horiz lines
2016-01-06 23:47:20 +08:00
42237dc511
Merge pull request #3456 from JosJuice/custom-texture-all-regions
...
HiresTextures: Also look for directories with 3-character IDs
2016-01-06 14:43:49 +01:00
a2b45a4b82
HiresTextures: Also look for directories with 3-character IDs
...
People who make texture packs usually release them using a specific ID
(for instance SX4E01). Users who have a different version of the game
(like the PAL version SX4P01) then need to rename the custom texture
folder to match. This is a lot simpler than renaming every texture file,
as was required with the old texture format, but it's still something
that users can forget to do. To make that unnecessary, this change makes
it possible to use three-character region-free IDs for custom texture
folders, similarly to how game INIs can use three-character IDs. Once
most people have updated to Dolphin versions that include this change,
those who make texture packs will be able to name them with
three-character IDs, removing the need for users to rename anything.
2016-01-06 14:33:36 +01:00
86b0e7e4f2
Merge pull request #3356 from degasus/master
...
Throttler: Rename "framelimiter" to "emulation speed".
2016-01-06 14:21:55 +01:00
Pierre Bourdon