gregory.hainaut@gmail.com
112800cb98
common, GSnull, zzogl-pg, SPU2null: add more safety to some fclose functions. Avoid a bunch of double free and memory corruption.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3671 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-20 11:13:40 +00:00
gregory.hainaut@gmail.com
c394c408d0
GregMiscellaneous: Some cleanup. Convert boolean function to bool.
...
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3670 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-20 10:01:38 +00:00
arcum42
c84d820c35
GregMiscellaneous: Implement a Linux dialog box item for skipdraw.
...
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3668 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-19 09:21:28 +00:00
gregory.hainaut@gmail.com
581a2b83c8
GregMiscellaneous:
...
* Use memset instead of GSC_Null, It saves a function call and I do not thinks it was related to the previous crash. Arcum can you test it ?
* Tune the GOW value.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3666 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-18 16:55:45 +00:00
gregory.hainaut@gmail.com
1c1eef8bde
GregMiscellaneous: Various clean
...
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3665 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-18 14:04:10 +00:00
arcum42
66c8b8381e
zzogl-pg: Quick Windows fix for an issue introduced in zzogl r218. Fix a typo.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3663 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-18 13:38:45 +00:00
arcum42
e7b0d43544
GregMiscellaneous: Fix a typo from the last commit. Add Skipdraw to the configuration file.
...
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3662 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-18 13:15:43 +00:00
arcum42
0e37310783
zzogl-pg: Copy the modified ps2hw.dat file in as well.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3661 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-18 12:44:45 +00:00
arcum42
a265546ddb
GregMiscellaneous: Add in GSdx's crcs. Fix a crash I encountered.
...
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3660 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-18 12:32:24 +00:00
arcum42
59262101db
zzogl-pg: Add in changes from zzogl r218. (I'll still need to go through r214-217 and grab any important changes, though.)
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3659 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-18 10:52:57 +00:00
arcum42
74895f189a
GregMiscellaneous: Update the codeblocks project file for ZZOgl.
...
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3658 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-18 09:26:51 +00:00
arcum42
9a5e9e24e1
zzogl: Get a start on abstracting the memory code a bit.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3657 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-18 08:54:16 +00:00
gregory.hainaut@gmail.com
7f5b0f49a3
GregMiscellaneous: Forget to clean one structure.
...
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3656 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-17 22:16:20 +00:00
gregory.hainaut@gmail.com
cd1a4b7d15
GregMiscellaneous:
...
* Fix some parameter
* Use some functions created by Zeydlitz to reduce the code.
Current status: blur effect is removed in FFX with UserHacks_SkipDraw=1 and various random crashes ;)
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3655 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-17 22:14:45 +00:00
gregory.hainaut@gmail.com
fbdf7521e5
GregMiscellaneous: Try to remove blur from some games. Gets the code from GSdx.
...
note: it is not working for the moment.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3653 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-17 13:38:57 +00:00
arcum42
699e623998
zzogl-pg: Work on GetRectMemAddress.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3639 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-14 08:15:19 +00:00
gregory.hainaut
2544f4c320
zzogl: update the size of the default advance panels. Avoid resizing every times.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3637 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-13 16:00:52 +00:00
gregory.hainaut
fa793cca25
cmake:
...
* move machine optimization in the global setup. In same time use i686 instead of i486
* Also build the debug with fvisibility=hidden No reason to use it only on devel. (actually same as codeblock)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3628 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-09 19:05:02 +00:00
gregory.hainaut
df436f1583
zzogl copyright:
...
* common.h is mostly based on multiple file in ffmpeg. So apply the same licence as the original files
* Others zerofrog's file: add a note on the missing copyright notice.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3627 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-09 18:57:00 +00:00
arcum42
cfc4c9b3ec
GSnull: Work on the GifTransfer functions, to bring them up to date, and straighten them out. Now enabled by default.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3610 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-06 09:30:36 +00:00
arcum42
2e77e2f9c8
zzogl-pg: Reworked Linux configuration dialog.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3582 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-31 00:29:49 +00:00
arcum42
7d5dbc64fc
zzogl-pg: More minor changes to the Liux config code.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3581 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-30 09:52:34 +00:00
arcum42
7b522ea680
zzogl-pg: I seem to have overlooked this somewhere along the way.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3580 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-30 09:26:23 +00:00
arcum42
ed9bf27015
pcsx2: Update the project files to no longer have coroutine. Fix a compiler warning. (zzogl-pg: Modify comments.)
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3569 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-26 10:51:06 +00:00
gregory.hainaut
83604ec59d
cmake: properly separate ldflags from cflags
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3567 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-25 14:20:03 +00:00
gregory.hainaut
4e90b10c76
cmake: Use same variable name for output. Allow easier copy-paste between files. Do not know why I did not do it earlier.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3566 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-25 13:54:26 +00:00
arcum42
fb034eda2a
zzogl-pg: Copy ps2hw.dat into the plugin directory when building.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3561 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-24 11:08:43 +00:00
arcum42
abc73d506c
zzogl-pg: A few minor changes to the last commit.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3560 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-24 08:08:42 +00:00
arcum42
b4e2bf4366
ZZOgl-pg: A bunch of work on the Windows dialog. Based off of an rc file given to me by SonicPCSX2, then hacked on a bunch by me.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3559 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-24 08:05:53 +00:00
arcum42
a496f3d81d
ZZOgl-pg: Yet more new register work.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3558 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-24 04:51:39 +00:00
arcum42
aee1e94a13
zzogl-pg: Apply the same changes to the new register code.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3538 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-19 20:52:52 +00:00
Jake.Stine
b6af82efa8
GSdx / zzogl-pg / pcsx2:
...
* Implemented support for legacy GS plugins (considered anything prior to the Reordering merge).
* Added a lot of 'const' qualifiers to the GSgifTransfer functions in both GSdx and zzogl.
DevNote: GS plugins shouldn't be modifying the data provided to them from PCSX2 -- zzogl wasn't, GSdx was. I had to do a little bit of juggling to remove the mem modifications from GSdx's TEX0/TEX2 handlers. With luck, nothing's broken. ;)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3536 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-19 15:49:30 +00:00
arcum42
4c03fb26d3
zzogl-pg: More blocks stuff.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3534 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-19 11:17:46 +00:00
Jake.Stine
856ffe4c65
Merge optimizations and code cleanups from the ReorderingMTGS branch (r3523) into Trunk. Summary of changes:
...
* GIFpath parsing copies as it parses (speedup!)
* Improved memcpy for 128-bit copies (speedup!)
* MTGS ringbuffer uses free-flowing wrapping now, which simplified ringbuffer management logic considerably (speedup!)
* Various MTGS-related refactoring (var renames and such)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3532 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-19 03:48:37 +00:00
arcum42
6972792a4e
zzogl-pg: Messing around with the BLOCK struct.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3528 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-18 06:59:23 +00:00
arcum42
b58a43cdf6
zzogl-pg: Revise the TransferHostLocal functions a bit. More arrays.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3526 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-18 04:53:50 +00:00
arcum42
48bbe19bd3
zzogl-pg: Add Swizzle function arrays.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3525 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-18 04:14:09 +00:00
arcum42
30a911f9f8
zzogl-pg: remove an unneccessary structure.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3524 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-18 03:45:28 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
arcum42
ef5124e6d3
cmake: Remove a few unneccessary defines.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3062 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-23 08:10:32 +00:00
Jake.Stine
d843f4bcc3
zzogl-pg: fixed a whole bunch of signed/unsigned warnings in Mem_Transit, and a macro redefinition warning.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3036 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-17 15:56:41 +00:00
arcum42
9baed432c9
cmake: A bunch of 32 bit/64 bit stuff.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3022 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-16 00:36:42 +00:00
arcum42
b363b7c715
cmake: Change the way stripping is handled.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3021 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-16 00:12:10 +00:00
arcum42
00f7cde4e0
zzogl-pg: Copy all the old zerogs patches that used to be in the patches folder into zzogl (minus the FF X ones, as the FFX hack is no longer relevant). Commented out right now, because I'm not sure how many of these are even useful any more.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3012 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-15 05:02:25 +00:00
arcum42
a18e8c74ad
zzogl-pg: Patch to prevent compilation issues if fPIC is in the compilation flags.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2999 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-13 20:41:48 +00:00
arcum42
5b4d508053
cmake: Enable zzogl-pg. (There's still a bug in here somewhere, though...)
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2996 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-13 11:03:39 +00:00
arcum42
d24831f0d8
cmake: Start getting zzogl-pg and spu2-x support in the cmake build system. (I'm not enabling it yet, as I don't have time to get it working properly at the moment. That's probably a project for this weekend.)
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2984 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-12 09:51:46 +00:00
arcum42
62c15102e4
Add NDEBUG to non-debug targets in Code::Blocks. Remove a few inlines that were causing problems with Linux. Remove a problematic hardcoded initialization of OutputModule I'd forgotten about in Spu2-x.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2967 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-08 01:51:29 +00:00
arcum42
546ead475b
Tweak zzogl-pg's C::B file a bit. Slap a quick patch on pcsx2 so it compiles. (Jake will probably want to fix that properly...)
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2949 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-05 09:10:22 +00:00
arcum42
b9c8ac3ead
zzogl-pg: Add the new files to the codeblocks project.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2935 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-02 06:29:43 +00:00
arcum42
393963f578
zzogl-pg: Separate out some profile code.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2934 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-02 03:09:20 +00:00
arcum42
c160aa495a
zzogl-pg: Missed the Windows specific files. BOOL->bool in a few places.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2933 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-01 23:34:44 +00:00
arcum42
12ad5308ed
zzogl-pg: Part 2 of the re-formatting; ran AStyle over the headers.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2932 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-01 22:54:23 +00:00
arcum42
a6c4df49ea
zzogl-pg: Ran a bunch of the files through AStyle, so I don't find myself messing with the source code formatting so much.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2931 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-01 20:33:53 +00:00
ramapcsx2
7e8c22b4f5
Committing "blood's" work on building PCSX2 and plugins under msvc 2010.
...
Changes: Fixed all compile errors in VS 2010. Added support for new w32pthreads.v4. Fixed all MSB8012 warnings. Fixed LNK419 warnings with /DELAYLOAD. Fixed issues when compiling Devel before Release. Added GSdx Devel target. Minor cleanups.
Thanks a bunch, blood :)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2930 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-30 19:46:43 +00:00
arcum42
26e3038683
zzogl-pg: Fix Linux after the last commit.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2928 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-30 05:24:27 +00:00
arcum42
e4d42b1e7b
zzogl-pg: Work on reducing the amount of platform specific code a bit.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2927 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-30 04:40:31 +00:00
arcum42
5c20358c19
zzogl-pg: A quick persistant window hack.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2924 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-28 02:56:40 +00:00
arcum42
6a2c745bf4
zzogl-pg: Missed a few ERRROR_LOGs.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2905 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-26 11:46:22 +00:00
arcum42
10b2eedb61
zzogl-pg: A few parenthesis went missing in my last commit.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2904 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-25 23:57:55 +00:00
arcum42
64da7dd76b
zzogl-pg: Remove a few hardcoded game options that shouldn't be there.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2903 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-25 19:52:33 +00:00
arcum42
2daee33eae
zzogl-pg: Revamp the crc code to pull from a table, and add a few crc codes. Based off of code from GSdx.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2902 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-25 11:14:37 +00:00
arcum42
07a16bc76d
zzogl-pg: Get rid of RELEASE_TO_PUBLIC, and use ZEROGS_DEVBUILD instead. Fix a typo I noticed.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2901 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-25 09:02:36 +00:00
arcum42
9293c2eb8e
zzogl-pg: Got rid of the logging macros. Changed the text of some of the messages a bit.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2900 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-25 08:33:05 +00:00
arcum42
0ccd832efe
zzogl-pg: Start reworking the way logging works.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2899 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-25 07:21:29 +00:00
sudonim1
4457fe40fc
Removed all trailing whitespace in *.c *.cpp *.h because it irritates me.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2897 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-25 00:31:27 +00:00
arcum42
790cd55608
zzogl-pg: I don't think this should be hardcoded to 640x480...
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2896 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-24 23:22:49 +00:00
sudonim1
a05e9c62be
Set svn:eol-style=native on all *.c *.cpp *.h
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2894 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-24 21:37:39 +00:00
arcum42
678f2018d0
pcsx2: A few misc changes. && != &. zzogl-pg: Comment out a log message that was spamming in Mana Khemia.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2866 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-16 05:08:41 +00:00
arcum42
6d6eb253c6
zzogl-pg: Fix a few game crashes in Windows. (Reverted a few misc changes in r2833.)
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2865 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-16 04:17:46 +00:00
arcum42
9f7032d0f6
zzogl-pg: Comment out a log message left in accidentally. Move the Gust checkbox on the Windows dialog to not be on top of a button.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2864 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-16 02:21:46 +00:00
arcum42
a91d499f17
zzogl-pg: Pull a check out of a for loop in Mem.cpp. Break CheckChangeInClut in two. Turn a bit of repeated code in ZeroGS::CRangeManager::Insert into a function. Work on creating a new tex0 struct.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2860 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-15 22:03:23 +00:00
gigaherz
a79f87439f
Fix the resources' build steps not being run (thanks ltc.inv).
...
sorta-hack-fix zzogl into linking with libjpeg7 and zlib (having the projects as dependencies is supposed to link to the .libs automatically, isn't it?).
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2859 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-15 21:19:51 +00:00
gigaherz
954847fca4
Initial work on vs2010 project files for PCSX2 and plugins.
...
The *null projects don't build, and neither do ZZOgl or ZeroSPU2.
Pcsx2 project has some issues with Resources' custom build steps not being run.
Only Debug target tested.
Needs work before it's usable.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2843 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-14 19:44:04 +00:00
arcum42
3cc6bbf584
zzogl-pg: Mess about with _Resolve.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2834 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-11 08:59:49 +00:00
arcum42
4a32e9b445
zzogl-pg: Turn BUILD_CLUT into a function.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2833 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-11 08:51:50 +00:00
arcum42
d617fe7927
zzogl-pg: Keep in sync with zzogl.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2831 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-11 03:12:17 +00:00
arcum42
3546591de5
zzogl: Rework things in Mem.cpp & Mem_Transfer.h some more.
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2827 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-09 04:23:27 +00:00
ramapcsx2
a57761c934
Crashfix for ZZogl / ZeroGSogl. Thanks "jur".
...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2825 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-08 21:58:14 +00:00