Commit Graph

13497 Commits

Author SHA1 Message Date
Vdauphin
4fa131573f Fractures is misspelled (#7026)
@Drofseh
2019-05-30 13:33:51 -05:00
xrufix
604721c769 Fixed incorrect Classnames in Tracer magazines (#7021) 2019-05-28 12:25:28 -05:00
commy2
4e04100ea9 Spotting scope - New reticle using CBA scripted optics (#6964)
* new reticle for spotting scope

* reticle b

* illuminated reticle for night

* use orig spotting scope reticle, bigger occular

* fix spotting scope attenuation
2019-05-27 10:46:21 -05:00
commy2
33602df517 Vector - New reticle using CBA scripted optics (#6981)
* vector IV updates

* vector IV updates

* compat cba optics and vector scripts

* hide periphery

* reticle texture for 7x magnification

* vector display config

* idc macros, fix illum mode

* add radblur effect when using optic

* hide zeroing control

* delete a broken config entry

* fix horizontal and vertical distance mode

* set REQUIRED_CBA_VERSION to 3.11.2
2019-05-27 10:46:07 -05:00
BaerMitUmlaut
452cba7ff7
Add vanilla magwells for 40mm grenades (#7004) 2019-05-22 01:31:37 +02:00
PabstMirror
50afcda918 Medical - Exit turret gunner view when going unconscious (#7003) 2019-05-20 21:12:18 +01:00
jonpas
91afbbdfa8
Remove pygithub installation from CircleCI (#6999)
Remove pygithub installation from CircleCI
2019-05-14 12:38:28 +02:00
jonpas
dd679e2975
Remove pygithub installation from CircleCI
Using acemod/armake, it is already installed.
2019-05-14 12:27:11 +02:00
PabstMirror
c6609cbdb9
Common - Fix script error with uniqueItems in scheduled (#6998) 2019-05-13 17:20:01 -05:00
commy2
ab8fa78377
Merge pull request #6994 from acemod/rw-injury-volume
Fix volume level of max injury sounds
2019-05-12 09:32:47 +02:00
SilentSpike
82083323f2 Fix volume level of Soundinjured_Max files 2019-05-12 07:53:49 +01:00
Oliver Blanthorn
c012941af0 Add support for N-bangs (#6848)
* Add support for multi-bang flashbangs

It also adds some randomness to 1-bangs as a side effect,
but I don't think that's a big deal.

Also adds flashbang documentation to wiki.

* Increase rate at which flashbang attenuates

Apologies for the magic numbers. I just tested a few out
until I was happy with the result. The radius could probably
afford to be reduced a little further.

* use max deviation in config, fix wiki file name
2019-05-11 23:43:32 -05:00
classic
7b44138282 Update Japanese translation (#6980)
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update stringtable.xml

* fix
2019-05-11 23:33:49 -05:00
mharis001
7877ce3116 Spectator - Add setting for follow camera max distance (#6989)
* Add setting for follow camera max distance

* Convert spectator settings to CBA function
2019-05-11 23:32:13 -05:00
PabstMirror
e56cc0d74e
Limping / Splint Treatment (#6947)
* Improve adjustment calcs / wound blood loss / medications

fix func descriptions

Calc wound blood loss on events

reorder includes so scritpmacroMed has global effect

trivial optimization for getCardiacOutput

Fix var

Fix wounds not reopening (nil _category)

Fix surgical kit inherting canBandage conditional

debug hitpoints

Update ACE_Medical_Treatment_Actions.hpp

Use woundBleeding for IS_BLEEDING macro

rework medication vars

comments

Reset var in init / fullHeal

Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Change wound data array

Drop unique id and merge classId and category

* Splinting and treatment and gui

* Add arm fractures and aim effects

* localizations and event

* fix

* cleanup

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* formating, rename bone images

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* disable calls to extension

* Update fnc_onMedicationUsage.sqf

* Medical - Skip unneeded setVars on initUnit (#6949)

*  Medical - Transfer state machine state on locality (#6950)

* Medical - Transfer state machine state on locality

* Fix feedback isUnconscious var

* Exclude AI

* Make UAV excludes consistant, formating

* Update fnc_treatmentFullHealLocal.sqf

* reset fractures on respawn
2019-05-11 23:13:59 -05:00
commy2
746d384a04
Merge pull request #6976 from acemod/taking-wheels-from-invincible-vehicles
Repair - Fix taking wheels from invincible vehicles
2019-05-11 23:09:59 +02:00
commy2
588ffba0a3
Merge pull request #6987 from acemod/fix-magwells-rearm
Fix rearming for vehicles using magazine wells
2019-05-11 08:38:33 +02:00
BaerMitUmlaut
229199ba16 Fix rearming for vehicles using magazine wells 2019-05-11 01:23:33 +02:00
jonpas
c5f6a6027d Rebuild gh-pages 2019-05-10 13:37:33 +02:00
PabstMirror
366f49295f
Medical Blood - Small optimizations (#6984) 2019-05-08 12:50:00 -05:00
Brandon Danyluk
709548c1ef Cookoff - Fix shell detonation (#6979)
* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* ShotShell requires velocity to simulate itself, so always spawn it with velocity
2019-05-06 10:23:07 -05:00
PabstMirror
e05c90767d Merge branch 'master' into cbaDisposable 2019-05-06 10:07:58 -05:00
PabstMirror
5eead2fc6e Merge branch 'master' into cbaDisposable 2019-05-06 10:05:35 -05:00
PabstMirror
5da1308151
Disposable - Add warning for addons using ace_disposable (#6963)
* Disposable - Add warning for addons using ace_disposable

* update arsenal code and cba version
2019-05-06 10:05:04 -05:00
BaerMitUmlaut
3cfdae899c Add berlin wall compatibility (#6982) 2019-05-05 19:03:57 -05:00
commy2
dfd7eee681
Merge pull request #6868 from acemod/hideEjectSetting
Aircraft - add setting to hide Eject action from action menu
2019-05-03 19:49:41 +02:00
PabstMirror
e4c9440c34
Update addons/aircraft/XEH_preInit.sqf
Co-Authored-By: commy2 <commy-2@gmx.de>
2019-05-03 19:13:54 +02:00
commy2
585e919b35 grey out scripted eject action if eject actions are hidden 2019-05-03 17:47:40 +02:00
commy2
58ece34149 manual merge 2019-05-03 17:18:32 +02:00
commy2
64e640bcf2 revert a variable 2019-05-03 17:09:16 +02:00
commy2
744b9778df temporarily re-allowDamage when using setHit(PointDamage) 2019-05-03 17:03:17 +02:00
ace3mod
f8b9429e70 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2019-05-03 16:58:44 +02:00
commy2
050cd0a1f9 remove weather dependancy from winddeflection (#6975) 2019-05-03 16:56:56 +02:00
commy2
36688ac040
Merge pull request #6974 from acemod/plusequal-magwells
+= for magwells
2019-05-03 16:46:04 +02:00
commy2
fba39bebd0 += for magwells 2019-05-03 13:07:04 +02:00
commy2
2cffe92848 don't disable remove mag if disposable replacement is disabled 2019-04-28 10:04:42 +02:00
commy2
9b57ef2111 adjustments for disposable enabled setting 2019-04-28 09:56:42 +02:00
ace3mod
0e09879528 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2019-04-27 21:14:30 +02:00
PabstMirror
847d2d4179
Medical - Improve adjustment calcs / wound blood loss / medications (#6910)
* Improve adjustment calcs / wound blood loss / medications

fix func descriptions

Calc wound blood loss on events

reorder includes so scritpmacroMed has global effect

trivial optimization for getCardiacOutput

Fix var

Fix wounds not reopening (nil _category)

Fix surgical kit inherting canBandage conditional

debug hitpoints

Update ACE_Medical_Treatment_Actions.hpp

Use woundBleeding for IS_BLEEDING macro

rework medication vars

comments

Reset var in init / fullHeal

Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-04-27 14:12:11 -05:00
PabstMirror
2cfe7ebd0c
FCS - Skip adding firedEH until needed (#6965) 2019-04-27 14:04:47 -05:00
PabstMirror
0d7709673a
Medical Feedback - Fix DISABLE_VANILLA_DAMAGE_EFFECTS (#6966)
* Medical Feedback - Fix DISABLE_VANILLA_DAMAGE_EFFECTS

* Keep compatibilty with old ace_medical_lastDamageSource var name
2019-04-27 14:04:31 -05:00
Dedmen Miller
50e3d8b3fe Fix macro argument counts (#6962) 2019-04-27 06:05:29 -07:00
PabstMirror
5265e8bd84 Merge branch 'cbaDisposable' of https://github.com/acemod/ACE3 into cbaDisposable 2019-04-26 16:41:45 -05:00
PabstMirror
6250cd6505 Arsenal - Don't unload disposables 2019-04-26 16:41:42 -05:00
commy2
534abdede1 nlaw disposable realistic weight 2019-04-26 23:31:56 +02:00
commy2
6af3628e6f fix baseWeapon 2019-04-26 19:19:34 +02:00
commy2
20853d2b20 let cba replace mags 2019-04-26 09:48:31 +02:00
Filip Maciejewski
cc22e95012 Fastroping - Remove FRIES on vehicle deletion / adjust Ghosthawk Fries (#6932)
* fastroping_fnc_deequipFRIES, remove FRIES on vehicle deletion

* Prevent FRIES from clipping into Ghost Hawk right door

* UNequipFRIES

* Remove fastroping checkVehicleThread

* Document FRIES equip and unequip functions
2019-04-25 13:31:36 -05:00
PabstMirror
83cd316b2e
Common - Don't add UAV AI to localUnits array (#6951)
* Common - Don't add UAV AI to localUnits array

* Update addons/common/functions/fnc_setupLocalUnitsHandler.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-04-25 13:30:43 -05:00
PabstMirror
15401468b9
Refuel - Drop nozzle at unit's feet if no valid pos found (#6957)
* Refuel - Drop nozzle at unit's feet if no valid pos found

Fix #6944

* Update fnc_dropNozzle.sqf

* Update addons/refuel/functions/fnc_dropNozzle.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-04-25 13:28:11 -05:00