Commit Graph

7487 Commits

Author SHA1 Message Date
Gregory Hainaut 6edd8834dd Merge branch 'josephgbr-master' 2015-12-23 17:56:38 +01:00
Gregory Hainaut 1ee8130ffa Merge branch 'master' of git://github.com/josephgbr/pcsx2 into josephgbr-master
greg: resolve conflict

Conflicts:
	locales/pt_BR/pcsx2_Iconized.po
	locales/pt_BR/pcsx2_Main.po
2015-12-23 17:56:21 +01:00
ramapcsx2 f4dcb35bc8 Merge pull request #1055 from ssakash/gsdx_dlgelement_changes
GSDX: disable SW mode options on hardware renderer
2015-12-23 10:39:09 +01:00
Akash acb82389c8 GSDX: disable SW mode options on hardware renderer 2015-12-23 12:30:22 +05:30
Jonathan Li e5535ccc8f 3rdparty:wxwidgets: Preserve Win32 last error in wxTlsKey::Get()
This is commit e093a3b1b402c067254558d24ef2d7f39f552251 from the wx3.0
stable branch.

The correct error code and message is now output when an error takes
place. Previously it would report an error code of 0 and inform us that
"The operation completed successfully".
2015-12-22 23:33:22 +00:00
ramapcsx2 e34b509b20 nsis changes. removed the web install script as it was progressively harder to maintain.
also bundling only the vc2015(sp1) redist now.
2015-12-22 17:56:59 +01:00
Gregory Hainaut 816dc65262 i10n: refresh all languages 2015-12-22 16:58:07 +01:00
ramapcsx2 05f1dca151 Merge pull request #990 from turtleli/windows-fixes
Windows: Potential fix for XAudio2.7 unload crashes
2015-12-22 16:56:06 +01:00
Gregory Hainaut 81891ac109 pcsx2:cli: support the elf option properly 2015-12-22 16:34:58 +01:00
ramapcsx2 49123cca59 Merge pull request #1051 from ssakash/GSDX_cleanup
GSDX-OCL: remove OCL device combobox from GUI
2015-12-22 15:11:43 +01:00
Rafael Fontenelle 05e45b196b Update Brazilian Portuguese translation 2015-12-22 11:13:08 -02:00
Akash 5e67276b6c GSDX-OCL: remove OCL device combobox from GUI
The following patch hides the combobox from the GUI when ENABLE_OPENCL macro is not defined.
2015-12-22 04:15:56 +05:30
ramapcsx2 3fd0b10762 small fix for WinXP / GSdx renderer cleanup 2015-12-21 19:53:36 +01:00
ramapcsx2 3210740872 Patch by r5 that reorders renderers in GSdx' config dialog. Also removes some redundant options. 2015-12-21 19:30:03 +01:00
ramapcsx2 d008de7b37 Merge pull request #1049 from KrossX/lilypad_default
Lilypad default xinput controls
2015-12-21 12:38:28 +01:00
KrossX 7493570a0d Default config file for xinput 2015-12-21 08:07:12 -03:00
KrossX ba8f34a594 Merge remote-tracking branch 'refs/remotes/PCSX2/master' 2015-12-21 07:57:11 -03:00
ramapcsx2 3bf86618fc nsis: include vc2015 (sp1) redist 2015-12-21 11:40:38 +01:00
Jonathan Li 000f4984cf spu2-x:windows: Potentially prevent XAudio2.7 unload crashes
The extra LoadLibrary call prevents XAudio2.7 from unloading since
LoadLibrary reference counts. See
http://blogs.msdn.com/b/chuckw/archive/2015/10/09/known-issues-xaudio-2-7.aspx

Should fix random XAudio2 crashes.
2015-12-20 20:08:20 +00:00
Gregory Hainaut 077f06562f gsdx-linux: use standard code for the renderer box
Fix the openCL issue and code is cleaner
2015-12-20 19:33:39 +01:00
ramapcsx2 9092be3a52 GSdx: better default renderer selection. Thanks, Gregory :) 2015-12-20 16:03:58 +01:00
ramapcsx2 16231f599b Merge branch 'master' of https://github.com/PCSX2/pcsx2 2015-12-20 14:47:27 +01:00
ramapcsx2 43b9caf735 GSdx: default renderer to DX11 hw. SPU2-X: default output module to xaudio2 (portaudio has issues selecting the proper hardware device) 2015-12-20 14:46:59 +01:00
Gregory Hainaut cae0ac2d3f gsdx: change gl reporting color message 2015-12-20 14:15:46 +01:00
ramapcsx2 9170d2902c shuffle some names in about dialog 2015-12-20 13:20:53 +01:00
ramapcsx2 c73f87ac71 Merge pull request #1046 from ssakash/GSDX_mode
PCSX2: Fix up Video mode detection on GS Frame
2015-12-20 13:05:12 +01:00
ramapcsx2 279fc2ac79 round of nsis fixes 2015-12-20 02:55:17 +01:00
ramapcsx2 58aaea6277 Better MTVU thread cancel 2015-12-19 12:22:15 +01:00
ramapcsx2 1111e03901 Finally nailed the MTVU zombie processes bug. Thanks a lot for the tip,
@turtleli! Well, at least we hope it's gone for good now ;)
2015-12-17 23:19:11 +01:00
Akash 0f1fec40cf GSFrame: Fix up video mode detection.
Previously Interlaced (Field) was displayed as Progressive which was wrong since the tested games didn't even support Progressive mode and it misleaded most of the users so let's just display Interlaced during Field mode.
2015-12-17 19:51:33 +05:30
Avi Halachmi (:avih) 3820bf16fd GUI: presets: don't gray-out static text when presets are disabled
The EE/IOP and VUs panels were disabled completely when presets are enabled,
which apparently also means disabling (graying out) the static texts, however,
re-enabling them (when disabling presets) didn't un-gray-out the static text.

