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,946 Commits 73 Branches 88 Tags 752 MiB
e67c9512ba
Commit Graph

8963 Commits

Author SHA1 Message Date
Glowbal
4ae4fca852 Prep 3.7.0 release 2016-09-12 19:47:31 +02:00
jonpas
0400a857e6 Fix Advanced Throwing vanilla throw block for primed throwables (#4370) 
* Fix vanilla throwing block failing after priming, simplify muzzle ammo (can only be 1 or 0, 1 doesn't influence anything if no appliccable throwable in inventory)

* Disable select grenade keys when advanced throwing is active

* Fix #4375 - select next grenade cycles between first 2 grenade muzzles due to setAmmo
 2016-09-12 19:21:04 +02:00
BaerMitUmlaut
1601f6a7b7 Disable medical AI for remote controlled AI 2016-09-12 17:06:14 +02:00
PabstMirror
9844ae32c9 Exit fatiuge loop when dead (don't play breathing sound) 2016-09-11 22:03:20 -05:00
commy2
bfb88efe9a Fix script error in cargo drop function (#4369) 2016-09-10 21:21:09 +02:00
Ozan Eğitmen
d533bd1663 Delete "Teleport Players" module after use 2016-09-10 15:33:19 +03:00
Glowbal
04dd0412ff Prepare 3.7.0 RC6 2016-09-09 11:43:40 +02:00
jonpas
062f6deec8 Fix Advanced Throwing floating IR grenades and block vanilla throwing (#4365) 
* Fix #4362 - floating primed IR grenades

* Fix #4363 - block vanilla throwing while prepared

* Respect last thrown time with vanilla throwing and dropping primed throwable,
 2016-09-09 11:00:30 +02:00
BaerMitUmlaut
b1f91f8cf5 Use directCall on tripflare effect 2016-09-08 21:22:32 +02:00
Glowbal
ebdc883855 Prepare 3.7.0 RC5 2016-09-07 21:35:58 +02:00
PabstMirror
0d81ce34e2 Fix stop gesture keybind (#4354) 2016-09-07 21:07:51 +02:00
PabstMirror
1caea46d60 Medical - Fix adv wound not stacking (#4353) 2016-09-07 20:54:54 +02:00
jonpas
13df3efce2 Prepare 3.7.0 RC4 2016-09-06 22:56:22 +02:00
commy2
6e99e8a951 don't let tripod fall over as easily (#4352) 2016-09-06 21:55:23 +02:00
PabstMirror
1a4ed7b7b4 Grenades - disable throw mode / keybind if advThrow (#4350) 2016-09-06 21:54:42 +02:00
commy2
5cd9b56866 don't let tripod fall over as easily (#4352) 2016-09-06 21:53:38 +02:00
PabstMirror
a320a56813 Fix blood bags not showing in medical menu (#4351) 
fix #4306
 2016-09-06 21:52:22 +02:00
PabstMirror
4781903be6 Add setting for medical ai 2016-09-06 21:48:46 +02:00
PabstMirror
ec4c2276a5 Add setting for medical ai 2016-09-05 22:35:01 -05:00
Glowbal
f3dc1afdbf Prepare 3.7.0 RC3 2016-09-05 22:27:30 +02:00
PabstMirror
4fd5d6be6c Fix handleDamage params for addDamageToUnit (#4344) 2016-09-05 22:27:00 +02:00
BaerMitUmlaut
a096439f36 Moved particles component to optionals (#4341) 2016-09-05 20:50:30 +02:00
PabstMirror
a585a36ced Add ace mags to 7.62 SPAR_03 (#4340) 2016-09-05 20:33:12 +02:00
jonpas
2034234940 Refuel nozzle taking, disconnecting, connecting and returning interaction fixes (#4337) 
* Prevent taking or disconnecting a nozzle if already carrying one

* Fix multiple nozzle connect actions, Fix returning nozzle into a vehicle being refueled
 2016-09-05 20:23:28 +02:00
jonpas
2474da36b3 Fix pick up delay and IR chemlights, prevent picking up GL and mortar smoke shells (#4336) 
* Fix pick up interaction not rendering right after throw, Prevent GL rounds from being picked up

* Prevent picking up GL and mortar smoke shells

* Fix pick up delay properly, Add separate define for quick throwing (for use when debugging)

* Fix forgotten rename in IR chemlight handling
 2016-09-05 20:23:03 +02:00
Glowbal
be8b4468af Increment build number 2016-09-05 08:27:58 +02:00
PabstMirror
7055b242e4 Fix AF author String (#4330) 2016-09-04 22:34:48 +02:00
PabstMirror
f21d45392f SPAR use ACE Magazines - Fix #4207 (#4329) 2016-09-04 21:56:05 +02:00
Glowbal
849a2cd475 Prepare 3.7.0 2016-09-04 21:51:36 +02:00
Glowbal
5034dffec8 Fix build error with make 2016-09-04 21:51:13 +02:00
BaerMitUmlaut
cc414de8d1 Add Advanced Fatigue component (#4321) 
* Initial commit advanced fatigue

* Added animation changes

* Fixes, rewrites

* Broadcast 3den attribute and fix UBC

* Further animation tweaks

* Added Eden attribute and CBA settings

* Switch to CBA events

* Add beautified component name

* Rewrites, fixes, tweaks

* Move setVars to GVARs

* Add setting to disable

* Switch to status effect handler for sprint and jog blocking

* Add component name

* Failsafe for early unit player EH

* Removed raised weapon penalty for pistols

* Added respawn compatibility

* Tweaked side jog animation speed

* Added support for virtual load

* Added stamina bar

* Remove debug flags

* Added custom duty factor functions and values

* Added structural comments

* Disabled CBA settings, added ACE settings

* Fixed config

* Added readme

* Remove leftover debug diag_logs

* Improved stringtable
 2016-09-04 21:33:07 +02:00
PabstMirror
7314f863f6 Add spare barrel to VA in 1.64 (#4328) 
Close #4325
 2016-09-04 21:26:15 +02:00
PabstMirror
0848b6d1de Fix script errors (#4327) 2016-09-04 21:03:52 +02:00
BaerMitUmlaut
8a47d7a9b6 Add fade nametags towards screen border (#4316) 
* Fade nametags towards screen border

* Use distance2D instead of vector commands

* Don't calculate fade when off screen

* Made fade on border optional
 2016-09-04 20:50:12 +02:00
Glowbal
b0fa1a32d9 Fix params 2016-09-04 20:37:25 +02:00
Glowbal
b489750d5b Minor optimizations using private, params, and isEqualType (#4323) 
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
 2016-09-04 16:44:22 +02:00
BaerMitUmlaut
278e7fa800 Add Medical AI implementation for basic medical (#4311) 
* Initial commit medical AI

* Finished non-healing functions

* Initial work on self healin

* AI healing

* Finished medical AI for basic medical

* Finito

* Fix for dead units, medic not being close enough

* Make ace_medical required

* Fixed double systemChat

* Made AI units able to heal players

* Fixed wound treatment

* Fixed medic movement

* Made units heal themselves earlier
 2016-09-04 11:25:03 +02:00
BaerMitUmlaut
c3222bdf0c Add realistic weights (#3868) 
* Adjusted weapon weights - Vanilla

* Adjusted weapon weights - Marksmen DLC

* Adjusted weight of SIG 556 to SIG 550
 2016-09-04 11:07:36 +02:00
PabstMirror
1c5761f845 Bundle fire damage into larger chunks (#4223) 2016-09-03 22:00:45 +02:00
J3aLeiNe
7220d0ee5d compat RHS US : Change for default ACE_12.7x99 (#4184) 
* Change for default ACE_12.7x99

 - rhsusf_ammo_127x99_M33_Ball = B_127x99_Ball from addons/ballistics/CfgAmmo.hpp

 - rhsusf_ammo_127x99_mk211 = ACE_127x99_API from addons/ballistics/CfgAmmo.hpp

* Default ACE3 12.7x99 and recheck bullets values

 - 7.62 M993 : fix Ballistic Coefficient and Mass according with ballistics/CfgAmmo.hpp
 - 7.62 M993 : add a muzzle velocity according with the Mk11 Mod0 barrel length (609.6mm) and the M14 EBR-R1 barrel length (558.8mm) (empiric, not perfect but better than nothing)
 - recheck all bullets values

* Accurate M249s' barrel length

* Little add and fix for Atragmx "GunList" (#1)

- add 12.7x99 API
 - fix .408 "Mass" according with the ballistics/CfgAmmo.hpp
 - fix .300WM MK248 Mod0 "Mass" according with the ballistics/CfgAmmo.hpp
 - Typo Mod0, Mod1 for a better reading on the Atrag's panel
 - fix .308 M80 "Mass" according with the ballistics/CfgAmmo.hpp
 - add .308 Mk316
 2016-09-03 22:00:15 +02:00
PabstMirror
2b29dcadc3 Merge pull request #4310 from acemod/voiperr-flashlight_housekeeping 
Map + Flashlights Cleanup (merge conflicts + fixes)
 2016-09-02 18:57:48 -05:00
jonpas
0e1f2828a9 Rename Advanced Throwing component to be in-line with other advanced_ components (#4318) 
* Rename Advanced Throwing component to be in-line with other advanced_ components

* Rename wiki page as well

* Add redirect from old wiki page
 2016-09-03 01:39:34 +02:00
PabstMirror
12de3265b8 Fix INFO Macro not in CBA 3.0 (#4320) 2016-09-02 12:50:23 -05:00
jonpas
d3ee125d5e Fix Advanced Throwing IR Chemlight and in-hand pick up (#4313) 
* Fix IR Chemlights pick up

* Fix attached throwable pick up interaction condition

* Fix in hand pick up locality
 2016-09-02 14:57:20 +02:00
PabstMirror
c4d2383005 Increase blood bag flow rate for basic medical (#4306) 
* Change blood bags

- Increase flow rate for basic medical
- Don't queue bags

* change to ivBags, reset var on init / fullHeal
 2016-09-01 12:46:08 +02:00
jonpas
eb007973c1 Merge pull request #4315 from acemod/fixChemlightShieldDescriptions 
Fix Chemlight Shield Green and Red descriptions
 2016-09-01 01:20:04 +02:00
jonpas
cbdabfb78d Fix Chemlight Shield Green and Red descriptions 2016-08-31 23:14:12 +02:00
PabstMirror
62bb1db705 Fix chemlight supplyCreate UBC (#4314) 2016-08-31 16:10:40 -05:00
PabstMirror
41d758567e Chemlights cleanup (#4304) 2016-08-31 22:12:40 +02:00
Glowbal
df66b0876f Minor private variable fixes (#4300) 2016-08-27 17:35:45 +02:00
PabstMirror
d448ea8916 Improve interaction position for air units. (#4285) 
Fix #4233
 2016-08-27 10:37:58 +02:00
[OMCB]kaban
64cf8aa95a Russain Translations Update (#4286) 2016-08-27 10:36:00 +02:00
PabstMirror
df7aa38a7a Allow inheritance for addActionToClass (#4272) 
* Allow inheritance for addActionToClass

* Update Headers

* Use inline code for inheritance example
 2016-08-27 10:35:21 +02:00
Glowbal
1366a6f15f Merge pull request #4289 from acemod/earlyAddPlayerEventHandler 
Fix null ace_player from early call to addPlayerEH
 2016-08-27 10:32:12 +02:00
Grey-Soldierman
dae3d8d682 Definable classname for Spare Barrel (#4121) 
* Added definable barrel classname through weapon config

* Improved condition for player carrying spare barrel
 2016-08-27 10:21:15 +02:00
voiperr
fedad7f8f7 Ace_Chemlights (Chemlight Enhancements) (#3921) 
* Add ace_chemlights.
Make chemlight intensity and dropoff more realistic.
Add orange, white, IR chemlights.
Add chemlight shields.
Make chemlight impact sounds more realistic.

* Moved impact sound changes to a different branch.

* Used QPATHTOF. Fixed scopes. Used initServer. Reduced lifetime duration.
Checked privates.

* Stringtable: 5 minute.

* Blue lifetime. Removed ref to deprecated function

* Use proper magazine macro. Add new chemlights to Misc box.
 2016-08-27 10:19:39 +02:00
commy2
9ef24d25ba paradrop crates from helicopter or plane cargo (#2468) 2016-08-27 10:14:54 +02:00
PabstMirror
c9f9b89ea2 Fix merge (was moved to XEH_postInitServer) 
Use short circuit for loadout change and add note
 2016-08-25 18:56:57 -05:00
PabstMirror
fd6bd7f794 Merge branch 'flashlight_housekeeping' of https://github.com/voiperr/ACE3 into voiperr-flashlight_housekeeping 2016-08-25 15:50:11 -05:00
Joko
927d8ead8f add Hiddenselection camo to bodybag for Retexturing (#4276) 
* add Hiddenselection camo to bodybag

* Add default texture

* Use macro
 2016-08-24 12:42:32 -05:00
PabstMirror
3f343086dc ad fix for noradio 2016-08-23 22:43:37 -05:00
PabstMirror
18153b0451 Fix null ace_player from early call to addPlayerEH 2016-08-23 22:24:59 -05:00
PabstMirror
5a83659136 Don't cookoff when commander turret is hit (#4280) 2016-08-23 09:57:54 +02:00
jonpas
f8dfa4f933 Add Advanced Throwing (#3477) 
* Add Advanced Throwing

* Add feature documentation
 2016-08-22 15:09:08 +02:00
commy2
cda100c9e7 Remove superfluous requiredAddons in hearing 2016-08-20 21:10:37 +02:00
Glowbal
d911dab5a7 Merge pull request #4191 from acemod/fix-4181 
add explosive devices to missing units, close #4181
 2016-08-20 12:25:56 +02:00
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
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
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
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
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
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
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
005f17131a Add Squad Radar UI setting 2016-07-05 23:06:44 +02: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
Glowbal
1922cac79e fix spelling of arguments 2016-07-03 23:22:31 +02: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
82f63b5935 Update showHud func for 1.62 (squad radar) 2016-07-03 12:17:42 -05:00
PabstMirror
bbc708e3e0 Less aggressive overlap detection 
Ensure the 2d screen pos distance is significant.
 2016-07-02 22:46:36 -05: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
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
Glowbal
1d66d46501 Fix damaged array not being overwritten. 
This fixes an issue were injured body parts were displayed as blue instead of red. Happens when using advanced medical with AI running in basic mode.
 2016-06-27 19:55:00 +02:00
Glowbal
419b525458 Fix incorrect macro syntax 
Syntax caused pboProject to choke
 2016-06-27 19:30:39 +02:00
Glowbal
a9f3c2f784 Merge pull request #4012 from acemod/fix-medical-config-typo 
Fix incorrect values for bandage configuration
 2016-06-27 19:07:34 +02:00
Glowbal
d7965233d9 Merge pull request #4010 from acemod/rearmHandleNil 
rearm - Skip selectWeapon on nil
 2016-06-27 19:05:37 +02:00
Glowbal
8809881a9e Merge branch 'release' into fixRearmEvents 2016-06-27 19:04:32 +02:00
Glowbal
0844e311a5 Merge pull request #4008 from acemod/cleanupWaitAndExec 
Switch EFUNC(common,waitAndExecute) to CBA
 2016-06-27 19:03:24 +02:00
Glowbal
c287223a08 Fix incorrect values for bandage configuration 2016-06-27 19:01:33 +02:00
PabstMirror
8bd3332b0e rearm - Skip selectWeapon on nil 
Should fix #4006
 2016-06-27 00:00:25 -05:00
PabstMirror
8ecd8a49cc Fix rearm events 2016-06-26 23:37:23 -05:00
PabstMirror
10a19b59e7 Swich EFUNC(common,waitAndExecute) to CBA 2016-06-26 22:18:53 -05:00
esteldunedain
d6d6ed7674 Make it work properly and support ceilings 2016-06-26 20:17:51 -03:00
esteldunedain
18fd198d1e If the surface is not horizontal create _v2 pointing upward instead of away 2016-06-26 20:02:14 -03:00
Glowbal
21c4efcbba Merge pull request #4004 from acemod/custom-rank-icons-function 
add function for custom rank icons displayed below nametags
 2016-06-26 10:57:49 +02:00
Glowbal
2a46099063 Merge pull request #4003 from acemod/disable-auto-weather 
Disable auto weather
 2016-06-26 10:51:38 +02:00
Glowbal
badb3fa943 Merge branch 'release' into fingerCleanup 2016-06-26 10:49:54 +02:00
Glowbal
b84b532cfb Merge pull request #4001 from acemod/renameEvents 
Rename events
 2016-06-26 10:47:39 +02:00
Glowbal
52f8def590 Merge pull request #3991 from acemod/uavFCS 
Block FCS when controlling a UAV
 2016-06-26 10:47:19 +02:00
PabstMirror
0ff0185359 Fix ballisitics and huntir configs 2016-06-25 21:57:42 -05:00
PabstMirror
ed0823e40f Fix UBC for 1.62 Apex 2016-06-25 21:07:30 -05:00
PabstMirror
5108ffe20c Add goggles setting for level of effects 
Can chose between none, tint/colorCC/ and full dust/dirt/rain/rotorwash
 2016-06-25 19:16:26 -05:00
PabstMirror
5a92aaeb28 Make dirt/dust effects less bright at night 
Fix #1447
 2016-06-25 19:02:07 -05:00
commy2
4a19f9b1af update russian rank icons 2016-06-26 01:01:03 +02:00
commy2
4e0fb4d171 give the iranians their ranks back 2016-06-26 00:35:56 +02:00
commy2
9eba2fe940 add russian rank icons 2016-06-26 00:02:19 +02:00
commy2
1db1c41072 only disable auto-weather settings by default, but keep them toggleable 2016-06-25 21:46:24 +02:00
commy2
e88ecfc236 add function for custom rank icons displayed below nametags 2016-06-25 21:25:03 +02:00
esteldunedain
0160ee81a6 - ACE_Finger cleanup 
- Allow pointing to nearby positions
 2016-06-25 16:02:06 -03:00
commy2
3690519a7c disable auto weather - bugging out ACE weather 2016-06-25 20:39:06 +02:00
Glowbal
f171ef8e16 Merge branch 'release' into fixLoadoutWhenNull 2016-06-25 12:25:23 +02:00
Glowbal
af61c2bc50 Remove unused parameter 
Gear is no longer used and can be removed from fthe function parameters
 2016-06-25 12:23:07 +02:00
Glowbal
5fef1ba384 Change use backpack command for backpack classname 
Uses the backpack command to retrieve the classname of a unit's backpack instead of a select. Fixes incorrect index.
 2016-06-25 12:03:44 +02:00
Glowbal
8f3907c03f Merge branch 'release' 2016-06-25 11:43:49 +02:00
Glowbal
6e6929be4d Merge pull request #3985 from acemod/fixLeadIndicatorForBluAA 
Fix lead indicator for B_APC_Tracked_01_AA_F
 2016-06-25 11:40:51 +02:00
Glowbal
fc876ce316 Merge pull request #3986 from acemod/fixSekerLos 
missleGuidance - Fix seeker los check
 2016-06-25 11:40:15 +02:00
PabstMirror
a18e46c1c9 missleGuidance - Fix seeker los check 
Close #3374
Because func was undefined _losOkay was nil, so target leading was
always skipped.
 2016-06-25 01:27:23 -05:00
J3aLeiNe
75396ce63e Update fnc_getMapData.sqf 
No Gitexit for Lingor. Stay with us Lingor ! :p
 2016-06-25 08:21:21 +02:00
PabstMirror
5589ef2bb8 Fix Target lead indication for B_APC_Tracked_01_AA_F 2016-06-25 00:13:07 -05:00
PabstMirror
c3710cc7f9 Handle "loadout" changed event when player is null 2016-06-24 23:32:32 -05:00
PabstMirror
618d3a2e96 Block FCS when controlling a UAV 
Fix doing FCS keyUp calculations/setVariable
when controlling a UAV while also in a turret with FCS enabled.

Normal rangefinder on the UAV will still work as FUNC(canUseRangefinder)
is still true
 2016-06-24 16:53:13 -05:00
Glowbal
7f7671d5ca Update required arma3 version 2016-06-24 20:58:45 +02:00
Glowbal
37c4351340 Increase required CBA version 2016-06-24 20:56:57 +02:00
J3aLeiNe
8e7282a46a Add OFP maps by CWR2 team 
- Add OFP maps by CWR2 team included in the last CUP terrains update
 - Fix latitude according to the Bohemia Wiki
 2016-06-24 19:47:44 +02:00
esteldunedain
28c41e0518 Rename cargo events: 
- ace_cargoAddedByClass -> ace_cargoAdded
- ace_addCargoByClass -> ace_addCargo
 2016-06-24 12:12:19 -03:00
esteldunedain
6f65155060 Rename the explosive orientations events again: 
- ace_explosives_clientRequestOrientations -> ace_explosives_sendOrientations
- ace_explosives_serverSendOrientations -> ace_explosives_orientationsSent
 2016-06-24 12:02:10 -03:00
esteldunedain
18f09b9310 Rename events: 
- ace_addedHeartRateAdjustment -> ace_heartRateAdjustmentAdded
- ace_cargoAddedByClass -> ace_cargoByClassAdded
- ace_enteredCardiacArrest -> ace_cardiacArrestEntered
- ace_itemAddedToTriageCard -> ace_triageCardItemAdded
- ace_reload_linkedAmmo ->  ace_reload_ammoLinked
- ace_reload_returnedAmmo -> ace_reload_ammoReturned
- ace_treatmentSuccess ->  ace_treatmentSucceded
- ace_common_engineOn -> ace_common_setEngine
- ace_explosives_clientRequestOrientations -> ace_explosives_requestOrientations
- ace_explosives_serverSendOrientations -> ace_explosives_sendOrientations
- ace_interaction_lampTurnOff -> ace_interaction_setLampOff
- ace_interaction_lampTurnOn -> ace_interaction_setLampOn
- ace_overheating_spareBarrelsLoadCoolest -> ace_overheating_loadCoolestSpareBarrel
- ace_overheating_spareBarrelsSendTemperatureHint -> ace_overheating_sendSpareBarrelTemperatureHint
Close #3533
 2016-06-24 10:45:13 -03:00
Nicolás Badano
6801954e1f Merge pull request #3969 from acemod/dogtag-bodybag 
Add dogtag actions to body bags
 2016-06-22 21:35:00 -03:00
J3aLeiNe
6a92b43b1d Update fnc_getMapData.sqf 
Add maps and fix latitude :
 - Kidal, latitude 18° (default latitude 0°)
 - Governor´s Island, latitude 41° (default latitude -34°)
 - Doung island (Unsung Mod), latitude 10° (default latitude -10°)
 - Dakrong (Unsung Mod), latitude 16° (default latitude -16°)
 - Pecher map, latitude 43° (default latitude -34°)

Remove obsolete Arma2 Lingor map

and fix my illiterate mistakes ...
 2016-06-22 16:36:53 +02:00
commy2
08886f413c change remaining ace events to CBA 'addPlayerEventHandler' 2016-06-22 11:16:55 +02:00
commy2
047ac8c3f2 Merge pull request #3973 from acemod/eventWrappers 
Convert state checking to CBA playerEH
 2016-06-22 10:53:47 +02:00
commy2
bd41260fa8 add a missing 'private' 2016-06-22 10:46:04 +02:00
PabstMirror
fad44e38a6 Convert state checking to CBA playerEH 2016-06-21 19:31:25 -05:00
commy2
89ecc81111 convert common events to CBA playerEvents 2016-06-22 01:39:20 +02:00
SilentSpike
6d8121b544 Improve unit name SSN generation 
Names shorter than the required 9 characters are now reused until we have 9 characters - making for fully unique generation.

To keep things distributed as pleasantly as possible they're itterated over with a step of two - alternating between odd and even indexes every full loop.

Similarly, the slice of string used for names longer than 9 characters is now offset based on the length of the name.
 2016-06-21 20:35:23 +01:00
SilentSpike
ebcf1687a7 Generate SSN of unit from their name 
Similar to how we're handling blood types, uses the unit's name to generate a valid three/two/four format SSN.

For names less than 9 characters long this will currently generate a unique SSN only up to the length of the name and append valid digits as necessary.
 2016-06-21 18:42:15 +01:00
PabstMirror
af6aaf6e7d fix mine ubc 2016-06-21 12:24:31 -05:00
PabstMirror
3972504d4a Add dogtag actions to body bags 2016-06-21 12:13:32 -05:00
Glowbal
284231fe21 3.6.0 2016-06-21 18:07:27 +02:00
Glowbal
e357ca3ca8 Merge pull request #3963 from acemod/fix_ace_requiring_patched_stock_classes 
fix some rogue mission dependencies
 2016-06-21 17:59:25 +02:00
Glowbal
ee58df9c34 bump minor version 2016-06-21 17:57:50 +02:00
esteldunedain
7f39748ff0 Tidy up text position to properly acommodate two line names 2016-06-20 17:42:21 -03:00
esteldunedain
7e3e101508 Nah, they don't 2016-06-20 17:37:37 -03:00
esteldunedain
171e6b278c Merge branch 'dogtags_blood_type' of github.com:KoffeinFlummi/ACE3 into dogtags 
# Conflicts:
#	addons/dogtags/functions/fnc_getDogtagData.sqf
 2016-06-20 17:19:35 -03:00
Nicolás Badano
09fd2c4895 Merge pull request #3965 from acemod/fixDogtagRespawn 
Fix issue with dogtag respawn/setVariable
 2016-06-20 17:17:02 -03:00
PabstMirror
578477eae6 Fix issue with dogtag respawn/setVariable 
Store object instead of bool to indicate when dogtags have been taken
When object respawns, the the old object reference won't apply (defacto
reset)
 2016-06-20 15:12:23 -05:00
esteldunedain
c47898a624 Parse the first portion of the uid 2016-06-20 17:04:30 -03:00
commy2
c88313221f add function to report a blood type which is fixed to the units name 2016-06-20 21:50:00 +02:00
esteldunedain
88cf6aad98 Attempt on making blood type and service number unique for players 2016-06-20 16:45:34 -03:00
esteldunedain
6df82aad55 I can't believe it happened to me. 2016-06-20 16:12:40 -03:00
commy2
bf098ec70e fix some rogue mission dependencies, fix #3954 2016-06-20 21:07:10 +02:00
PabstMirror
fe5dd3fe76 Cleanup some undefined functions and strings 2016-06-20 13:58:37 -05:00
esteldunedain
0d30bf1de8 - Add random service number and bloodtypes to all units. 
- Leave up to CBA to decide if events should be local or remote
- Imp
 2016-06-20 15:51:36 -03:00
esteldunedain
e58d829927 Restyle the dog tag text. 2016-06-20 14:54:16 -03:00
commy2
3fdc0dd521 Merge pull request #3955 from acemod/add_name 
add 'name' to components
 2016-06-20 19:25:58 +02:00
esteldunedain
1f74bfca17 Merge branch 'dogtags' of https://github.com/SzwedzikPL/ACE3 into SzwedzikPL-dogtags 2016-06-20 12:46:49 -03:00
Glowbal
38df85bccc Merge pull request #3958 from acemod/fix3950 
Fix freeing prisoners after they've switched locality
 2016-06-20 17:21:11 +02:00
commy2
750efbfdd8 fix spelling "Name Tags" 2016-06-20 12:34:30 +02:00
commy2
2249ef5e1c fix spelling "Laser Pointer" 2016-06-20 12:34:03 +02:00
commy2
ae5fe8af3c fix spelling "Wire Cutter" 2016-06-20 12:33:10 +02:00
BaerMitUmlaut
88b58216ee Added beautified component names 2016-06-20 11:44:36 +02:00
Glowbal
e540134de1 Change component name to ACE3 2016-06-20 09:57:27 +02:00
Glowbal
afb9eb3084 Merge pull request #3342 from acemod/vehicleInteractionDistance 
Uniformize interaction distance for vehicle based on bounding box
 2016-06-20 09:55:55 +02:00
Glowbal
8549d4402e Merge pull request #3919 from acemod/fixSpottingScopePlacement 
Fix the placement of spotting scopes on slopes
 2016-06-20 09:54:24 +02:00
Glowbal
dac7e54165 Merge pull request #3957 from acemod/fixComancheGuidance 
Fix Comanche's weapon lock and guidance
 2016-06-20 09:53:33 +02:00
esteldunedain
dc1c312288 Also handle the surrendering AnimChanged EH 2016-06-19 20:15:51 -03:00
esteldunedain
ac144ca248 Move the AnimChanged EH to its own function to avoid duplication 2016-06-19 19:30:36 -03:00
esteldunedain
8042b888d4 Close #3950 2016-06-19 19:17:49 -03:00
BaerMitUmlaut
f0e4e5d2e8 Tweaked particles, added macros, tweaked burn times 2016-06-19 23:48:23 +02:00
BaerMitUmlaut
58c061553c Added readme and author 2016-06-19 23:46:41 +02:00
esteldunedain
394832ef40 Completely restore the Comanche's DAGRs to vanilla. Close #3671 2016-06-19 18:26:09 -03:00
Nicolás Badano
618d14555a Merge pull request #3952 from alganthe/french_translation_update 
French translation update
 2016-06-19 10:18:47 -03:00
Josuan Albin
a04dec0c63 Update french translation 2016-06-19 15:16:43 +02:00
Josuan Albin
19da369887 Add back missing portuguese strings in inventory 2016-06-19 13:27:26 +02:00
commy2
c481ddedaf add 'name' to components 2016-06-19 09:38:39 +02:00
Josuan Albin
d26f133733 Add missing french entries in stringtables and update older ones 
Take changes from #3480 and completed empty entries
 2016-06-19 01:18:12 +02:00
esteldunedain
cc9e5f4631 Add icons for mine detector actions. Close #3935 2016-06-18 20:05:14 -03:00
commy2
ddbdf116ab Merge pull request #3949 from acemod/remove_unused_files 
remove unused files
 2016-06-18 20:17:42 +02:00
commy2
2d38ae62d2 remove another unused file 2016-06-18 20:12:17 +02:00
jonpas
ffd207dcf7 Merge pull request #3947 from acemod/fixCarrySitting 
Fix ability to carry a chair someone is sitting on
 2016-06-18 19:55:03 +02:00
commy2
9b6441b3c1 remove unused files 2016-06-18 19:54:39 +02:00
jonpas
2b56d0c0dd Use claim system - fix possibility to carry while someone is sitting 2016-06-18 19:53:44 +02:00
SilentSpike
ca01f31b52 Improve zeus auto-add XEH behaviour 
The XEH InitPost event only needs to be added if the `GVAR(autoAddObjects)` setting is enabled. This change will save on overhead when the setting is disabled and also removes some complexity from the function that runs in response to the event.
 2016-06-18 15:41:13 +01:00