Commit Graph

10339 Commits

Author SHA1 Message Date
BaerMitUmlaut
3f843958e8 Fixed function header 2016-08-29 12:27:19 +02:00
BaerMitUmlaut
3e1e4fca27 Keep empty magazines when reloading 2016-08-09 20:36:21 +02: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
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
3aee2d9e40 RHS ZSU-23-4 compat with FCS
- close #4189
2016-07-30 12:50:52 +02:00
PabstMirror
c117a79431 Add missing semi-colon (#4180) 2016-07-28 17:05:53 -05:00
J3aLeiNe
7e027ea3b5 Update compat_rhs_usf3 (Weapons/Ammo) (#4028) 2016-07-28 23:50:52 +02:00
Glowbal
a2a8f53157 Merge pull request #4155 from acemod/firedEHCleanup
Minor cleanup of fired EH listeners
2016-07-28 23:49:01 +02:00
Glowbal
35c7de2fb0 Merge pull request #4172 from acemod/log-file-and-linenumbers
log file and line numbers for warnings/errors/debug msgs
2016-07-28 23:47:21 +02:00
Glowbal
d9112fb07e Merge pull request #4175 from acemod/remove-obsolete-pickup-fix
reenable pickup action, because related bug has been fixed
2016-07-28 23:47:07 +02:00
jonpas
76b04913cb Merge pull request #4177 from 654wak654/patch-1
Bump CBA's version in Issue Template
2016-07-27 13:52:06 +02:00
Ozan Eğitmen
7466c373a3 Bump CBA's version 2016-07-27 14:46:28 +03:00
Glowbal
66a741a9c3 Merge pull request #4169 from acemod/cleanup-sort
deprecate sort function
2016-07-26 23:24:52 +02:00
commy2
4f77adaa0c Merge pull request #4137 from 654wak654/master
Use GVAR Macro Where Applicable
2016-07-26 19:15:00 +02:00
commy2
5711a863c6 reenable pickup action, because related bug has been fixed 2016-07-26 19:07:31 +02:00
PabstMirror
fa7d0df2df Improve creation time of house actions dummy (#4159) 2016-07-26 00:03:29 -05:00
commy2
0c073448dc log file and line numbers for warnings/errors/debug msgs 2016-07-25 20:39:30 +02:00
commy2
37d4a4a0c3 deprecate sort function 2016-07-25 20:00:41 +02:00
jonpas
541349efef Fix refuel not respecting time acceleration and pause (#4140)
* Fix refuel not respecting time acceleration and pause

* Make lastTickMissionTime local
2016-07-24 20:11:35 +02:00
jonpas
e3a70c6d3b Add Tagging module icon 2016-07-24 20:08:53 +02:00
jonpas
4b8f203f9b Add quick tag keybind and setting 2016-07-24 20:00:33 +02:00
PabstMirror
455f65947a Minor cleanup of fired EH listeners 2016-07-23 23:08:40 -05:00
SilentSpike
695101a914 Merge pull request #4151 from acemod/spectatorMap
Fix spectator map click not changing cam pos
2016-07-23 20:18:25 +01:00
PabstMirror
9cc0e64b46 Fix spectator map click not changing cam pos
Fix #3842
PFEH FUNC(handleCamera) will set camera position using GVAR(camPos)
2016-07-23 14:07:03 -05:00
jonpas
9b4f565cc5 Split cache and EH to functions 2016-07-23 15:52:20 +02:00
jonpas
c5edc00ee9 Add Tagging framework and improvements 2016-07-23 15:09:13 +02:00
PabstMirror
fa176bdea7 Change macro for pboProject (#4120) 2016-07-21 20:08:29 -05:00
PabstMirror
399404024c Don't frag for some shells that end in water (#4136)
shotbullet, shotShell don't seem to explode when touching water, so
don't create frags
Fix #4134
2016-07-21 20:08:11 -05:00
PabstMirror
7239f3e88c Fix terrain LOS check for vehicles with low getPos (#4130)
Fix #4126
2016-07-21 20:07:54 -05:00