This is likely a wxWidgets bug, but we can avoid it by just enabling/disabling
all items explicitly (and keeping the panels themselves always enabled).

For these panels, this means adding explicit enable/disable of the he EE-cache
checkbox and the Restore-Defaults buttons.

The issue doesn't seem to happen on other panels (though some earlier revisions
apparently also had this issue for the static text at the game fixes panel, but
apparently it's not an issue now).
2015-12-17 06:59:33 +02:00
Gregory Hainaut b1d7f0e3fd gsdx: remove openCL from the ini if it isn't enabled 2015-12-14 10:00:28 +01:00
ramapcsx2 c8a7a709dc bring vsyncinfocalc up to the revision that seems to fix 2 games that
got broken by the last update. debugger output still looks sensible.
2015-12-13 19:20:58 +01:00
refractionpcsx2 d3ec74be2b Merge pull request #980 from AdmiralCurtiss/ff12mcdfix
FolderMemoryCard: Fix issue #976: Corrupted FF12 saves when overwriting data.
2015-12-13 00:08:42 +00:00
refractionpcsx2 b5b5a51897 Merge pull request #947 from ssakash/EE_Control_V2
EE: Rework overclock and underclock function
2015-12-12 15:08:18 +00:00
Jonathan Li 60426a5dec linux: Fix and simplify stdout/stderr redirection
Use close() instead of some dodgy read unblocking and thread cancelling
sequence - it fixes a race condition when closing PCSX2.

Move most of the setup/cleanup into LinuxPipeThread. In addition to
simplifying things, it should also mean that no messages to
stdout/stderr are lost - in the previous code there was a small period
of time where messages would disappear.
2015-12-11 08:52:28 +00:00
refractionpcsx2 0bd7cb1ebe Merge pull request #1023 from ssakash/prafull_patches
GameDB: Add prafull's Gamefix patches
2015-12-07 11:10:40 +00:00
Akash f67f3a3010 GameDB: Add prafull's Gamefix patches
Patches for 7 games have been added including default settings
modifications for Disney's Treasure Planet to prevent few issues.

Thanks to Prafull for the patches !
2015-12-07 13:21:00 +05:30
ramapcsx2 601d18272b Small fix to the timing revert: need to use gsRegionMode now since scansPerFrame isn't fixed anymore.
(NTSC modes would fail to update the vblank variable)
2015-12-05 02:07:27 +01:00
ramapcsx2 ff2845b2d2 When debugging vSyncInfoCalc(), some serious problems with the math resulted in a nearly saturated u64 and hRender being 0 in all video modes. Team decided to revert to the earlier version, even though it probably breaks "Legendz Gekitou! Saga Battle".
No one knows how any games even started in the broken state and we prefer code being sane('ish) over one game miraculously working. The change is pretty big so it needs some good testing!
2015-12-05 00:25:16 +01:00
Gregory Hainaut ab962bf5c6 Merge pull request #994 from KrossX/master
Fix for odd DualShock rumble (Untested)
2015-12-04 10:01:19 +01:00
Gregory Hainaut 74c309b4ff i10n: refresh language files 2015-12-03 09:14:06 +01:00
Gregory Hainaut 31e80c1321 Merge pull request #1010 from turtleli/travisci_appveyor
Travis CI and Appveyor continuous integration
2015-12-03 09:08:53 +01:00
Gregory Hainaut 184deec510 Merge branch 'karv-patch-1' 2015-12-03 09:05:29 +01:00
Edgar Carballo Domínguez e97b65c320 man: Update "Reporting bugs" section in manpage
Greg: squash the commits
2015-12-03 09:04:51 +01:00
rexcaptain501 4b25865108 README: Fix broken DirectX link
Old link leads to a page offering to upgrade/download Windows 10. It has
now been fixed so that it takes you to a working DirectX June 2010
Redist page.
2015-12-02 21:07:53 +00:00
Jonathan Li 2e1ea22532 gsdx: Make TV Shader F7 toggle temporary
Both the Linux and Windows config dialogs now have a TV Shaders combobox,
so the F7 toggle can be made temporary. This makes the hotkey behaviour
consistent with all the other hotkeys.
2015-12-02 19:45:24 +00:00
Jonathan Li 6e5b8c25dd gsdx:windows: Adjust dialog margin values 2015-12-02 19:07:36 +00:00
Jonathan Li 0f2cb4e2f5 Merge pull request #993 from ssakash/GSDX_dlgchanges
gsdx:windows: Add TV shaders and change GUI design
2015-12-02 18:58:09 +00:00
Gregory Hainaut e01c1784f3 Merge branch 'master' of github.com:PCSX2/pcsx2 2015-12-02 19:10:06 +01:00