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
8,693 Commits 73 Branches 88 Tags 752 MiB
051973a546
Commit Graph

7149 Commits

Author SHA1 Message Date
commy2
f33beb9865 update movement config comments 2016-02-05 21:31:08 +01:00
commy2
d89c93de22 setAllGear - abort function and print warning when used on remote units, 2016-02-05 21:14:20 +01:00
Nicolás Badano
027de27e33 Merge pull request #3268 from acemod/fix3140 
Document the locality requirements of fnc_setAllGear.
 2016-02-05 10:19:57 -03:00
esteldunedain
dbe7e294a5 Document the locality requirements of fnc_setAllGear. Close #3140 2016-02-05 10:18:36 -03:00
esteldunedain
b2d050afca Close #3188, Close #3260 2016-02-05 09:46:51 -03:00
Nicolás Badano
d26fc4614f Merge pull request #3266 from SzwedzikPL/overheatingStringtableFix 
Fix overheating stringtable
 2016-02-05 09:35:29 -03:00
Thomas Kooi
0850ab35e3 Merge pull request #3262 from acemod/nozzleFixes 
fix some issues with Fuel Nozzle
 2016-02-05 09:15:27 +01:00
Thomas Kooi
f47b51c0cb Merge pull request #3070 from dixon13/newCivInteraction 
Changes to civilian interaction
 2016-02-05 09:14:45 +01:00
dixon13
a0e6f97125 Updated condition for ACE_GetOut 2016-02-05 00:32:56 -07:00
SzwedzikPL
270b557084 fix overheating stringtable 2016-02-05 04:55:05 +01:00
Nicolás Badano
dadec15948 Merge pull request #2104 from acemod/trenches 
Trenches
 2016-02-04 23:43:06 -03:00
esteldunedain
b6581cf5ef Fix #3264 2016-02-04 21:00:40 -03:00
esteldunedain
2577992dfc Progress bar localization 2016-02-04 20:43:32 -03:00
esteldunedain
7da6e2a35f Reduce the placement distance 2016-02-04 18:47:30 -03:00
esteldunedain
8c187cbf07 Adjust big trench height 2016-02-04 18:47:17 -03:00
esteldunedain
4cd0028794 Add animation and progresive digging 2016-02-04 18:43:47 -03:00
esteldunedain
3d47156547 Rename some variables 2016-02-04 17:42:12 -03:00
esteldunedain
2d45a28863 Merge branch 'master' into trenches 2016-02-04 17:04:09 -03:00
jokoho48
dc3026366a remove unneeded files 
fix hard edge in model
add LOD
 2016-02-04 20:52:28 +01:00
Glowbal
8c0472bbeb Merge branch 'master' of github.com:acemod/ACE3 2016-02-04 20:35:15 +01:00
Glowbal
f1ce133d32 Merge branch 'release' 
Conflicts:
	addons/refuel/functions/fnc_connectNozzle.sqf
 2016-02-04 20:34:32 +01:00
Thomas Kooi
653f6567cc Fix french translation refresh marker interval 
As per @alganthe's comment on #3114
 2016-02-04 20:30:51 +01:00
Thomas Kooi
543d54d37e Merge pull request #3114 from Luigium/master 
Fixed and added French Translation
 2016-02-04 20:28:00 +01:00
Thomas Kooi
727cb38be6 Merge pull request #3218 from SzwedzikPL/fix3202 
Fix laser_selfdesignate does not measure the distance
 2016-02-04 20:17:06 +01:00
PabstMirror
54870f872a Disable Debug 2016-02-04 13:16:41 -06:00
Nicolás Badano
c967bd1ace Merge pull request #3259 from acemod/fix3denGoggles 
Fix ACE_goggle changing the tint on the 3den camera
 2016-02-04 16:08:02 -03:00
Nicolás Badano
cbafe05f76 Merge pull request #3082 from acemod/deterministicOverheatingX 
Deterministic overheating (updated)
 2016-02-04 16:03:30 -03:00
Thomas Kooi
dd3613c357 Merge pull request #3190 from acemod/fcs_enableGMG 
Add FCS to more things
 2016-02-04 20:03:19 +01:00
Thomas Kooi
893040b08a Merge pull request #3102 from buddytex/SandbagEditor 
Add Sandbag to editor
 2016-02-04 20:00:51 +01:00
Thomas Kooi
f26fb9e9da Merge pull request #3107 from jonpas/headless 
Add Dynamic AI Group Tranferring to Headless Clients
 2016-02-04 20:00:16 +01:00
Thomas Kooi
a3f80dbc30 Merge pull request #3230 from acemod/draggingStuff 
Fix dragging moving object to random location
 2016-02-04 19:58:56 +01:00
Thomas Kooi
ce27575de3 Merge pull request #3244 from acemod/fixScopesCapturingKeys 
Fix ace_scopes capturing native adjustment keys for the PSO scope.
 2016-02-04 19:58:21 +01:00
