1
0
forked from 0ad/0ad
Commit Graph

4930 Commits

Author SHA1 Message Date
79f2fc1ac1 Fixes build error on MSVC, use of sqrt was ambiguous. Refs #1572
This was SVN commit r12804.
2012-10-31 20:59:43 +00:00
fb035d08e3 fixes #1572 and fixes #932
Changes the water rendering in game to support higher quality effects
and to look nicer.

This was SVN commit r12802.
2012-10-31 18:42:17 +00:00
97b46d402c Removing GL3 dependency from GPU skinning code.
This was SVN commit r12801.
2012-10-30 21:57:00 +00:00
7c1b03d031 Fixes MSVC warnings of truncation from double to float
This was SVN commit r12797.
2012-10-30 02:03:40 +00:00
367c67d6ad GPU-skinned tangent-space effects for non-instanced units, plus a bit of cleanup.
This was SVN commit r12795.
2012-10-29 13:20:21 +00:00
402ea61581 don't set location info by default, music and sounds should not have it set
This was SVN commit r12781.
2012-10-24 13:12:55 +00:00
7fafeec767 Fixes splash screen to display only once at startup. Fixes #1701.
Adds some spacing between splash screen icons and text.

This was SVN commit r12762.
2012-10-17 20:33:50 +00:00
bc1efba1dc Moves water rendering update to CCmpWaterManager and uses sim time instead of real time. Fixes water not animating in Atlas and incorrectly animating while the game is paused.
This was SVN commit r12758.
2012-10-15 19:36:04 +00:00
1fb7889539 Postproc manager
This was SVN commit r12755.
2012-10-15 10:34:23 +00:00
5ce5ef9286 Adds a splashscreen that appears on startup and informs the player about the status of the game (bugs, missing features). The splashscreen can be disabled for future startups by unckecking a checkbox on the splashscreen.
This was SVN commit r12735.
2012-10-07 12:43:08 +00:00
65c0f3efc5 removed extra whitespace
This was SVN commit r12728.
2012-10-03 15:14:20 +00:00
9e328e6b9f Changing sky manager to render sky using cubemaps, to avoid duplication of sky textures in memory.
This was SVN commit r12727.
2012-10-03 12:40:01 +00:00
5cff74f4e7 Replaces FAM file monitoring with inotify on Linux, based on patch by noKid. Fixes #1316, refs #1687.
Removes FAM dependency.

This was SVN commit r12726.
2012-10-02 00:03:14 +00:00
772c10801c Fixes missing Atlas selection rings for decorative actors
This was SVN commit r12716.
2012-09-28 19:16:32 +00:00
7d8dc05c68 Fixes actor viewer bug where view was obstructed by map's water level. Fixes #1562.
Adds water plane option to actor viewer.

