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,669 Commits 73 Branches 88 Tags 752 MiB
2bfa1370a5
Commit Graph

8765 Commits

Author SHA1 Message Date
Glowbal
83e78f1021 Merge pull request #4258 from acemod/reviveTimer 
Clear reviveState when calling setUnconscious
 2016-08-20 11:57:51 +02:00
Glowbal
47d17c49dc Merge pull request #4245 from acemod/eject-ai-crew-cookoff 
eject ai during cookoff
 2016-08-20 11:56:40 +02:00
Glowbal
167dc7735d Merge pull request #4197 from acemod/litterSimpleObject 
Use createSimpleObject for medical litter
 2016-08-20 11:53:43 +02:00
Glowbal
1f8f463f32 Merge pull request #4267 from acemod/fix-object-event 
fix FUNC(objectEvent)
 2016-08-20 11:49:53 +02:00
PabstMirror
7f9a697dca Update CBA_DEBUG_SYNCHRONOUS macro for new CBA (#4271) 2016-08-19 16:33:27 -05:00
commy2
1c6825bcab skip DLL check on non-windows machines, close #4253 2016-08-19 16:01:59 +02:00
commy2
91e4f50ba0 fix FUNC(objectEvent) 2016-08-19 15:23:47 +02:00
jonpas
ff0dcd3152 Use pushBackUnique in Tags cache (#4249) 
* Use pushBackUnique in tagging

* Use configProperties, Add maintainers

* Fix header

* Revert to configClasses
 2016-08-18 20:52:28 +02:00
jonpas
986ac43a68 Cache config UI (#4234) 
* Cache config UI

* Use configClasses to prevent reading entries in base class

* Fix header not containing return value

* One more count

* More lazy eval
 2016-08-18 19:07:05 +02:00
PabstMirror
b02e91e02e Clear reviveState when calling setUnconscious 
#4250
 2016-08-18 01:59:40 -05:00
freghar
9fa247398f add BlueForceTracking filtering via an object variable (#4196) 
There's no good workaround for this:

 * creating a dummy unit on [0,0,0] and making it leader prevents
   grp members from entering vehicles
 * joining group of a different side prevents grp members from seeing
   blueforce tracking markers of their original side

Usage (_obj can be group or unit, depending on BFT_ShowPlayerNames):

  _obj setVariable ["ACE_map_hideBlueForceMarker", true];

The inverse, hiding of markers of other groups/units for a particular
player, can be already done by 'ace_map_BFT_Enabled = false' locally,
as the Update function checks for it every time.

Signed-off-by: freghar <freghcz@gmail.com>
 2016-08-16 19:28:21 -05:00
PabstMirror
24d13e525f Add ACE_isBelt for DLC/Expansion magazines 
Fix #4094
 2016-08-14 13:35:00 -05:00
commy2
7d2f2023ee eject ai during cookoff 2016-08-14 13:51:33 +02:00
commy2
2231464087 fix bug which would cause unecessary echo network traffic (#4242) 2016-08-13 16:45:50 +02:00
Lukas
84a370d0f2 Czech translation (#4241) 2016-08-13 15:44:48 +02:00
Glowbal
fdfe672491 Merge pull request #4166 from acemod/glasses-hearing 
Make hearing component compatible with glasses
 2016-08-13 14:17:47 +02:00
Glowbal
ba8c8bb5b0 Merge pull request #4109 from acemod/port-incendiary-grenades 
Port ACE2 incendiary grenades
 2016-08-13 14:16:39 +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
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
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
PabstMirror
f12feae7fe Fix some efuncs 2016-08-09 12:47:59 -05:00
PabstMirror
011c6a0d00 Fix merge conficlts 2016-08-09 12:14:30 -05:00
PabstMirror
6c63d3c23a Merge branch 'master' into medical-rewrite 2016-08-09 12:11:30 -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
jonpas
51450b86fb Add dogtags $, Improve function headers 2016-08-09 01:15:59 +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
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
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
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
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
PabstMirror
a2f391cd59 Convert finger to CBA hashes (#4183) 2016-07-30 12:28:07 -05:00
commy2
8a8bc6a336 remove hitpoint config from medical-main component 2016-07-30 17:23:08 +02: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
f793a0d8d1 merge medical engine component into medical rewrite branch 2016-07-30 14:00:42 +02:00
commy2
9a468c4068 add explosive devices to missing units, close #4181 2016-07-30 13:15:45 +02:00
commy2
b059217f4d fix-inverted-logic 2016-07-30 12:35:10 +02:00
commy2
5a1b33a5da convert common to cba hashes 2016-07-30 12:28:06 +02:00
commy2
1ffe3131e3 remove deprecated functions 2016-07-30 11:16:19 +02:00
commy2
c9a8e0a892 deprecate ACE hash functions in favor of CBA versions 2016-07-30 10:54:01 +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
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
commy2
755f6bcc6b Make hearing component compatible with glasses 2016-07-26 16:14:16 +02:00
PabstMirror
fa7d0df2df Improve creation time of house actions dummy (#4159) 2016-07-26 00:03:29 -05:00
commy2
6507acdbab optional pbo to disable cross hair 2016-07-25 21:00:27 +02: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
commy2
63b41843fc remove some broken functions 2016-07-25 19:43:42 +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
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
Ozan Eğitmen
8f80cd59c8 Use GVAR where applicable 2016-07-20 07:15:18 +03:00
SilentSpike
fed71b00e8 Merge pull request #4089 from acemod/dogtagSSN 
Improve SSN hash
 2016-07-15 22:59:41 +01:00
Glowbal
131ef576b4 Add medical treatments and configuration 2016-07-15 12:23:47 +02:00
Glowbal
62f84efb9b Add medical menu 2016-07-15 12:23:26 +02:00
Glowbal
ddb4ef42f3 Add stringtables and items 2016-07-15 12:21:56 +02:00
Glowbal
e4c36d9fa0 Change injuries include to ACE_Medical_Injuries 2016-07-15 12:10:18 +02:00
Glowbal
565da090bc Add missing bracket 2016-07-15 11:53:57 +02:00
Glowbal
ab2075c328 Merge branch 'master' into medical-rewrite 
Conflicts:
	addons/medical/CfgEden.hpp
	addons/medical/functions/fnc_reviveStateLoop.sqf
	addons/medical/functions/fnc_serverRemoveBody.sqf
	addons/medical/functions/fnc_unconsciousPFH.sqf
 2016-07-15 11:50:58 +02:00
Glowbal
c8a54fd090 Merge branch 'release' 2016-07-15 02:03:42 +02:00
PabstMirror
1213c08e4b Fix cached call events 2016-07-14 13:06:45 -05:00
bux578
630ab70982 Merge branch 'release' into cut-ropes-keybind 2016-07-14 15:30:38 +02:00
bux578
51bdf32f9f Merge branch 'release' into microdagr-zero-fixes 2016-07-14 15:25:25 +02:00
ColdEvul
492f075ac8 Added fixed name for Weapon_SMG_05_F (MP5K) for EDEN item. 2016-07-14 15:18:29 +02:00
ColdEvul
43c1c89cc1 Made new APEX crates draggable 2016-07-14 15:12:54 +02:00
Glowbal
2f2c4b91a1 3.6.2 2016-07-14 14:51:46 +02:00
BaerMitUmlaut
21f1329762 Added keybind to cut ropes 2016-07-14 08:13:52 +02:00
BaerMitUmlaut
40d460b1b6 Fixed MicroDAGR trailing zero 2016-07-14 03:32:30 +02:00
Glowbal
10b7e5d270 Merge pull request #4107 from acemod/fixMainMenuAceOptionsPlacement 
Fix MainMenu Ace_Options Placement to top left
 2016-07-14 01:39:18 +02:00
Glowbal
11a72431c2 Merge pull request #4099 from acemod/FixMinigunMags 
Add missing vanilla magazines to LMG_Minigun
 2016-07-14 01:38:58 +02:00
Glowbal
078647c403 Merge pull request #4097 from acemod/fixApex3denLayout-cherry-pick 
Fix 3den attribute layout for 1.62, target release
 2016-07-14 01:38:41 +02:00
Glowbal
9d14121a9e Merge pull request #4096 from acemod/func-dogesture 
use a function to do gestures
 2016-07-14 01:38:18 +02:00
PabstMirror
13e182a7a9 Fix MainMenu Ace_Options Placement to top left 
Stick ace_options button placement to top left
so it doesn't interfere with apex singleplayer menu
 2016-07-13 13:49:05 -05:00
commy2
cc76ac482a add priority parameter to doGesture 2016-07-13 11:00:31 +02:00
commy2
404d5b49b4 add function to read vanilla keybinds 2016-07-13 10:40:28 +02:00
PabstMirror
981dc874a4 Add missing vanilla magazines to LMG_Minigun 
Fix #4098
Missing:
"500Rnd_65x39_Belt"
"500Rnd_65x39_Belt_Tracer_Red_Splash"
"500Rnd_65x39_Belt_Tracer_Green_Splash"
"500Rnd_65x39_Belt_Tracer_Yellow_Splash"
 2016-07-12 13:17:29 -05:00
PabstMirror
0281bc8f3d Fix 3den attribute layout for 1.62 2016-07-12 17:54:16 +02:00
commy2
ce72bfd07a replace tabs with spaces 2016-07-12 16:28:36 +02:00
PabstMirror
a0aea441b4 Fix reload mutex with binocs or mounted 
Fix #4088
 2016-07-12 16:22:27 +02:00
commy2
8a4514f8e7 use a function to do gestures 2016-07-12 16:16:01 +02:00
jonpas
845dca9ea5 Add description and example to blur screen function 2016-07-12 16:13:53 +02:00
Glowbal
96a08dfc01 Merge pull request #3923 from voiperr/grenadesounds 
Grenade + Chemlight Sounds
 2016-07-12 13:37:40 +02:00
Glowbal
02fea363b6 Merge pull request #3940 from acemod/particles 
Custom smoke particles
 2016-07-12 13:36:36 +02:00
Glowbal
ee8e03a1ae Merge pull request #3916 from acemod/merge-basic-and-advanced 
Merge basic and advanced injury systems
 2016-07-12 13:36:02 +02:00
PabstMirror
89992a9710 Improve SSN hash 2016-07-11 21:30:04 -05:00
Glowbal
0e740f00c3 Merge branch 'release' 2016-07-11 23:42:03 +02:00
Glowbal
de612d9613 Merge branch 'apex' into release 2016-07-11 20:59:34 +02:00
Glowbal
8e3ad9a032 Merge pull request #4083 from acemod/required-addons-apex-cherry-pick 
Required addons for APEX
 2016-07-11 20:58:50 +02:00
Glowbal
0869cf96bd required arma3 version 1.62. closes #4081 2016-07-11 19:27:40 +02:00
Glowbal
d0c30577af Remove usage of setUnconscious 2016-07-11 19:18:40 +02:00
Glowbal
86c67d9e33 Merge branch 'apex' into release 2016-07-11 19:04:53 +02:00
commy2
17f848fba9 Merge pull request #4063 from acemod/gunbag-assault-rifles-cherry-pick 
enable gunbag for all non-machinegun primary weapons
 2016-07-11 17:40:53 +02:00
commy2
25a3405d1f required addons apex, close #4020 2016-07-11 12:01:47 +02:00
Glowbal
dbac1c6398 Merge branch 'apex' into release 2016-07-11 11:16:50 +02:00
Glowbal
02f08939f2 Merge pull request #4052 from acemod/fix4049 
Mine detector optimization and cleanup
 2016-07-11 11:16:16 +02:00
Glowbal
9b85bc3e29 v3.6.1 2016-07-11 11:15:36 +02:00
PabstMirror
74da791610 Proper fix for naval mines 2016-07-10 17:29:19 -05:00
PabstMirror
721bc205ef Allow defusing naval mines 
Fix #4074
- Workaround for naval mines not working with deactivate
- Add "isNotSwimming" exception to defuse progress bar
 2016-07-10 13:49:06 -05:00
esteldunedain
9323314da5 Merge branch 'fix4049' of github.com:KoffeinFlummi/ACE3 into fix4049 2016-07-09 20:04:20 -03:00
esteldunedain
165bd4b3f8 Make volume consistent 2016-07-09 20:00:53 -03:00
commy2
d249132864 Merge pull request #4062 from acemod/disable-interaction-menu-while-reloading 
Add reload mutex as canInteractWith condition
 2016-07-09 21:03:55 +02:00
PabstMirror
3ac1525a3d Add base icon 2016-07-09 12:11:58 -05:00
jonpas
55c7b9bfc4 Merge pull request #3997 from acemod/gogglesEffectsSetting 
Add goggle setting for level of effects
 2016-07-09 18:48:22 +02:00
jonpas
d9d2302ab8 Merge pull request #4069 from acemod/addAsianStrings 
Add Korean and Japanese strings to tracker
 2016-07-09 18:20:16 +02:00
jonpas
317c36e85c Merge pull request #4061 from acemod/removegtgt 
Remove remaining >> signs from interaction menu
 2016-07-09 18:17:39 +02:00
BaerMitUmlaut
0a46a83e02 Realistic names for APEX content (#4055) 
* Added realistic names for APEX content

* Fix strings

* Lowercase Polish colors
 2016-07-09 18:14:08 +02:00
Glowbal
f86d8d113c Merge branch 'release' 2016-07-09 11:36:49 +02:00
PabstMirror
ef38144d70 Merge pull request #4051 from acemod/simplifyNews 
Make ace news fit apex menu style
 2016-07-08 15:46:54 -05:00
jonpas
1185375c90 Add Korean and Japanese strings to tracker 2016-07-08 20:00:12 +02:00
commy2
c55c0d5666 only use one waitUntilAndExecute at any time for reload mutex 2016-07-08 15:12:47 +02:00
esteldunedain
071201ea46 Remove the pistol cursor from the mine detector 2016-07-07 19:03:14 -03:00
jonpas
0220b57609 Remove redundant getMagazineIndex compatibility function 2016-07-07 20:16:03 +02:00
esteldunedain
2a36fec793 Make the detector AI compatible 2016-07-07 12:38:53 -03:00
Glowbal
da661afe9b Improve syntax 2016-07-07 17:22:08 +02:00
commy2
be17b72cad remove old 'gestures' reload mutex 2016-07-07 16:38:24 +02:00
commy2
6569de5332 add event handler for reload mutex 2016-07-07 16:35:07 +02:00
esteldunedain
6160fe076d Add an event when a mine is detected to allow hooking into missions 2016-07-07 11:17:57 -03:00
esteldunedain
244bdb093d Add clicks when activating/deactivating the detector 2016-07-07 11:17:09 -03:00
esteldunedain
7a25c53dd3 Switch say2D to playSound 2016-07-07 10:51:34 -03:00
commy2
2a84865302 add event handler for reload mutex 2016-07-07 15:47:37 +02:00
Glowbal
7157fcf420 Clean up unconscious and revive states 2016-07-07 12:57:21 +02:00
Glowbal
2daee60d0c Add handle revive and Unconscious states 2016-07-07 12:04:26 +02:00
Glowbal
d0236a007a Work done on medical states 2016-07-07 11:46:55 +02:00
commy2
bf7fde0d65 enable gunbag for all non-machinegun primary weapons 2016-07-07 09:47:02 +02:00
commy2
e39017e27a add reload mut ex as canInteractWith condition 2016-07-07 09:10:14 +02:00
esteldunedain
893866ff39 Remove >> signs from interaction menu 2016-07-06 22:38:03 -03:00
esteldunedain
ce0da11aed Clip sound duration to below 0.5 s to avoid it stacking into itself when using say 2016-07-06 22:23:34 -03:00
esteldunedain
f73b6b1aad - Restore the config of detector sounds through CfgSounds 
- Add the possibility of switching between headphones or speaker
- Move detector actions to their own submenu
 2016-07-06 22:14:26 -03:00
esteldunedain
34654fffb7 Add function to allow using playSound3D on CfgSounds classes 2016-07-06 21:31:06 -03:00
PabstMirror
5362a80911 Tweak spotting scope anims / mem points 2016-07-06 16:55:54 -05:00
PabstMirror
450b8dfedb Fix order of revive loop 
Fix #4035
Revive loop was killing heartrate before it exited
 2016-07-06 00:54:51 -05:00
PabstMirror
4047c44b64 Merge pull request #4047 from acemod/cleanupRefuel 
Refuel - Simplify Actions, Fix Van_01 config
 2016-07-05 20:59:49 -05:00
PabstMirror
022e7747b1 Fix no attack profile on static titan launcher (#4023) 2016-07-05 20:58:32 -05:00
jonpas
bd2a063861 Fix pboProject false/true becoming 0/1 in UI config, Default ammoCount to off (#4041) 2016-07-05 23:01:25 +02:00
PabstMirror
6c732bf789 Fix action name, put actions on base class 2016-07-05 00:22:47 -05:00
esteldunedain
30532983a1 Improve the positioning of the detector point 2016-07-04 19:32:40 -03:00
esteldunedain
e26eda3ac2 - Optimize getDetectedObject 
- Cache detected mines for 0.15 s
- Call detectorLoop every 0.05 s instead of 0.01s
- Compile a dictionary of detectable classnames from config at start
- Switch to playSound3d for global effect
- Remove dummy
- Change config entries to support playSound3d
- Cache getDetectorConfig for better interaction menu performance
- Change sound to mono wss
- Close #4049
 2016-07-04 19:04:58 -03:00
PabstMirror
8a572ace41 Make ace news fit apex menu style 2016-07-04 15:31:25 -05:00
PabstMirror
e40415b628 Add #undef for PREP w/ DISABLE_COMPILE_CACHE 2016-07-04 01:17:30 -05:00
PabstMirror
ea140f63a5 Refuel - Simplify Actions, Fix Van_01 config 2016-07-03 15:17:00 -05:00
Nicolás Badano
08c4731a3a Merge pull request #4045 from acemod/fixOverheatingBarrels 
Fix overheating spare barrels
 2016-07-03 21:11:13 +02:00
commy2
a5b88d3276 Merge pull request #4034 from acemod/dragKeybind 
Add Drag/Drop Keybind
 2016-07-03 20:43:06 +02:00
commy2
0a5a4d2d33 Fix German word order / capitalization 2016-07-03 20:42:43 +02:00
PabstMirror
5ad1f752ca Fix overheating spare barrels 
- Remove ACE_SpareBarrel from CfgWeapons as it is now a magazine
- Don't call updateTemperature in displayTemp, as unit may not be local
- Fix targetEvent error
 2016-07-03 12:58:40 -05:00
PabstMirror
bbc708e3e0 Less aggressive overlap detection 
Ensure the 2d screen pos distance is significant.
 2016-07-02 22:46:36 -05:00
Glowbal
e8eb729e04 Merge medical core and medical state. Add working version of the state machine, re-add sounds 2016-07-02 16:34:28 +02:00
PabstMirror
d15330d245 Fix cargo event name - spare parts not being added 2016-07-01 23:14:20 -05:00
PabstMirror
96efbaef53 Add Drag/Drop Keybind 2016-07-01 16:28:44 -05:00
Glowbal
2d330e36e0 Add initial medical state component 2016-06-30 23:43:25 +02:00
Glowbal
3aa88c80bf Add first step in medical rewrite 
Split up medical core and medical damage. Move out all other functionality
 2016-06-30 17:33:29 +02:00
Glowbal
8b1b31fc8d Merge branch 'apex' into medical-rewrite 2016-06-30 16:51:50 +02:00
Glowbal
8c331937d0 Merge branch 'merge-basic-and-advanced' into medical-split-treatment 
Conflicts:
	addons/medical/ACE_Medical_Treatments.hpp
	addons/medical/config.cpp
	addons/medical_treatment/functions/fnc_addToTriageCard.sqf
 2016-06-30 11:41:03 +02:00
Glowbal
e3f96b6594 Merge branch 'master' into merge-basic-and-advanced 
Conflicts:
	addons/medical/XEH_postInit.sqf
	addons/medical/functions/fnc_displayPatientInformation.sqf
 2016-06-30 11:27:51 +02:00
Glowbal
cd08e00c71 Merge pull request #3962 from acemod/dogtags 
Dogtags
 2016-06-29 22:19:02 +02:00
Glowbal
a497690bbd Merge branch 'master' into apex 2016-06-29 21:44:15 +02:00
Glowbal
eca5263df8 Merge pull request #3998 from acemod/apexUBC 
Fix UBC for 1.62 Apex
 2016-06-29 12:04:21 +02:00
Glowbal
806877492c Merge pull request #3999 from acemod/fixApexWeapons 
Fix ballisitics and huntir configs
 2016-06-29 12:04:05 +02:00
PabstMirror
3ae8a494c4 Add javelin configs for new apex launchers 
Fix #4007
 2016-06-28 22:46:04 -05:00
commy2
ab2307996c add possibility to overwrite a units faction for determining name tags 2016-06-28 23:43:34 +02:00
Glowbal
01c184b174 Merge pull request #4014 from acemod/apexTitanBandaid 
Handle bad target when using apex titans
 2016-06-28 22:01:12 +02:00
Glowbal
4251831e2e Merge pull request #4009 from acemod/fixRearmEvents 
Fix rearm events
 2016-06-28 20:33:56 +02:00
BaerMitUmlaut
898217a533 Fixed popping and stray particles 2016-06-28 19:23:47 +02:00
PabstMirror
20376385ca Fix #4007 - Handle bad target when using apex titans 2016-06-27 13:43:05 -05:00