Thomas Kooi
508f6a16ae Merge pull request #3162 from acemod/Refuel_Fuelbladders 
Refuel - Add refuel actions to fuel bladder objects
 2016-02-04 19:57:50 +01:00
Thomas Kooi
8c9523e36b Merge pull request #3151 from acemod/explosives_cleanup_plus_minetriggers 
Various explosives enhancements
 2016-02-04 19:56:27 +01:00
Thomas Kooi
e0946c3fc5 Merge pull request #3106 from acemod/explEvents 
Explosive events, fix #3104
 2016-02-04 19:52:10 +01:00
PabstMirror
35333cbe9d Merge branch 'cargoCleanup' 2016-02-04 12:51:52 -06:00
Thomas Kooi
3e5908faf8 Merge pull request #3018 from jonpas/fixFuelHoseExceededAfterDisconnect 
Fix refuel PFH not exiting on nozzle disconnect
 2016-02-04 19:47:52 +01:00
Thomas Kooi
038befbce0 Merge pull request #3191 from acemod/cargoCleanup 
Cargo Cleanup, Add makeLoadable
 2016-02-04 19:44:27 +01:00
Thomas Kooi
324edbde6d Merge pull request #3192 from acemod/getTargetDistance_to_LIS 
Rewrite ace_common_fnc_getTargetDistance to use LineIntersectsSurfaces.
 2016-02-04 19:42:32 +01:00
Thomas Kooi
6cf02bd06b Merge pull request #3193 from acemod/fcs_rewriteRangeFunctions 
Cleaning up the FCS code
 2016-02-04 19:39:32 +01:00
Thomas Kooi
d68c79efb1 Merge pull request #3204 from acemod/m67_dns 
Fix Handgrenade DisplayNameShort
 2016-02-04 19:37:20 +01:00
Thomas Kooi
69746a133b Merge pull request #3254 from ProfessorCZ/master 
Czech Translation - Update
 2016-02-04 19:36:28 +01:00
Thomas Kooi
8034d91d76 Merge pull request #3249 from GitHawk/refuel_nozzle 
Added a real nozzle
 2016-02-04 19:32:17 +01:00
Thomas Kooi
d72c73dc25 Merge pull request #3257 from acemod/flashbangUnderwater 
Flashbangs - pass pos instead of obj reference
 2016-02-04 19:31:11 +01:00
Thomas Kooi
dc8e7e2994 Merge pull request #3255 from acemod/tourniquetMedications 
Tourniquets block medication until released
 2016-02-04 19:30:40 +01:00
PabstMirror
336184dfaa Change medication removal from array 2016-02-04 10:00:33 -06:00
esteldunedain
c87f19c8da Fix #3258 2016-02-04 10:04:26 -03:00
PabstMirror
2cf2cb0e59 Fix statusEffect error in refuel 2016-02-04 01:31:12 -06:00
PabstMirror
7fc84c60dd Flashbangs - pass pos instead of obj reference 
Fix #3205
 2016-02-03 17:53:24 -06:00
PabstMirror
3cc10a27ce Tourniquets block medication until released 
Close #2704
 2016-02-03 14:40:26 -06:00
ProfessorCZ
61611d0ec7 Czech Translation - Update 
Update
 2016-02-03 18:31:31 +01:00
PabstMirror
397a12056a Merge branch 'master' into deterministicOverheatingX 2016-02-02 17:11:00 -06:00
Githawk
cbeac7f154 params stuff 2016-02-02 15:47:05 +01:00
Githawk
4d403d21aa Fixes 
Moved models into data
fixed vehicle attach for certain angles
 2016-02-02 15:45:57 +01:00
Githawk
5e103ba398 Added nozzle 
Added code for nozzle object
Params and private update
 2016-02-02 15:03:06 +01:00
esteldunedain
f744e164d3 Fix #3238 even if ACE_ScopeAdjust_Vertical = 0 or ACE_ScopeAdjust_Horizontal = 0 2016-02-01 14:58:01 -03:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
PabstMirror
af6b084ba3 Don't allow carrying with injured legs 
Fix #2644
 2016-01-28 23:05:55 -06:00
PabstMirror
c0eccc67c3 Change all SCALAR to NUMBER in headers 2016-01-28 18:19:15 -06:00
PabstMirror
3f1d6ffeb7 Fix dragging sending objects to random location 
attachTo seems to have weird getpos results for a few frames.
also don't show mouse wheel option for carrying man
and always use 0 offset for dragging man
 2016-01-28 17:11:05 -06:00
