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
9,698 Commits 73 Branches 88 Tags 752 MiB
207d6612da
Commit Graph

8010 Commits

Author SHA1 Message Date
jonpas
3389bc5e1b Add cargo to Taru pods 2016-04-28 04:44:57 +02:00
PabstMirror
d40735d5c2 Improve synced event error logging 2016-04-25 15:48:24 -05:00
commy2
5c3f5f5751 fix wrong macro names 2016-04-25 21:34:25 +02:00
PabstMirror
27c5598135 vehicle inventory lock - compatibility with acre 2016-04-24 11:26:13 -05:00
jonpas
b06659a2e4 Fix params error 2016-04-23 00:29:58 +02:00
jonpas
dbe4c6ae26 Merge branch 'master' into uiSettings 2016-04-23 00:17:16 +02:00
PabstMirror
efc956eb99 Merge pull request #3692 from acemod/unloadOnSlopes 
Better handle unloading on slopes
 2016-04-22 10:40:16 -05:00
PabstMirror
7366133629 Merge pull request #3699 from acemod/cWireFixes 
Concertina Wire - Don't recoil broken wire, fix killer
 2016-04-22 10:40:04 -05:00
PabstMirror
71ff7e9d8a Merge pull request #3682 from acemod/javelinCursorTargetFix 
Javelin - Verify player has LOS to cursorTarget
 2016-04-21 19:50:23 -05:00
PabstMirror
72aa0fffea Merge pull request #3713 from acemod/gesturesFixBIS 
Fix BIS gesture keybinds
 2016-04-21 19:48:26 -05:00
PabstMirror
d7e3f51ec2 Merge pull request #3705 from acemod/gforceSetting 
Gforces - Add ace_setting to only run in aircraft
 2016-04-21 19:47:29 -05:00
PabstMirror
9bd66bc40f Cleanup scopeCurator 2016-04-21 15:07:13 -05:00
PabstMirror
c432ce714e Make explosives helpers hidden in eden. 2016-04-21 13:56:32 -05:00
PabstMirror
097bba9b68 Spaces 2016-04-21 13:21:55 -05:00
PabstMirror
4214e31678 Fix BIS gesture keybinds 
- From #3635 - FUNC(playSignal) needs "BIgesture" prefix
- Interaction conditions are checked on parent, don't need on every
child
 2016-04-21 13:15:35 -05:00
Glowbal
392012bb4b Merge pull request #3702 from acemod/dayVector 
Add day (non night vision) version of the vector 21
 2016-04-20 18:01:59 +02:00
PabstMirror
c2126c3bd4 Simplify binocular check 2016-04-20 10:48:25 -05:00
PabstMirror
cf9479efab Non-hardcoded binocular / vector detection 2016-04-20 10:40:00 -05:00
PabstMirror
3adbb59f04 Geforce - Change default to aircraft only 2016-04-19 23:04:51 -05:00
PabstMirror
236ad912af Gforces - Add ace_setting to only run in aircraft 2016-04-19 12:59:41 -05:00
Glowbal
db5d1d42b7 Merge pull request #3703 from acemod/fix-redundant-privates 
Fixed redundant privates in setCardiacArrest
 2016-04-18 15:39:35 +02:00
BaerMitUmlaut
65ccf66d00 Fixed redundant privates in setCardiacArrest 2016-04-18 15:23:04 +02:00
PabstMirror
23632281cf Add day (non night vision) version of the vector 21 2016-04-17 23:22:41 -05:00
jonpas
0762e13816 Merge pull request #3655 from acemod/improveCargoXEH 
Improve cargo initialization XEH
 2016-04-17 11:29:09 +00:00
jonpas
10cadb535f Merge pull request #3631 from acemod/customTaggingTextureSupport 
Add support for custom textures in tagging
 2016-04-17 11:28:14 +00:00
PabstMirror
7bd2378c41 Concertina Wire - Don't recoil broken wire, fix killer 
Close #3695
- Don't recoil broken wire
- Use midpoint to search for nearby cars, and ensure the veh was moving.
 2016-04-16 12:54:33 -05:00
Glowbal
f8fb75247d Merge pull request #3693 from acemod/fixShipViewDistance 
Fix ship view distance using foot instead of vehicle setting
 2016-04-16 12:45:58 +02:00
