ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,238 Commits 24 Branches 4,249 Tags 427 MiB
Commit Graph

1085 Commits

Author SHA1 Message Date
Jake.Stine 9ba58e1398 ReorderingMTGS: Sync with trunk! 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/ReorderingMTGS@3523 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-17 22:42:18 +00:00
sudonim1 b5f1ef528a GSDx: fixed incorrect RGB->YUV conversion when capturing video which was producing off colour results. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3517 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-17 14:04:38 +00:00
arcum42 8e7a7cf5fe zzogl-pg: Now it lists all the enabled hacks, and if they were manually or automatically enabled. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3514 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-17 11:39:04 +00:00
arcum42 a0225a2318 zzogl-pg: Lets try that again. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3513 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-17 10:56:26 +00:00
arcum42 c2804a2806 zzogl-pg: Change the messages when finding a game crc a bit. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3512 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-17 10:55:22 +00:00
arcum42 155e0a1bfa zzogl-pg: Cleaning up a bit after the last commit. Expand a hack to remove lines when AA is on to cover AA at x8 & x16. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3511 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-17 06:56:07 +00:00
arcum42 ecad8b7a4f zzogl-pg: Convert the helper function into arrays. Use them in other places as well. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3510 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-17 06:10:39 +00:00
arcum42 1a3373a9a4 zzogl-pg: Add some helper functions, and rework the _TransferLocalLocal functions a bit. (Needs more testing) 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3509 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-17 01:52:46 +00:00
arcum42 3143be1da1 zzogl-pg: Converted the TransferLocalLocal defines into inlined functions. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3508 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-17 01:12:33 +00:00
arcum42 cfe4d607b3 zzogl-pg: Working more on the new register code. Combined the KickVertex functions. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3506 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-17 00:12:07 +00:00
Jake.Stine f2d637a6e0 zzogl-pg: 
* Removed extern "C" and applied static const to s_clut16 vars.  Should be fine since the old x86.S files that needed extern "C" have been removed from zzogl.
 * Fixed a compilation error in Win32/Debug builds.
 * Changed some references of DEVBUILD ZEROGS_DEVBUILD.  Not sure if all of them should be changed over or not, so I just stuck to some of the more obviously correct bits.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3500 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-16 03:48:13 +00:00
gregory.hainaut 71bcec243e [zzogl]: ooups forget 2 lines. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3495 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-15 16:52:25 +00:00
gregory.hainaut 4a23585a55 [zzogl]: asm work. Asm was totally broken. At least in release build. 
* use volatile keyword to avoid gcc removing the function...
* Use name variable in asm code instead of %n
* Fix constraint on s_clut16mask. There are input, not output...

Arcum can you look at this 2 things thanks.
-> code is still broken in one place. s_clut16mask & s_clut16mask2 
re null in the code generated by gcc ! To fix it (do not know why), we can declare them as static. But I'm not sure
on the impact and I can not test windows...
-> s_clut16mask is declared as a 256bits numbers instead of 128 !


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3494 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-15 16:32:59 +00:00
Jake.Stine 1a8dcc5598 ReorderingMTGS: Sync with trunk 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/ReorderingMTGS@3492 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-15 05:36:38 +00:00
gregory.hainaut 266fb8d73e [zzogl] Square asm constraint. No change, just better bug-proof. 
* add xmm register to the clobber list.
* Add input contrainst (avoid to depend of the function attribute and easier to understand)


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3480 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-13 19:11:07 +00:00
arcum42 f6d0222a8c ReorderingMTGS: Hackfix Linux, until some assembly is written. 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/ReorderingMTGS@3476 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-13 09:28:24 +00:00
gregory.hainaut b326504054 [cmake] 
* Major rework of the linker flags. Use some globals flags for -s and -m32
  Add a USER_CMAKE_LD_FLAGS variable. Easier to play with advanced link flags for future gcc version (>=4.5)
