Commit Graph

481 Commits

Author SHA1 Message Date
mattmenke 73cace2e54 Highly experimental DS3 support added. Use newly added features at your own risk. Requires libusb installed and DS3 set up as per instructions at http://forums.pcsx2.net/thread-7582.html. Doesn't require sixaxis64.exe/sixaxis.exe, but might have to fool around with starting/stopping Pcsx2 or LilyPad's test device screen and the PS button on your controller until the "1" light turns on.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1810 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-09-12 13:10:17 +00:00
Jake.Stine b638f52809 Re-ordered the MSVC folder structure to split PCSX2 into two definitive sections: [App]Host and [Emu]Core (the bracketed names indicate the "long" versions which are generally used in the code to differentiate the functions and classes). If the tentative layout is good then I'll sort the files on SVN to match that layout.
(note: Patch.cpp/Patch.h is still the odd child out in this commit, as it's destiny is to become a plugin)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1804 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-09-12 02:58:22 +00:00
arcum42 f02c04cb3b Added more plugin project files.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1799 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-09-09 11:28:57 +00:00
mattmenke c6a33eb2f0 May or may not fix certain failure to bind issues. May or may not cause issues in canceling binding when using mouse/keyboard to navigate the bind window when the corresponding mode is set to disabled. May or may not result in Armageddon. Probably not. I hope.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1795 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-09-09 05:13:31 +00:00
arcum42 e03e8bff40 Fixed Linux up to compile in codeblocks again. Added Onepad plugin project file.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1790 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-09-08 21:41:46 +00:00
Jake.Stine 4b4422d2dc * Better icon! Transparency in Windows Taskbar icon is still bad, but I can't figure out how to fix it (documented in code)
* Cleaned up the code of the Gamefixes a bit.
 * More svn:native props -_-

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1788 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-09-08 16:39:37 +00:00
Jake.Stine d2fbb22076 Upgraded PCSX2 core and utilities to GPLv3.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1783 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-09-08 12:08:10 +00:00
Jake.Stine 50446e6930 * Added preliminary keyboard support back in (probably doesn't compile in linux)
* Fixed a deadlock in thread cancellation.
 * Muted some folder warnings when running pcsx2 for the first time.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1778 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-09-07 21:16:12 +00:00
Jake.Stine fbae183dcc Linux: Remove code::blocks layout files (those are client/user files, not intended for svn).
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1775 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-09-07 13:43:44 +00:00
Jake.Stine aa3d448c97 Linux: Using Code::Blocks Custom Compile option to generate embedded resources now. :)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1774 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-09-07 13:40:16 +00:00
arcum42 19eaebe9be Created project files for all the null plugins, and added them to codeblocks.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1771 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-09-07 04:56:31 +00:00
Jake.Stine 43d9aef534 wxgui: sync with trunk (microVU + ee loadstore cycles + improved plugin logging).
* Fixed crash on exit, caused by logging.
 * Updated versioning in main window and console.

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1751 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-09-06 05:21:07 +00:00
Jake.Stine b422809d6e wxgui: my excitement in getting a game to run for the first time in months clearly has shattered my ability to commit.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1748 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-09-06 00:42:24 +00:00
Jake.Stine c1a818386f wxgui: removed dependency on afxres.h, added resource/manifest versioning info to w32pthreads.v2.dll, and fixed a compile error.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1746 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-09-05 23:46:08 +00:00
Jake.Stine bfdb469347 SPU2-X: Minor cleanups and updated DLL/resource versioning info (which never got updated for v1.2, oops)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1740 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-09-05 01:05:47 +00:00
ramapcsx2 00e1ac1cfb SPU2-X:
Fixe the dsp (winamp plugin) crashes. Thanks to Gigaherz for this one, too :p

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1739 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-09-04 22:39:21 +00:00
ramapcsx2 f06998808a SPU2-X:
5.1 support is back!
Currently for XAudio2 only, and it's not doing much (Simple copy of the stereo source to the other speakers).
Gigaherz is already working on a nice, semi - prologic II upmixer though ;)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1738 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-09-04 22:15:02 +00:00
arcum42 dbeeca16a1 Might as well copy some register code from GSdx to GSnull, so I have a starting place on register handling in it.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1733 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-09-03 23:57:59 +00:00
Jake.Stine 396783957e wxgui:
* synched with trunk to pick up all new cdvdiso fixes.
 * configuration wizard now starts if pcsx2.ini is missing/deleted.
 * changed GetWindowChild (MSW specific?) to FindWindow.

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1696 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-28 13:06:06 +00:00
mattmenke b5264ca7c9 LilyPad: Added setupapi.lib to release build. Was already correctly linked in debug.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1681 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-26 01:49:43 +00:00
mattmenke 143b2f63d3 LilyPad: bugfix that should (hopefully) make it more difficult to accidentally bind an entire axis. May make issues with devices incorrectly reporting initial state worse.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1679 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-25 12:05:08 +00:00
mattmenke 5558ceafb3 Some preliminary HID code that I may or may not build off of.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1673 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-23 03:15:42 +00:00
arcum42 44bb5cdbb5 Odds and ends. Various defines involving vif->stat are now enums, and are now used in various places. Added a new file to GSnull. Moved the new Vif functions to Vif.h.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1670 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-22 09:52:00 +00:00
Jake.Stine 68188a1fe2 wxgui: Changed the method of usermode storage so that it doesn't violate /program files permissions; plus some minor bugfixes/cleanups.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1665 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-21 04:44:47 +00:00
Jake.Stine e25db2a0ba wxgui: sync with trunk (boooring)
git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1660 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-20 16:19:33 +00:00
ramapcsx2 dc4f05d7c2 GSdx:
Initial pixel offsetting support via gsdx.ini.
Use pixoff_x = somevalue and pixoff_y = somevalue.
This can be used as a workaround for the various upscaling errors :)

