Commit Graph

11867 Commits

Author SHA1 Message Date
Serg Vergun
128ddf2591
Nametags - Add setting to disable effect of ambient brightness on view distance (#8325)
* Add setting to disable effect of ambient brightness on view dist

* Add periods and Title Case for English localization

* Apply suggested code. Make it more readable

Co-authored-by: jonpas <jonpas33@gmail.com>

* fix spelling

* fix mistype

* one more mistype

* Implement suggestions

Settings parameter as slider.
English and Russian localization.

* Update addons/nametags/functions/fnc_getCachedFlags.sqf

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2021-10-11 00:35:21 -05:00
GhostIsSpooky
0d34ac2838
add string for black P99 (#8501) 2021-10-10 18:03:41 -05:00
GhostIsSpooky
e92ea53385
Medical - Return tourniquets after PAK (#8419) 2021-10-11 00:34:28 +02:00
Krzyciu
4f0fea8d67
Translations - Polish (#8497)
Add missing Polish translations
2021-10-11 00:27:06 +02:00
GhostIsSpooky
baff363915
Realistic Weights - Add Apex / Contact / Anti-Tank Weapons (#8357)
* Add Apex / Contact / Tanks Weapons

* Inheritance fix

* Fix UBCs

* Weight for the RPK
2021-10-10 12:54:12 -05:00
GhostIsSpooky
e3986f4528
Small Arms - Fix FNX-45 magazine round count (#8352)
* Change FNX-45 magazine round count

* Style pass
2021-10-10 12:02:26 -05:00
GhostIsSpooky
97deef5617
General - Use engine hashmaps (#8468)
Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>
2021-10-10 18:55:14 +02:00
GhostIsSpooky
9479c29b42
Repair - Fix claimed object abuse (#8460) 2021-10-10 18:50:10 +02:00
GhostIsSpooky
1b318433a2
Common - Add settings for additional progress bar information (#8428)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-10 18:49:41 +02:00
BaerMitUmlaut
6128b8ef06
Common - Only switch side if necessary on person loading (#6334)
Co-authored-by: Serg Vergun <1197314+severgun@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-10 16:26:36 +02:00
GhostIsSpooky
0a203fdde4
Medical Feedback - Stop effects on featureCamera (#8373)
Co-authored-by: Kyle Mckay <5459452+kymckay@users.noreply.github.com>
2021-10-10 16:24:10 +02:00
GhostIsSpooky
755c5ea50d
Hit Reactions - Add check for disabled damage (#8474) 2021-10-10 16:04:54 +02:00
Dedmen Miller
7bf9f3112e
Attach - Follow bone rotation for attached items (#8477) 2021-10-10 16:03:50 +02:00
PabstMirror
94c62d8ed3
Extensions - Replace ace_parse_imagepath with SQF regexFind (#8243) 2021-10-10 15:41:47 +02:00
Ozan Eğitmen
64decdd189
Cargo - Add Option to Reopen Menu After Unload (#8487)
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-10 15:37:16 +02:00
Ozan Eğitmen
2a7eb07803
Use modelToWorldVisualWorld (#8489)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-10 15:37:05 +02:00
PabstMirror
d780c02ef1
Misc - Adjust some functions to be more compatible with sqfvm (#8494) 2021-10-09 15:32:53 -05:00
Ozan Eğitmen
fb2b1ceadb
Explosives - Fix Dial Tone Sound Position (#8488)
* explosives - fix dial tone sound position

* Use right hand pos instead of hardcoded pos
2021-10-08 11:35:47 -05:00
classic
536ab0568f
Update of Japanese translation (#8492) 2021-10-08 09:05:06 -05:00
GhostIsSpooky
a95e71fec8
Arsenal - Handle Weapon Items not in Box Virtual Items as Unique (#8375)
* Handle unique items that are also weapon attachments

* only flatten once
2021-10-07 12:39:55 -05:00
GhostIsSpooky
ce705310e3
Realistic Names - Add Contact DLC & PIP optics (#8413)
* Add Contact DLC optics

* add DMS variants

* fix bracket, add pip optics

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-07 12:39:18 -05:00
10Dozen
f232f84c6c
Add workaround for ballistics shields (#8418) 2021-10-07 10:46:56 -05:00
GhostIsSpooky
78f9fc964a
Common - Take container into account when replacing items (#8379)
* make registerItemReplacement add to proper container

* cleanup, fix variable in itemReplacements namespace

* add exception for not having room in original container
2021-10-07 00:10:19 -05:00
mharis001
d6559f22e0
Arsenal - Fix sort running twice (#8479) 2021-10-06 22:16:42 -05:00
Dedmen Miller
d836cbfe6e
Fix vanilla NV Marker lifetime (#8473)
* Fix vanilla NV Marker lifetime

* Empty lines

* Fix whitespace
2021-10-06 22:16:13 -05:00
mharis001
09d1284ad9
Arsenal - Fix sortPanel clearing custom item names (#8478) 2021-10-05 15:37:27 -04:00
Dedmen Miller
7347d563b1
Add event property to detect temporary detach/reattach (#8476) 2021-10-05 12:32:38 -05:00
BaerMitUmlaut
8d804cf76d
Common - Add epilepsy friendly mode (#8452)
* Add epilepsy friendly mode

* Disable LSD vehicles in epilepsy friendly mode
2021-10-05 12:29:22 -05:00
GhostIsSpooky
5fbbb34d2d
Make unrelated things not explode when repairing (#8351)
_useEffects was probably inverted. Makes ERA/SLAT not explode when repairing unrelated hitpoints. See #7452.
2021-10-05 12:27:55 -05:00
PabstMirror
cb07e2ceba
Tools - Update /includes for 2.06 and cba (#8484)
* Tools - Update /includes for 2.06 and cba

* Update required ArmA/CBA
2021-10-05 12:05:42 -05:00
Filip Maciejewski
d0fd45e220
UI - Infantry speed indictator (#8384)
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-05 18:47:24 +02:00
BaerMitUmlaut
54c9cf6c61
S.O.G. Prairie Fire Compatibility (#8284)
* Added initial compat

* Added G-Forces compatibility

* Added Reload compatibility

* Add fuel capacities to planes and helicopters

* Add fuel capacities to wheeled and tracked vehicles, added fuel cargo config

* Add fuel capacities to OH-6

* Removed custom fuel capacities from Mi-2 with external tanks

* Fix config errors

* Add CSW compatibility for static guns

* Add ACE arsenal to EMM main menu

* Add CBA versioning check for SOG:PF

* Add vn_emm to requiredAddons

required for main menu patching

* Fix arsenal not being added to main menu

* Fix styling of ACE Arsenal button

* Add CSW compat for mortars

* Disable dragging of large statics

* Disable frag for molotov

* Set damage type of melee ammo

* Add custom damage handling for punji traps

* Add ACE Explosives compat to M18 Claymores

* Improve digDistance of Claymore x3

* Add ACE Explosives compat to M14 and M16 mines

* Add Explosives compat for M16 Trip Wire mines

* Add Explosives compat for F1 Trip Wire mines

* Add Explosives compat for Arty Shell Trip wire mine

* Improve interaction points for explosives

* Add Explosives compat for Satchel charge and AT mine

* Add Explosives compat for Punji traps, improve comments

* Add Explosives compat to M112 Breaching charge

* Rename mines.hpp to explosives.hpp

* Allow digging spiderholes with entrenching tool

* Fix minor config errors

* Add CSW pictures, models and stringtable entries

* Add missing stringtable entries

* Add CSW weapon pictures and stringtable entries

* Handle punji trap damage with disabled medical

* Disable cookoff for bicycles

* Remove custom digging tools (needs deeper changes)

* Improve spiderhole digging translation

* Fill CfgPatches units and weapons arrays for Zeus

* Add witty comment

* Use lowercase for external component names

* Fix indentation

* Fix missing base class

* Remove accidentally added files

* pboProject fixes for S.O.G. Prairie Fire Compatibility (#8311)

* Change macros to work with pboproject

* Add placeholders for VN p3d files

* Add ending newlines

Co-authored-by: jonpas <jonpas33@gmail.com>

* Fix UBC

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2021-10-05 13:28:43 +02:00
mharis001
66ce0ba5ff
Arsenal - Restore curator camera state when exiting (#8464) 2021-10-02 06:52:50 -04:00
mharis001
310da98c5e
Arsenal - Fix updateUniqueItemsList incorrectly identifying backpacks (#8463) 2021-10-02 06:52:33 -04:00
mharis001
64db683e53
Arsenal - Fix items in custom panels having mass of zero (#8462) 2021-10-02 06:52:20 -04:00
Filip Maciejewski
9eb615ee66
Various polish translation updates (#8465) 2021-10-01 21:55:17 -05:00
Filip Maciejewski
3b90b5eb7f
Grenades - Polish translations updates (#8466)
* Grenades - Polish translations updates

* Remove rogue tab
2021-10-01 21:55:03 -05:00
Filip Maciejewski
26d0a85650
Medical - Polish translations updates (#8467) 2021-10-01 21:51:19 -05:00
PabstMirror
d8fa8220c4
Realisticnames - Fix ubc (#8421) 2021-09-25 15:03:09 -05:00
Salluci
48912be73c
Captives - Disallow ACRE/TFAR radio usage on surrender/handcuff (#8388)
* Block radio on captive/surrendered/unconscious via status effect

* missing semicolon

* Don't broadcast setVar if radio addon doesn't exist

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-09-25 11:16:15 -05:00
Salluci
f9d064e5f4
Add TFAR 1.0 support (#8392) 2021-09-25 11:14:17 -05:00
Vdauphin
e31d931078
Cargo - Fix can't load Slingload_01_Base_F (#8437)
* fix can't load Slingload_01_Base_F

20ft containers (`Land_Cargo20_military_green_F`) can be loaded but all children from `Slingload_01_Base_F` which share the same real size of a 20ft container can't be loaded (ex: `B_Slingload_01_Ammo_F`)

* add a comment next to the changed line 

add a comment next to the changed line indicating why it has to be like that (the point of this PR) for future source reference
2021-09-25 10:55:47 -05:00
Salluci
d5328781db
DAGR / Kestrel - Fix deviceKey condition (#8368)
* Fix DAGR keybind

* Fix Kestrel keybind

* Consistency with other deviceKey conditions
2021-09-25 10:43:09 -05:00
Salluci
a4f24cbe3d
CSW - Fix AI reloading from GroundWeaponHolder (#8399)
* fix fnc_ai_handleFired

* remove debug messages

* use banana instead of FakePrimaryWeapon

* switch from dummy item to new weaponholder

* use exitWith instead of break
2021-09-25 10:39:03 -05:00
Salluci
82a8350fb4
Add weapon data for the Contact M14 (#8412) 2021-09-25 10:35:45 -05:00
Dystopian
7687429b82
Fix keyhandler removing when drop (#8443) 2021-09-18 11:06:01 -05:00
PabstMirror
58730b82fd
Common - Fix getAwakAnim for some vehicles (#8435) 2021-09-13 16:33:56 -05:00
Elgin675
565aa8cf0e
Add French Translation (#8427) 2021-09-07 13:35:16 -05:00
PabstMirror
efe09682cc
Add SQFC support (#8235)
* sqfc

compile_script
cba 3.15.5 and update make.py

* \n

Co-authored-by: jonpas <jonpas33@gmail.com>

* Update make.py

Co-authored-by: jonpas <jonpas33@gmail.com>
2021-09-03 19:08:34 -05:00
PabstMirror
cdd7b6d81b
Medical Treatment - Allow diagnosing death/CA (invalidates old setting) (#8162)
* Medical Treatment - Allow diagnosing death/CA

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2021-09-03 14:50:54 -05:00
Brandon Danyluk
0f7376f60c
Vehicles - Add Auto-Throttle to Planes (#8275)
* Add auto throttle to planes

* add newline

* clarify things

* Use a better deltaTime value. Takes into account game pause

* add coment

* Add auto throttle cancellation on user input

* misc fixes
2021-09-03 14:39:52 -05:00
Salluci
be8a50c8a9
Captives - Add caller to captiveStatusChanged event (#8360)
* Add caller to ace_captiveStatusChanged event

* missing bracket

* Spaces, default value for _caller in setHandcuffed

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* use default value in SetSurrendered

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* update function example in doRemoveHandcuffs

* fix undefined variable

a lesson in not copy-pasting code

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* ditto last commit

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-09-03 14:38:49 -05:00
∂ω∂
f7126383fe
Medical - Add treatment status events (#8385)
* Medical: Add item params to ace_treatmentSucceded

* Medical: Add treatment[Started,Failed] events
2021-09-03 14:37:48 -05:00
Salluci
ce91d19f28
Realistic Names - Add strings for Khaki MX variants (#8411)
* Add Khaki MX variants

* German Translations

Co-authored-by: Jo David <github@jonathandavid.de>

* Translations

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Translations

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Whoops

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Capitalize

Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-09-03 14:36:58 -05:00
Salluci
ee44319801
Fix typo (#8416) 2021-09-01 12:46:48 -05:00
Salluci
afde782d12
change 7.62x67 to .300 WM (#8395) 2021-09-01 12:12:22 -05:00
Salluci
b6c86d8a8a
Add MRAWS/Vorona support to reload_launchers (#8408) 2021-09-01 12:11:58 -05:00
Salluci
10e56c090d
Cleanup config & allow LIM-85 to swap barrel (#8409) 2021-09-01 12:11:02 -05:00
PabstMirror
0c1d7177c0
Common - Block user input on headbug fix (#8398)
* Common - Block input on headbug fix

* keep return
2021-08-28 14:56:13 -05:00
Salluci
039af66a8f
Medical - Fix #8389 (#8390)
* fix implicit dependency between medical damage and medical engine

* move stringtable

* valve pls fix

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-08-23 18:27:00 -05:00
PabstMirror
83cbec73ce
medical - re-enable movedToSQF for enableVehicleCrashes (#8391) 2021-08-23 18:26:32 -05:00
Serg Vergun
0d5a4d89d8
Remove duplicates from mags array (#8367) 2021-08-23 12:44:06 -05:00
Salluci
2944064c06
Add spare barrel to misc items (#8374) 2021-08-23 12:43:05 -05:00
Kyle Mckay
56123591a0
Update contribution documents (#8382)
* Update code guidelines for script_component

* Update contributing documents for pull requests

- Reflect true attribution practices
- Reflect true merge process (this changed a long time ago)

* Remove listed maintainer from component readmes

We have almost never used these and serve as a source of confusion for
new contributors.
2021-08-16 20:17:56 +01:00
Kyle Mckay
62679832df
Zeus - Move to native CBA Settings (#8381)
* Zeus - Move to CBA settings

* Zeus - Update BI module functions to 2.04 versions
2021-08-16 12:01:50 +01:00
Sergey Veryaskin
106ef17071
Translation - Russian (#8376)
* Translation - Russian

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-08-11 15:44:04 -05:00
PabstMirror
e6a0772adb
Cargo - Fix UBC on iDAB (#8358) 2021-08-06 15:15:20 -05:00
Vdauphin
34069ed031
Update CfgVehicles.hpp (#8344) 2021-08-04 12:34:44 -05:00
Serg Vergun
3827178606
Remove 4th never used parameter (#8342) 2021-08-03 13:06:12 -05:00
Brandon Danyluk
82c14a0ae2 SACLOS tweaks 2021-08-02 17:32:35 -06:00
Brandon Danyluk
98e66d20ab remove malyutka 2021-08-02 16:53:14 -06:00
Brandon Danyluk
76c5c6e6d3 make over-fly trajectory over-fly 2021-08-02 16:51:46 -06:00
Brandon Danyluk
7b7d79fbd3 fix uninitialised values 2021-08-02 16:28:29 -06:00
Brandon Danyluk
aff19ec6ea fix NLAW navigation profile 2021-08-02 16:22:38 -06:00
Serg Vergun
fa6da1ae7c
Vehicles - Add configurable engine startup delay (#8327)
* Add configurable engine startup delay

* add suggested change

Add space char

Co-authored-by: Dystopian <sddex@ya.ru>

* Squashed commit of the following:

commit 14f5483d8fa49d36effa8b18a3df392ed39b19da
Author: Serg Vergun <1197314+severgun@users.noreply.github.com>
Date:   Fri Jul 23 20:23:52 2021 +0300

    Add 0 cap and update docs

commit e3ce7f273882b3f4e2cba916c39b506f857b20db
Author: severgun <sewergun@gmail.com>
Date:   Fri Jul 23 12:42:42 2021 +0300

    add parentheses

commit b36eedc61b5e6bb868c37901bd4191767fbdaff8
Author: severgun <sewergun@gmail.com>
Date:   Fri Jul 23 12:34:30 2021 +0300

    Add ability to set engine startup delay per vehicle by script

* Change function name

* add suggested exitWith condition

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Update docs/wiki/framework/vehicles-framework.md

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-07-27 12:47:07 -05:00
PabstMirror
fafd7b3928
Inventory - Fix default return for currentItemListBox (#8340) 2021-07-27 12:39:45 -05:00
Dystopian
27bd25c4b8
Interact Menu - Simplify fnc_renderActionPoints (#8186)
* Simplify fnc_renderActionPoints

* Replace nil-count with forEach
2021-07-24 12:10:49 -05:00
Elgin675
46df1bd811
Translations - Update / Fix French Translations (Markers, Medical Damage and Medical Treatment) (#8334)
* French translation - fix typo

* French translation - add french translation of `STR_ACE_Markers_MarkerDirectionScaleSlider_Tooltip` key

* French translation - Add french translation of `Medical_Treatment_CPRSuccessChance` keys
Fix french translation of `Medical_Treatment_TreatmentTimeCPR_DisplayName` key
2021-07-24 02:40:36 -05:00
Yannis Li
0e043e5fb7
fix: change conditional so a magazine is added to turret when array is not modified (#8287)
Co-authored-by: Yannis Li <yannis@trybe.ly>
2021-07-24 00:20:17 -05:00
Joko
08eadc7c19
Fix issues with action Eject on non local vehicles (#8291) 2021-07-23 17:25:00 -05:00
10Dozen
0b7aa7f3e5
Overheating - Drop jammed states on unit respawn (#8333)
* Overheating - Added respawn handler to drop jammed state

Fixes https://github.com/acemod/ACE3/issues/7651

* Description update

* Update addons/overheating/functions/fnc_handleRespawn.sqf

Co-authored-by: jonpas <jonpas33@gmail.com>
2021-07-23 15:48:16 -05:00
Serg Vergun
489fab4cb8
Cargo - Prevent damage to items (created from classnames) on unloading (#8324) 2021-07-23 22:45:36 +02:00
Dystopian
35290a1a10
Interact Menu - Add settings for self interaction menu reordering (#8036) 2021-07-23 22:44:27 +02:00
JoramD
ec0d950a3d
Common - Fix addToInventory replacing existing weapon (#8329)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-07-23 22:35:52 +02:00
BaerMitUmlaut
c7ff918554
Medical Engine - Disable third party medical systems (#8289)
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-07-23 21:32:36 +02:00
Lupus the Canine
4ae4dba3bb
DAGR - Align underlining in waypoint editing page (#8313)
* Allign uderlining in DAGR waypoint editing

* Removed duplicated DAGR_MENU_PSELECTION8
2021-07-23 13:51:35 -05:00
Dystopian
ad41bf2c60
Dragging - Add more objects configs (#8104)
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-07-23 16:11:57 +02:00
pterolatypus
c81f371f5d
Medical Treatment - Allow variable CPR chance based on blood volume (invalidates old setting) (#7983) 2021-07-23 15:59:32 +02:00
BaerMitUmlaut
88bbb0dd69
Medical - Add functions to serialize / deserialize the medical state of a unit (#7944) 2021-07-23 15:49:04 +02:00
10Dozen
d3ee39d8e4
Markers - Add direction/scale reset on Right Mouse Button (#8319)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-07-23 15:06:31 +02:00
Serg Vergun
5e56885b1e
Fix category duplication in Russian (#8326) 2021-07-22 11:59:17 -05:00
Kyle Mckay
e870e2f1f9
Common - Improve vehicle icon caching implementation (#8318)
* Use native hashmap for common vehicle icon caching

Should be more optimised
2021-07-18 18:26:23 +01:00
PabstMirror
75934f883c
Rangecard - All use inside vehicles via interaction menu (#8310) 2021-07-07 12:10:35 -05:00
StuntKeeper
1b43cd6951
Added missing Russian translations (#8307)
Added missing Russian translations and fixed a few incorrect ones in acemedical.
2021-07-06 14:25:52 -05:00
Elgin675
238d285344
French translation : fix Mine M6 and IED french translations (#8309) 2021-07-06 14:25:10 -05:00
Brandon Danyluk
25b1b47f5f Merge branch 'missileDynamics' of https://github.com/TheCandianVendingMachine/ACE3 into missileDynamics 2021-07-02 17:47:29 -06:00
Brandon Danyluk
d50491f44f Destroy projectile on all clients
The projectile needs to be destroyed on all clients to stop it from being simulated. If not destroyed where projectile is local, it will still explode when hitting the ground. If not destroyed on remote clients, the projectile will still be visible but deal no damage
2021-07-02 17:47:15 -06:00
Brett
8bd755e40a
capitalize huntir monitor (#8303) 2021-07-02 16:42:23 -05:00
PabstMirror
5acc2775ee Update 9m14_joystick.p3d
removed p:\ part from proxy path:
was: `\p:\a3\data_f\proxies\gunner_static_low01\gunner.p3d`
2021-07-02 11:46:58 -05:00
PabstMirror
59e3b07c36
Common - Fix gesture anim lockout for some launchers (#8282) 2021-06-28 00:01:32 -05:00