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

8392 Commits

Author SHA1 Message Date
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
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
PabstMirror
af6aaf6e7d fix mine ubc 2016-06-21 12:24:31 -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
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
commy2
3fdc0dd521 Merge pull request #3955 from acemod/add_name 
add 'name' to components
 2016-06-20 19:25:58 +02: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
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
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
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
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
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
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
jonpas
6644a89fbf More isModLoaded 2016-06-13 15:58:42 +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
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
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
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