Commit Graph
1984 Commits
Author SHA1 Message Date
Wanne 23e02580bf - Moved text L"%" from source code files (ANSI encoding) to the language specific CPP files (UTF 8 encoding)
o For example, Chinese exe can't display "%" in ANSI files
o STR16 sSpecialCharacters[]

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6608 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-16 10:21:43 +00:00
Wanne 57dd52a839 Small changes and fixes for grenades and explosives (by Sevenfm)
1) Fixed small bug when MAPELEMENT_PLAYER_MINE_PRESENT was set after planting explosives with remote detonator.
2) Arming bomb with only remote defuse attached is not allowed. 
3) Showing item locator before "add blueflag" messagebox is disabled for our mines as it was annoying and you anyway know that it is here.
4) Total weight for throwing range is calculated for all items (previously it was calculated only for grenades).
5) Grenade-throwing formula and demolitions bonus applied only for hand-thrown grenades (check for TOSSCURS). Previously it was applied for launched grenades too.
6) Changed grenade throwing range formula from

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6606 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-15 19:51:12 +00:00
Wanne bb5b5e21d6 Externalized heli refuel sites (by Buggler)
- Map\HeliSites.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6605 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-15 19:33:10 +00:00
Wanne 4ad50accc6 - Fixed hidden towns and sam sites a dead giveaway when calling info box in strategic screen (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6604 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-15 19:28:27 +00:00
Wanne ba31e849e4 - Translated Chinese Texts (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6603 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-14 22:24:55 +00:00
Flugente cbbcbf48c0 Various fixes (by Buggler):
- Fixed IMP Background hardcoded text: Prev, Next & None.
- Fixed unable to proceed to IMP Attribute screen when Merc Background feature is off
- Changed 'Ore Type' text to 'Resource'

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6599 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-14 18:35:16 +00:00
Wanne 6ec2a96173 - Used externalized hardcoded texts for "Prev" and "Next" on the IMP background pages
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6598 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-14 07:36:40 +00:00
silversurfer 7a5fda48d4 Bugfix JaggZilla #532
Robot was limited to 6 bullets per autofire and wasted additional AP.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6596 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-13 21:14:51 +00:00
Wanne 4a49630c75 - Fixed compilation error with disabled zombies (// #define ENABLE_ZOMBIES)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6594 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-13 18:15:07 +00:00
silversurfer d41ea7f6c2 Bugfix for JaggZilla Bug #587
Objects thrown at civilians don't hurt them anymore. Anybody else will still suffer -1 health.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6593 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-13 11:09:39 +00:00
Flugente f60a8b2120 Fix: first gamestart helidrop after starting exe had wrong dropoff gridno
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6590 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-12 18:08:45 +00:00
Wanne 7081976f16 - Translated Chinese texts (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6586 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-12 14:19:30 +00:00
silversurfer 8257d11276 -Fix for throwing explosives with attachments (by Sevenfm)
Weight is now considered correctly.

-Civilians now take care not to step on player placed tripwire. (by Sevenfm)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6585 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-12 11:46:45 +00:00
Wanne 010e967948 New Feature: Different Mineral Types for Mines (by Jazz & Buggler)
- Instead of only having Gold and Silver for Mines, we can now add more mineral types (-> TableData\Map\Minerals.xml)
- The initialization of the mineral types of the mines is done in LUA (Scripts\initmines.lua)

- Example: https://ja2svn.dyndns.org/source/ja2/trunk/Documents/1.13%20Modding/Modding%20Examples/New%20Minerals-Mines%20Example.zip
o In this example we have a new mineral type (Oil) and the Cambria Mine (H8) becomes a Refinery


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6584 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-12 09:58:18 +00:00
Flugente c85471ecd6 If USE_AIMED_BURST and AIMED_BURST_ALTERNATE_KEY are TRUE, we now use [o] intead of [Alt] + [t] to toggle aiming. This is for people who have no working mousewheel and thus couldn't aim with auto-only weapons.
This is necessary as [ALT] switches the mousewheel function between increasing aiming levels and adding more bullets.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6583 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-11 22:11:45 +00:00
silversurfer d7fa19068f - New camo handling:
Camo Kits can now only be used to paint naked skin which usually means face and hands. Clothing will take care of the rest Together they can reach 100% camo.
CAMO_KIT_USABLE_AREA = 5 in Ja2_Options.ini sets the area that can be painted.

CAMO_LBE_OVER_VEST_MODIFIER = 0.2
CAMO_LBE_OVER_PANTS_MODIFIER = 0.6
These two set the amount of camo that armor vest/pants can provide if LBE is worn over them.
http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/327902/Re_Code_Snippets.html#Post327902

- New Mine avoidance for civilians (by Sevenfm)
Civilians can now avoid player placed mines.
CIVILIANS_AVOID_PLAYER_MINES = TRUE in Ja2_Options.INI takes care of that. I set the default to TRUE which will allow players to use mine fields in city sectors.
http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/327817/Re_Code_Snippets.html#Post327817

- Smoke effects and explosive attachments (by Sevenfm)
Normal explosions can now cause a smoke effect. Explosives can be attached to other exlosives to create a more potent bundle. Ja2_Options.INI has some new options for that:
ADD_SMOKE_AFTER_EXPLOSION = FALSE
ALLOW_EXPLOSIVE_ATTACHMENTS = FALSE
ALLOW_SPECIAL_EXPLOSIVE_ATTACHMENTS = FALSE
http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/327918/Re_Code_Snippets.html#Post327918


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6582 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-11 12:51:33 +00:00
Wanne c2549bf279 Fixes (by Buggler)
- Fixed enemy garrison group troops & elites spawning numbers as per ArmyComposition.xml description (thanks to Moa)
- Refactored random stats code to separate function for future reuses

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6581 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-11 09:56:10 +00:00
Wanne 294b67ce22 Enemy Taunts
- Added support for localized version of the EnemyTaunts.xml file
- Added <uiIndex> tag

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6579 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-11 09:46:50 +00:00
Flugente 6ac2d94e5f Fix: included <cmath> in case std::sqrt is unknown
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6577 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-10 20:17:16 +00:00
Flugente 7e5cbd126a - New Feature/exploit enhancement: enter hostile sector with helicopter and land mercs anywhere (see http://www.bears-pit.com/board/ubbthreads.php/topics/327879.html#Post327879)
- MP entry points are now much more and scale with mapsize

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6576 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-10 19:35:13 +00:00
Wanne 899d0f15a0 New Feature: Externalized Enemy taunts (by anv)
- Taunts will be shown in the tactica log, once enabled (TAUNT_SHOW_IN_LOG = TRUE)
- Enemies will randomly choose their taunt from an pool of applicable ones
- All taunts can be stored in TableData/EnemyTaunts.xml
- see: http://www.bears-pit.com/board/ubbthreads.php/topics/327830/Externalised_taunts.html#Post327830


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6575 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-10 08:26:05 +00:00
Wanne 896c1e3e24 Reworked Briefing Room Feature (mission based JA2) (by Jazz)
- Briefing room feature must be enabled in ja2_options.ini (BRIEFING_ROOM)
- Briefing room can be accessed from the laptop. Enter key "SN5631" and then click the exit button

- see: http://www.bears-pit.com/board/ubbthreads.php/topics/327839/Reworked_Feature_Mission_based.html#Post327839
- see: https://ja2svn.dyndns.org/source/ja2/trunk/Documents/1.13%20Modding/Modding%20Examples/Briefing%20Room%20Modding.txt


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6573 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-10 08:03:47 +00:00
Kriplo b997811a5d -in previous version committed wrong files :-}
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6571 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-09 20:55:11 +00:00
Kriplo 4104fbb248 Brief: //dnl ch76
- Debug performance improvement when working with inventory and UDB.
Details:
- Open UDB was quite slow and then clicking at some attachment slots halted game for few seconds.
- Moving mouse over opened inventory slots with hundreds of items jerking and halting mouse for moment.
- Fix CTD in rare occasions after attach and then remove GL and try attach some improper attachment.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6570 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-09 20:49:40 +00:00
Wanne 12d65e8eba Deleted empty unused 7z folder (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6569 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-08 17:00:07 +00:00
Wanne b44716d8af 7z-Library Update to version 7z 9.22 (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6568 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-08 16:59:09 +00:00
Kriplo c9b913127c - Thanks to @Moa suggestions and links for iterators problem under VS2010 debug which throws exceptions after qsort is applied on objects with std::list members, decide to return std::sort for debug version of VS2010 and later although is much much slower. However qsort will remain under all release version and debug versions of older VS as they seems to work fine.
- Put more comments under my previous inventory changes and throw out altering contents of the array under qsort compare function MapScreenSectorInventoryCompare.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6567 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-07 20:52:02 +00:00
Flugente 1122203771 Fix: radio listening did not work
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6566 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-07 20:43:55 +00:00
silversurfer 6c9d6cec68 - fixed bug with CAMO_REMOVING = TRUE
Too much of a camo kit was used when the character was wearing an outfit with different camo bonus.

- fixed bug with DYNAMIC_IMP_PROFILE_COST = TRUE
The game was always one step behind in cost display but charged the correct price. Now charged price and display match.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6565 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-07 19:11:35 +00:00
silversurfer d054395b59 some fixes for NCTH recoil handling
- first bullet will now always return 0 recoil
- following bullets should now count correctly depending on single or dual wielding shots

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6564 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-07 15:13:05 +00:00
Wanne a05bb3ad5b I.M.P. Screen Adjustments
- Fixed wrong X/Y coordinates of some title positions
- Externalized hardcoded "I.M.P. Prejudices" and "I.M.P. Background" texts to the language cpp files
- A few more minor cosmetics

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6563 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-07 14:34:20 +00:00
Wanne f7f07d4897 - Fixed wrong x-location of IMP title texts
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6562 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-07 13:42:05 +00:00
Flugente c55cb02a6a Backgrounds.xml can now be localized.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6560 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-05 19:06:29 +00:00
Flugente 26dfbe9b55 Skill Menu target marker did not refresh correctly
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6559 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-05 18:18:36 +00:00
Wanne ee44781fbe Externalizations (by Buggler)
- Strategic AI garrisons and patrol main spawning sector (thanks to Moa)
- Tixa Sector; separated from Dynamo captive sector to allow modding flexibility 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6557 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-05 12:39:35 +00:00
Flugente 86a2967508 new radio operator settings: RADIO_OPERATOR_ARTILLERY disables artillery for all teams, RADIO_OPERATOR_ARTILLERY_DISTRIBUTED_OVER_TURNS causes artillery to not fire one massive barrage, but to fire over multipe turns
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6556 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-04 22:32:44 +00:00
Flugente d3f5d3d9b0 If USE_AIMED_BURST and AIMED_BURST_ALTERNATE_KEY are TRUE, then [Alt] + [t] over a target will toggle aiming. This is for people who have no working mousewheel and thus couldn't aim with auto-only weapons.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6555 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-04 18:25:31 +00:00
Kriplo b91bc7b209 Brief: //dnl ch75
- More map editor fixes and map inventory pool performance improvement for big maps.
Details:
- Fix not showing expected messagebox on exit (ALT+x) which also throw exception and goes to improper mapeditor exit.
- Fix second annoying sticky message which shouldn't popup during map loading and performing RemoveProhibitedAttachments.
- Fix CTD when delete all enemies or civilians or all of them in map.
- Fix some std exception when reporting for missing optional xml file.
- Fix memory and map corruption in old mapeditors if loaded old map has item with invalid attachment and we try to attach something else.
- As years ago pInventoryPoolList had migrated from WORLDITEM* array to std::vector<WORLDITEM> it was time to do that with gWorldItems too, all necessary functions which need to be adopted to gWorldItems std::vector type are also changed.
- Resize code for gWorldItems is changed hoping will lead into less corruption problems as now could occur in mapeditor and game when code automatically doing attachment changes.
- Change code for handling map inventory which now should be fast enough to support AIMNAS project which will probably deal with thousands of items per map.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6554 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-03 16:26:30 +00:00
silversurfer 0c82c1845f Fixed overlapping camo values for armor and LBE vests
New item property modifier for armor:

CAMO_LBE_OVER_ARMOR_MODIFIER sets the amount of camouflage from armor vests that is used when we wear LBE over them. Default is 0.2. That's basically the arms sticking out of the LBE.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6553 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-02 10:49:29 +00:00
Wanne 7440dd5745 Enhancements (by Buggler)
- Allows all mercs cover display view by using hotkey '='; multi-selected mercs view only possible in realtime mode

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6551 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-01 13:00:44 +00:00
Wanne e7bd32dad9 Reworked Encyclopedia (by Moa)
- Access Encyclopedia from laptop screen
- Encyclopedia can be enabled/disabled in the ja2_options.ini: ENCYCLOPEDIA
- more infos:  http://www.bears-pit.com/board/ubbthreads.php/topics/327315/Re_Ingame_Encyclopaedia.html#Post327315


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6550 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-31 11:42:05 +00:00
Wanne 5872d264f7 Additional Mobile Militia improvements from Rev: 6544 (by Moa)
- popup for training mobiles allowed training when above maximum

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6548 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-31 09:04:11 +00:00
Flugente f17829fac9 New feature: radio operator trait allows calling in artillery, requesting reinforcements, scanning for enemies and a few other skills.
Also includes mechansim for easy implementation of new skills.

For more info see http://www.bears-pit.com/board/ubbthreads.php/topics/327348.html#Post327348

Requires GameDir >= r1848.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6547 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-30 23:05:37 +00:00
Flugente bef4e7b52b Fix: DropDown tooltip text was copied
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6545 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-30 19:50:00 +00:00
Wanne 923327ca14 Mobile Miltia improvements (by Moa)
- ja2_options.ini: MOBILE_MILITIA_MAX_ACTIVE_MODE, MOBILE_MILITIA_MAX_ACTIVE_MODIFIER
- see: http://www.bears-pit.com/board/ubbthreads.php/topics/325103/2.html


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6544 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-30 19:48:45 +00:00
Wanne cf06aed52a Bugfix: AP deduct is different then shown (by Moa)
- no more jump with backpack (keys 'j' and 'J'). This is more consistent. Sometimes the soldier got stuck in the fence as some functions did not allow jumping and others did.
- Pickup items from ground will now cost AP.
- Backpack, Scubba fins and swimming background AP modificattion is now shown in path and is considered when calculating new path. No pathing through fences when wearing backpack. More likely to create path through water when wearing scubba fins.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6543 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-30 19:36:15 +00:00
Flugente cb53f7bb91 Fix: text outside of laptop boundary on first use of IMP Prejudice webpage
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6542 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-30 18:55:20 +00:00
silversurfer 27faf8d763 Bugfix: Enemy/Militia Profiles will not overwrite tanks anymore
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6541 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-30 11:25:54 +00:00
silversurfer 5582f09537 Bugfix for crash with attachment popups and hidden attachments
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6540 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-30 10:22:45 +00:00
Wanne 08e6bc4aca More buddies/foes (by anv)
- Currently MercProfiles.xml contains 5 records for buddies and 5 for foes + 1 per "learn to", but in code only 2 first + "learn to" are handled. I changed it so all possible buddies and foes can be used, and it's possible to add their specific like/dislike quotes to quote .edts.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6538 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-28 20:02:19 +00:00