Commit Graph

15216 Commits

Author SHA1 Message Date
3ee94d3aca [Arsenal] Filter firemodes for precision display by showToPlayer (#6572) 2018-09-14 15:01:50 -05:00
d6976f63ac Zeus - UI improvements and additional objects setting for Editable Objects module (#6391)
* Add additional objects setting to Editable Objects

* Fix Teleport Players UI height and remove unnecessary strings

* Improve Garrison UI

* Config based combo for Toggle NVG and Toggle Flashlights UI

* Capitalize garrison module names
2018-09-13 08:40:55 -05:00
429ecb6171 RHS Compats - Update bases classes for RHS 4.6 (#6529)
* RHS Compats - Update bases classes for 4.6

* Update CfgMagazines.hpp

* Update CfgWeapons.hpp
2018-09-13 00:29:30 -05:00
66da48fcdb Merge pull request #6402 from mharis001/explosives-timer
Explosives - New Timer UI
2018-09-13 06:39:50 +02:00
f2a57797da Make sure explosive is still valid when updating timer 2018-09-12 23:07:39 -05:00
0e980907fe Fix some item type magic numbers (#6487)
* Fix item type magic numbers

* Add weapon and magazine macros
2018-09-12 22:29:56 -05:00
364f84d382 Fix RHS static turrets interaction point (#6567) 2018-09-12 16:12:05 -05:00
eab84e0d09 Arsenal - Fix sort by value not sorting properly (#6570)
* Fix sort by value not sorting properly

* Change single to double quotes

* Remove uneeded space
2018-09-12 14:59:36 -05:00
9de11e066f Merge pull request #6571 from acemod/stamina-bar-setting-fix
don't hide stamina twice when changing the setting
2018-09-10 20:51:15 +02:00
05ad146ba3 restore 2018-09-10 19:31:26 +02:00
b651cc8093 delete duplicated code 2018-09-10 19:30:30 +02:00
e592717c30 make hide stamina setting make bar reappear when changed mid mission 2018-09-10 15:15:59 +02:00
8cd0b496ac Merge pull request #6561 from acemod/repairFacility
Repair - Fix isInRepairFacility for buildings at height
2018-09-03 18:02:01 +02:00
fe1737081c Merge pull request #6556 from alganthe/arsenalMissionUnitInsignias
Arsenal - Add support for mission defined unit insignias
2018-09-03 09:51:11 +02:00
628878d074 Repair - Fix isInRepairFacility for buildings at height
Fix #6560
2018-09-02 21:59:32 -05:00
d13641d670 Add author support for mission defined unitInsignias 2018-08-31 18:35:12 +02:00
04aeaa0912 Add support for mission defined unitInsignias 2018-08-31 18:20:55 +02:00
055c85d56d update shell tracer textures to appear smaller
While in the gunner view, or generally when seeing the tracer from the
front or rear, the shell tracers look reasonalble.
However closer to a perpendicular angle the tracers appear substantially
larger than they ought to.
This texture update makes the tracer look a little smaller from those
angles.
2018-08-29 13:16:06 -07:00
16a3bd096a RHS GREF Compat - MG42 (#6552)
Close #6550
2018-08-27 17:13:38 -05:00
24846e6f74 Make state change status updates consistent (#6538)
State transitions call respective functions in the status component where unit variables and status are actually handled.
2018-08-25 16:40:22 +01:00
0c18d5bcae Merge pull request #6548 from Neviothr/CfgWeaponsReferenceSemicolonFix
Fix missing semicolon in CfgWeaponsReference
2018-08-23 19:14:33 +02:00
8d83800f37 Fix missing semicolon 2018-08-23 18:57:23 +03:00
d8b54a8ef0 Fix switching non-local portable light on (#6522) 2018-08-16 20:52:13 -05:00
48b459240d Update No Uniform Restrictions for Arma 3 v1.84 (#6513) 2018-08-16 19:41:51 -05:00
11547d7ff8 Fix environmental damage sources (#6515)
* Tidy handle damage code
* Fix environmental damage conditions

- Vehicle damage would never occur because it doesn't fire all the
hitpoints
- Missing sanity check on fall damage to check that unit isn't in a
vehicle
- Getting hit by a vehicle while on foot can be detected by checking for
a shooter

* Improve collision handling

- All collisions have a `_shooter` so we simply first check for that because burning doesn't and it could happen at any velocity
- We don't actually care what caused the collision because they should all cause the same type of wounding
- The exception is fall damage because we want to prioritise wounding the legs, we assume if the `_unit` had downward velocity and `_shooter == _unit` that it was fall damage (not necessarily always true, but almost always is and there doesn't look to be a more specific way to check).
2018-08-15 07:57:11 +01:00
5fbaf426a8 Fix various bugs (#6523)
* Fix medical menu not reopening regardless of setting
* Ensure no heartrate or bloodpressure on death
* Fix status variables not being reset on respawn
* Fix JIP resetting status variables for all units
* Fix heart rate adjustment overflow and
2018-08-14 21:34:35 +01:00
ced45b2a4d Remove play with six launch method (#6528)
PWS is no longer active.
2018-08-13 12:29:22 +02:00
0e8ed5315e Remove patient treatment animations (#6524)
* Prevent treatment animation on dead bodies

This was causing bodies to glitch out on dedicated servers according to
feedback

* Remove patient animation logic and setting
2018-08-12 12:28:48 +01:00
a182336880 Ignore playable logic hitpoints (#6517) 2018-08-12 12:21:06 +01:00
923c25163f Fix missing boolean return in CPR 2018-08-12 11:50:47 +01:00
7fcd12c792 Reset default state on respawn (#6518)
* Reset default state on respawn
* Remove old getUnitState function
* Add locality check
2018-08-12 10:14:48 +01:00
14d52ee77e Remove CPR alive check (#6492) 2018-08-12 08:57:23 +01:00
c1c5d6d63c Remove collision of bandage litter (#6495)
* Remove littergeneric collision
* Remove collision/shadow from non-litter items
* Remove quik clot litter shadow
* Add empty shadowLOD to litter
2018-08-11 17:52:26 +01:00
b3134d00dc remove comments from rvmat files 2018-08-11 08:58:50 -07:00
0a97ef3cc8 Fix event name overlap and macros (#6514) 2018-08-11 11:40:06 +01:00
d8f0de1a5d acex fortify deploy handler and event docs (#6282) 2018-08-09 11:01:35 -05:00
0696875175 Wiki - Add new Arsenal EHs and stat indexes to arsenal framework doc (#6497)
* Add new EHs and stat tab index to wiki

* Add added-in collumn for new arsenal EHs
2018-08-09 11:01:01 -05:00
cd980dc28d 3.12.3 - Build 36 v3.12.3 2018-08-09 09:42:36 -05:00
21de7138a7 Merge branch 'master' into release-3.12.3 2018-08-08 09:49:17 -05:00
48c3900507 Fix Japanese stringtable (#6511) 2018-08-08 07:17:22 -05:00
f6737f0c6e Bump required Arma 3 version to 1.84 and CBA to 3.8.0 (#6508) 2018-08-08 09:56:33 +01:00
88238dd0b5 Fix wrong macro (#6509) 2018-08-08 09:54:17 +01:00
9d24cebb9b Build 35 v3.12.3-rc2 2018-08-06 11:49:21 -05:00
dd519f1bed Merge branch 'master' into release-3.12.3 2018-08-06 11:34:00 -05:00
2d5892f285 Fix facility is like vehicle (#6478) 2018-08-06 11:27:14 -05:00
d31f004ac2 Update Japanese translation (#6503)
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation
2018-08-06 11:18:59 -05:00
9e5c4a7ed9 Move medical settings into their respective components (#6493)
* Transfer medical AI to CBA setting
* Neuter the old settings module

I've left the entry in CfgVehicles so that it doesn't cause errors on
older missions, but it's just a dumb logic now and does nothing.

* Remove medic setting
* Move increaseTraining setting
* Move fnc_adjustPainlevel to medical_status
* Move pain and bleed coefficients to medical_status
* Move advanced bandages to medical_treatment
* Move advanced medication to medical_treatment
* Move advanced diagnose to medical_treatment
* Move wound reopening and screams settings
* Move damage threshold settings
* Move showPain setting
* Move statemachine settings
* Move pain visualisation setting
* Move all treatment usage settings
* Move self IV setting
* Move remaining settings
* Sort treatment setting string categories
2018-08-06 17:08:43 +01:00
29d11bc752 Fix terminals not being properly added to currentItems (#6504) 2018-08-05 23:15:49 -05:00
bac4156d1a Arsenal - Fix weapon without mag showing weird velocity (#6500)
* Fix weapon without mag showing weird velocity

* Update stringtable.xml

* Change string to str_empty
2018-08-05 22:22:39 -05:00
21eb5e3df6 Merge branch 'master' into armake 2018-08-02 21:49:35 +02:00