Try these values for Takes of the Abyss for example:
pixoff_x=-8
pixoff_y=-8

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1650 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-19 01:08:40 +00:00
ramapcsx2 5b1700f98d Fix a foopah, and get rid of the useless imdct warning.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1644 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-17 10:36:53 +00:00
gabest11 de2d3603a0 GSdx: corrected recording code.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1637 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-16 16:45:26 +00:00
ramapcsx2 7a36e448c9 GSdx: Fix for the bad colors when capturing.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1636 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-16 13:46:50 +00:00
ramapcsx2 2dc77cd128 GSdx:
Re-enabled capturing via F12 key. It was missing the callback entirely.
The videos I capture here turn out all blueish though. No idea why :p

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1635 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-16 11:35:30 +00:00
gabest11 b44e6fcb8a doh, so many missing files
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1619 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-12 22:47:48 +00:00
gabest11 0d40e9963e vs2010 project files for pcsx2 (plugins later)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1617 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-12 22:11:06 +00:00
gabest11 3bd8037573 GSdx: fix for transparent walls in kingdom hearts (or anything else that sets AA1 with ABE off)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1611 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-07 21:11:27 +00:00
mattmenke 3cbd298cff LilyPad: A number of small fixups.
DirectInput devices corresponding XInput devices should be listed as "[Detached]" when XInput is enabled.  No idea if this works, as it requires an XBox 360 controller to fully test.
FF Axes now sorted, rather than being displayed in the order MS returns them.
Small motor DirectInput binding now correctly displays "Square" effect type in list when first created.
Attempt to more accurately model "soft" vs "hard" presses.  Don't have a game where this matters, so no idea if it works.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1607 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-06 04:50:55 +00:00
Jake.Stine 3544bcd118 wxgui: maintenance sync with trunk.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1604 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-04 13:34:52 +00:00
gabest11 3435ca8b74 GSdx: fixed the crash when booting through the bios
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1600 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-03 11:01:36 +00:00
gabest11 570e4ce85e GSdx: fixed dx9 + msaa=0
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1598 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-03 00:17:35 +00:00
gabest11 cea0f395aa GSdx: experimenting with msaa, add msaa=N to gsdx.ini to activate it (N=2,4,8)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1597 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-02 23:07:30 +00:00
Jake.Stine 37b63f8a0c Zeropad/Win32: Make what appears to be a fairly significant bugfix, for what it's worth.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1596 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-08-02 18:46:39 +00:00
gabest11 3f4f3db3e6 GSdx: little code cleanup
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1591 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-31 23:59:06 +00:00
ramapcsx2 a0828bc8f9 GSdx:
- Trippled the number of cached textures, many games constantly recreated them
- Don't clear some shaders at each drawcall (in dx10) , which is a nice speedup (but could potentially be bad, please check..)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1584 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-30 00:21:33 +00:00
Jake.Stine 71490981bf wxgui: synced with trunk, and started work on an improved plugin initialization procedure. (branch currently does NOT compile, sorry)
git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1582 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-29 14:00:00 +00:00
gabest11 cc3130660a GSdx:
- Automatic texture filtering should be ok now, occasionally point filtering was used. Tested it on the ps2 and figured with no mip levels LoD and minification settings are just ignored altogether.
- Also run a few tests on the gather instruction with the reference rasterizer and found a fatal flaw with it. It returns the four samples for bilinear sampling (in a funny order, which isn't documented of course, x = bl, y = br, z = tr, w = tl), but there is no way to guess which four were selected exactly. Due to some hidden rounding error it might grab different texels than I would when calculating the position of the upper-left texel, of which the fractional part is be used for the interpolation. When the texel positions do not match it leaves annoying discontinuity errors. Oh well...

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1571 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-26 15:30:25 +00:00
gabest11 4eaa5265df Added vs2010 project files for xpad and CDVDolio, too.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1565 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-24 12:54:54 +00:00
gabest11 319782cf39 GSdx: just updating vs2010 project files
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1564 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-24 09:24:09 +00:00
Jake.Stine 3751c928d3 wxgui: synced with trunk (to acquire new CDVD/ISO api)
git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1558 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-23 14:58:17 +00:00
ramapcsx2 0b6ed4bc15 GSdx: Disabled requesting of thread safe D3D devices. This is a speedup, and we shouldn't need the safety.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1553 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-22 19:04:48 +00:00
gabest11 3599acc618 GSdx: ffxii fmv works again and even less bogus
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1552 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-22 14:28:14 +00:00
gabest11 3a569dba23 GSdx: disabled "gather" until I can sort it out
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1551 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-22 12:23:58 +00:00
gabest11 83b15dbac0 GSdx:
- trying the dx10.1-only "gather" shader instruction for palletized lookups ("8-bit texture" mode), saves 4 instructions which isn't much but still... (not tested, don't have ati)
- may fix the intel gma "no output" bug (don't have gma either :P)
- and the usual small code optimizations


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1549 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-22 03:55:28 +00:00
gabest11 4a7304d6f7 GSdx: added ltrapper's modifications.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1538 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-17 23:45:32 +00:00
gabest11 e58776e095 GSdx: just squeezing a few more fps.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1534 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-16 21:36:07 +00:00
gigaherz de976b8234 Remove the bool from the GS exports, as Jake said.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1531 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-16 12:38:42 +00:00
Jake.Stine 657660371c wxgui: Fixed crash-on-exit problem in Release builds and made the console logger thread-safe (uses messages instead of direct wxFrame method invocations).
git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1529 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-16 09:58:17 +00:00
gigaherz 63a01f76ac Matsuri sent me a cleanup of his previous patch. No changes in functionality.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1528 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-16 03:34:30 +00:00
ramapcsx2 258dc05529 Plugin interface / GSdx changes that binds the GSdx vsync option to the pcsx2 framelimiter.
This patch by matsuri makes playing with vsync a lot nicer, so thanks for that one ;)