This was SVN commit r12715.
2012-09-28 18:20:36 +00:00
44821da620 new threaded soundmanager and proper distance roll off
This was SVN commit r12709.
2012-09-27 02:42:03 +00:00
e72b603cce Implements Vision/Range tech modification
This was SVN commit r12707.
2012-09-24 22:27:32 +00:00
db4b08d1ad Slight changes to the cubemap stuff in the sky manager, to make it behave better after archivebuild.
This was SVN commit r12697.
2012-09-21 20:22:23 +00:00
11b1c59397 A minor change to water rendering on models.
This was SVN commit r12677.
2012-09-16 11:39:04 +00:00
f91111aec8 Load default MP player name from the config.
This was SVN commit r12673.
2012-09-14 05:38:29 +00:00
fef2bdf39b Removed unused file
This was SVN commit r12658.
2012-09-09 19:41:32 +00:00
6528751875 Fix non-pch build. Fixes #1664.
This was SVN commit r12655.
2012-09-09 13:51:04 +00:00
779a33ee30 Water and waterfall shaders, materials and examples.
This was SVN commit r12643.
2012-09-08 18:56:13 +00:00
1fce30839f zero out buffers before loading sounds
This was SVN commit r12639.
2012-09-08 02:54:49 +00:00
df0c4559ad silence repeated errors when buffers don't allocate, fix up reference counting
This was SVN commit r12638.
2012-09-07 12:05:29 +00:00
d04f737c5e Putting a check for bad texture references, in case anyone tries to use old-style texture tags in actors.
This was SVN commit r12637.
2012-09-06 21:05:34 +00:00
3efb235725 And re-enabling the stuff disabled for debugging 2
This was SVN commit r12632.
2012-09-04 17:30:01 +00:00
10101b138d And re-enabling the stuff disabled for debugging
This was SVN commit r12631.
2012-09-04 16:59:03 +00:00
8b10290f78 Disabling some LOD stuff to track down Deiz's bug (as a result, parallax also temporarily disabled)
This was SVN commit r12629.
2012-09-04 15:55:36 +00:00
1ba858bf6e More on that bug (warning: renderer temporarily slower)
This was SVN commit r12628.
2012-09-04 12:34:02 +00:00
f92cda7a91 Testing something different in the hope it helps with a bug reported on the forums
This was SVN commit r12627.
2012-09-04 11:09:36 +00:00
0a0a49eb09 Explicitly store whether whether a unit is moving, as formation members don't finish moving as normal.
This was SVN commit r12624.
2012-09-04 03:57:22 +00:00
d805c87249 Send messages when formation members hit fail to find a path or are obstructed.
This was SVN commit r12613.
2012-09-03 02:59:15 +00:00
7d2e201332 Fixes some unreferenced formal parameter warnings
This was SVN commit r12611.
2012-09-02 23:07:16 +00:00
38ea080d25 Increase the AI's js runtime size to 32 MB for the time being.
This was SVN commit r12594.
2012-09-02 01:50:16 +00:00
ba3b6b9bb7 Attempting to rewrite fixed renderpath model rendering code to apply LOS to models.
This was SVN commit r12593.
2012-09-02 01:33:56 +00:00
a6e1e6cec7 report errors opening sound files and hopefully revcover from them gracefully
This was SVN commit r12591.
2012-09-01 23:24:32 +00:00
affe91b52c Fixed fixed renderpath: green water, broken minimap
This was SVN commit r12588.
2012-09-01 22:34:36 +00:00
d45a044445 Cleans up rogue printf
This was SVN commit r12587.
2012-09-01 22:16:53 +00:00
ccdb67c8f2 Fix non-pch build.
This was SVN commit r12586.
2012-09-01 22:12:28 +00:00
a29acce208 Adds some missing includes, refs #1614
This was SVN commit r12577.
2012-09-01 18:23:13 +00:00
0133197dcd proper disposal of single buffer sounds
This was SVN commit r12574.
2012-09-01 02:41:48 +00:00
df96445284 missing files from 89c8bccbde
This was SVN commit r12570.
2012-08-31 19:26:29 +00:00
89c8bccbde Sound system patch by stwf:
Fixes sound system to work with archives (use VFS files instead of
POSIX), fixes #1604.
Improves error handling and logging, refs #1594.
Allows sound to be disabled with -nosound/-quickstart runtime options or
--without-audio build option, fixes #1609, #1614.
Experimentally increases default buffer size to help prevent sound
stoppages.

This was SVN commit r12566.
2012-08-31 19:08:41 +00:00
e8758b8bf1 Making sure LOS really is black after Reveal Map option is used...
This was SVN commit r12565.
2012-08-31 18:33:03 +00:00
9fcb7cc738 Fixed formations so switching formation in-place doesn't leave entities in FORMATIONMEMBER.WALKING and short walk orders bring units into proper formation.
This was SVN commit r12563.
2012-08-31 08:20:36 +00:00
5f88bf8a79 Displays error when converting a grayscale texture instead of possibly crashing, refs #1640
This was SVN commit r12560.
2012-08-30 19:24:24 +00:00
38c1a4c4a1 Modified sky, minimap and healthbar renderers to use shaders, to fix a bug reported by historic_bruno
This was SVN commit r12551.
2012-08-29 23:07:53 +00:00
fcf09598d9 Temporarily disabling FAM for Alpha 11 because it can cause problems on Ubuntu and hotloading doesn't seem to work anyway at the moment.
Known problems with FAM:
- System hangs at shutdown
- Assertion failure at startup in debug mode

