Commit Graph

10926 Commits

Author SHA1 Message Date
bux578
4d31c8f148 add missing line in medical doc (#4545) 2016-10-11 21:42:16 -05:00
Glowbal
84cbd50582 Merged branch master into release 2016-10-11 19:04:14 +02:00
commy2
8822cb1b90 emulate frag grenade ai behaviour for incendiaries (#4534) 2016-10-11 19:04:08 +02:00
jonpas
b8cc10fecb Fix #4523 - fuel nozzle disconnect at maximum hose distance 2016-10-11 18:57:58 +02:00
PabstMirror
5d610cf148 Always create namespace at preInit 2016-10-11 18:57:34 +02:00
commy2
130265fd9f add function to disable dogtags for factions, and disable for civilians 2016-10-11 18:57:34 +02:00
Glowbal
a98013c36e Merge branch 'master' into release 2016-10-11 18:51:05 +02:00
PabstMirror
cd79ebe3ce Bump REQUIRED_VERSION to 1.64 2016-10-11 18:49:31 +02:00
BaerMitUmlaut
2ba0137a1e Fix going unconscious while fastroping (#4531) 2016-10-11 18:48:20 +02:00
commy2
c390b6c1fc increase red laser alpha, close #4535 2016-10-11 18:47:52 +02:00
commy2
4fb5d230ac remove civilian rank icons from nametags (#4538) 2016-10-11 18:44:27 +02:00
bux578
a1fef405e8 Merge pull request #4542 from acemod/docReadmeFix
Fix documentation README commands
2016-10-11 14:31:19 +02:00
jonpas
cbbdd6f939 Use apt-get consitently instead of new apt only 2016-10-11 14:21:54 +02:00
jonpas
627a11545a Fix documentation README commands 2016-10-11 14:18:58 +02:00
PabstMirror
a3bbc848a7 Fix ammo box cookoff strings (#4528) 2016-10-09 11:57:29 +02:00
bux578
0143dd40ba Merge pull request #4524 from acemod/removeLaserSelfWiki
Remove Laser-SelfDesignate wiki page
2016-10-08 16:05:32 +02:00
jonpas
d29677d366 Remove Laser-SelfDesignate wiki page 2016-10-08 15:01:34 +02:00
Glowbal
8e72d89ef6 Prepare 3.80 RC1 2016-10-08 13:10:34 +02:00
ace3mod
c192378e90 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-10-08 12:56:30 +02:00
Nicolás Badano
ab6fc8efca Laser guidance for all designators (#3308)
* Fix laser and missileguidance over water

* Return a normalized vector in EFUNC(common,getTurretDirection)

* Make laser dispersion simulation optional, default off

* Prototype for ace_laser_designate

* Remove vanilla laser handling from ace_laser in favor of the new code on ace_laser_designate

* Simplify laser into one module

Rewrite large parts of laser
Merge laser_designate
Delete lase_selfDesignate

* Cleanup missile guidance

* Headers, fix laser over water

* Cleanup

* Test

* Change setting to scalar, more cleanup

* Add seeker debug drawing
2016-10-08 12:55:30 +02:00
commy2
74dfa6ca33 avoid PCTW error on certain vehicles (#4463)
fix #4413
2016-10-08 12:45:40 +02:00
commy2
4c96278bb4 fix fatigue when diving while sprinting, fix #4481 2016-10-08 12:44:37 +02:00
commy2
842279af9a setup hit-points LODs 2016-10-08 12:43:28 +02:00
commy2
d1db8899c1 fix damage materials of repair items 2016-10-08 12:43:28 +02:00
PabstMirror
de1c4bc4d9 Draw Straight Lines with maptool (#4410)
* Draw Straight Lines

* Fix roamer sides, handle closing map mid-draw

* Add missing privates / formula notes
2016-10-07 17:21:19 -05:00
PabstMirror
ef9fd92898 Show correct elev for mortar with no ammo (#4478)
Fix #3757
2016-10-07 17:06:04 -05:00
PabstMirror
1756ca2eeb Add tool to upload ace and compats to workshop (#4163)
* Add tool to upload ace and compats to workshop

* Add ACE/RHS steamIDs, use changelog.txt

* Uncomment main ace publish

* Create individual RHS compat mods, add adr97
2016-10-07 17:05:53 -05:00
PabstMirror
198f6c93e4 Fix FRIES attach point for unarmed wildcat (#4518)
Close #4490
2016-10-06 15:58:45 -05:00
Glowbal
059980b1a5 Add ammo cookoff (#4376)
* Add Ammo cookoff

* Remove tabs

* Add initial ammo box cook-off

Does not include a fire effect, mostly just a proof of concept.

Should probably also add further potential cook-off conditons (if hit by tracer for example).

* Add burning effects to ammo box cook off

- Add burning effect while ammo box is cooking off
- Add setting to enable/disable ammo boxes cooking off
- Clear magazine cargo while box is burning

Currently the box will burn for 60 seconds hardcoded, this is to allow time for the ammunition to cook off (since boxes sink into the ground and dissapear when destroyed). Perhaps we can implement a way to burn until all ammo is expended.

* Improve ammo cookoff

* Integrate ammo cookoff with the incendiary grenade

* Disable ammo cook off underwater

* Optimize fnc_detonateAmmunition

I say optimize, the only real performance optimization is using `vectorMultiply`. The rest is readability optimization though!

* Improve ammo box cook off

- Remove unnecessary light source (fire particles provide lighting)
- Add randomness to cook off time
- Cook off begins with fire effect rather than smoke

* Add tracer induced ammo box cook off

Due to limitations in the way arma handles tracer rounds (there's no way to check if an individual projectile is a tracer), only magazines with a high enough tracer density (at least 1 in 4) can cause cook off this way. However this is deemed an acceptable approximation since the chance of this happening should be quite low anyway.

* Decrease amount of explosions from ammo cookoff

* Add is local check for remote event
2016-10-06 22:37:38 +02:00
PabstMirror
dfa09d3161 Functions to perform arithmetic ops on sets (#4514)
* Functions to perform arithmetic ops on a set

* fix spelling
2016-10-06 10:18:14 +02:00
commy2
2e147b37f0 fix formating of CBA version check (#4511) 2016-10-05 13:06:21 -05:00
PabstMirror
97c02c306b Disable FCS on RHS helicopters (#4509)
* Disable FCS on RHS helicopters - Close #4495

* Cleanup
2016-10-05 13:03:52 -05:00
PabstMirror
1779099b71 Cleanup old common macros (#4507) 2016-10-04 05:29:37 +02:00
bux578
bc4177d4ff Merge pull request #4503 from acemod/fixTables
Make wide tables scrollable on mobile, close #3115
2016-10-03 11:42:50 +02:00
bux578
c57e2e1cd0 make wide tables scrollable on mobile 2016-10-03 07:02:50 +02:00
commy2
05d30c5573 convert log macros to cba versions (#4282)
* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro
2016-10-02 12:55:31 +02:00
Pawel W
ddd036f5bd Removed aiDispersionCoef for vanilla weapons (#4484)
When merged this pull request will restore default aiDispersionCoef for vanilla weapons.
2016-10-01 10:27:34 +02:00
PabstMirror
95da004370 Fix Ambient Sounds (#4470)
Fix #4418
- Remove leading `\` for configfile sounds
- Cleanup randomized location code
2016-10-01 10:27:00 +02:00
PabstMirror
bfc5af32f3 Add model.cfg for medical blood (#4489) 2016-09-30 16:29:48 -05:00
PabstMirror
6ad15e02c7 Fix spotting rifle loudness (#4488) 2016-09-30 15:10:20 -05:00
jonpas
8458cb2339 Replace ace_common_fnc_stringRemoveWhiteSpace with CBA_fnc_removeWhitespace (#4222)
* Replace FUNC(stringRemoveWhiteSpace) with CBA_fnc_removeWhitespace, Depreacte ACE's

* Use QFUNC

* Bump required CBA version

* Change remove version to 3.110.0
2016-09-30 15:51:03 +02:00
PabstMirror
a5d106c116 Fix cookoff event calling (#4487) 2016-09-29 18:44:48 -05:00
jonpas
dad4293216 Revert "Update showHud setter for Squad Radar" (#4485) 2016-09-29 17:53:17 -05:00
jonpas
1bd7a66888 Merge pull request #4085 from acemod/apexShowHud
Update showHud setter for Squad Radar
2016-09-29 21:11:15 +02:00
PabstMirror
3c7ac5a3e4 Fix medical blood locality / bleeding in vehicles (#4469)
* Fix medical blood locality / bleeding in vehicles

- Fix ace_setting
- Don't run on headless if enabledFor = 1
- Don't create blood for non-local units
- Don't create blood when mounted (except static weapons)

* Add readme
2016-09-29 10:42:56 -05:00
PabstMirror
85c4a1f021 Fix frag - reflectionsEnabled (#4475)
PFEH never exited
2016-09-29 10:42:21 -05:00
Nicolás Badano
2fda3e3471 Merge pull request #4480 from acemod/esteldunedain-fix4476
Remove visible id from the dog tag item
2016-09-28 20:52:49 -03:00
Nicolás Badano
0fda1b0c3d Fix #4476 2016-09-28 19:37:54 -03:00
ace3mod
85a1ce6d83 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-09-28 13:16:04 +02:00
commy2
1219d3df23 remove deprecated sitting module (#4458)
* remove deprecated sitting module

* Update sitting documentation for removal

* Remove ACE3 sitting doc, redirect to ACEX and add note

* Fix wording
2016-09-28 13:14:50 +02:00