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,845 Commits 73 Branches 88 Tags 752 MiB
5032619b9a
Commit Graph

10845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Glowbal
9874911ca1 Merge pull request #3982 from acemod/update-required-cba-version 
Increase required CBA version
 2016-06-25 11:39:48 +02:00
Glowbal
a76b00d699 Merge branch 'release' into update-required-cba-version 2016-06-25 11:38:30 +02:00
Glowbal
8ac7e94436 Merge pull request #3981 from acemod/updateCBAinTools 
Update cba in tools
 2016-06-25 11:38:13 +02:00
Glowbal
ec6f3879c0 Merge pull request #3978 from J3aLeiNe/patch-2 
Update compat_r3f config.cpp
 2016-06-25 11:37:50 +02:00
Glowbal
4cfbb22e90 Merge pull request #3979 from J3aLeiNe/patch-3 
Update compat_r3f CfgAmmo.hpp
 2016-06-25 11:37:31 +02:00
Glowbal
2f627f57a5 Merge pull request #3977 from J3aLeiNe/patch-1 
Update fnc_getMapData.sqf
 2016-06-25 11:37:17 +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
PabstMirror
d5c3334719 Update CBA included in tools 2016-06-24 12:16:12 -05: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
Glowbal
8d451354f8 Merge pull request #3975 from acemod/cba-add-player-eh 
convert common events to CBA playerEvents, target: release branch
 2016-06-22 17:44:54 +02:00
commy2
4368c6afc6 Merge branch 'release' into cba-add-player-eh 2016-06-22 17:37:50 +02:00
J3aLeiNe
7d74331328 Update CfgAmmo.hpp 
Fix correct "ACE_barrelLengths" for "R3F_127x99_Ball" and "R3F_127x99_PEI" according to the R3F_PGM_Hecate_II barrel length (700mm)
 2016-06-22 17:24:09 +02:00
J3aLeiNe
08aa518e68 Update config.cpp 
Add correct requiredAddons entries since the last @R3F_ARMES update
 2016-06-22 16:55:19 +02: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
Glowbal
cea77fb331 Merge pull request #3974 from acemod/master 
Move towards 3.6.0 release
 2016-06-22 09:51:15 +02:00
PabstMirror
fad44e38a6 Convert state checking to CBA playerEH 2016-06-21 19:31:25 -05:00
Nicolás Badano
3fa17580c4 Merge pull request #3971 from acemod/dogtags-player-ssn 
Generate SSN of unit from their name
 2016-06-21 20:46:57 -03: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
Glowbal
e298f5c71b Merge pull request #3970 from acemod/fixMineUBC 
fix mine ubc
 2016-06-21 19:40:04 +02: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
6abe937488 Update extensions 2016-06-21 18:17:24 +02:00
Glowbal
eef2bb060a Update readme version mentions 2016-06-21 18:09:15 +02: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
Glowbal
cd3d7c8e24 Merge pull request #3961 from acemod/undefinedCleanup 
Cleanup some undefined functions and strings
 2016-06-21 17:57:02 +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