This was SVN commit r12550.
2012-08-29 21:22:57 +00:00
89cf2b26e3 Second attempt to fix a graphical glitch in ARB mode
This was SVN commit r12526.
2012-08-25 21:41:31 +00:00
6de082abca Forgot a semicolon :P
This was SVN commit r12514.
2012-08-22 08:04:55 +00:00
e50bf9e539 Sky toggling through config and with Alt+Z
This was SVN commit r12513.
2012-08-22 07:32:26 +00:00
7e382fc26f CCmpUnitMotion::MoveToPointRange should ignore unit radius, so it correctly returns false when called repeatedly for large units.
This was SVN commit r12511.
2012-08-22 06:13:23 +00:00
58b3a88daa Fixes more overloaded-virtual warnings in clang.
This was SVN commit r12510.
2012-08-21 21:47:36 +00:00
619dd95d5b Fixes an overloaded-virtual warning in clang.
This was SVN commit r12509.
2012-08-21 20:13:42 +00:00
43eac32795 Fixes GCC warning about passing NULL to non-pointer argument
This was SVN commit r12506.
2012-08-21 16:44:54 +00:00
ddbc9e7d86 Disables useless MSVC warning in MikktspaceWrap. Cleans up a few inconsistencies
This was SVN commit r12505.
2012-08-21 16:40:07 +00:00
952385b21d Ticket 1612: Fixed overlay z-fighting in GLSL mode
This was SVN commit r12504.
2012-08-21 16:28:06 +00:00
0af34b1fcb Removes some unread variables reported by LLVM. Refs #1114
This was SVN commit r12501.
2012-08-20 23:59:50 +00:00
66012e2e2c Destroy dying 'remain' entities and replace them with visually-identical resources. Fixes #1600.
This was SVN commit r12486.
2012-08-20 01:38:39 +00:00
d71f883d3e Adds warning when OS X users try to toggle fullscreen since it's disabled
This was SVN commit r12482.
2012-08-19 20:45:43 +00:00
875ea8f440 Fixes some warnings in mikktspace and weldmesh
This was SVN commit r12481.
2012-08-19 20:28:00 +00:00
a17ffaa0f2 Fixes weldmesh build on *BSD
This was SVN commit r12478.
2012-08-19 19:57:23 +00:00
6e326e2d2e Ticket 1603: Using GL extension defines to avoid compiler errors on older systems
This was SVN commit r12472.
2012-08-19 07:05:11 +00:00
e485fb9e2c Implements copy/paste for OS X using NSPasteboard including pre-10.6 API support. Fixes #1326
This was SVN commit r12464.
2012-08-18 19:47:55 +00:00
8e996cedab Adds sensible default sound gains, when the config file(s) omit them
This was SVN commit r12458.
2012-08-17 23:00:41 +00:00
fdb3995141 Adds UTF-8 BOM stripping to checkrefs.pl when using JSON files, patch by retrosnub. Refs #1556
This was SVN commit r12456.
2012-08-17 19:24:23 +00:00
37964d048e Added camera movement speed modifier keys.
This was SVN commit r12455.
2012-08-17 18:33:41 +00:00
d7532a1c77 This was SVN commit r12450. 2012-08-16 18:52:39 +00:00
3d67aeeb71 Adds some debug output to OpenAL init
This was SVN commit r12448.
2012-08-16 17:01:15 +00:00
714426f761 Fixes unnecessary use of VfsPath pointers in sound system. Refs #1223
This was SVN commit r12444.
2012-08-16 01:41:45 +00:00
3653fe5d3a Added support for putting technologies in folders. Fixes #1462.
This was SVN commit r12440.
2012-08-15 22:25:25 +00:00
011ba8255e New sound system implementation by stwf, refs #1223, #961.
Enables audio on OS X, refs #685, #931.
Fixes music not playing after a game, refs #946.

This was SVN commit r12428.
2012-08-15 00:10:44 +00:00
97de77c6b6 Adds alternative materials to reference checker
This was SVN commit r12419.
2012-08-14 02:31:54 +00:00
9f358abaed Adds particle and material files to reference checker
This was SVN commit r12411.
2012-08-13 19:39:09 +00:00
13d7867a58 Fixes checkrefs.pl for latest actor format.
Adds checking for map preview textures.
Adds checking for random map scripts.

