zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity
1458 commits 2 branches 1 tag 128 MiB
Commit graph

1455 commits

Author SHA1 Message Date
plagman
0688522507 Adds r_pr_shadowfiltering and r_pr_atiworkaround cvars. 
git-svn-id: https://svn.eduke32.com/eduke32@1408 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-06-06 16:00:48 +00:00
plagman
f46e3b44f4 Using memcpy with clearly overlapping blocks is sad. 
git-svn-id: https://svn.eduke32.com/eduke32@1407 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-06-06 14:22:17 +00:00
plagman
2186154dac Avoid a square root in the point light GPU program by comparing squared lengths. This changes the lighting model a bit since the attenuation calculation is based against these lengths. 
git-svn-id: https://svn.eduke32.com/eduke32@1406 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-06-06 13:48:52 +00:00
plagman
b112e1d3c3 Re-implements the old light priority system, removes applylights() and optimizes the light invalidation code. 
git-svn-id: https://svn.eduke32.com/eduke32@1405 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-06-06 13:40:15 +00:00
plagman
dbb84c7ee8 Reverts the priority change and removes applylights. 
git-svn-id: https://svn.eduke32.com/eduke32@1404 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-06-06 13:12:29 +00:00
plagman
721177ce18 Fix the build on Linux. 
git-svn-id: https://svn.eduke32.com/eduke32@1403 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-06-06 11:17:10 +00:00
terminx
d4bca26bd9 Light stuff 
git-svn-id: https://svn.eduke32.com/eduke32@1402 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-06-06 10:20:00 +00:00
terminx
c3b41ce1cf git-svn-id: https://svn.eduke32.com/eduke32@1401 1a8010ca-5511-0410-912e-c29ae57300e0 2009-06-05 21:10:42 +00:00
terminx
0a1eef74a3 Fix VS manifest error 
git-svn-id: https://svn.eduke32.com/eduke32@1400 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-06-05 20:34:40 +00:00
terminx
af5128bcdd MSVC fixes + clean out tree 
git-svn-id: https://svn.eduke32.com/eduke32@1399 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-06-05 20:09:13 +00:00
plagman
2547739ff4 This prevents shadows from flooding the OSD and killing performance. 
git-svn-id: https://svn.eduke32.com/eduke32@1398 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-06-01 21:11:26 +00:00
plagman
a23c9c23ba This overhauls the light culling/management code. Note: this renders the current gameland dynamic light code useless, to it'll have to be ported before they're back. Please don't complain on the forums. 
git-svn-id: https://svn.eduke32.com/eduke32@1397 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-06-01 20:55:36 +00:00
helixhorned
52aff6e8d9 minor stuff 
git-svn-id: https://svn.eduke32.com/eduke32@1396 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-31 22:06:18 +00:00
plagman
930689d468 More corrupt map checks. 
git-svn-id: https://svn.eduke32.com/eduke32@1395 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-31 18:16:14 +00:00
plagman
2997d1e0f5 Light pathing tweak. 
git-svn-id: https://svn.eduke32.com/eduke32@1394 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-31 18:10:09 +00:00
terminx
4e5bde3a79 git-svn-id: https://svn.eduke32.com/eduke32@1393 1a8010ca-5511-0410-912e-c29ae57300e0 2009-05-28 02:55:46 +00:00
helixhorned
d897eca725 fancy gradient at a few more places; minor corrections 
git-svn-id: https://svn.eduke32.com/eduke32@1392 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-25 21:47:08 +00:00
helixhorned
d4641adc03 mapster32: fix when rotating sprite; fancy gradient in sprite search 
git-svn-id: https://svn.eduke32.com/eduke32@1391 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-24 22:18:40 +00:00
terminx
8474211c95 Misc small fixes 
git-svn-id: https://svn.eduke32.com/eduke32@1390 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-22 23:49:25 +00:00
plagman
82211327e8 Work around ATI driver bug (that's there since Cat 8.10 according to the intertubes). 
git-svn-id: https://svn.eduke32.com/eduke32@1389 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-20 22:30:18 +00:00
plagman
515451e45f Speed up polymer_init a little. 
git-svn-id: https://svn.eduke32.com/eduke32@1388 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-17 21:55:50 +00:00
plagman
5eae5cdc50 Moves editorselect and clearmapdata to non-external function categories, makes them static and prototypes them in the header. 
git-svn-id: https://svn.eduke32.com/eduke32@1387 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-17 16:12:53 +00:00
terminx
5209d30f13 Missed one 
git-svn-id: https://svn.eduke32.com/eduke32@1386 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-16 22:32:23 +00:00
terminx
bc4d262216 Fixes most polymer memory leaks 
git-svn-id: https://svn.eduke32.com/eduke32@1385 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-16 22:26:40 +00:00
terminx
6285f8b2e2 Misc crap 
git-svn-id: https://svn.eduke32.com/eduke32@1384 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-16 04:07:09 +00:00
plagman
747a242b80 Unbreak specular maps (were broken because of mirror unbreaking). 
git-svn-id: https://svn.eduke32.com/eduke32@1383 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-16 01:33:04 +00:00
plagman
b1f358de6f Unbreak mirrors. 
git-svn-id: https://svn.eduke32.com/eduke32@1382 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-16 01:28:42 +00:00
plagman
854c72263c More tweaks to the specular lighting model. 
git-svn-id: https://svn.eduke32.com/eduke32@1381 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-16 00:50:30 +00:00
plagman
396256b6e0 Tweak the lighting model so that specular highlights ignore the diffuse map value when a specular map is defined. 
git-svn-id: https://svn.eduke32.com/eduke32@1380 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-15 14:23:08 +00:00
qbix79
77703ce68a Fix a warning. Nobody seems to use this field though? 
git-svn-id: https://svn.eduke32.com/eduke32@1379 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-14 12:35:13 +00:00
qbix79
c8fcae3be4 Improve saving on 64 bit linux. DukePlus seems to save/load for me now. No changes for HUBmaps though. 
git-svn-id: https://svn.eduke32.com/eduke32@1378 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-13 10:40:42 +00:00
plagman
a5f8978a9f Spotlightmaps. 
git-svn-id: https://svn.eduke32.com/eduke32@1377 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-12 20:08:38 +00:00
plagman
1b948be858 Corrects polymost rotation offset scale (didn't match build units before) and a bug in the polymer offset code (bug 2783065). 
git-svn-id: https://svn.eduke32.com/eduke32@1376 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-10 19:19:25 +00:00
plagman
77e873b476 Adds pitch/roll script rotation for mdsprites (bug 2783065). 
git-svn-id: https://svn.eduke32.com/eduke32@1375 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-10 17:51:00 +00:00
plagman
3cd91a1832 Parallax the parallax skies (bug 2783074). 
git-svn-id: https://svn.eduke32.com/eduke32@1374 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-09 11:04:10 +00:00
plagman
72721c1663 Mirror skies (bug 2783066). 
git-svn-id: https://svn.eduke32.com/eduke32@1373 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-09 10:42:57 +00:00
helixhorned
ca81a4e40b mapster32: fixes crash in linux 
git-svn-id: https://svn.eduke32.com/eduke32@1372 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-08 23:13:12 +00:00
plagman
0f95655e27 Fixes floor-aligned sprite and flipping/1-way interaction (bug 2783071). 
git-svn-id: https://svn.eduke32.com/eduke32@1371 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-08 19:15:14 +00:00
terminx
87c2ab5cc6 bleh 
git-svn-id: https://svn.eduke32.com/eduke32@1370 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-08 18:26:10 +00:00
plagman
3b5cf1310a Fixes floor-aligned sprites being affected by the real center cstat bit (bug #2783389). 
git-svn-id: https://svn.eduke32.com/eduke32@1369 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-08 18:04:02 +00:00
qbix79
5aeddd2aa1 Fastcall is not 64 bit. 
git-svn-id: https://svn.eduke32.com/eduke32@1368 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-07 18:55:33 +00:00
qbix79
f568146387 Fix memory addresses being either 32 or 64 bit 
git-svn-id: https://svn.eduke32.com/eduke32@1367 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-07 18:50:53 +00:00
plagman
02edf9a0e4 Fix the build with POLYMOST=0. 
git-svn-id: https://svn.eduke32.com/eduke32@1366 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-07 16:05:33 +00:00
plagman
d097ebc8e3 Fix the build with USE_OPENGL=0 and/or POLYMER=0. 
git-svn-id: https://svn.eduke32.com/eduke32@1365 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-07 16:00:49 +00:00
terminx
ec159726a0 Mapster fixes and a new 8x8 pixel font I've been playing around with 
git-svn-id: https://svn.eduke32.com/eduke32@1364 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-06 23:58:53 +00:00
terminx
e47b890189 undo improvements 
git-svn-id: https://svn.eduke32.com/eduke32@1363 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-05 21:25:06 +00:00
terminx
024edae792 Use LZF for undo/redo snapshots 
git-svn-id: https://svn.eduke32.com/eduke32@1362 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-05 20:01:23 +00:00
terminx
f3d93e8406 Undo/redo support for Mapster32 and some other minor changes 
git-svn-id: https://svn.eduke32.com/eduke32@1361 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-05 16:21:33 +00:00
terminx
c585380de6 Mapster fixes 
git-svn-id: https://svn.eduke32.com/eduke32@1360 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-01 19:28:57 +00:00
terminx
0ee75ced2a Widescreen-friendly Mapster32 2D mode 
git-svn-id: https://svn.eduke32.com/eduke32@1359 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-05-01 06:35:27 +00:00
terminx
f3fbf8d9a3 Add support for cvars of type 'double', fix vid_gamma/brightness/contrast cvars, save cvars to eduke32_binds.cfg at shutdown, better method for drawing the floor textures in Mapster32 2D mode, slightly more yellow/orange lights on fire/rockets/lasers/etc 
git-svn-id: https://svn.eduke32.com/eduke32@1358 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-30 21:09:44 +00:00
terminx
493d621eb0 More cvar shit 
git-svn-id: https://svn.eduke32.com/eduke32@1357 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-30 01:07:08 +00:00
terminx
d11e8789e3 git-svn-id: https://svn.eduke32.com/eduke32@1356 1a8010ca-5511-0410-912e-c29ae57300e0 2009-04-29 20:20:57 +00:00
terminx
30a649c86f Some more cvar stuff 
git-svn-id: https://svn.eduke32.com/eduke32@1355 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-29 19:43:51 +00:00
terminx
c222341417 Clean up polymost vars 
git-svn-id: https://svn.eduke32.com/eduke32@1354 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-29 07:47:10 +00:00
terminx
152d3f8813 Fix CVAR_MULTI flag 
git-svn-id: https://svn.eduke32.com/eduke32@1353 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-29 06:27:09 +00:00
terminx
e11dbd7428 Unify cvar handling between the engine and game sides of things 
git-svn-id: https://svn.eduke32.com/eduke32@1352 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-29 06:20:07 +00:00
terminx
3938de1f22 test versions of new startup dialog images 
git-svn-id: https://svn.eduke32.com/eduke32@1351 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-29 00:51:03 +00:00
terminx
ec0a8f2033 Modified priority system to use 6 priority levels instead of 3, added proper def syntax "specular" and "normal" which work identically to "detail" and "glow" for defining normals and specular maps (defining these with pals 100 and 101 will no longer work) 
git-svn-id: https://svn.eduke32.com/eduke32@1350 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-28 22:56:43 +00:00
terminx
096b5dda42 Light SE changes... helixhorned's idea 
git-svn-id: https://svn.eduke32.com/eduke32@1349 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-28 05:31:32 +00:00
helixhorned
c6ed542a98 various input enhancements for mapster32 
git-svn-id: https://svn.eduke32.com/eduke32@1348 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-26 20:51:00 +00:00
plagman
5a090e84bc Couple of fixes for corrupt maps. 
git-svn-id: https://svn.eduke32.com/eduke32@1347 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-26 17:47:08 +00:00
terminx
7c036eb073 Remove jmact/types.h in favor of standardized inttypes.h stuff 
git-svn-id: https://svn.eduke32.com/eduke32@1346 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-26 05:57:42 +00:00
terminx
d419b6e0c9 test commit 
git-svn-id: https://svn.eduke32.com/eduke32@1345 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-24 21:12:30 +00:00
terminx
9dc32d2ded git-svn-id: https://svn.eduke32.com/eduke32@1344 1a8010ca-5511-0410-912e-c29ae57300e0 2009-04-24 06:04:13 +00:00
terminx
26ca7e7fc0 Sprite cstat 16384: invisible w/ shadows 
this also adds shadows for the player when in first person


git-svn-id: https://svn.eduke32.com/eduke32@1343 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-24 04:02:39 +00:00
terminx
2752e9d500 git-svn-id: https://svn.eduke32.com/eduke32@1342 1a8010ca-5511-0410-912e-c29ae57300e0 2009-04-24 03:29:28 +00:00
terminx
b7b016383f Sector effector based light sources, basic Mapster32 light support, additional sprite/model alpha control, sprite selection in Mapster32 3D mode with Polymer 
git-svn-id: https://svn.eduke32.com/eduke32@1341 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-24 02:53:50 +00:00
terminx
9462a17ae7 git-svn-id: https://svn.eduke32.com/eduke32@1340 1a8010ca-5511-0410-912e-c29ae57300e0 2009-04-23 21:08:48 +00:00
terminx
4d240d1bea git-svn-id: https://svn.eduke32.com/eduke32@1339 1a8010ca-5511-0410-912e-c29ae57300e0 2009-04-23 17:44:55 +00:00
terminx
dbb24affe9 git-svn-id: https://svn.eduke32.com/eduke32@1338 1a8010ca-5511-0410-912e-c29ae57300e0 2009-04-23 09:30:10 +00:00
terminx
3449ba8bef Revision 1337: fixes the crash on exit with polymer on win32 
that's pretty l33t, right?


git-svn-id: https://svn.eduke32.com/eduke32@1337 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-23 09:09:41 +00:00
terminx
dba312e61b git-svn-id: https://svn.eduke32.com/eduke32@1336 1a8010ca-5511-0410-912e-c29ae57300e0 2009-04-23 07:09:24 +00:00
plagman
e48c4c2c87 Really fix concave relative slopes. 
git-svn-id: https://svn.eduke32.com/eduke32@1335 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-19 18:00:51 +00:00
plagman
9241ab974a Don't step over the bounds of the plane buffer in buffertoplane (now computeplane). 
git-svn-id: https://svn.eduke32.com/eduke32@1334 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-19 17:23:07 +00:00
plagman
711db577ab Fixes a texturing bug with a combination of relative texturing and concave sectors. 
git-svn-id: https://svn.eduke32.com/eduke32@1333 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-19 17:03:18 +00:00
plagman
ed7157f1e5 Reverts part of 1331 and misc. fixes. 
git-svn-id: https://svn.eduke32.com/eduke32@1332 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-19 09:49:27 +00:00
terminx
779eda41da git-svn-id: https://svn.eduke32.com/eduke32@1331 1a8010ca-5511-0410-912e-c29ae57300e0 2009-04-17 18:34:55 +00:00
terminx
45897cf581 Fixes a stupid mistake I made and changes mem* calls to Bmem* for consistency with the rest of the codebase 
git-svn-id: https://svn.eduke32.com/eduke32@1330 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-16 06:49:29 +00:00
terminx
b1704e8407 Nothing important 
git-svn-id: https://svn.eduke32.com/eduke32@1329 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-16 06:41:24 +00:00
plagman
6dba1ba1ed Few fixes for the visibility checks. 
git-svn-id: https://svn.eduke32.com/eduke32@1328 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-16 06:31:19 +00:00
terminx
1889e9151b git-svn-id: https://svn.eduke32.com/eduke32@1327 1a8010ca-5511-0410-912e-c29ae57300e0 2009-04-15 05:58:38 +00:00
terminx
b459bdd1cd git-svn-id: https://svn.eduke32.com/eduke32@1326 1a8010ca-5511-0410-912e-c29ae57300e0 2009-04-14 23:34:48 +00:00
terminx
80e2ec8edf git-svn-id: https://svn.eduke32.com/eduke32@1325 1a8010ca-5511-0410-912e-c29ae57300e0 2009-04-14 22:55:32 +00:00
plagman
5b3524d621 Message log cleanup for GPU program compilation and removed a GL error. 
git-svn-id: https://svn.eduke32.com/eduke32@1324 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-14 13:58:38 +00:00
plagman
2ac7c2dc1e ATI fixes. (sigh) 
git-svn-id: https://svn.eduke32.com/eduke32@1323 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-14 12:37:44 +00:00
plagman
b006c85790 Update the TODO list and fix the light leaking fix. 
git-svn-id: https://svn.eduke32.com/eduke32@1322 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-14 08:39:13 +00:00
terminx
3a085b0980 git-svn-id: https://svn.eduke32.com/eduke32@1321 1a8010ca-5511-0410-912e-c29ae57300e0 2009-04-14 07:39:11 +00:00
plagman
14108f3be9 Don't parse closed sectors. 
git-svn-id: https://svn.eduke32.com/eduke32@1320 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-14 07:38:45 +00:00
terminx
cc701a3908 git-svn-id: https://svn.eduke32.com/eduke32@1319 1a8010ca-5511-0410-912e-c29ae57300e0 2009-04-14 07:15:08 +00:00
plagman
dfd2a379b1 Don't propagate light through sealed portals. 
git-svn-id: https://svn.eduke32.com/eduke32@1318 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-14 07:01:55 +00:00
terminx
8cd5bb68d0 git-svn-id: https://svn.eduke32.com/eduke32@1317 1a8010ca-5511-0410-912e-c29ae57300e0 2009-04-14 04:20:37 +00:00
terminx
3d7a6a3572 git-svn-id: https://svn.eduke32.com/eduke32@1316 1a8010ca-5511-0410-912e-c29ae57300e0 2009-04-13 06:53:03 +00:00
terminx
22a7ec1b3b git-svn-id: https://svn.eduke32.com/eduke32@1315 1a8010ca-5511-0410-912e-c29ae57300e0 2009-04-13 06:01:50 +00:00
plagman
f1f13f5eb6 Fix for E3L4 (and possible others) corrupt sectors. 
git-svn-id: https://svn.eduke32.com/eduke32@1314 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-12 22:27:49 +00:00
plagman
6d5571f320 Couple of cleanups. 
git-svn-id: https://svn.eduke32.com/eduke32@1313 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-12 22:23:47 +00:00
terminx
ec71eebecb git-svn-id: https://svn.eduke32.com/eduke32@1312 1a8010ca-5511-0410-912e-c29ae57300e0 2009-04-12 21:52:49 +00:00
plagman
39b1908be8 Sanitize wall computation code a bit and fixes a problem with crossing slopes (E1L3 vertical security doors and E2L4 starting door). 
git-svn-id: https://svn.eduke32.com/eduke32@1311 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-12 19:26:02 +00:00
plagman
b47ad2bde2 Works around a precision bug that would cause the sloped floor in the E1L1 bathroom vent to have a wrong normal matrix. 
git-svn-id: https://svn.eduke32.com/eduke32@1310 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-12 17:37:35 +00:00
plagman
9152cf3b40 Fix detail mapping on ATI cards. 
git-svn-id: https://svn.eduke32.com/eduke32@1309 1a8010ca-5511-0410-912e-c29ae57300e0
 2009-04-12 17:29:50 +00:00