Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,479 Commits 73 Branches 88 Tags 752 MiB
9cd50c89a0
Commit Graph

10479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glowbal
b66291d668 Merge pull request #4240 from acemod/rename-enable-setting-for-cookoff 
rename cookoff setting to 'GVAR(enable)'
 2016-08-13 14:15:25 +02:00
commy2
58539a0949 Merge branch 'master' of https://github.com/acemod/ACE3 into glasses-hearing 2016-08-13 13:03:23 +02:00
commy2
5b3d424509 always destroy engine, effect only requires cookoff 2016-08-13 12:44:38 +02:00
commy2
d0d407a2c5 only do engine burning effect if cookoff is enabled 2016-08-13 12:39:52 +02:00
commy2
1bde8d617b rename cookoff setting to 'GVAR(enable)' 2016-08-13 12:38:04 +02:00
Glowbal
41ce89b439 Merge pull request #4116 from acemod/cookoff 
Port AGM cook off
 2016-08-13 12:17:47 +02:00
commy2
0dc13276df change default value to true 2016-08-13 12:13:49 +02:00
commy2
f0a74781c9 add setting to disable cook off effects 2016-08-13 12:12:34 +02:00
commy2
c42004449d Port AGM cook off 2016-08-13 11:59:15 +02:00
commy2
9a93dffc3b port A2 incendiary grenades 2016-08-13 11:49:36 +02:00
Broström.A | Evul
0dfee34a56 Added additional cargo and dragging for crates (#4129) 
* Added Cargo and Dragging for `Land_WoodenBox_F` and `Land_WoodenCrate_01_F`.
 2016-08-13 11:33:41 +02:00
PabstMirror
f354bab3c2 Add Tripflare (#4152) 2016-08-13 11:29:01 +02:00
[OMCB]kaban
8fc2cbd0ef Russian Translations - Update (#4217) 2016-08-13 11:25:43 +02:00
Glowbal
822b1f6894 Merge pull request #4232 from acemod/fixFcsUI 
Fix missing zeroing UI on vehicles without FCS
 2016-08-13 11:24:20 +02:00
jonpas
5985f3bd26 Fix missing zeroing UI on vehicles without FCS 2016-08-11 22:34:38 +02:00
PabstMirror
a2da54bfec Fix javelin fire block not being removed (#4228) 2016-08-11 13:30:28 -05:00
commy2
5e40c24985 Merge pull request #4185 from acemod/cleanup-deprecated 
remove deprecated functions
 2016-08-09 18:34:43 +02:00
commy2
c2da1b4980 Merge pull request #4225 from acemod/fix-missing-magazine-mass 
Fix wrong config path in FUNC(calculateMass)
 2016-08-09 18:30:04 +02:00
commy2
9228bb9349 manual merge 2016-08-09 18:28:42 +02:00
jonpas
e909901100 Merge pull request #4226 from acemod/fixTagString 
Fix tagging cstring
 2016-08-09 18:27:00 +02:00
commy2
36e78e0722 Merge pull request #4171 from acemod/cleanup-hash 
deprecate ACE hash functions in favor of CBA versions
 2016-08-09 18:25:01 +02:00
commy2
83f32ebc29 Merge pull request #4170 from acemod/cleanup-missionSQM 
remove some broken functions
 2016-08-09 18:24:52 +02:00
commy2
439a85924c Merge pull request #4188 from acemod/cba-hash-synchedEvent 
Convert common to CBA hashes
 2016-08-09 18:24:27 +02:00
commy2
7000414df4 Fix wrong config path in FUNC(calculateMass) 2016-08-09 18:20:25 +02:00
PabstMirror
8e10bf5eef Fix tagging cstring 2016-08-09 11:18:52 -05:00
Nicolás Badano
02794a972b Merge pull request #4221 from acemod/dogtagsPboPrefix 
Add dogtags $PBOPREFIX$ and Improve function headers
 2016-08-08 20:48:28 -03:00
jonpas
51450b86fb Add dogtags $, Improve function headers 2016-08-09 01:15:59 +02:00
Glowbal
37330a35b7 Merge pull request #4218 from acemod/stringRemoveWhitespaceHeaderFix 
Improve stringRemoveWhitespace function header
 2016-08-08 23:18:32 +02:00
jonpas
91128729ba Improve stringRemoveWhitespace function header 2016-08-08 23:08:39 +02:00
jonpas
c6f3627c70 Merge pull request #4146 from acemod/taggingFramework 
Tagging Framework and Improvements
 2016-08-08 23:04:28 +02:00
freghar
769ca7e835 lower wirecutter item mass (#4209) 
The current mass makes it take a LOT of inventory space (~half of
an assault pack) which makes it impractical to carry around as a tool.

Signed-off-by: freghar <freghcz@gmail.com>
 2016-08-08 15:18:51 -05:00
Glowbal
c2d127f0ec Merge pull request #4216 from acemod/healHitPoint 
Heal hitpoint after bandage sets bodyPartStatus
 2016-08-07 23:24:29 +02:00
PabstMirror
c46b2d09cf Heal hitpoint after bandage sets bodyPartStatus 2016-08-07 13:58:09 -05:00
Mark Ruffner
ff297e307b Fix the captive module from creating attributes when not needed (#4213) 
* Fix default values

Fix default values, so we don't get two custom attributes per unit, even when the unit is not handcuffed/surrendered

* Add parentheses to avoid conversion
 2016-08-07 12:50:58 -05:00
PabstMirror
919c8469de Add interaction action on demand (#4079) 
* Only use addActionEventHandler when needed

-Only install addActionEventHandler when the interaction menu is
actually open
-Less SQF running each frame,
-it should help with issue #4066

* Cleanup debug
 2016-08-05 12:05:15 -05:00
PabstMirror
dc7ac4c42c Fix static weapons not being loadable in cargo (#4205) 
- Fix #4165
 2016-08-05 12:03:45 -05:00
commy2
fbd8fb5655 Merge pull request #4203 from acemod/dragAnimChanged 
dragging - Don't run animChanged event on all units
 2016-08-04 15:10:13 +02:00
PabstMirror
6f22df40b6 dragging - Don't run animChanged event on all units 
Also Fix CBA_fnc_addPlayerEventHandler
 2016-08-03 15:35:10 -05:00
PabstMirror
afe3e5ccd3 Fix repair cargo not added to zeus created objects (#4201) 
- Fix #4200 (add delay for units created via zeus)
- Use ace_settingsInitialized to add events
 2016-08-03 13:44:04 -05:00
Glowbal
0a56ab1fc4 Merge pull request #4202 from acemod/medicalTweaks 
Minor tweaks to medical
 2016-08-03 20:37:38 +02:00
PabstMirror
82cf18575c Minor tweaks to medical 
- decrease needed blood loss on selection to turn icon red. (Largest
wound bleedingRate is only 0.1)
- Don't print warning for basic medical bandage not having sub configs
 2016-08-03 13:14:12 -05:00
PabstMirror
be3afe6eb3 Increase defuse range for underwater mines (#4195) 
Fix #4144
- Adds a 2nd defuse helper with increased range
 2016-08-02 18:29:31 -05:00
commy2
b9600e661c Merge pull request #4198 from acemod/UntergrundbewegungPanzerkette 
Fix track repair selection placement
 2016-08-02 14:20:51 +02:00
PabstMirror
787a57c12b Fix track repair selection placement 2016-08-01 21:19:48 -05:00
PabstMirror
02c308e141 Use createSimpleObject for medical litter 2016-08-01 16:20:13 -05:00
commy2
f6eb6a6d66 Merge pull request #4190 from acemod/fix-4189 
RHS ZSU-23-4 compat with FCS
 2016-07-30 20:06:18 +02:00
PabstMirror
a2f391cd59 Convert finger to CBA hashes (#4183) 2016-07-30 12:28:07 -05:00
commy2
46adfe1150 convert map-gestures to cba hashes (#4187) 2016-07-30 17:17:52 +02:00
commy2
1f6b10c4cb convert laser to cba hashes (#4186) 2016-07-30 17:16:29 +02:00
commy2
9a468c4068 add explosive devices to missing units, close #4181 2016-07-30 13:15:45 +02:00