PabstMirror
32cd23076f Merge pull request #3690 from acemod/engineRepairMsg 
Clarify repair while engine is running
 2016-04-15 15:56:52 -05:00
jonpas
d90fc3dd06 Fix variable name and header examples 2016-04-14 18:58:01 +02:00
PabstMirror
d523ef1fcd Try to use cursorObject first 2016-04-14 10:57:36 -05:00
jonpas
839d067797 Exclude base FRIES class 2016-04-14 17:38:11 +02:00
jonpas
300d069e78 Exclude FRIES from repair interactions 2016-04-14 13:59:31 +02:00
jonpas
04831267f2 Use lazy evaluation 2016-04-14 13:55:15 +02:00
jonpas
dec266a546 Fix ship view distance using foot instead of vehicle setting, Cleanup view distance component 2016-04-14 13:52:20 +02:00
PabstMirror
3360047204 Better handle unloading on slopes 
Close #3667
 2016-04-13 13:05:32 -05:00
PabstMirror
f16a65f381 Fix default 2016-04-12 20:05:56 -05:00
PabstMirror
4f6b11c2a6 Clarify repair while engine is running 
#3348
- Show action, but exit and show warning when selected
- Optional (default off) setting to auto shut off engine to keep
compatibility with missions
 2016-04-12 20:04:12 -05:00
PabstMirror
d7b0bde1ca Fix Wildcat attach point 2016-04-12 12:28:48 -05:00
PabstMirror
5d70db3d9b LoadPerson - Only try vehicles that have room 
Fix #2965
The FRIES is a "Helicopter" so we were trying to load into it, because
it was closest.
Also disable Cargo system on it so we don't load other things into it
And remove all interactions on it as well.
 2016-04-12 12:12:49 -05:00
PabstMirror
3744b980f4 Javelin - Verify player has LOS to cursorTarget 
Fix #3668
 2016-04-12 02:14:06 -05:00
PabstMirror
2869a53e6d Googles - Only play wipe anim for primary weapon 
Close #3638
Animation only makes sense for primary weapon, so skip for others.
 2016-04-12 00:19:24 -05:00
James McCartney
153cd28f94 Change event name to weaponJammed 2016-04-11 23:09:45 +01:00
James McCartney
121c45eb84 Raise a local event when a weapon is jammed 2016-04-11 22:29:33 +01:00
Glowbal
f409ce8248 Add config style validation 2016-04-07 19:55:10 +02:00
PabstMirror
f8b46e859c Wait until postInit to install playerChanged event 2016-04-03 23:36:38 -05:00
jonpas
d931eb4e15 Improve XEH adding in cargo 2016-04-03 14:17:16 +02:00
jonpas
357045a0ed Merge pull request #3518 from ColdEvul/CargoAndInteractionCase 
Carry, drag and load metal and plastic cases
 2016-04-03 11:43:11 +00:00
jonpas
3abb3d321c Merge branch 'master' into customTaggingTextureSupport 2016-04-03 13:41:26 +02:00
jonpas
f4074e981a Merge pull request #3529 from acemod/tagEvents 
Throw a globalEvent when a tag is created.
 2016-04-03 11:38:24 +00:00
jonpas
caf06f58c8 Add map altitude to GPS - fix #3650 2016-04-02 18:53:34 +02:00
nomisum
5c87161118 fixed logic problem 2016-04-02 15:53:39 +02:00
nomisum
02e3e1c7ec Merge remote-tracking branch 'refs/remotes/acemod/master' 2016-04-02 15:39:44 +02:00
nomisum
fed4662884 changed suggested lines to ace standards 2016-04-02 15:36:21 +02:00
Nicolás Badano
ec2c331bd9 Merge pull request #3644 from J3aLeiNe/master 
fnc_getMGRSdata update1
 2016-04-02 09:23:29 -03:00
commy2
a7cf010f7a Merge pull request #3648 from acemod/fixtagging_master 
fix script error in tagging
 2016-04-02 10:12:38 +02:00
J3aLeiNe
4576ea0194 abbottabad altitude fix 
altitude 0 for altitude 1256
 2016-04-02 09:50:50 +02:00
PabstMirror
84c5a0d266 FCS - Minor firedEH optimization 2016-04-01 21:51:22 -05:00
jonpas
31953c5d52 Merge pull request #3635 from acemod/fixInvertedGestureStopFreeze 
Fix inverted gestures Stop and Freeze and minor gestures cleanup
 2016-04-01 19:30:48 +00:00
