This is an automated email from the git hooks/post-receive script.
micove-guest pushed a change to branch upstream
in repository pcsx2.
from ee25511 Imported Upstream version 1.3.1-1008-g9f291a6+dfsg
new c1533a7 Imported Upstream version 1.3.1-1094-gf062b0f+dfsg
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
PCSX2_suite.sln | 124 ++--
common/build/Utilities/utilities.vcxproj | 7 +-
common/build/Utilities/utilities.vcxproj.filters | 9 +-
common/include/Utilities/MemcpyFast.h | 10 -
common/include/Utilities/ScopedAlloc.h | 13 +-
common/include/Utilities/Threading.h | 3 +-
common/include/Utilities/wxGuiTools.h | 1 -
common/src/Utilities/AlignedMalloc.cpp | 32 +-
common/src/Utilities/Windows/WinMisc.cpp | 78 ++-
common/src/Utilities/pxCheckBox.cpp | 5 +-
common/src/Utilities/pxRadioPanel.cpp | 5 +-
common/src/Utilities/pxTranslate.cpp | 6 +-
common/src/Utilities/wxGuiTools.cpp | 30 +-
common/vsprops/3rdpartyDeps.props | 2 +-
common/vsprops/preBuild.cmd | 17 +-
common/vsprops/pthreads.props | 26 +-
old_plugins.sln | 48 +-
pcsx2/gui/AppConfig.cpp | 17 +-
pcsx2/gui/AppInit.cpp | 7 +-
pcsx2/gui/AppMain.cpp | 12 +-
pcsx2/gui/Dialogs/BaseConfigurationDialog.cpp | 22 +-
pcsx2/gui/Dialogs/ConfigurationDialog.h | 2 -
pcsx2/gui/Dialogs/ConfirmationDialogs.cpp | 3 +-
pcsx2/gui/Dialogs/GameDatabaseDialog.cpp | 2 +
pcsx2/gui/Dialogs/LogOptionsDialog.cpp | 2 +
pcsx2/gui/Dialogs/SysConfigDialog.cpp | 10 +-
pcsx2/gui/FrameForGS.cpp | 4 +-
pcsx2/gui/GSFrame.h | 2 +-
pcsx2/gui/MSWstuff.cpp | 28 +-
pcsx2/gui/MSWstuff.h | 6 +-
pcsx2/gui/MainMenuClicks.cpp | 4 +-
pcsx2/gui/MemoryCardFolder.cpp | 7 +-
pcsx2/gui/MemoryCardFolder.h | 2 +-
pcsx2/gui/Panels/SpeedhacksPanel.cpp | 2 +-
pcsx2/gui/Panels/VideoPanel.cpp | 25 +-
.../HashMap.h => pcsx2/windows/Optimus.cpp | 26 +-
pcsx2/windows/PCSX2.manifest | 22 +
pcsx2/windows/VCprojects/pcsx2.vcxproj | 12 +-
pcsx2/windows/VCprojects/pcsx2.vcxproj.filters | 8 +
pcsx2/x86/microVU_Compile.inl | 2 +-
plugins/GSdx/GLState.cpp | 4 +-
plugins/GSdx/GLState.h | 1 -
plugins/GSdx/GS.cpp | 24 +-
plugins/GSdx/GSCapture.cpp | 12 -
plugins/GSdx/GSCapture.h | 7 -
plugins/GSdx/GSDevice.cpp | 4 +-
plugins/GSdx/GSDevice.h | 21 +
plugins/GSdx/GSDevice11.cpp | 16 +-
plugins/GSdx/GSDevice9.cpp | 5 +-
plugins/GSdx/GSDeviceOGL.cpp | 52 +-
plugins/GSdx/GSDeviceOGL.h | 13 +-
plugins/GSdx/GSDialog.cpp | 83 +++
plugins/GSdx/GSDialog.h | 5 +
plugins/GSdx/GSLinuxDialog.cpp | 13 +-
plugins/GSdx/GSRasterizer.cpp | 2 -
plugins/GSdx/GSRasterizer.h | 14 -
plugins/GSdx/GSRenderer.cpp | 4 -
plugins/GSdx/GSRenderer.h | 4 -
plugins/GSdx/GSRendererHW.cpp | 1 +
plugins/GSdx/GSRendererOGL.cpp | 131 ++--
plugins/GSdx/GSRendererSW.cpp | 23 +-
plugins/GSdx/GSSetting.cpp | 112 ++--
plugins/GSdx/GSSetting.h | 14 +-
plugins/GSdx/GSSettingsDlg.cpp | 175 ++---
plugins/GSdx/GSSettingsDlg.h | 2 -
plugins/GSdx/GSShaderOGL.cpp | 12 -
plugins/GSdx/GSTextureCache.cpp | 79 ++-
plugins/GSdx/GSTextureCache.h | 1 -
plugins/GSdx/GSTextureCacheOGL.h | 2 -
plugins/GSdx/GSTextureFX11.cpp | 4 +-
plugins/GSdx/GSTextureFX9.cpp | 4 +-
plugins/GSdx/GSThread.cpp | 52 --
plugins/GSdx/GSThread.h | 359 -----------
plugins/GSdx/GSdx.cpp | 8 +-
plugins/GSdx/GSdx.vcxproj | 284 ++++-----
plugins/GSdx/res/glsl/convert.glsl | 160 ++---
plugins/GSdx/res/glsl/merge.glsl | 3 +-
plugins/GSdx/res/glsl/tfx_fs.glsl | 514 +++++++--------
plugins/GSdx/res/glsl/tfx_vgs.glsl | 34 +-
plugins/GSdx/res/glsl_source.h | 707 +++++++++++----------
plugins/GSdx/stdafx.cpp | 4 +-
plugins/GSdx/stdafx.h | 10 -
plugins/GSdx/vsprops/common.props | 4 +-
plugins/LilyPad/Config.cpp | 1 -
plugins/LilyPad/DeviceEnumerator.cpp | 2 +-
plugins/LilyPad/LilyPad.vcxproj | 4 +-
plugins/LilyPad/LilyPad.vcxproj.filters | 12 +-
plugins/LilyPad/{XInput.cpp => XInputEnum.cpp} | 1 +
plugins/LilyPad/{XInput.h => XInputEnum.h} | 0
plugins/spu2-x/src/Wavedump_wav.cpp | 2 +-
plugins/spu2-x/src/Windows/Spu2-X.vcxproj | 12 +-
plugins/zzogl-pg/opengl/Win32/zerogsogl.vcxproj | 16 +-
92 files changed, 1745 insertions(+), 1931 deletions(-)
copy common/include/Utilities/HashMap.h => pcsx2/windows/Optimus.cpp (59%)
create mode 100644 pcsx2/windows/PCSX2.manifest
rename plugins/LilyPad/{XInput.cpp => XInputEnum.cpp} (99%)
rename plugins/LilyPad/{XInput.h => XInputEnum.h} (100%)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/pcsx2.git
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
