1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,616 Commits 9 Branches 6 Tags
86b23474cfdca5efeb495c5732cd95171825f459
Commit Graph
7616 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
silversurfer 9f206f2ab2 - new icon 62 in ItemInfoAdvancedIcons.sti for displaying PercentRecoilModifier in UDB 
- new item property modifiers in Item_Settings.ini for recoil of guns

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1873 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-16 16:27:07 +00:00
silversurfer f986cc1292 Externalizations and fixes (by Buggler) 
- Externalized heli tile index for helisites.xml
- More checks and fixes for hidden towns and sam sites to be hidden in infobox

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6611 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-16 10:45:00 +00:00
silversurfer a920a3eadf - Added new tags for heli tile index and missing tag in helisites.xml (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1872 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-16 10:44:13 +00:00
Wanne dad39391ce - Updated _ChineseText.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6609 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-16 10:23:38 +00:00
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 c9d626d004 - Externalized heli refuel sites (Map/HeliSites.xml) 
- Added more default tags to empty startinggearkits
- Added comments to minerals.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1871 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-15 19:37:06 +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
Wanne d15714a737 - Updated Chinese GameDir files (by zwwooooo) 
- Fixed wrong MercEdit folder for Chinese Version -> MercEdt (by zwwooooo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6602 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-14 22:24:18 +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 6157807cc9 - Added *.Minerals.xml files (currently only with English texts) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6588 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-12 14:22:05 +00:00
Wanne 52163edb4c Translated Chinese XML files (by zwwooooo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6587 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-12 14:21:21 +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 63ebacb730 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_v1.13_data@1870 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-12 09:58:46 +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 3751e7507b Changed mousewheel replacement keybind from [ALT] + [t] to [o] 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1869 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-11 22:14:40 +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
Flugente 679c357c23 added picture for radio set (by smeagol) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1868 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-11 20:35:31 +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
silversurfer 4dee3218aa - 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_v1.13_data@1866 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-11 12:50:06 +00:00
Wanne a8e1dfe83b Adjustments (by Buggler) 
- MERCS_RANDOM_BELL_DISTRIBUTION = True for bell curve distribution; False for uniform distribution in Ja2_Options.ini
- Turn off MERCS_RANDOM_STATS
- Double MAX_MERC_DEATHS in 1.13 as current AIM + MERC roster is twice that of vanilla

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1865 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-11 09:57:51 +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 1611613bd3 - Removed EnemyTaunts.xml fro UB 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1864 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-11 09:51:07 +00:00
Wanne ef9ca4eaa7 - Added localized version of EnemyTaunts.xml (currently all texts are in English) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6580 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-11 09:50:54 +00:00
Wanne eaadd70ada - Added <uiIndex> Tag to the EnemyTaunts.xml, because of localized version support 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1863 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-11 09:47:49 +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
Wanne ecdff8e24c Added localized version of Backgrounds.xml 
- Currently all files have English texts

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6578 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-11 07:52:12 +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
Flugente 7b57c3c865 - New Feature/exploit enhancement: enter hostile sector with helicopter and land mercs anywhere 
- MP entry points are now much more and scale with mapsize

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1861 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-10 19:32:30 +00:00
Wanne 5b712a8ab7 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_v1.13_data@1860 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-10 08:27:54 +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