PabstMirror
d9eafbdf0f Privates / Headers 2016-01-28 12:52:53 -06:00
PabstMirror
84e76efc7f Not needed on CfgMagazines 2016-01-27 15:54:45 -06:00
esteldunedain
2eb91cf2b4 Delete spare models 2016-01-27 18:23:04 -03:00
PabstMirror
7a7e0d689a Improve underwater cargo unloading 2016-01-27 14:56:25 -06:00
esteldunedain
d2d7e46401 Align trench to ground surface to avoid having to lower them too much on slopes 2016-01-27 17:54:40 -03:00
esteldunedain
b20a2f338b Replace trench models: bigger and opaque 2016-01-27 17:54:10 -03:00
PabstMirror
17a882fe4d Add findUnloadPosition integration 2016-01-26 18:01:01 -06:00
esteldunedain
f8a1215264 Align trenches to ground 2016-01-26 11:03:11 -03:00
esteldunedain
0358b10298 Bigger trenches 2016-01-26 11:02:55 -03:00
PabstMirror
b15716860d Remove VehicleLock Items from Virtual Arsenal 
Close #3215
 2016-01-25 14:29:27 -06:00
SzwedzikPL
03fca3c372 fix fcs keyup/down forced params #3202 2016-01-25 09:49:47 +01:00
PabstMirror
78729e96ff Fix bad forceWalk params 2016-01-24 11:39:59 -06:00
esteldunedain
0fd6981809 Don't allow placing is standig above the terrain level 2016-01-23 22:05:29 -03:00
esteldunedain
4970423cd7 Cancel placing if position is no longer suitable 2016-01-23 22:04:49 -03:00
esteldunedain
8ff8204905 Initial code implementation of ace_trenches 2016-01-23 20:45:59 -03:00
esteldunedain
1d886ac624 Merge branch 'master' into trenches 
Conflicts:
	AUTHORS.txt
 2016-01-23 17:39:54 -03:00
esteldunedain
758611d230 Restrict temp update to current weapon, and only primary or handgun 2016-01-23 11:48:23 -03:00
PabstMirror
3a62956e24 Fix wind display angle being reversed 2016-01-22 20:43:22 -06:00
PabstMirror
5df211c586 Merge pull request #3126 from acemod/weatherCleanup 
Weather cleanup, fix wind inversion, add non-color based wind speed indicator
 2016-01-22 14:56:21 -06:00
PabstMirror
73b29085e2 Merge pull request #3200 from acemod/moreCache 
Hearing - Cache Weapon/Ammo loudness
 2016-01-22 14:56:00 -06:00
PabstMirror
45138aea18 Merge pull request #3163 from acemod/unifiedStatusEffects 
Unified status effect handler
 2016-01-22 14:55:25 -06:00
VKing
9501c54530 Fix #3203 IEDs magically changing shape 2016-01-22 14:21:25 +01:00
VKing
68531bd4a9 Merge branch 'master' into explosives_cleanup_plus_minetriggers 2016-01-22 14:15:45 +01:00
VKing
1cf7fc727d Fix Handgrenade DisplayNameShort 2016-01-22 13:12:20 +01:00
PabstMirror
1a98726716 Add makeLoadable sync module 2016-01-21 22:12:54 -06:00
VKing
999d8ac2ce Use max 2016-01-22 00:01:13 +01:00
VKing
8482d45d8b Add FCS to gunner and commander RCWS types for MRAPs, APCs, and arty. 
Lower max range to 5500m (9990 is too damn high!)
 2016-01-21 16:00:55 +01:00
VKing
299baf1e4a Fix shotbullet checking (lost in merge) 2016-01-21 15:56:53 +01:00
VKing
fedfa94dcd Clean up 2016-01-21 15:01:41 +01:00
VKing
4406f270e2 Fix infantry rangefinders (again) 2016-01-21 14:44:23 +01:00
esteldunedain
91b7c7de61 Change the varname of the weapon data cache to be consistent with other modules 2016-01-20 22:22:53 -03:00
esteldunedain
41f8628917 Change cache location type to ACE_HashLocation 2016-01-20 22:20:16 -03:00
esteldunedain
f7cfbebc49 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into deterministicOverheatingX 2016-01-20 22:19:11 -03:00
VKing
bf5eb78788 Merge branch 'fcs_fixWeaponInitspeed' into fcs_rewriteRangeFunctions 
# Conflicts:
#	addons/fcs/functions/fnc_keyUp.sqf
 2016-01-21 02:14:51 +01:00
VKing
b83be88571 Enhance ranging. 
KeyDown will now apply a static range calculation. KeyUp calculates the target movement and reapplies the calculation as normal.
Sorry in advance for the merge conflicts
 2016-01-21 02:02:50 +01:00
VKing
7d3044a5c2 Move display update stuff to fnc_getRange 2016-01-21 00:20:21 +01:00
PabstMirror
be8afe507c Few more privates 2016-01-20 17:19:08 -06:00
PabstMirror
3dac426bc6 Merge pull request #3132 from acemod/interactionMenuCleanup 
Cleanup Interaction Menu
 2016-01-20 17:04:10 -06:00
PabstMirror
abb01e0653 Merge pull request #3129 from acemod/frag-cacheIfWillFrag 
Frag - only run addPfhRound on ammo that will frag (for master)
 2016-01-20 17:03:55 -06:00
VKing
43ab126c1f Add FCS to botes RCWS 2016-01-20 23:06:06 +01:00