This was SVN commit r12395.
2012-08-12 21:00:58 +00:00
9dc838bed5 Add support for cropped images in the GUI code and update game setup to use cropped map previews. Refs #1343.
This was SVN commit r12348.
2012-08-10 19:59:20 +00:00
613f845095 Improve gate closing behaviour when locked or with no allies nearby. Fixes #1551.
This was SVN commit r12337.
2012-08-09 19:06:01 +00:00
97c97dc7e0 Bugfix- changed decal/terrain blending mode for the fixed renderpath
This was SVN commit r12334.
2012-08-09 16:22:49 +00:00
e046fc0a01 Bugfix- changed some decal materials and fixed decal blending mode
This was SVN commit r12325.
2012-08-08 19:08:56 +00:00
166255b744 Remember scroll position when re-opening dropdown lists.
This was SVN commit r12319.
2012-08-08 17:22:52 +00:00
791752c7a4 Added a 'quiet' version of SetOwner() that doesn't send a message, to allow faux-atomic batch ownership changes.
This was SVN commit r12315.
2012-08-08 05:18:20 +00:00
c9abf6f68c Heightmap importing in Atlas
This was SVN commit r12308.
2012-08-07 18:49:46 +00:00
e488eb4d6f Bugfix for smoothlos, a test routine was complaining because g_Renderer wasn't available in test mode.
This was SVN commit r12307.
2012-08-07 18:28:23 +00:00
88ab3f0f5b Terrain/decal materials (includes triplanar/normal/specular/emissive mapping); custom alphamaps
This was SVN commit r12306.
2012-08-07 18:21:16 +00:00
648e68e49c smooth LOS
This was SVN commit r12304.
2012-08-06 22:38:42 +00:00
47c2907f10 added licensing headers to some of the new files
This was SVN commit r12301.
2012-08-06 21:34:41 +00:00
da8c673a0a ao/parallax/normal/specular/emissive mapping; windy trees; time manager; render queries; conditional defines
This was SVN commit r12300.
2012-08-06 19:10:47 +00:00
c0f522fd20 Use upper camel case for member variables
This was SVN commit r12298.
2012-08-06 16:46:54 +00:00
2eb49be1a3 Show shallows (walkable water) on the minimap in a lighter color.
This was SVN commit r12277.
2012-08-04 18:52:02 +00:00
2c642fc68e Uninitialized variable was causing nondeterministic weirdness in Atlas.
This was SVN commit r12275.
2012-08-04 16:56:09 +00:00
20d75a3880 Free cursors before shutting down SDL. Fixes #1355.
This was SVN commit r12271.
2012-08-03 16:48:02 +00:00
be31d3a9e7 Added a function for finding colliding entities with identical control groups. Refs #1529.
This was SVN commit r12269.
2012-08-03 16:36:40 +00:00
692795e56e Added engine-side obstruction group sanitizing, saving, and loading. Refs #1566
This was SVN commit r12258.
2012-08-01 21:38:13 +00:00
b8b6ebb6ec Properly re-initialize drop-down lists when the list items changes. Fixes #1558.
This was SVN commit r12244.
2012-07-31 03:34:09 +00:00
3c0bd23108 Slightly speed up actor rendering; have selectables properly handle fog of war, etc. Refs #1365.
This was SVN commit r12241.
2012-07-30 21:06:54 +00:00
4264166acf Detect when units aren't in the world and hide their selection rings. Based on patch by dvangennip. Refs #1365.
This was SVN commit r12239.
2012-07-30 04:45:33 +00:00
2c8adb1aea Adds support for Boost.Filesystem v3, the only option in Boost 1.50. Fixes #1527. Refs #1360
This was SVN commit r12229.
2012-07-29 23:04:22 +00:00
c6a0d0b6f3 Fixes build error left out of c1a3b8f171. Refs #1497
This was SVN commit r12205.
2012-07-27 05:26:37 +00:00
c1a3b8f171 Updates to myconid's most recent multiple UV set patch. Refs #1497
This was SVN commit r12185.
2012-07-24 02:57:25 +00:00
1f15257987 Update actor editor for data driven textures. From zoot. Refs #1493.
This was SVN commit r12184.
2012-07-23 22:51:20 +00:00
f598101c34 Add support for multiple UVs and data driven texture loading. From myconid's patches. Fixes #1493 and fixes #1497.
This was SVN commit r12183.
2012-07-23 22:49:46 +00:00
89399e08e6 Implements always visible hero selection rings, based on patch by Deiz/F00. Fixes #1365
This was SVN commit r12148.
2012-07-19 04:45:01 +00:00
51b9fa6186 Uses xml attributes instead of elements for obstructions shapes.
This was SVN commit r12093.
2012-07-12 20:00:38 +00:00
2c5933912c Gates. Adds UI buttons, replaces wall section with a gate, defines and create obstruction shapes, detects friendly units and eventually disable door's "block movement" flag, allows us to lock / unlock the door by disabling "block pathfinding" flag. Needs icons, play sound, animations. Fixes #1385, refs #619.
This was SVN commit r12081.
2012-07-08 16:25:33 +00:00
574f4db8ab Fixes font texture handling to use format auto-detection when possible, based on patch by Deiz/F00. Fixes #1508
This was SVN commit r12073.
2012-07-05 01:05:09 +00:00
512854e30c Fixes log folder script on WinXP/2000. Moves script inside source/tools. Adds start menu shortcut to the installer. Updates README. Fixes #1438
This was SVN commit r12068.
2012-07-04 03:50:01 +00:00
99d04e93bb Implements global tech modification function. Fixes #1358, refs #1520.
Applies tech modifications to template data returned by GuiInterface.
Extends engine to load arbitrary global scripts, separates this from RNG
replacement. Refs #1193.
Loads global scripts for most script contexts for consistency.
Adds simulation tests for global scripts.