* Remove useless stub file
[debian]
* minor dependency fix


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3475 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-13 09:16:13 +00:00
Jake.Stine 742b9c5535 CDVDnull: Fix an MSVC compilation error. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3466 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-12 02:38:40 +00:00
gregory.hainaut f0f0cef2d5 [autotool] Remove autotools for *null plugins, CDVDiso, zerospu2. Superseed by cmake & codeblock, no reason to keep them. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3463 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-11 12:35:36 +00:00
gregory.hainaut eb88a12a5d [CDVDnull] Completely remove unused files. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3462 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-11 12:04:51 +00:00
gregory.hainaut 9522b1b9e4 [CDVDnull] 
* include a common file to define sysmessage
* Do not compile useless CDVDnull/Linux/* files


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3460 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-11 10:45:14 +00:00
arcum42 472358345a ReorderingMTGS: zzogl-pg: Add GSgifTransfer. pcsx2: Add an include so Linux compiles. 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/ReorderingMTGS@3459 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-11 06:16:16 +00:00
arcum42 2e3ca85647 zzogl-pg: Bug fig on new register code. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3457 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-11 04:53:09 +00:00
Jake.Stine e85da0dfe1 GSdx: Add support for the new hack-free GSgifTransfer callback, which will supercede the various hacky GSgifTransfer1/2/3 callbacks in use now. This version of GSdx will be *REQUIRED* by PCSX2 soon. 
DevNote for zzOgl coders: Implementation of this callback can just double up on m_path[0].  I used a separate instance at m_path[3] mostly because it was easier than trying to fight around the existing PATH1 nloop hack, which is still needed for backward compat with existing and earlier versions of PCSX2.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3454 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-11 04:38:33 +00:00
arcum42 749b180005 zzogl-pg: Removed some redundant code in the new register code. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3452 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-11 03:30:35 +00:00
arcum42 fab3d1d4b7 zzogl-pg: A few Windows changes, and fix an incorrect variable type. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3450 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-10 12:41:49 +00:00
arcum42 7020f82fc7 zzogl-pg: Add some register logging code. Fix a bug in the new register code I noticed. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3448 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-10 10:25:48 +00:00
arcum42 f03c302ae2 zzogl-pg: Be more consistant about the plugin name and years in the headers. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3447 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-10 08:20:50 +00:00
arcum42 4c6dc19aa0 zzogl-pg: Here I go, splitting code into separate files again... 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3446 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-10 08:08:36 +00:00
arcum42 088aa28cde zzogl-pg: Fix mistake in last commit. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3445 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-10 06:05:57 +00:00
arcum42 f07f522238 zzogl-pg: More changes to the new register code. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3444 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-10 06:04:32 +00:00
Jake.Stine 9d5a1b44ba SPU2-X: Remove obsolete utf8 files. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3441 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-09 16:41:31 +00:00
gregory.hainaut 64450c5711 [cmake] 
* Do not compile useless utf8.* files.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3440 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-09 16:02:24 +00:00
gregory.hainaut 6bd3aa9889 [copyright] 
* another bunch of copyright fix.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3439 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-09 15:36:09 +00:00
arcum42 d536cc5cde zzogl-pg: Work on the FOGCOL & GIFRegHandlerTEXA registers in the new register code. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3437 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-09 09:26:35 +00:00
ramapcsx2 1adf69bfb2 GSdx: 
- Fix a tiny GUI bug. Thanks for spotting it, KrossX ;)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3436 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-08 23:24:36 +00:00
gregory.hainaut 57161ec785 [copyright] 
* Upgrade SGI license to 2.0, opensource compliant :) and GPL compatible :)

Note: previous version (1.1) is not free. And therefore not compatible with GPL. Fortunately for us, there is a license clause that allow upgrading the license.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3433 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-08 18:59:44 +00:00
gregory.hainaut 83d71700d9 [copyright] 
* same as previous commit except for zzogl


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3430 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-08 16:51:56 +00:00
gregory.hainaut 84d94276e1 [copyright] 
* Add missing copyright according issue 792
* Miss few files from the previous commit ^^


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3429 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-08 16:40:44 +00:00
gregory.hainaut 0e9030689c [copyright] * second round of bad FSF postal address. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3428 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-08 16:34:39 +00:00
ramapcsx2 19c03083a2 SPU2-X: 
We overshot the final pre-clamp shift by one bit. Should be final now ;)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3422 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-07 20:49:55 +00:00
Jake.Stine b62dbc545a SPU2-X: More volume! Expect to have to turn your speakers down a bit. (made possible by proper clamping) 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3419 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-07 19:20:53 +00:00
gregory.hainaut 8864c8bbaf [cmake] Move flags clean in the build modules. Next step allow user to control them. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3416 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-07 11:08:05 +00:00
arcum42 83adf0f0d4 zzogl-pg: Add -fno-strict-aliasing to zzogl-pg's compiler flags. (Fixes FF X-2.) 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3415 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-07 10:41:17 +00:00
arcum42 b5d8508989 zzogl-pg: Change a few assertions into warnings. (Makes it possible to run Final Fantasy X-2 with Debug builds. With tons of console spam, mind.) 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3413 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-07 10:14:42 +00:00
arcum42 6a3f1bdab2 zzogl-pg: Mucking around with the new register code. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3412 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-07 09:59:29 +00:00
gregory.hainaut 6e30a41931 [asm] * Set a good default GNU-stack note. Need to properly support the nx bits (security concerns) 
See http://www.gentoo.org/proj/en/hardened/gnu-stack.xml for details.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3396 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-05 15:56:38 +00:00
gregory.hainaut f8163336b7 [cmake] remove -fPIC. Expect a little speed up. 
[plugins] remove __forceinline on variadic function that has been broken by the removal of -fPIC.
[debian] update readme about fpic status. And add some lintian overrides.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3395 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-05 15:43:21 +00:00
arcum42 1a593a4134 zzogl-pg: Fence off an area where I can work on the register code without worrying too much about it. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3394 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-05 13:22:02 +00:00
gregory.hainaut 1394b9e03c [copyright]: * Update copyright to use the new postal address of the Free Software Foundation. Nothing to see. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3391 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-04 22:49:00 +00:00
arcum42 cc06570bd4 zzogl-pg: Minor fix from my last commit. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3385 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-04 10:53:41 +00:00
arcum42 cc47fdbb8c zzogl-pg: Enable a GifTransfer shortcut from GSdx. Comment out two variables that weren't being used. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3382 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-04 03:53:01 +00:00
arcum42 84c5073b7c zzogl-pg: Hack and slash at zerogs.h. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3379 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-03 07:57:56 +00:00
arcum42 841e326e0c zzogl-pg: Shuffle stuff out of zerogs.h to ZZGl.h and Util.h. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3377 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-03 06:34:27 +00:00
arcum42 4eb20d3f47 zzogl-pg: Add a new header. Remove a few includes that didn't seem to be used, or were included from elsewhere. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3376 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-03 06:16:28 +00:00
Jake.Stine 2fda352baf GSdx: 
* Fix BIOS graphical errors by re-introducing part of the PATH1 hacks, which is still needed until further notice.
 * Likely fix for DX10+ cards crashing on Configure...  (still can't test directly because MSI sucks, sorry folks)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3370 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-02 14:31:50 +00:00
arcum42 4289d544d2 zzogl-pg: Move various stuff related to GSmain around. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3368 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-02 12:10:40 +00:00
arcum42 e35211addb zzogl-pg: Move the Keyboard code to a separate file. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3367 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-02 10:33:44 +00:00
arcum42 cab7a894e4 zzogl-pg: Move the logging code to its own file. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3366 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-02 09:32:04 +00:00
gregory.hainaut d4fdb08049 [cmake] Fix a typo 
[debian] Multiple lintian (package checker) fix


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3365 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-01 22:50:18 +00:00
Jake.Stine 390b811a1a ... and it helps when I save both files before committing. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3364 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-01 20:22:26 +00:00
Jake.Stine 7c156efb2b zzogl-pg: Bugfix for g_bSaveFlushedFrame, which is *not* used as a boolean, in spite of the fact it used to be a BOOL type in zerogs (must have started as a bool that zerofrog later added a few extra bits and toggles to). 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3363 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-01 20:21:26 +00:00
Jake.Stine bba618beed GSdx: Improved DX10/11 detection. Fixes crashes using the Configure... button mid-game. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3361 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-01 17:46:25 +00:00
Jake.Stine 1b587538a2 LinuzCDVDiso: Second part for fixing Issue 679. Have CDVD plugin return "1" from Open() if the user cancels iso source selector. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3358 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-01 15:09:36 +00:00
refraction a9b8160d9e removed path1 hack from gsdx (not needed) and the redundant path3 hack 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3356 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-01 00:40:19 +00:00
gregory.hainaut f8365215c4 [pcsx2 gui]: For first time wizard panel, use PathDefs::GetDocuments instead of wx GetDocumentsDir (more accurate). 
[zzogl]: fix a bad path for snapshot.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3344 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-29 16:05:54 +00:00
gregory.hainaut 0a012aec25 [pcsx2]: use a local implementation of GetUserLocalDataDir. Follow the xdg specification for linux. 
IMPORTANT NOTE FOR LINUX USER: the "main" pcsx2 configuration is moved from $HOME/.pcsx2 to $XDG_CONFIG_HOME/pcsx2 (or $HOME/.config/pcsx2 if xdg var is not defined).
A first time wizard is expected. Just import you previous settings.

[cmake]: add a missing h file. 


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3336 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-28 19:46:54 +00:00
arcum42 f058e38f5b zzogl-pg: Commit patch from zzogl-213 for shaking when interlace is on in FFX-2. (Issue 768). 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3334 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-28 10:54:26 +00:00
Jake.Stine b7f2af1160 zzogl-pg: fix a warning on win32, and remove the non-existent gssoft.def file form the vsproj. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3329 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-28 03:01:06 +00:00
ramapcsx2 9a9c41f59e SPU2-X: This should be more correct. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3327 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-27 14:39:28 +00:00
Jake.Stine af40a22ee8 SPU2-X: Reverb compatibility improvements (fixes Ys6). 
* EEA / ESA writes are ignored when Effects are enabled.
 * When effects are disabled, reverb does not process IRQs or produce sound.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3326 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-27 13:11:38 +00:00
arcum42 dceefdf22b zzogl-pg: Get rid of some annoying spam when debugging, and remove some old code. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3324 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-27 08:51:24 +00:00
arcum42 8f46aea568 zzogl-pg: Some work on the Gif Registers. I'm trying to bring them a bit closer to the way GSdx handles them. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3323 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-27 08:38:50 +00:00
arcum42 621fb5bd24 zzogl-pg: Fix a silly typo. Issue 766. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3322 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-27 03:36:39 +00:00
arcum42 2787e6e2a1 zzogl-pg: Assorted cleanup. Added ZZoglCRTC.h, to clean up some clutter in ZZoglCRTC.cpp. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3319 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-27 00:53:06 +00:00
ramapcsx2 15782fefdd SPU2-X: 
- Some preliminary work on better resets. Also some commented out yet changes.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3318 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-27 00:44:00 +00:00
ramapcsx2 fe92409fd4 SPU2-X: 
Revert all reverb area tryouts, caused bleeps in many games (breaking Ys and that shonen jump game, but oh well).

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3315 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-26 15:00:32 +00:00
Jake.Stine c3f2320994 GSdx and some other plugins no one cares about: remove ddraw.lib. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3296 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-25 02:36:21 +00:00
sudonim1 61f7a4ddab SPU2-X: Double IRQ prevention found on real hardware. Only affects developers who didn't read the SDK documentation properly, like me. Nothing fixed as far as we know. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3294 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-25 01:49:26 +00:00
Jake.Stine 4ad1e48950 GSdx: minor fixes to movie recording. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3291 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-24 20:25:33 +00:00
Jake.Stine c394708651 GSdx: Fix cases where DX9 cards detected as having DX10/11 under Windows 7. Changed the device selector to display either DX10 or DX11 depending on the supposed feature set availability reported by drivers/dx. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3277 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-23 05:32:50 +00:00
Jake.Stine 24ae022a74 Fully implement hash-based database lookup. Fix some bugs that caused startup crashes in previous revisions of mine. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3273 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-22 18:57:48 +00:00
Jake.Stine fddc5afe38 GSdx: Remove ddraw.h references, which were long since obsolete anyway. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3270 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-22 13:42:41 +00:00
gregory.hainaut 3d9c63b0f0 [cmake]: 
* Print a fatal_error when users do not source the good CMakeLists file.
* Do not search system libraries if the user force the internal libraries


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3269 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-22 13:30:36 +00:00
arcum42 b8267258bf spu2-x/pcsx2: Fix the path used for wav files. (Hack; I'll fix it properly later.). Add a missing header into the cmake build. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3268 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-22 12:09:32 +00:00
ramapcsx2 bd9606ab0b Yay, typo :p 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3262 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-21 15:37:26 +00:00
ramapcsx2 5f85a0c956 SPU2-X: 
- Double the audio output volume before sending it to the output modules. Was way too quiet.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3261 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-21 15:34:32 +00:00
arcum42 4adb345a86 spu2-x: Remove some debugging messages I accidentally left in the last commit... 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3260 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-21 12:06:21 +00:00
arcum42 85657682da zzogl-pg: Printing to the console now works. Fixed AA+/-. Misc. pcsx2: Took care of two non-POD safe objects. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3259 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-21 12:03:14 +00:00
arcum42 8bbb5848af spu2-x/ZeroSPU2: Let's add in clobber lists, and take out volatile on the rng as well... 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3253 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-21 10:09:19 +00:00
arcum42 10576c5b01 spu2-x: Fix a crash in Linux. (Do the same thing to ZeroSPU2 for good measure.) 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3252 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-21 09:40:15 +00:00
Jake.Stine 7461f83414 UI / Cmdline: 
* Fullscreen mode should be remembered/applied properly now.
 * implemented --fullscreen and --windowed options
 * Made the --help popup a lot prettier

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3249 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-21 04:04:32 +00:00
arcum42 7c8170d582 ZZOgl-PG: Suppose I should have left this line in... 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3248 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-20 09:38:35 +00:00
arcum42 6db8dd3bd7 zzogl-pg: Fix Windows again. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3247 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-20 07:33:47 +00:00
arcum42 fd28ec1012 zzogl-pg: Forgot to remove this... 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3246 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-19 22:36:20 +00:00
arcum42 344bdb8739 zzogl-pg: Go with gregorys dummy key limit change for the moment. Gets rid of garbage in Grandia III. Needs more testing with other games. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3245 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-19 22:32:53 +00:00
ramapcsx2 23f63c37cc SPU2-X: 
Another relocation of Reverb Address space. Ys and Shaman King work.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3244 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-19 16:19:22 +00:00
ramapcsx2 c996934a1e SPU2-X: 
- Clamp requested pitch values to 0x3fff. Fixes games that set a too big pitch, run that voice and expect it to hit an IRQA (Romancing Saga).
- Gigaherz and Pseudonym worked out better modulation support. Should make some sounds better (FFX battle sound, etc).

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3242 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-19 14:52:37 +00:00
arcum42 a04e71cf9d zzogl-pg: A bit more refactoring. Rename DrawTriangle. Move some code around. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3237 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-19 12:59:51 +00:00
arcum42 49d929c19c spu2-x: Get Spu2-X compiling in Linux again. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3235 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-19 11:15:05 +00:00
ramapcsx2 15d296cca0 SPU2-X: 
We're free to put the ESA wherever we want. So let's use an area that makes the game Ys not die. :p

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3234 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-19 11:04:02 +00:00
arcum42 1681fa0b76 zzogl-pg: Fix the Windows port back up. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3233 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-19 09:07:21 +00:00
arcum42 328d046d6c zzogl-pg: Revamp configuration code. (Likely breaks Windows. I'll take care of that. Also, you may need to reset a few settings in ZZOgl after this commit... 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3232 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-19 08:46:40 +00:00
arcum42 9f21cc3dcd zzogl-pg: If ZZOgl automatically turns a game hack on, it shouldn't leave it on. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3231 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-19 06:23:40 +00:00
arcum42 d3266a3921 zzogl-pg: Some refactoring, a bit of work on logging. Some disabled stuff I was fiddling with. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3230 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-19 05:41:06 +00:00
Jake.Stine 0f39ecb725 SPU2-X: Comment gigaherz hack better and disable it by default. (doesn't seem to make much of a diff either way though) 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3228 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-19 03:39:17 +00:00
Jake.Stine 29fc645157 SPU2-X: Reverb tweaks. Still shooting in the dark, so no promises on if this helps or hurts. -_- 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3227 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-19 03:33:41 +00:00
gigaherz 6857acbadf SPU2-X: Voices used for modulation are not supposed to be played out loud. The actual modulation could still be wrong, but at least it will avoid annoying sounds to be played (e.g. Romancing SaGa main menu). 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3224 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-18 17:47:50 +00:00
ramapcsx2 668a425a18 SPU2-X: Small fix for bad resets. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3219 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-17 20:10:28 +00:00
ramapcsx2 9390afdbf1 SPU2-X: Some changes to make debugging easier. 
-ADMA can now be logged undependable from DMA.
-Visual core activity display works again.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3218 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-17 11:06:28 +00:00
gigaherz 067b30caa0 SPU2-X: Experimental Reverb engine changes. Since I don't have any game that shows any obvious reverb usage, and I can't properly test this, I'll leave it here and let other people yell at me later if it makes any game noisy. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3217 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-17 01:17:41 +00:00
gigaherz d5878d783b I was just reminded savestates do exist, and my changes make current states incompatible. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3216 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-16 20:28:17 +00:00
gigaherz 16bceab316 Silly me for not proofreading the patch BEFORE commiting. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3215 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-16 20:19:15 +00:00
gigaherz c6ad0e52b5 Remove the AutoDMA buffer hack, using its own allocated space as it's supposed to. 
If there's any regression we should look at what CAUSES it, instead of hacking it back.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3214 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-16 20:15:33 +00:00
arcum42 ee1d7f137b ZZogl-pg: In the Debug build, downgrade various assertions to log messages. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3209 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-15 11:20:52 +00:00
arcum42 6de9dbeca0 zzogl-pg: A bit of refactoring and debugging code. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3208 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-15 10:32:22 +00:00
Jake.Stine 87ebbb652b SPU2-X: Woops, missed a writeback. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3207 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-13 02:10:22 +00:00
Jake.Stine f752038f65 SPU2-X: Fixed Core1 writeback areas; probably fixes quite a few things. 
Details: (0x1800 to 0x1fff were being mis-written to 0x2000->0x2800, roughly).

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3206 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-13 01:54:59 +00:00
ramapcsx2 c9dc18053f SPU2-X: Fix a small bug with voice volume in linear interpolation mode. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3205 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-12 16:45:14 +00:00
Jake.Stine 5e33e270fd ZeroSPU2: Fix compilation errors and warnings under Windows/MSVC. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3204 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-11 19:06:35 +00:00
gregory.hainaut 1e9be9eab2 [spu2null, padnull, gsnull, zzogl]: use the setLogDir API to select the log path. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3203 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-11 17:31:45 +00:00
arcum42 b43d8b650f Bring codeblock in sync with the new soundtouch path. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3201 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-11 14:03:37 +00:00
gregory.hainaut 6e118887a5 * Apply a co-patch of Air and me to use linux friendly include path 
[cmake]:
* Update to use the above patch.
* Remove a52. Need to use system version.
* Remove stub file. Append pcsx2 to 3rparty library to ease futur support.

Important Note: codeblock will probably need some update. (add 3rdparty/soundtouch_linux_include in include path)


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3200 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-11 13:51:43 +00:00
arcum42 68eeefd130 zzogl-pg: Shuffle things around a bit. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3199 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-11 11:48:07 +00:00
arcum42 54b89a4717 zerospu2: Redo the dialog, and get rid of all the crufty Glade 2 files. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3198 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-11 08:56:54 +00:00
gregory.hainaut c34bb28087 [gsnull, padnull, spu2null] : remove the deprecated glade interface. 
Note: I updated the codeblock xml to remove the file. It is normaly ok but I do not test it (only cmake one^^)


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3195 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-10 17:38:09 +00:00
gregory.hainaut 080d68927e [spu2null, gsnull, padnull]: Use the same configuration interface as others null plugins. Drop the glade dependency ^^ 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3194 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-10 16:30:08 +00:00
sudonim1 6a79fef67a GSDx: bug in D3D11 CopyRect, does not affect anything. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3193 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-10 13:26:31 +00:00
arcum42 00404edfbc spu2-x: Added a define in to make it easy to disable the decoder code. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3186 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-09 10:38:14 +00:00
gregory.hainaut aa430319c0 [pcsx2 ui]: update Game fixes panel to look like speed hack one 
[spu2x]: explain why one inline fail on linux
[cmake]: Prepare some include directory updates


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3185 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-08 17:08:00 +00:00
sudonim1 ec989a50cf GSDx: Fix D3D11 leaks. (Completely, forever.) 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3183 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-07 18:41:37 +00:00
gregory.hainaut f775d20cbc [cmake] 
* Better separation between pcsx2/plugins/3rdparty => no need anymore to download everythings :)
* Drop build dependency on unused libBPM (from soundtouch)


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3180 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-07 13:32:10 +00:00
gregory.hainaut a849202d28 * Simple fix. Avoid a segfault with GSnull and GSoutput disabled. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3177 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-06 22:25:11 +00:00
gregory.hainaut 275a923911 * Declared a local function static. Fix compilation error on gcc/linux. Spu2x is now ok 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3174 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-05 21:38:52 +00:00
Jake.Stine 581d17e282 SPU2-X: Remove antiquated use of __fastcall, from a time long ago when I was paranoid and overly in-love with fonction prototype red tape. (should fix linux/gcc compilation errors). 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3173 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-05 15:59:59 +00:00
gregory.hainaut 7883180ab9 [cmake] 
* align cmake flags with codeblock one. (note spu2x may still fail to compile with inline problem)
* Some final cleaning. You must be able to see your reflection now ;)


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3169 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-05 11:56:52 +00:00
arcum42 e7b2379b03 onepad: various cleanup. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3168 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-05 11:03:12 +00:00
arcum42 fb89acafe9 onepad: fix up a few things in the tree code. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3167 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-05 09:22:26 +00:00
arcum42 eb3ebc422a onepad: Add a modify button. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3166 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-05 09:09:12 +00:00
arcum42 a372eaf2eb onepad: Fix my last commit. A few minor changes. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3165 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-05 09:01:38 +00:00
arcum42 d39bdfcd1e onepad: Switch to the new dialog code and remove the old code. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3164 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-05 08:22:14 +00:00
arcum42 d51d36d65f onepad: More dialog work. It's starting to get functional, but not totally there yet. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3163 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-05 05:35:36 +00:00
Jake.Stine b7c9aa63cd GSdx: Fix an unfriendly crash when trying to create a device on a machine that only supports DX9 when DX10/11 is configured (Think temporary downgrading your video card, and then running PCSX2). 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3161 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-05 04:06:24 +00:00
arcum42 492488a15d onepad: Commit some work in progress on onepad's gui. (Currently disabled, because I haven't hooked anything up yet.) 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3157 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-04 22:12:37 +00:00
gregory.hainaut 0d6ba65557 * Do not build spu2x unless all dependencies are ok 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3147 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-03 15:43:10 +00:00
gregory.hainaut 6055ca126b * Grunt work :) Use variables to set flags to ease futur modifications 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3146 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-03 15:12:29 +00:00
Jake.Stine 1083b658b3 * Apply gregory's patch for inconsistent "setLogsDir / SetLogsFolder" usage. 
* Fix slomo hotkey (issue 725)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3139 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-01 11:27:10 +00:00
Jake.Stine 899e691781 SPU2-X: Disable MSVC's SSE2 opts (they suck anyway -- nothing more than a novelty option at this point). The SSE2 detection code was causing problems, namely perma-hangs when applying settings. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3138 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-01 03:36:07 +00:00
Jake.Stine 19fb2ec775 zzogl-pg: fix for issue 701 : screwy config dialogs in win32, caused by incorrect 'bool' type on Win32 API CALLBACK functions. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3135 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-01 02:00:48 +00:00
Jake.Stine 644d4cda7f Screwed up my last i18n commit -- forgot that gettext/poedit needs explicit text literals to work from, so my pxE_* macros won't work. This version should be better. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3132 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-05-31 15:18:49 +00:00