jonpas
723d27fc99 Rename tagging action classes 2016-04-01 21:29:03 +02:00
jonpas
fbaae2beb3 Fix stringtable casing 2016-04-01 21:25:00 +02:00
jonpas
9f7f176b1f Merge branch 'master' into customTaggingTextureSupport 2016-04-01 21:24:31 +02:00
J3aLeiNe
d4a7d864aa fnc_getMGRSdata update1 2016-04-01 11:53:33 +02:00
J3aLeiNe
093da2badf Merge branch 'master' into master 2016-03-31 22:22:50 +02:00
PabstMirror
e104b0ac55 Merge pull request #3640 from acemod/fixZeusAutoAdd 
Delay calling addCuratorEditableObjects for a frame
 2016-03-31 10:04:44 -05:00
J3aLeiNe
c998ab622e fnc_getMGRSdata update1 
fnc_getMGRSdata update1
 2016-03-31 14:41:09 +02:00
bux578
076803951d Merge pull request #3628 from alef/translation/15bn/alef 
Italian translation
 2016-03-31 06:54:31 +02:00
commy2
92af6ffe2e add cargo space to csat attack heli (can transport 8 troops) 2016-03-31 01:03:40 +02:00
commy2
28468bec82 specify helicopter cargo spaces, fix #3591 2016-03-31 00:57:04 +02:00
Joko
6038ab89c9 improve Code to String 2016-03-30 23:02:52 +02:00
PabstMirror
6f412c312a Delay calling addCuratorEditableObjects for a frame 
Fixes createVehicle not always being added on dedicated server.
 2016-03-30 10:26:33 -05:00
PabstMirror
a83c3b5219 Merge pull request #3623 from acemod/fixAbTerrainProcessor 
Fix AB Terrain Extension
 2016-03-29 13:08:14 -05:00
commy2
89428dc55c Merge pull request #3624 from acemod/compatPboWarnings 
Compat pbo warnings
 2016-03-29 17:01:53 +02:00
commy2
a4c848a090 formating 2016-03-29 17:00:54 +02:00
jonpas
ec2be36e81 Use boolean 2016-03-29 16:25:55 +02:00
jonpas
2d22b06150 Add README.md to gestures and update author URL 2016-03-29 16:08:33 +02:00
jonpas
330977a709 Remove including DIK KeyCodes definitions, use decimal codes, Improve BI gesture handling even further 2016-03-29 16:03:41 +02:00
jonpas
3489dd48bb Remove unused gestures, Improve stringtabling and remove duplicate 2016-03-29 15:51:51 +02:00
commy2
49f6904f9e Merge pull request #3634 from acemod/fixerrornoname 
fix FUNC(setName) for Zeus and alive spawned units
 2016-03-29 15:48:19 +02:00
jonpas
c24c1b9dc0 Fix inverted Stop and Freeze - prone Stop will still be freeze due to BI animation being wrong 2016-03-29 15:39:32 +02:00
commy2
4e1b2dd24a just delay setName one frame 2016-03-29 15:32:05 +02:00
commy2
1f6f90a5b2 fixerrornoname 2016-03-29 13:59:07 +02:00
commy2
666a4030b5 make FUNC(scriptedExplosive) work in scheduled env, ref #3621 2016-03-29 13:21:13 +02:00
jonpas
6469b11f3c Cleanup tagging, use internal getTexture for getting texture from color, move tag size definition 2016-03-28 20:07:02 +02:00
jonpas
dc1af390cd Allow custom texture for tagging (only direct function call) 2016-03-28 18:44:30 +02:00
PabstMirror
bcde9f8ed6 Filter minor falling damage to non-leg hitpoints 2016-03-28 01:15:58 -05:00
Alessandro Foresi
e97c7c0f65 Translation: IT completed (with BOM) 2016-03-27 21:22:15 +02:00
Alessandro Foresi
e5a7578f92 Translation: IT completed (no BOM) 2016-03-27 21:20:15 +02:00
PabstMirror
e90609d043 Fix AB Terrain Extension 2016-03-24 12:23:48 -05:00
PabstMirror
86ad2ab415 Only warn for weapon compat if AB is on 2016-03-24 11:53:55 -05:00
PabstMirror
b0df31783d Merge branch 'master' into compatPboWarnings 2016-03-24 11:23:29 -05:00
SzwedzikPL
9b1b4a46fa better polish translation 2016-03-23 17:17:16 +01:00
SzwedzikPL
cdcde46a7d Fix double displayName in medical settings 2016-03-22 13:05:47 +01:00
SzwedzikPL
10d20472d3 Remove grass behind the trench 2016-03-22 11:26:40 +01:00
SzwedzikPL
203c059cc1 move placement data to config, setTrenchPlacement fnc, cleanup 2016-03-22 08:10:37 +01:00
Nicolás Badano
b4f6dbbc18 Merge pull request #3568 from acemod/settingsNameDescp 
Ace_Settings - add name,descption,categories
 2016-03-21 21:24:22 -03:00