This was SVN commit r12056.
2012-07-03 02:16:45 +00:00
ebe5b66ba3 Fix test failure caused by f660f834bf.
This was SVN commit r12014.
2012-06-24 21:03:46 +00:00
941a8c014b Update fontbuilder with stroked and bold stroked 12, 13, and 16
This was SVN commit r12001.
2012-06-23 22:05:05 +00:00
vts
f660f834bf Added default, arbitrary-sized Footprint component to actor entities. Makes their selection outlines show up in Atlas. Fixes #1477.
This was SVN commit r11997.
2012-06-23 21:12:51 +00:00
vts
8f2b82fa8a Basic README.txt for fontbuilder.py to outline installation process of PyCairo on Win32
This was SVN commit r11980.
2012-06-17 23:01:37 +00:00
vts
821cfe8862 Removed reverse dependency on SOverlayTexturedLine from CTexturedLineRData; fixes dangling pointer dereference. Fixes #1495.
This was SVN commit r11979.
2012-06-17 03:40:35 +00:00
8dc36bed4e Fixes error in actor viewer caused by 962da61f12. Fixes #1499
This was SVN commit r11973.
2012-06-14 22:47:57 +00:00
637c09b204 Add support for OpenBSD. Fixes #1463.
Backport os_getversion from premake4.4-beta4 and extend it to support
POSIX-compilant systems.
Add some missing newlines at the end of file as these cause warnings on
OpenBSD.
Update the config paths.

This was SVN commit r11970.
2012-06-13 20:43:56 +00:00
4ac52a3c47 Fixes bug in percentage map explored calculation. Refs #1334
This was SVN commit r11957.
2012-06-09 23:04:27 +00:00
2243f699fc Fix test failure.
Fix entity placement on Phoenician Levant.

This was SVN commit r11951.
2012-06-08 19:17:31 +00:00
962da61f12 Adds shared LOS for allied players, based on patch by Deiz/F00. Fixes #1334.
This was SVN commit r11949.
2012-06-08 04:41:39 +00:00
vts
6b50a660b9 Added elapsed real time (as opposed to elapsed simulation time) to MT_Interpolate messages. Fixes leftover TODO from #824. Refs #824.
This was SVN commit r11944.
2012-06-06 19:37:03 +00:00
vts
da719b883c Split out code specific to textured overlay lines construction from OverlayRenderer into its own files.
This was SVN commit r11933.
2012-06-02 21:19:20 +00:00
vts
1c005b0c0e Fixed AABB to OBB transformation resulting in NaN basis vectors when the AABB size in one or more dimensions is zero. Fixes #1121.
This was SVN commit r11928.
2012-05-31 23:17:15 +00:00
137b6dd338 Queued orders for rally points. Fixes #1053 and #1211.
This was SVN commit r11909.
2012-05-24 18:25:31 +00:00
dd072112d1 Improved shadow filtering, from eihrul.
This was SVN commit r11896.
2012-05-21 19:23:14 +00:00
c4d6019599 Add garrison order sound and remove the old garrison sound.
Fix some map errors, tabs in templates and update docs.