Note: For now its directx 10 only, due to dx9 needing a swapchain reset..

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1526 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-15 19:44:06 +00:00
ramapcsx2 fadea3d7bb SPU2-X: Just the version update
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1517 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-15 14:07:42 +00:00
gabest11 aa438a6b73 GSdx: game fixes and small optimizations
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1495 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-12 13:46:05 +00:00
ramapcsx2 f166306276 SPU2-X:
Fixed a problem in volume slides that caused them to update way too slow.
Music in Ys 6 works again.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1490 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-11 23:46:34 +00:00
arcum42 192f602ae7 Fixed up the Linux build. A couple minor OnePad changes.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1487 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-11 17:21:23 +00:00
Jake.Stine 3c195e9f9a wxgui: more of the slowly progressing.
* Implemented internationalization (i18n) framework.
 * Made a pretty configuration dialog box!
 * Many minor bugfixes.
 * Removed most of the old Win32 and Linux/GTK gui code because it was causing gettext cataloging to grab about 500 non-relevant strings (can always reference trunk for them anyway).

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1484 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-11 08:31:38 +00:00
arcum42 b0861c6d81 OnePAD: All around my hat...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1482 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-10 06:07:32 +00:00
arcum42 cae05180f5 Onepad: Added a clear all button, and did some work on the backend.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1481 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-10 00:05:05 +00:00
ramapcsx2 629950a1fa GSdx: New default settings, to avoid common mistakes and problems.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1479 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-08 16:15:33 +00:00
gabest11 af643a38b2 GSdx: 4 bit local-local transfer crash fixed (shadow hearts)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1476 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-07 13:04:56 +00:00
gabest11 a7ce451167 GSdx: couple of fixes for the new palletized lookup mode
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1475 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-07 10:57:04 +00:00
gabest11 90e7944577 GSdx: the new option was accidentally linked to vsync, they got the same control id.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1473 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-06 18:09:31 +00:00
gabest11 f9f056d581 GSdx: fixing/breaking things again... palletized texture lookup can be done by pixel shader now (selectable, off by default), if you have a fast card it may help with texture heavy games, otherwise it is only going to be slower.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1472 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-06 16:35:06 +00:00
gabest11 f24be5c352 GSdx: a few games fixes (one piece grand battle, xenosaga 1, chikyuu boueigun 2)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1469 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-05 12:58:59 +00:00
gabest11 fad91c7ebf GSdx: got rid of that bogus multiple inheritance, it just didn't feel right
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1468 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-05 00:18:33 +00:00
gabest11 2ed180d7c0 GSdx: last commit broke the sw renderer, the compiler seems to misalign the "this" pointer for member callbacks when two base classes have virtual destructors at the same time (or just virtual members, didn't test it).
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1467 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-04 23:52:58 +00:00
gabest11 ae62a56cc1 GSdx: more leak cleanup
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1466 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-04 22:54:57 +00:00
gabest11 6eed14ae75 GSdx: fixing the (texture) memory leak
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1464 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-04 17:37:06 +00:00
gabest11 4c76909afe GSdx: small optimizations and tried to fix that dx9 fullscreen alt+tab crash
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1463 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-04 15:14:04 +00:00
Jake.Stine 2a5a32d359 GSdx: Fixed crash when minimizing GS window and alt-tabbing out of fullscreen.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1462 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-04 11:43:05 +00:00
Jake.Stine fb6a8939b0 wxgui: Moved some more files around in Common/Utilities, and merged against trunk.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1460 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-03 20:48:11 +00:00
arcum42 d82c3653ce WIP: Zeropad fork. This is intended more as a backup copy so I have a good copy to work from then as a release. As such, while it works, the gui is glitchy, the Windows port is non-existant, and a lot of things are subject to change...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1457 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-03 11:45:47 +00:00
Jake.Stine c13cc555be A couple minor compiler warning fixes.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1455 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-03 01:06:53 +00:00
Jake.Stine da691894c3 wxgui branch: Maintenance merge against trunk, plus many cleanups and project-level changes.
* Moved the x86 emitter to /common, so that plugins can link against it if they wish.
 * Created a new "utility" class in /common which houses string utils, fast memcpy, common exception classes, and other handy dandies.
 * Removed old-style linux automake files from the pcsx2 dir since they were hopelessly out of date (and their multi-file-per-line format makes svn merging impossible >_<)

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1454 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-03 00:49:40 +00:00
gabest11 ba5823b144 GSdx: added a few CRCs
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1451 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-02 16:05:03 +00:00
gabest11 7ddbaa6cb0 GSdx: the valkyrie profile 2 fix
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1450 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-02 00:47:50 +00:00
gabest11 c68802a334 GSdx: dq8 fix
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1448 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-01 22:29:24 +00:00
gabest11 5a292d202d GSdx: couple of fixes
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1447 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-07-01 21:14:12 +00:00
gabest11 7c2e51157e GSdx: dx9 texture uploads should be at least as fast as before
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1442 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-28 02:02:14 +00:00
gabest11 8abcc6dab2 GSdx: fixed a crashing in the previous revision, dx9 slowdown problems will be addressed later
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1440 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-27 19:05:36 +00:00
gabest11 7bb9a3cc25 GSdx: changed a lot of things, expect new bugs :P
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1439 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-27 03:32:33 +00:00
gabest11 c1fc72a634 GSdx: small fixes to the last commit
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1426 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-23 12:33:30 +00:00
gabest11 b284fae2d5 GSdx: moved around some code and optimized texture caching a bit, there may be a slight speed-up in hw mode for those games that use many textures.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1425 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-23 04:12:32 +00:00
Jake.Stine c1dbdd7b62 SPU2-X: Upgraded license to the LPGLv3; and changed some #ifdef mess to #pragma once.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1419 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-21 11:00:53 +00:00
arcum42 bd093b41bd Recursive inlining appears to be driving gcc to drink, or at least, to use up all available system memory trying to compile microVU.cpp and then failing. :(
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1418 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-21 10:26:56 +00:00
Jake.Stine 101dbdd132 SPU2-X: *Really* fix compat with older versions of pcsx2 this time (0.9.4 and prior) >_<
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1415 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-21 08:24:17 +00:00
gabest11 5f45219eb9 GSdx: fixes for ffx2 menu
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1412 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-20 20:28:36 +00:00
gabest11 69e3dcfa63 GSdx: everything should be back to normal now
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1406 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-19 20:43:08 +00:00
gabest11 191a3d0c7e GSdx: another useless revision...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1405 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-19 20:31:36 +00:00
gabest11 6ef94cc707 GSdx: ignore this...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1404 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-19 20:24:18 +00:00
gabest11 df8c611084 GSdx: trying to fix gaps between sprites that may still appear with d3d in native res
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1402 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-19 13:03:59 +00:00
gabest11 7ad2d919b8 GSdx: removed the last bit of mfc dependency from cdvdolio
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1398 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-19 00:11:56 +00:00
Jake.Stine bc1b84295f Improvements to the new installer project:
* installer automatically includes all three SSE build targets for GSdx (each built target needs to be built manually prior to building the installer).
 * Fixed some typos and abbreviated install paths from "PCSX2 Team/PCSX2" to just "PCSX2".
 * Added an "SSEtype" user define to GSdx's property sheets, which is used to generate the SSE postfix on the DLLs automatically. (ie, GSdx-SSE2.dll, etc).

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1397 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-18 20:44:20 +00:00
arcum42 91be7889e2 Suppose I should do something about the configure.ac files and _DEBUG, as well.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1390 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-18 09:58:56 +00:00
arcum42 816e39851a Linux: Quick fixes to get the Linux build working with the changes in r1388.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1389 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-18 09:32:35 +00:00
Jake.Stine b974b815ff Major Build System changes:
* Changed w32pthreads library into a DLL so that it can be used from plugins correctly. (NOTE: you will need to make sure to build and copy w32pthreads.dll into your pcsx2 folder).
 * Switched pcsx2 from static CRT to shared CRT linking (needed to ensure correct exception handling behavior in multithreaded DLL environments).
 * Switched all standard plugins in the Suite to the shared CRT, to match pcsx2's new style. :)
 * Renamed _DEBUG (depreciated) to PCSX2_DEBUG (excluding Gabest projects since the ATL still uses it).
 * Added intrin.h to Pcsx2Defs.h (so that it is included universally), and added intrin_x86.h for GCC compatibility.

Notes:
 * Current plugin version compatibility status should be unaffected.  The new shared-CRT plugins work fine with older versions of Pcsx2, and the older plugins should work fine with the new shared-CRT version of pcsx2; so long as the necessary CRT DLLs are available on the user's system.
 * All future packagings of pcsx2 will include w32pthreads.dll and the Common Runtimes (CRTs).
 * Existing users who do not have MSVC installed can obtain the CRTs by downloading the Microsoft Visual C++ 2008 Redistributable Package (anyone with msvc installed should already have all they need).

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1388 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-18 08:20:19 +00:00
gabest11 af0b33c7b5 GSdx: minor fixes, ar tonelico 2 shadows in sw mode, lamune palette problems in hw mode
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1384 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-18 01:07:28 +00:00
gabest11 1845c3cc38 GSdx: just updating the vs2010 project files...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1378 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-17 15:18:12 +00:00
gabest11 caa7a5dffd GSdx: forgot to disable opengl code, glew32.dll isn't needed yet but cannot be delay loaded
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1376 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-17 11:36:24 +00:00
gabest11 8e979f1b96 GSdx: moved 16 bit texture processing from gpu to cpu, with the pixel shader it was either incorrectly done or too slow, please check what got slower/faster or broken :P
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1375 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-17 11:24:42 +00:00
gabest11 d1c7d2f1a6 xpad: fixed a crash that happened when subclassing an opengl window, also got rid of mfc.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1373 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-16 02:28:43 +00:00
gabest11 48eae0c907 GSdx: more opengl code, please review, I have no idea if it done the right way ^_^
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1372 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-16 01:42:08 +00:00
Jake.Stine c60095f6b0 GSdx: Fixed Software-mode crash on Escape/Exit, caused by a couple destructor race conditions. (C++ destructors and thread safety are fickle beasts that like to claw each others' eyes out)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1371 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-15 23:21:17 +00:00
Jake.Stine 674ac75d6a GSdx: Minor bugfix for DoMerge encountering a NULL pointer in rare cases.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1369 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-15 20:15:17 +00:00
Jake.Stine 136716a4f5 SPU2-X:
* Fixed crash problems when using SPU2-X with old versions of Pcsx2 (0.9.4 and prior).
 * Fixed broken Device specification override (the device GUID wasn't being loaded from the INI).

Pcsx2:
 * Added ThreadAffinity stuff to the CPUSpeed detection.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1368 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-15 16:44:26 +00:00
arcum42 b9cb1d3a59 Delete a stray file that's automatically regenerated every time you build ZeroGS anyways...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1365 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-14 09:56:42 +00:00
arcum42 deae0ce1a6 Linux: Experimental - Add a alternate, more flexible, build script written in Ruby.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1364 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-14 09:41:33 +00:00
gabest11 359c596bd8 GSdx: added missing glew32.lib reference
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1363 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-13 22:31:12 +00:00
gabest11 690ef417b1 GSdx: replaced switch with ifs in the shaders, kingdom hearts should be fixed
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1362 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-13 19:41:34 +00:00
gabest11 693bb3bdce GSdx: added ogl/cg to the list of delay loaded dlls
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1361 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-12 19:39:54 +00:00
gabest11 5736bbd449 GSdx: looking for an opengl guru...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1360 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-12 19:09:17 +00:00
gabest11 6841f7fd98 GSdx: that damned different pixel center of dx10... this one should fix the screen edge and other strange artifacts that appeared in non-native resolution.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1357 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-11 09:27:59 +00:00
gabest11 bd229032c0 GSdx: fix for genji
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1355 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-11 00:08:23 +00:00
gabest11 4e20305fe2 GSdx: dx10 hw mode sharper again
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1354 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-10 17:03:23 +00:00
gabest11 b678bb129c GSdx: texture filtering checkbox fixed, changed texture lookup a bit, removed more unused code
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1351 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-09 10:13:28 +00:00
gabest11 4ed3035661 GSdx: pixel shaders were reorganized, things might be broken :P
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1341 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-06 17:53:34 +00:00
Jake.Stine 95ff8e3a98 GSdx: Applied normalization of UV in the DX9 texture repeat shader, allowing it to be re-enabled. Fixes massive slowdown in the Xenosaga 2 opening menu (Issue 262 / DX9 only) [note: collective fix uncovered by sudonim, feal87, and drk||raziel -- I'm just the patching boy]
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1340 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-06 11:00:30 +00:00
gabest11 8784c1cd43 GSdx: added vs2010 project files
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1339 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-06 10:17:07 +00:00
gabest11 743e93f3ee GSdx: should fix Issue 263, but I could not verify it
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1338 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-06 10:11:22 +00:00
gabest11 01d1573fdc GSdx: cleaned up some obsolete code
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1331 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-05 15:15:02 +00:00
Jake.Stine 3f97423a30 GSdx: Found three other instances of CComPtr that could be removed. (DX9 only)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1330 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-05 12:33:07 +00:00
gabest11 e9ad2ffe7b GSdx: added post build step
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1322 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-04 09:30:35 +00:00
gabest11 7ee6eefb68 GSdx: config dialogs disable unrelated controls again
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1320 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-04 08:32:31 +00:00
gabest11 b792d0c50b GSdx: escape/resume fix
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1314 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-04 00:15:05 +00:00
gabest11 db8feac8c3 GSdx: the BeginScene/EndScene optimization for dx9 (Issue 256)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1312 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-03 22:45:28 +00:00
Jake.Stine 02167e90b3 GSdx: Streamlined several instances of CComPtr use in the Shader caches, as it was causing general slowdowns due to internal reference counters. Gives fairly significant speedups (6-15%) across most games and both DX9 and DX10 alike.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1311 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-03 19:22:50 +00:00
gabest11 ffda8ead30 GSdx: mfc-free
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1310 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-06-03 12:09:04 +00:00
arcum42 187dffc5f4 Zeropad: Fixes a minor mistake in r1286.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1294 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-05-30 12:11:21 +00:00
arcum42 e384d001da Zeropad: Windows is back to compiling, though the config dialog is still broken.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1288 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-05-29 08:39:32 +00:00
arcum42 71480b3124 Zeropad: A bunch of refactoring and cleanup. The Windows port probably won't compile right now.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1286 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-05-29 06:33:56 +00:00
gabest11 65b90bce83 GSdx: there was a bug in unaligned 4/8 bit transfer, small texture glitches may be fixed (simpson game, car logos in gt4).
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1285 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-05-29 06:26:46 +00:00
gabest11 4bc698d698 GSdx: just fixing slow texture uploads with dx9... (odin sphere back to 40-50 fps)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1279 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-05-28 02:57:01 +00:00
arcum42 e8ae911664 Linux: Hack microVU into the Gui.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1275 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-05-27 13:10:43 +00:00
gabest11 3e12966919 GSdx: Even more alpha test voodoo magic, it must be nailed now!
And there is even an explanation. 

The tfx functions calculate At * Af >> 7, which means modulating by 0x80 should return At as the result. 

With the evil floating point pixel shader however 0x80 translates to 128/255 (0.502), not exactly 0.5, modulation as At' * Af' * 2 (' means 0 - 1.0 range) is not the same as with integers.

At' = Af' = 0.502
At' * Af' * 2 = 0.504

If the alpha test happens to be "not equal to 0x80", then abs(0.504 - 128/255) < 0.5/255 will just miss.

Solution is to re-scale those values to the integer range, do the calculations, and then back to float again, but in the end it just simplifies down to At' * Af' * 255/128, doh...

At * Af >> 7 => ((At' * 255) * (Af' * 255) / 128) / 255 => At' * Af' * 255/128

At' = Af' = 0.502
0.502 * 0.502 * 255/128 = 0.502 (w00t!)


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1272 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-05-27 05:55:32 +00:00
gabest11 6c58f3039a GSdx: bit more work on the vertex buffer, and broken ffxii fmv fixed again.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1266 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-05-26 03:40:31 +00:00
arcum42 bd9886b332 Zeropad: Yes it's a bunch *more* cleanup work on Zeropad.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1256 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-05-25 01:59:17 +00:00
arcum42 7519fb8113 Some quick fixes.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1252 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-05-24 04:34:23 +00:00
arcum42 08d3360376 ZeroGS: Strictly in the interests of maintainability, I'm moving these functions to a separate file.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1251 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-05-24 00:31:46 +00:00
gabest11 081006bcbe GSdx: dx9 hw mode got a vertex buffer too (as dx10), it was an old TODO...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1250 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-05-23 23:52:53 +00:00
arcum42 20f0e52a1a Zeropad: All around my hat...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1249 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-05-23 23:07:53 +00:00
arcum42 f1be4728ba Zeropad: Fix a glitch in the new esc code, and the hat code should not save in the same spots as the axis code.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1248 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-05-23 22:20:16 +00:00
arcum42 ecfed766cd ZeroPad: Refactor a bunch of code. Escape now sets the key value to 'Unknown' when configuring. Work some more on the hat code (still disabled).
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1245 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-05-23 11:57:28 +00:00
arcum42 fea158f392 PadNull: A bit more work on the Windows side.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1244 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-05-23 06:50:10 +00:00
arcum42 a180b105d3 PadNull: It compiles in Windows. (It does not pass key events, such as escape, though, so should not be used yet.)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1243 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-05-23 06:11:48 +00:00
arcum42 47bc9722d4 GSnull/PadNull: Add a null Pad plugin (Currently Linux only). Fix up GSnull on the Linux side.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1242 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-05-23 05:15:03 +00:00