SzwedzikPL
d6e9890b1b Add remove trench and continue digging trench actions 2016-03-21 18:25:38 +01:00
esteldunedain
ec2920ed35 Improve protractor accuracy. Close #3606 2016-03-20 22:24:30 -03:00
commy2
5aeb19312b fix script error in tagging 2016-03-20 17:09:03 +01:00
commy2
a841839aa6 don't overwrite helicopter sub class self actions 2016-03-19 19:37:26 +01:00
SzwedzikPL
8555f00889 remove needless tolower from mortarinit 2016-03-18 17:26:37 +01:00
Thomas Kooi
daceaa9dd8 Merge branch 'master' into settingsNameDescp 2016-03-18 14:48:11 +01:00
Thomas Kooi
e8b26a7a14 Merge pull request #3593 from BaerMitUmlaut/release 
Fixed fastroping race condition
 2016-03-18 12:07:43 +01:00
BaerMitUmlaut
fc06782256 Fixed broken ropeDetach 2016-03-18 00:16:31 +01:00
BaerMitUmlaut
b25ffdb54f Fixed network race condition 2016-03-18 00:15:57 +01:00
commy2
5e52e22e81 Merge branch 'release' into fixNametagsRank 2016-03-17 20:14:40 +01:00
PabstMirror
218d333738 Fix nametag error when rank is empty string 2016-03-17 11:56:20 -05:00
Glowbal
485900dce8 increment patch version 2016-03-16 22:59:28 +01:00
Thomas Kooi
559d111e66 Merge pull request #3584 from SzwedzikPL/fixmk6mortarinit 
Fix mortar ammo handling init on dedicated
 2016-03-16 22:48:49 +01:00
commy2
0c42bb5345 Merge branch 'release' into revc65656a0 2016-03-16 22:44:19 +01:00
jonpas
72c9e9da39 Replace usage of filter to select in tagging 2016-03-16 20:17:23 +01:00
jonpas
c568c18865 Add module icon 2016-03-14 19:14:52 +01:00
jonpas
89924e927a Disable debug 2016-03-14 17:25:20 +01:00
Nicolás Badano
8ff4fb8851 Merge branch 'release' into revc65656a0 2016-03-14 12:21:11 -03:00
esteldunedain
14183470bc Revert "Improved rope glitchyness" 
This reverts commit c65656a016.
 2016-03-14 12:16:23 -03:00
SzwedzikPL
32846014a1 fix ammo handling init on dedicated 2016-03-14 14:21:02 +01:00
PabstMirror
2ab169eb73 Merge branch 'release' into FixTrue 2016-03-12 13:46:44 -06:00
PabstMirror
1985e7e20a Fix versioning true when compiled 2016-03-12 13:42:52 -06:00
Thomas Kooi
61f1959109 Fix morphine increasing viscosity 
Morphine should decrease viscosity instead of increase. Closes #3579
 2016-03-12 18:55:42 +01:00
commy2
fca8b51bb2 reset interaction menu time variables on save game load 2016-03-12 17:08:08 +01:00
esteldunedain
aad79eda85 The dead shouldn't interact (it's not TWD) 2016-03-12 10:06:45 -03:00
jonpas
32c32b6cc5 Add stamina bar selective UI 2016-03-09 18:58:46 +01:00
PabstMirror
ad3a03a9c7 versioning - Add warnings for missing compat PBOs 2016-03-08 13:52:34 -06:00
PabstMirror
94adcf4ccb MicroDagr Scalar Values 2016-03-08 13:17:20 -06:00
esteldunedain
3122542814 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2016-03-08 15:25:04 -03:00
esteldunedain
69bd858167 Merge branch 'fr-fix-quotes' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-fix-quotes 
Conflicts:
	addons/fastroping/CfgMoves.hpp
	addons/fastroping/CfgVehicles.hpp
 2016-03-08 15:24:23 -03:00