This was SVN commit r11891.
2012-05-20 15:44:57 +00:00
f72d820cd4 Added randomized arrow positions with hit detection when the missile lands and splash damage. Fixes #18.
This was SVN commit r11886.
2012-05-19 23:07:41 +00:00
2ee9981d99 Replace boost::uniform_real to avoid OOS caused by changes in behaviour between Boost versions
This was SVN commit r11857.
2012-05-13 23:40:06 +00:00
fbc3cbad7c Fix handling of non-ASCII paths on Unix
This was SVN commit r11839.
2012-05-11 14:30:15 +00:00
3efbd0ab25 Fixes Atlas losing map settings if random map generation failed. Refs #1398.
This was SVN commit r11835.
2012-05-10 23:11:42 +00:00
56269b2489 Fixes Atlas bug where default player data wasn't sent to engine after being displayed in the UI (introduced by 1f5f82f375). Fixes #1398.
This was SVN commit r11834.
2012-05-10 22:49:04 +00:00
1f5f82f375 Fixes invalid civ check in rmgen.
Removes some default data from the Atlas blank map.
Changes default civ in autostart-random mode.

This was SVN commit r11809.
2012-05-09 23:06:03 +00:00
282d0f39e2 Remove unused variables
This was SVN commit r11804.
2012-05-09 15:39:16 +00:00
c036a7d7e3 Adds control groups to saved game data, based on patch by mk12. Fixes #1261.
This was SVN commit r11783.
2012-05-07 04:18:54 +00:00
37a5bedb81 Adds partial support for Debian GNU/kFreeBSD, based on patch by vincent. Refs #1322.
This was SVN commit r11781.
2012-05-07 01:53:35 +00:00
1674a7503f Fixes error from 79c6a2cecc.
This was SVN commit r11780.
2012-05-07 01:29:02 +00:00
79c6a2cecc Adds config and hotkey options for toggling unit silhouettes, based on patches by Ello and mk12. Fixes #1186.
This was SVN commit r11779.
2012-05-07 01:09:53 +00:00
vts
d67d2e2370 Updated some documentation in CmpObstructionManager
This was SVN commit r11766.
2012-05-05 23:10:25 +00:00
vts
490182ddd0 Wall placement. Closes #786.
This was SVN commit r11760.
2012-05-05 19:22:22 +00:00
ffc89ee1af Adds some OS X availability macros to support 10.5 SDK. Not foolproof but good enough for now.
This was SVN commit r11757.
2012-05-05 03:18:22 +00:00
0c233487ec Disables broken window resizing and fullscreen toggling on OS X. Fixes #1381. Refs #741
This was SVN commit r11752.
2012-05-04 23:30:46 +00:00
32d2927449 Adds UTF-8 support for JavaScript files.
This was SVN commit r11750.
2012-05-04 21:48:46 +00:00
d0784bd314 Fix minimap issue caused by 5b7027ec53. Fixes #1372.
This was SVN commit r11748.
2012-05-04 17:44:28 +00:00
da4c1c8f2b Fixes handling of UTF-8 encoded JSON files (stripping BOM if necessary). Fixes #1375.
This was SVN commit r11739.
2012-05-04 03:46:05 +00:00
58836c624a Read formations from civ JSON files. Fixes #1234, #601.
This was SVN commit r11735.
2012-05-03 23:32:10 +00:00
5b7027ec53 Fix tech overlay issue.
This was SVN commit r11725.
2012-05-02 22:57:35 +00:00
6f06d7e69e ...
This was SVN commit r11714.
2012-05-01 23:01:40 +00:00
9173f3c81f This was SVN commit r11713. 2012-05-01 22:54:02 +00:00
030771907e This was SVN commit r11712. 2012-05-01 22:52:24 +00:00
fc47098743 Implements TerritoryInfluence/Radius tech modification. Adds C++ interface for TechnologyManager. Renames its message to MT_TechnologyModification defined in TypeList.h. Refs #1357.
This was SVN commit r11711.
2012-05-01 22:44:27 +00:00
e4528af72b Fix vector allocator types
This was SVN commit r11708.
2012-05-01 21:12:43 +00:00
cafb817446 Reverts broken change from 022fc4c47c.
This was SVN commit r11694.
2012-04-29 03:20:00 +00:00