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
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
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
Josuan Albin
7c9dcf6bdb Merge branch 'pr/3480' 
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/cargo/stringtable.xml
	addons/flashlights/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/main/stringtable.xml
	addons/map/stringtable.xml
 2016-06-18 16:26:46 +02:00
Glowbal
74da8cc36c Fix strange animation played when using PAK 
Fixes #1695
 2016-06-18 13:12:49 +02:00
Glowbal
f6b744e741 Merge pull request #3945 from acemod/fix-gray-screen-medical 
Fix no gray screen for advanced medical
 2016-06-18 11:59:14 +02:00
Glowbal
12a1f10a29 Merge pull request #3944 from acemod/funcHeaders 
Cleanup Function Headers Titles
 2016-06-18 11:57:43 +02:00
Glowbal
7dc76dee78 Fix no gray screen for advanced medical 
Advanced medical was never displaying the gray screen on low blood volume. This is because for advanced medical, the blood volume minimum level is around 40 before death. For basic medical, this is 0.
 2016-06-18 11:55:03 +02:00
jonpas
03e923aa68 Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
Githawk
0723df7dea Replace execRemoteFnc with CBA events in rearm 2016-06-18 11:44:36 +02:00
jonpas
ed15d99915 Fix basic UI being overwritten on RscDiary unload (#3920) 
* Display disabled message when basic config set by mission showHud

* Set showHud on RscDiary unload - fix #3907, Remove redundant force parameter from basic setElements

* Log forced source to RPT

* Add source to scripted element setter
 2016-06-18 11:32:56 +02:00
Glowbal
5d9def3874 Merge pull request #3927 from acemod/use-proper-undefs 
Fix for MikeRo Tools strict requirement for #undef usage
 2016-06-18 11:25:25 +02:00
voiper
d5b3b03c1c Make flashlight on/off + glow a PVAR. 
Clean up all privates.
Change glow proxies to not inherit from chemlight_base, to avoid ammo detection issues.
Make handleDisconnect glow deletion dedi server compatible (was only listen server compatible).
Clean up determineMapLight: faster when no chemlights nearby, a tad slower when chemlights nearby, however sources the colour settings directly from the chemlight's config.
 2016-06-17 17:18:06 -07:00
Glowbal
4c2c647842 Fix change in behaviour of QFUNC 
When using QFUNC, the intend most often is to have the name of the variable referencing the function as a string. This behaviour works when compiling without debug enabled. However if debug is enabled, QFUNC compiles in with the debug wrapper, becoming a code string instead of a string representation of a variable reference.

A good example where this change of behaviour can be a problem is config attributes that refer to a call back (used a lot within ACE). In normal build, you will use a getvar to get the relevant code, as it is expected to point to the function. When using debug, you will need to do a compile instead, as it's a string representing a code block.
 2016-06-17 21:44:04 +02:00
BaerMitUmlaut
deb9e0d75c Added custom smoke particles 2016-06-17 17:33:50 +02:00
Glowbal
a63f496bf6 Merge pull request #3936 from acemod/fixMineDetector 
fix mine detector not picking up fused explosives
 2016-06-17 09:17:49 +02:00
voiper
f28f90b624 Use isEqualTo. 2016-06-16 12:21:40 -07:00
bux578
04c9b628c4 exit the loop properly 2016-06-16 17:36:37 +02:00
bux578
2d029401f5 fix capitalization 2016-06-16 17:33:21 +02:00
bux578
5f52101b26 fix mine detector not picking up fused explosives 2016-06-16 17:20:15 +02:00
Glowbal
eedb406ae5 Merge pull request #3930 from acemod/wireCuttersLOS 
Fix Line Of Sight check for wire cutter helper
 2016-06-16 15:03:05 +02:00
Glowbal
fc241479fe Merge pull request #3924 from voiperr/remove_attached_chemlights 
On Detach, Delete Used Chemlights
 2016-06-16 15:02:29 +02:00
Glowbal
66450ad36a Merge pull request #3755 from acemod/add-mine-detector 
Add mine detector port from ACE2
 2016-06-16 14:59:35 +02:00
Glowbal
05aac2d223 Add store new helper object 
Fixes an issue were you end up with many helper objects that are not cleaned up
 2016-06-16 14:57:26 +02:00
voiper
3070b2ac6e Sounds are sourced from configs. 
Used impactGroundSoft[] as shortcut.
 2016-06-15 18:16:28 -07:00
voiper
d4dfaeaf85 Capital L. 2016-06-15 16:31:05 -07:00
voiper
a20629066a Further cleanup. Checked some privates. 2016-06-15 16:27:46 -07:00
voiper
2158d39e8a Used QPATHTOF. Reverted config names. 
Optimised fnc_getUnitFlashlights.
 2016-06-15 14:58:07 -07:00
PabstMirror
81c8ea54c3 getVehPos - Tweak heli width, and put at eye level 2016-06-14 23:30:58 -05:00
PabstMirror
cfc046ce71 Fix Merge 2016-06-14 19:37:22 -05:00
PabstMirror
d46c596cc4 Merge remote-tracking branch 'refs/remotes/origin/master' into vehicleInteractionDistance 2016-06-14 19:36:45 -05:00
PabstMirror
2bcc82cea7 Fix Line Of Sight check for wire cutter helper 
Fix #2976
 2016-06-14 19:32:30 -05:00
ViperMaul
99d08d988a Merge branch 'master' of https://github.com/acemod/ACE3 into use-proper-undefs 2016-06-14 08:27:47 -07:00
ViperMaul
d5750a6c40 Remove Tab 2016-06-14 08:12:29 -07:00
ViperMaul
b79a00d8d1 These 2 can be removed, since they are in CBA since 2.4.0 as Note from jonpas 2016-06-14 08:11:28 -07:00
voiper
01c335d13a More cleanup + a bug fix. 2016-06-13 19:23:14 -07:00
voiper
69c3dd5cfb Remove extra bracket. 2016-06-13 18:42:45 -07:00
voiper
c0e412211e More realistic chemlight impact sounds. 2016-06-13 18:07:46 -07:00
voiper
b69aa8571e Chemlights no longer re-add to inventory on remove. 
Items are detached prior to being deleted, to avoid objNull attaches.
 2016-06-13 18:06:05 -07:00
esteldunedain
a12d9dc2fb Attempt aof fixing the placement of spotting scopes on slopes 2016-06-13 16:51:28 -03:00
commy2
11dc3bd71a Merge pull request #3911 from acemod/gunbagCleanup 
Gunbag cleanup
 2016-06-13 20:39:46 +02:00
PabstMirror
a6766b611f Always add finger keybind so it is changeable (#3914) 2016-06-13 12:14:35 -05:00
ViperMaul
2242f7c622 Fix for MikeRo Tools strict requirement for #undef usage 2016-06-13 09:20:09 -07:00
Glowbal
a8831a0d16 Change split medical in two components 
- medical component is responsible for the injuries and common functionality
- medical_treatment component is responsible for offering treatment functionality
 2016-06-13 17:00:56 +02:00
jonpas
6644a89fbf More isModLoaded 2016-06-13 15:58:42 +02:00
Glowbal
295ad3b037 Merge branch 'medical-impr' into merge-basic-and-advanced 2016-06-13 14:32:15 +02:00
Glowbal
38cdd523f0 Clean up medical function private declares 2016-06-13 14:27:43 +02:00
Glowbal
fd108478fe Clean up medical menu privates 2016-06-13 12:49:35 +02:00
Glowbal
58f43f8a51 Remove unneeded and deprecated functions from medical 2016-06-13 12:24:28 +02:00
Glowbal
d568041838 Change medical menu to work with basic medical injury overhaul 2016-06-13 12:19:19 +02:00
Glowbal
6657bde921 Change basic medical to use advanced medical injury system 2016-06-13 12:18:56 +02:00
Glowbal
792dbcd009 Change clean up privates in handleDamage code 2016-06-13 11:05:21 +02:00
Glowbal
8e59993d7a Change clean up medical code 2016-06-13 10:55:19 +02:00
Glowbal
73bd684b65 Change formatting and private keywords in medical 2016-06-13 02:34:56 +02:00
Glowbal
3ba2396db7 Change minor clean up of handleUnitVitals 2016-06-13 02:11:21 +02:00
voiper
1ffd9d58ab Revert postInit. 2016-06-12 15:39:16 -07:00
voiper
5a29c4b04c Fix up weapon names. 2016-06-12 15:33:37 -07:00
voiper
f3fc99f3b8 Housekeeping of ace_flashlights and ace_map. 
ace_map now handles flashlights independently of ace_flashlights.
ace_map searches for flashlight beam textures directly from weapon configs.
ace_map has acc_flashlight config (so vanilla ace_map will have at least one flashlight to use).
 2016-06-12 15:31:11 -07:00
jonpas
b80b7e5265 Shorten more GVARs 2016-06-13 00:08:28 +02:00
jonpas
323555d9a4 Prefix model, Fix indentation of model.cfg, Remove redundant CLASSNAME macro 2016-06-13 00:03:33 +02:00
jonpas
b40915dd12 Cealnup quotes, capitalization, function headers 2016-06-12 23:56:00 +02:00
voiper
b45a17001c Merge remote-tracking branch 'origin/master' into grenadesounds 2016-06-12 14:54:14 -07:00
Glowbal
f0b0b49f3c Merge pull request #3908 from acemod/funBag 
Only do gunbag things when target has a gunbag
 2016-06-12 23:25:55 +02:00
Glowbal
43a2b0ea29 Merge pull request #3909 from acemod/fix-bandaging-configuration 
Adjust bandage configuration
 2016-06-12 23:25:16 +02:00
PabstMirror
1997cb5199 Add maxDam for medium velocity wounds 
Ensures that velocity wounds from a major hit will use the "Large" type
of wound
 2016-06-12 14:47:59 -05:00
Glowbal
fa1282406f Change bandage configurations 
- Field dressing is average treatment
- Packing bandage is average treatment, higher reopen change, longer reopening delay
- Elastic bandage is higher treatment, higher reopen change, shorter reopen delay
- QuikClot is lower treatment, lower reopen change, longer reopening delay
 2016-06-12 20:40:45 +02:00
PabstMirror
e8a403a9ad Only do gunbag things when target has a gunbag 2016-06-12 12:58:39 -05:00
VKing
d5f8d965f3 Change ace_time to cba_missionTime 2016-06-12 17:22:44 +02:00
VKing
6b62436cfb Delete unused animation files 2016-06-12 16:29:00 +02:00
VKing
fe18107077 Fix cfgPatches entries 2016-06-12 16:28:42 +02:00
commy2
3c6de5ad6f remove misc box from gunbag CfgPatches 2016-06-12 14:00:55 +02:00
commy2
000e4a68e6 gunbag improvements 2016-06-12 13:51:23 +02:00
VKing
7f3aacb4d6 Add mass to metal detectors 
Based on values from the manufacturer's pamphlet (vallon.de)
 2016-06-12 12:41:59 +02:00
commy2
7a0b9a1a16 Merge branch 'gunbag' of https://github.com/ir0n1e/ACE3 into ir0n1e-gunbag 2016-06-12 11:02:23 +02:00
commy2
7b49855e89 Merge pull request #3902 from acemod/tanoaWindDAta 
Tanoa Weather Data
 2016-06-12 10:26:56 +02:00
VKing
12130c8c3a Add description string 2016-06-12 10:19:06 +02:00
VKing
3c85398d87 Clean up the sound config 2016-06-12 10:17:02 +02:00
commy2
813b584acf Merge pull request #3900 from acemod/pipFlicker 
Optics - Create PIP camera only when needed
 2016-06-12 10:11:04 +02:00
PabstMirror
8aa5e53bdd movement - Handle objNull in virtualMass 2016-06-12 02:01:49 -05:00
PabstMirror
5e3d4866a6 Prepare camera when optic equipped 2016-06-12 01:53:03 -05:00
bux578
a2124a6b45 add tanoa wind dir data, add comments 2016-06-12 07:30:38 +02:00
bux578
68e2531af3 Merge remote-tracking branch 'origin/master' into tanoaWindDAta 2016-06-12 07:01:14 +02:00
PabstMirror
d14392c35c Optics - Create PIP camera only when needed 2016-06-11 23:08:55 -05:00
commy2
ec01ae0d0b Merge pull request #3897 from acemod/tanoaMapData 
Tanoa map data
 2016-06-11 23:03:22 +02:00
SilentSpike
931ccf8a46 Merge pull request #3796 from acemod/zeusModuleUiExample 
Add more zeus modules
 2016-06-11 21:41:55 +01:00
bux578
2a667a322d init WindData --- missing directions 2016-06-11 22:37:03 +02:00
SzwedzikPL
0e247bdb00 CBA events 2016-06-11 22:13:39 +02:00
SzwedzikPL
acdfa52a89 Merge branch 'acemod/master' into dogtags 2016-06-11 22:07:57 +02:00
bux578
950cdb1ee3 fix missing values 
was using an incomplete regex
 2016-06-11 22:05:44 +02:00
SilentSpike
242876fa83 Merge remote-tracking branch 'origin/master' into zeusModuleUiExample 2016-06-11 21:02:16 +01:00
PabstMirror
ddf9e0b5cc CBA Events 2016-06-11 14:57:04 -05:00
Glowbal
e8ba309765 Merge pull request #3887 from gpgpgpgp/patch-2 
add a line to get rid of 4 first aid kits in the invisible fast roping helper
 2016-06-11 21:53:34 +02:00
Glowbal
1632cb9105 Merge pull request #3878 from acemod/fastroping-sounds-fix 
Only play fastroping sounds for player
 2016-06-11 21:53:00 +02:00
PabstMirror
00e5cef145 Merge remote-tracking branch 'refs/remotes/origin/master' into add-mine-detector 2016-06-11 14:49:12 -05:00
commy2
250e27bfd2 Merge pull request #3864 from acemod/removeLineDrawing 
Remove line drawing
 2016-06-11 21:38:56 +02:00
Butt4cak3
151d13244b Improved misleading translation of german bandages (#3810) 
* Improved misleading translation of german bandages

* Further improved german bandage names
 2016-06-11 21:35:22 +02:00
PabstMirror
d57754a7cd Private/Formatting 2016-06-11 14:34:14 -05:00
PabstMirror
4f73ead80c Fix alt/lat for maps not defined in getMapData 2016-06-11 14:32:36 -05:00
bux578
c268572649 add Tanoa mapData 2016-06-11 21:14:05 +02:00
bux578
18d864e950 split mapData into separate function 2016-06-11 21:13:51 +02:00
Glowbal
7f9257716e Merge pull request #2331 from acemod/323bloodyoverlay 
remove BI blood overlay
 2016-06-11 20:49:54 +02:00
VKing
589ad4d2e7 Remove attachments from mine detectors 
When WeaponSlotsInfo was added, rifle attachments could be added to the mine detectors.
 2016-06-11 20:47:53 +02:00