Thomas Kooi
bfe738ba80 Merge pull request #3513 from acemod/cbaVersioning 
Add CBA 2.3.1 to versioning check
 2016-03-08 19:21:36 +01:00
Thomas Kooi
ddd8187b19 Merge pull request #3534 from GitHawk/refuel_isEngineOn 
Disallow refueling with running engine
 2016-03-08 19:20:28 +01:00
esteldunedain
2b33dd7686 Merge branch 'fr-ai-deploy' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-ai-deploy 
Conflicts:
	addons/fastroping/XEH_preInit.sqf
 2016-03-08 15:13:50 -03:00
esteldunedain
88f4c49c08 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2016-03-08 15:08:53 -03:00
esteldunedain
afe835816f Merge branch 'fr-fixes' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-fixes 
Conflicts:
	addons/fastroping/CfgVehicles.hpp
 2016-03-08 15:07:45 -03:00
commy2
4ceb1b34b8 Merge pull request #3566 from acemod/removeDragCarryFromCannons 
Disable drag and carry for StaticCannon
 2016-03-08 19:05:04 +01:00
jonpas
70100825cf Fix params in clientInit 2016-03-08 18:49:19 +01:00
PabstMirror
1a77b0fcd4 Disable drag and carry for StaticCannon 
#3528
 2016-03-08 11:43:35 -06:00
jonpas
e90ef30904 Add return value to public setElementVisibility function 2016-03-08 18:42:37 +01:00
jonpas
23e2617db8 Change params order and improve clientInit 2016-03-08 18:40:23 +01:00
Thomas Kooi
60af0d3162 Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR 
Standardize GVAR array brackets in configs.
 2016-03-08 18:19:50 +01:00
jonpas
64fe944b0f Add public setter function, Optimize some checks 2016-03-08 18:12:01 +01:00
PabstMirror
3232654e13 Close #3565 -Fix spelling of local var _woundEffectiveness 2016-03-08 11:02:54 -06:00
PabstMirror
b5e95f3945 Add some names/descriptions to settings configs 2016-03-08 01:17:40 -06:00
commy2
e605ede04a execute addActionEvents in unscheduled env 2016-03-08 01:19:32 +01:00
BaerMitUmlaut
35857f4523 Cleanup canPrepareFRIES 2016-03-07 20:42:13 +01:00
Thomas Kooi
d86f58f418 Merge pull request #3525 from acemod/sandbag3den 
Set sandbag side to civ to show in 3den
 2016-03-07 19:30:24 +01:00
Thomas Kooi
8946779c1a Merge pull request #3527 from acemod/fixHrCallbackVar 
Fix empty callback for hr adjustment
 2016-03-07 12:51:23 +01:00
BaerMitUmlaut
c65656a016 Improved rope glitchyness 2016-03-06 20:33:23 +01:00
BaerMitUmlaut
84af4b7676 Force open ramps on helicopters 2016-03-06 19:53:37 +01:00
commy2
a85c5b14cf Merge pull request #3547 from acemod/fixsavegamecrashmaybe 
Store Interact Menus on CBA Namespaces
 2016-03-06 19:28:26 +01:00
commy2
a9578ab473 Merge pull request #3524 from acemod/fixCancelAction 
Fix Cancel (RMB) Action
 2016-03-06 19:16:40 +01:00
commy2
81c29d8120 Merge pull request #3551 from acemod/disableOnlyActionMenuOnMouseHint 
Disable only action menu on mouse hint and modifier where unnecessary
 2016-03-06 19:13:10 +01:00
commy2
391aaeba89 Merge pull request #3548 from acemod/namespaceforcargofilters 
use namespace for cargo filters, fixes problem with save games
 2016-03-06 19:10:53 +01:00
commy2
c90775091e Merge pull request #3549 from acemod/fixmagincompat 
remove obsolete fix, fix #3545
 2016-03-06 19:10:45 +01:00