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

8284 Commits

Author SHA1 Message Date
PabstMirror
68d6c1969b Cleanup transistion to CBA's waitAndExec (#3858) 2016-06-02 09:22:40 -05:00
jonpas
4c995d4c5c Improve selective UI API (#3805) 
* Improve selective UI API, Disable ammo count when reload component is loaded, Fix stance UI

* Upgrade Selective UI framework for controls that share IDCs for gunner and soldier

* Separate more soldier and gunner settings sharing same IDCs, Remove vehicle gunner weapon which has no effect anymore

* Separate more soldier and gunner IDC sharing elements, Fix typo, Fix API setting not being respected in case where selective type is not the same on load

* Rework Selective UI using ACE_UI config, Cleanup, Add ACE_UI to FCS component to mark it (is already disabled due to other necessary settings for FCS to function)

* Do location check in function, Rename condition to location, change to number

* Use macros in ACE_UI location
 2016-06-02 14:32:39 +02:00
jonpas
590d4fa70b Merge branch 'master' into abolishExecRemoteFnc 2016-06-02 14:28:43 +02:00
Glowbal
603d07ddc2 Fix incorrect indentation 
Should be using 4 spaces instead of a tab.

Quick, before flummi sees this.
 2016-06-02 10:53:09 +02:00
Glowbal
2e54310ff4 Merge pull request #3844 from acemod/fixShowHud 
Fix showHud if set before display loaded
 2016-06-02 10:39:46 +02:00
Glowbal
5c7148de1f Merge pull request #3851 from acemod/huntIR-multipara-fix 
Fixed HuntIR deployment
 2016-06-02 10:38:37 +02:00
BaerMitUmlaut
cc83bf64d6 Moved all deployables to equipment submenu 2016-06-02 10:35:33 +02:00
PabstMirror
b949440eb1 Goggles - Fix script error from CBA_fnc_waitAndExecute 2016-06-01 17:27:55 -05:00
jonpas
95573ee711 Stringtable URL (#3855) 
* Move url into stringtable to display it properly, Add some missing author and url entries

* Fix main

* Remove duplicate author
 2016-06-01 23:45:51 +02:00
jonpas
ba27c8f914 Fix WEB_URL end of line error (#3854) 
* Fix WEB_URL end of line error

* Change location of quote macro

* Fix medical_menu VERSION_CONFIG error
 2016-06-01 14:41:33 +02:00
commy2
9d61dd6159 Merge pull request #3850 from acemod/fixCfgPatchesAuthor 
Fix CfgPatches author/ is not a value
 2016-06-01 14:24:17 +02:00
jonpas
1354826d56 Put semi-colon to the correct place 2016-06-01 14:11:32 +02:00
commy2
e6000807ee Merge pull request #3849 from acemod/fix160ubc 
Fix 1.60 UBC (slingloads)
 2016-06-01 13:57:07 +02:00
jonpas
1331265e65 Move url into a macro 2016-06-01 13:49:10 +02:00
jonpas
6730d016c2 Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility 2016-06-01 13:27:02 +02:00
BaerMitUmlaut
7a8506cefd Update handleFired header comment 2016-05-31 23:12:57 +02:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
BaerMitUmlaut
f3fbb6cbdd Fixed HuntIR deployment 2016-05-31 22:13:01 +02:00
jonpas
fa9384ffb4 Fix vanilla CCIP on A-10 2016-05-31 20:35:38 +02:00
Glowbal
d7b239f487 Merge pull request #3795 from acemod/deprecate-components 
Add Deprecate components support
 2016-05-31 10:40:24 +02:00
PabstMirror
6905e6f97f Fix showHud if set before display loaded 2016-05-31 01:53:28 -05:00
PabstMirror
598c3dc181 Fix 1.60 UBC (slingloads) 2016-05-30 17:11:06 -05:00
commy2
fd26e2e44e Merge pull request #3516 from acemod/cbamissiontime 
replace timePFH with CBA_missionTime
 2016-05-30 21:23:57 +02:00
commy2
7512c4e52e manual merge 2016-05-30 21:14:34 +02:00
jonpas
7a307393a4 Merge branch 'master' into useQuotedPathMacros 2016-05-30 21:14:17 +02:00
commy2
e7fa02d0d9 Merge pull request #3812 from acemod/cbaDelayedExecFnc 
Use new CBA delayed execution functions and deprecate ACE functions
 2016-05-30 21:02:29 +02:00
commy2
94b5cea3cf Merge pull request #3814 from acemod/cbaBinocularMagazineFnc 
Use new binocular magazine CBA functions and deprecate ACE functions
 2016-05-30 21:00:43 +02:00
commy2
272775445f Merge pull request #3670 from acemod/useQuotedFuncMacros 
Use new quoted function macros
 2016-05-30 21:00:23 +02:00
commy2
882aa26ab2 Merge pull request #3813 from acemod/cbaGetItemObjectConfig 
Use new CBA get config functions and deprecate ACE functions
 2016-05-30 21:00:05 +02:00
PabstMirror
4df30327ac Flashsuppressors - use next CBA's JM configs (#3709) 
#3700
 2016-05-30 13:49:08 -05:00
jonpas
816da2aef1 Normalize to LF line endings 2016-05-30 18:37:03 +02:00
PabstMirror
3163b53710 gforces - Fix missing ace_settings.hpp include (#3837) 2016-05-29 11:54:44 -05:00
bux578
b4cb49ffec Merge pull request #3836 from acemod/fix_null_rallypoint 
fix rallypoint being objNull, when created via 'createvehicle'
 2016-05-29 13:57:44 +02:00
commy2
bc6f756df4 fix rallypoint being objNull, when created via 'createvehicle' 2016-05-29 13:22:49 +02:00
commy2
1bd44e562a replace a comma with semi colon 2016-05-29 11:44:00 +02:00
Grey-Soldierman
9f588d283c Fixed indentation again 2016-05-27 19:10:44 +01:00
Grey-Soldierman
d92b5fb459 Fixed indentation 2016-05-27 19:08:34 +01:00
Grey-Soldierman
b0363d4ba9 Removed Valon from any vest configured for holsters 2016-05-27 18:52:30 +01:00
voiperr
52ea640c4b ace_map: More realistic flashlight glow + minor fix (#3824) 
* -Converted flashlight glow object to chemlight type (emits light without sprite)
-Fixed issue where glow object was being deleted without being first detached

* Cleanup of temp classes.

* Spaces before and after =

* Moved effects into Effects.hpp.
 2016-05-27 19:16:15 +02:00
jonpas
4f515ec4e1 QGVAR captives, interaction 2016-05-25 20:23:53 +02:00
jonpas
5d36f84eb1 qGVAR overheating and reloadlaunchers 2016-05-25 20:13:36 +02:00
gpgpgpgp
cfb3d7f0a9 add a line to support JSRS Eden (getting rid of JSRS explosion sound effect) 
JSRS Eden defines a SoundSetExplosion[] on ShellBase to define explosion sounds, which gives huntir unexpected exploding sound when used together. Adding SoundSetExplosion[] = {}; shall fix the problem.
 2016-05-25 09:17:19 +08:00
PabstMirror
87ee34ba35 vehicleLock - Use QGVAR 2016-05-24 19:37:24 -05:00
PabstMirror
fef50ae48f Fix duplicate event 2016-05-24 19:25:38 -05:00
jonpas
c4999c13e4 QGVAR and Fix sandbag, tagging, tripod, viewdistance, weather, zeus 2016-05-25 02:19:50 +02:00
jonpas
7ede53bbdd QGVAR and Fix laser, map, map_gestures, maptools, modules, nightvision, optics 2016-05-25 02:09:11 +02:00
jonpas
b54d1985f1 QGVAR and fix gforces, goggles, grenades, hearing, interact_menu 2016-05-25 01:57:41 +02:00
jonpas
99675417c6 QGVAR and fix events in concertina_wire, disarming and explosives 2016-05-25 01:51:58 +02:00
jonpas
dd2e9140ae Q(E)GVAR rangefinderData event 2016-05-25 01:44:56 +02:00
jonpas
da4c08fb6c QGVAR all reload events 2016-05-24 20:51:10 +02:00
jonpas
30b15ee3d3 Fix quotes in cargo 2016-05-24 19:22:48 +02:00
jonpas
331c3c70cb Verify and fix cargo, nametags, rearm, reload, repair, ui, Convert infoDisplayChanged in common and mk6mortar Rsc's 2016-05-24 18:58:27 +02:00
SilentSpike
207d6612da Remove duplicate ACE_newEvents entries 2016-05-24 15:06:17 +01:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
PabstMirror
ccbd52e811 Fix Can't toggle safemode in FFV seats #3819 
Also block safemode when no weapon
 2016-05-23 15:51:09 -05:00
PabstMirror
84eca899a9 Add event renaming system 
Allows us to switch event names such that anyone currently using our old event framework and names won't have their code broken until it is deprecated in version 3.8.0
 2016-05-23 14:03:55 +01:00
PabstMirror
86b9022322 Fix VehLock Macros 2016-05-22 23:13:15 -05:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts 
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
 2016-05-22 16:47:39 +01:00
SilentSpike
f0b8da33c4 Deprecate ACE events framework 
CBA 2.4.0 entirely replaces the ACE events framework.

Adds wrappers with deprecated warnings to all of the public event framework functions and removes all of the underlying GVARs and code.
 2016-05-22 16:09:49 +01:00
jonpas
bd0e05d7d6 Use CBA config functions, return correct value 2016-05-22 16:18:24 +02:00
jonpas
38b48390b5 Call CBA binocular functions - leave as wrapper 2016-05-22 16:03:41 +02:00
jonpas
bbd96f9e71 Call CBA delayed execution functions, remove ACE's PFH for handling them 2016-05-22 16:01:12 +02:00
jonpas
4b121480bb Use new binocular magazine CBA functions, deprecate ACE functions 2016-05-22 15:48:03 +02:00
jonpas
d35e89892c Use new get item and object config CBA functions, deprecate ACE functions 2016-05-22 15:36:31 +02:00
jonpas
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
jonpas
472e4631d6 Deprecate delayed execution functions 2016-05-22 15:25:59 +02:00
jonpas
d902d1182a Replace ace_common_fnc_execRemoteFunc with events 2016-05-21 23:55:48 +02:00
SilentSpike
a7c1d0e5bf Remove erroneous tabs 2016-05-21 17:45:50 +01:00
SilentSpike
3e16142ff6 Merge branch 'master' into zeusModuleUiExample 2016-05-21 17:37:49 +01:00
SilentSpike
b3192adbb7 Add support for a zeus module position attribute 
Allows zeus to select a position for the module task to be carried out at - as a bonus it works alongside the radius attribute and will draw a circle preview if a radius is present.

Unfortunately control types 100 & 101 don't play nicely with controls groups and so I've commented out the position attribute from the displays that would currently use it. Otherwise it is all seemingly working fine, just that the position of the control is all wrong and it doesn't stay within the bounds of the controls group.

I opened an issue tracker ticket for the problem here: https://feedback.bistudio.com/T116708
 2016-05-21 17:29:53 +01:00
commy2
c9ea5676ea travis test 2016-05-21 13:29:42 +02:00
commy2
e40c814b04 Merge branch 'master' of https://github.com/acemod/ACE3 into improve_getTurretX 2016-05-21 13:27:51 +02:00
commy2
d395fcd792 travis pls 2016-05-21 13:22:13 +02:00
commy2
aee4d23bdb fullCrew new parameter to improve FUNC(getTurretX) 2016-05-21 13:07:17 +02:00
Glowbal
dd60ac8170 Remove isEnabled check in sitting 
IsEnabled check is not necessary here. It should not have been included, as it was a left over from testing for migrating sitting to ACEX.
 2016-05-21 00:41:49 +02:00
PabstMirror
f69142dd45 Hearing - New XEH, Fix dead effects, Medical var (#3802) 
* Hearing - New XEH, Fix dead effects, Medical var

* Use setHearingCapability

* Cleanup dead player vol update

* Don't change global hearing in medical

* Fix exitWith
 2016-05-20 11:23:14 -05:00
PabstMirror
d464a23d21 Use the lovely CBA_fnc_canUseWeapon function 2016-05-20 01:10:12 -05:00
PabstMirror
0d5385ffaf Update FCS hud when manually setting range. 2016-05-19 21:50:51 -05:00
PabstMirror
508b71e7ba Scopes - Allow Scope Adjust from FFV 2016-05-19 21:39:15 -05:00
SilentSpike
adaa10aea5 Adjust center of zeus AI task modules 
The tasks should center on the logic rather than the group leader.

The search nearby module is also deleted after it's processed.
 2016-05-19 22:32:05 +01:00
SilentSpike
3a1dba4486 Add zeus defend, patrol and search modules 
Using a shared `radius` attribute for all of these displays so a generalized method of initializing and retrieving the value associated that was implemented.
 2016-05-19 01:24:08 +01:00
SilentSpike
e05f2ca637 Add search nearby building zeus module 2016-05-19 01:24:07 +01:00
SilentSpike
600b71817f Update zeus module logic deletion behaviour 
The teleport players module is reusable, while the global AI skill and group side modules should be deleted appropriately once the display is closed.
 2016-05-18 16:30:14 +01:00
SilentSpike
8a70cfbcd8 Clean new zeus module config and functions 
Adds function headers, stringtables and renames some display control classes.
 2016-05-18 16:16:35 +01:00
commy2
25876d82ca manual merge 2016-05-18 12:21:53 +02:00
commy2
230f0ab85e manual merge 2016-05-18 12:20:33 +02:00
commy2
08bafd535f deleted to much 2016-05-18 12:00:13 +02:00
commy2
655277cc17 remove previously deleted block 2016-05-18 11:58:42 +02:00
commy2
d93132dac8 more replacing 2016-05-18 11:57:40 +02:00
commy2
da70854568 manual merge 2016-05-18 11:48:27 +02:00
SilentSpike
81d854c56a Add group side zeus module 
The module is placed on a unit in order to switch the side of that unit's group. A "simple" dialog is used to select the new side.

The dialog code is a little ugly to say the least.
 2016-05-17 23:44:17 +01:00
SilentSpike
4cbded1811 Fix zeus cargo display for empty vehicles 
The cargo wasn't displaying for empty vehicles because they use a different display.
 2016-05-17 23:44:16 +01:00
ir0n1e
4a7f5529f6 added gunbag to ACE_Box_Misc 2016-05-17 12:56:48 +02:00
ir0n1e
3e9cf73b0d added readme 2016-05-17 12:24:18 +02:00
ir0n1e
1302ccb3fe clean up 2016-05-17 12:19:17 +02:00
ir0n1e
7ef02400dc adapted to #3378 and added support for UGL 2016-05-17 12:14:57 +02:00
ir0n1e
c89163316c fixed idention tabs are 4 spaces now 2016-05-17 11:21:48 +02:00
ir0n1e
6d988524d3 Merge branch 'master' of https://github.com/acemod/ACE3 into gunbag 2016-05-17 11:03:57 +02:00
ir0n1e
1a14634b41 dissolved some edges 2016-05-17 10:57:24 +02:00
SilentSpike
d90d5a7ac1 Rewrite global AI skill zeus module 
Remove the use of ace settings and makes the module more zeus specific. It might be worth adding a similar module or mission settings to ace_ai for mission editing.
 2016-05-16 15:16:53 +01:00
commy2
473149b8ca revert changes from other PR to make it compatible 2016-05-16 15:22:37 +02:00
commy2
cac7b9c0c3 optional param to skip deprecated warning 2016-05-16 15:15:51 +02:00
Glowbal
32055401d3 Add backwards compatability for InventoryChanged 
The output of `getUnitLoadout` is different as `getAllGear`. Using a different format in the event would mean that any eventhandler depending on the inventory output would now be broken.
 2016-05-16 00:09:53 +02:00
SilentSpike
5b460205a9 Add teleport player zeus module 2016-05-15 21:02:40 +01:00
Glowbal
487400b142 Add different warning messages based on current version of component 2016-05-15 20:13:10 +02:00
Glowbal
7a7e930024 Add deprecate sitting component 2016-05-15 19:38:37 +02:00
Glowbal
3d74c25c97 Add deprecate component solution 2016-05-15 19:38:24 +02:00
SilentSpike
4d028be876 Cleanup zeus display modules 
Replaces display size and position defines with macros for readability and compactness.

Changes naming convention of functions and displays to distinguish categories and make more readable.

Converts the global set skill module to use display events rather than waiting in a loop for the module to be set and confirmed.
 2016-05-15 18:08:54 +01:00
SilentSpike
77de1ec6eb Update vanilla zeus functions 
Merges the changes introduced by arma updates to vanilla functions with our overwrites.

I also reverted some of the command capitalization since it makes the process of going through differences quicker in future.
 2016-05-15 12:48:32 +01:00
Glowbal
da3f6113d6 Merge branch 'master' into add-mine-detector 2016-05-15 00:20:46 +02:00
commy2
07caf1b0bd fix for null player 2016-05-14 20:33:33 +02:00
PabstMirror
7628f9a4ab Fix nils in array 2016-05-14 13:08:58 -05:00
commy2
e4c86a8af5 don't do 'playerInventoryChanged' just because ammo decreased after firing 2016-05-14 19:50:08 +02:00
commy2
cc9e128e74 Merge pull request #3792 from acemod/useGetUnitLoadout 
use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it
 2016-05-14 13:04:35 +02:00
commy2
c5275813a4 use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it 2016-05-14 10:49:09 +02:00
Glowbal
04b61ff32e Fix missing semicolon 2016-05-14 10:37:29 +02:00
Glowbal
180a0f9d84 Merge pull request #3462 from acemod/medicalLoops 
Cleanup medical PFHs
 2016-05-14 09:39:14 +02:00
Glowbal
36e48554c2 Merge pull request #3787 from acemod/motorcycleInteraction 
Add interaction support to Motorcycle class
 2016-05-14 09:33:41 +02:00
Glowbal
4e109ae93b Merge pull request #3781 from acemod/specTree 
Fix spectator unit tree refreshing
 2016-05-14 09:26:42 +02:00
Glowbal
e867db3a24 Merge pull request #3780 from acemod/lighter-bodybags 
Adjusted weight of bodybag
 2016-05-14 09:24:25 +02:00
Glowbal
eb8390741b Change round down mass of body bag 
Mass is an integer.
 2016-05-14 09:23:29 +02:00
Glowbal
57e83f8b35 Merge pull request #3791 from acemod/dropTestMission 
Remove old test-mission
 2016-05-14 09:18:06 +02:00
PabstMirror
d48bd3ca83 Remove old testmission addon 2016-05-13 19:54:14 -05:00
PabstMirror
895bf2580a Merge pull request #3773 from J3aLeiNe/master 
fnc_getMGRSdata.sqf update3
 2016-05-13 15:59:24 -05:00
jonpas
a950b2c2fe Add canPush config entry to enable pushing on boats with mass higher than 2600 2016-05-13 16:33:15 +02:00
SilentSpike
ce3787b3c3 Merge pull request #3768 from acemod/add-zeus-objects-setting 
Add zeus objects setting
 2016-05-13 10:39:20 +01:00
jonpas
e984fcf715 Fix part name for Tank class 2016-05-12 21:56:12 +02:00
jonpas
2d2d5bc828 Readd mistakenly removed spare part adding 2016-05-12 21:52:06 +02:00
jonpas
58cc686aac Remove initial spare part adding for classes not Car or Tank, Improve addSpareParts 2016-05-12 21:49:45 +02:00
jonpas
f6e4bd7a6b Remove redundant spare part adding 2016-05-12 21:37:54 +02:00
jonpas
c591c7af64 Add interaction support to Motorcycle class 2016-05-12 21:30:32 +02:00
Glowbal
721b161161 Remove useless if statement 2016-05-12 19:56:07 +02:00
Glowbal
7ba02a21ec Merge remote-tracking branch 'refs/remotes/origin/add-mine-detector' 
Conflicts:
	addons/minedetector/functions/fnc_detectorLoop.sqf
 2016-05-12 19:49:32 +02:00
Glowbal
7cc423d48f Change mindetector sound 2016-05-12 19:44:43 +02:00
jonpas
5147f366a5 Execute take nozzle actions only on progress bar success (#3783) 
* Execute take nozzle actions only on progress bar success - fix #3739, Prettify params

* Fix animation on holster
 2016-05-12 17:11:35 +02:00
PabstMirror
09371bce96 Merge pull request #3776 from acemod/cleanupFastRopeSounds 
FastRope Sounds - Fix Config, Merge PFEH, Add CC Attribution
 2016-05-11 22:29:28 -05:00
commy2
7304bd3fda Merge pull request #3779 from acemod/showvirtualloadingearmenu 
show virtual load in inventory menu
 2016-05-11 22:57:37 +02:00
commy2
dd6241e376 Merge pull request #3778 from acemod/fixGetWeaponState 
fix getWeaponState, fix #3777
 2016-05-11 22:57:25 +02:00
BaerMitUmlaut
f9c643b941 Modified fastroping thud sound 2016-05-11 21:05:59 +02:00
SilentSpike
1b1329b350 Increase spectator unit tree refresh rate 
Reduce the time between automated refreshing of the unit tree. Also makes an initial call to the tree populating code upon first opening to remove the initial delay.
 2016-05-11 16:01:07 +01:00
SilentSpike
9364ae60df Fix spectator unit tree refreshing 
- Account for decrement in node index when culling the tree of sides/groups/units
- Fix non-zero-based index `to` value when navigating the units in the tree
 2016-05-11 13:30:17 +01:00
J3aLeiNe
078c1d585f Add Kerama Islands by "Les Vétérans" 
add Kerama Islands by "Les Vétérans" with the correct latitude (default config latitude : 1°)
 2016-05-11 00:01:35 +02:00
BaerMitUmlaut
38bb4f6c29 Adjusted weight of bodybag 2016-05-10 23:40:03 +02:00
commy2
f738b17db7 show virtual load in inventory menu 2016-05-10 22:32:40 +02:00
commy2
53c9a96c77 fix getWeaponState, fix #3777 2016-05-10 22:14:01 +02:00
J3aLeiNe
c619bcb5a3 Fix "jacobi" latitude and elevationOffset 2016-05-10 19:39:01 +02:00
PabstMirror
518a873efd Add module readme 2016-05-10 10:14:15 -05:00
PabstMirror
980da16826 FastRope Sounds - Fix Config, Merge PFEH, Add CC Attribution 2016-05-10 10:09:52 -05:00
J3aLeiNe
29e7dbf757 fnc_getMGRSdata.sqf update3 2016-05-10 12:39:56 +02:00
commy2
be99d4b3d7 Merge pull request #3772 from acemod/fixmissingmags 
add missing magazines, fix #3685
 2016-05-10 11:57:32 +02:00
commy2
505fa0d773 add missing magazines, fix #3685 2016-05-10 11:50:59 +02:00
Tim Beswick
19df821ff5 Moved IR Strobe to left shoulder when attached. 2016-05-09 11:51:28 +01:00
BaerMitUmlaut
3f96e11cbb Made icons grey 2016-05-08 18:52:33 +02:00
Glowbal
74fd4b4b52 Add run at settings initialized auto add objects 2016-05-08 13:47:35 +02:00
Glowbal
a526d33aba Fix inconsistent name for module setting 2016-05-08 13:44:51 +02:00
Glowbal
b08af3fea6 Add read auto add objects setting from module 2016-05-08 13:42:45 +02:00
Glowbal
220b8b6352 Merge pull request #3767 from alganthe/zeus_fix 
Add new zeus addObjects setting to settings module (#2451)
 2016-05-08 13:41:13 +02:00
jonpas
a0bd521a40 Remove difficulties component 2016-05-07 23:48:31 +02:00
PabstMirror
2a5ec42148 Repair - Improve wheel detection for RHS (#3760) 
* Repair - Improve backup wheel detection

Fix #3759

* Cleanup
 2016-05-07 16:04:27 -05:00
Glowbal
dbe70a7094 Merge pull request #3761 from acemod/cleanupExplosiveSync 
Fix explosive sync on dedicated server
 2016-05-07 22:46:35 +02:00
Glowbal
ed9d05d6dd Merge pull request #3753 from acemod/blockEngine-statusEffect 
Add blockEngine status effect
 2016-05-07 22:40:05 +02:00
J3aLeiNe
d79cbe0844 Getmgrsdata update2 (#3736) 
* correct mildot reticle LRPS/AMS/KHS

correct mildot reticle LRPS/AMS/KHS

* replace 1 tab with 1 space

replace 1 tab with 1 space

* fix tab

* ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes

ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes,
same opticszoommax/min for each scopes : 1µ (1meter for 1000meter) / 4µ
(4meter for 1000meter),
LRPS :  variable magnification / SOS : 2 magnifications

* fnc_getMGRSdata.sqf update2

fnc_getMGRSdata.sqf update2

* fnc_getMGRSdata.sqf update2

add new maps, in alphabetic order now
 2016-05-07 22:37:58 +02:00
PabstMirror
9f6661f4db Make 40mm Grenades Frag (#3679) 
* Make 40mm Grenades Frag

* Just use existing force cfg instead of adding new

Add RHS compat entries
 2016-05-07 15:35:39 -05:00
BaerMitUmlaut
4eb2ecb0b6 Fixed getting stuck on rope whilst fastroping (#3734) 2016-05-07 22:35:18 +02:00
BaerMitUmlaut
82f8eb758c Removed remaining usage of player (#3710) 2016-05-07 22:27:33 +02:00
PabstMirror
1742629045 Add NonSteerable Reserve Parachute (#3689) 
* Add NonSteerable Reserve Parachute

Close #3364

* Use params
 2016-05-07 22:26:02 +02:00
Rebel
8bd4afed6b Drag and carry icons. (#3676) 2016-05-07 22:23:38 +02:00
J3aLeiNe
fd8167b7e7 AB - correct mildot reticle LRPS/AMS/KHS (#3664) 
* correct mildot reticle LRPS/AMS/KHS

correct mildot reticle LRPS/AMS/KHS

* replace 1 tab with 1 space

replace 1 tab with 1 space

* fix tab

* ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes

ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes,
same opticszoommax/min for each scopes : 1µ (1meter for 1000meter) / 4µ
(4meter for 1000meter),
LRPS :  variable magnification / SOS : 2 magnifications
 2016-05-07 22:20:50 +02:00
commy2
4a8e727ba5 end spectator by global mission end event from server (#3659) 
* end spectator by global mission end event from server

* add ;
 2016-05-07 22:17:21 +02:00
Ozan Eğitmen
b8abec0c61 Fix Capitalization of ACE Settings classes. (#3627) 2016-05-07 22:14:56 +02:00
Glowbal
f34d890e7a Merge pull request #3612 from SzwedzikPL/trenchestweaks 
Add remove trench and continue digging trench actions
 2016-05-07 22:12:15 +02:00
Glowbal
1ad348d415 Merge pull request #3517 from gruppe-adler/master 
Added fastroping sounds
 2016-05-07 22:01:21 +02:00
Glowbal
5ff91484ed Merge pull request #3438 from acemod/spareBarrelSimulation 
AAR actions + track temperatures of spare barrels
 2016-05-07 21:48:03 +02:00
PabstMirror
dd858c7e6b Stringtables, Add Detector Pos Deubg 2016-05-07 12:08:36 -05:00
PabstMirror
dd049a9699 Merge pull request #3762 from acemod/toggleWindDisplay 
Add key to toggle wind info display
 2016-05-07 10:58:43 -05:00
PabstMirror
71b86a7525 Merge pull request #3746 from acemod/fixTacLaderModelCfg 
Tactical Ladder - Update model cfg
 2016-05-07 10:58:29 -05:00
PabstMirror
9b46e77f66 Add key to toggle wind info display 2016-05-06 12:47:59 -05:00
PabstMirror
28c65c4bed Fix explosive sync on dedi 2016-05-05 14:36:56 -05:00
jonpas
59e412032e Merge pull request #3756 from acemod/uiShowHud 
UI - Don't overwrite other showHud indexes
 2016-05-04 21:50:42 +00:00
PabstMirror
cf92ba9c46 Overheating - Add Master Enabled Setting (barrelPR) 2016-05-04 14:59:04 -05:00
ir0n1e
13dc56c435 added opening sounds 2016-05-04 20:06:56 +02:00
PabstMirror
bc584b4c95 Merge remote-tracking branch 'refs/remotes/origin/master' into spareBarrelSimulation 2016-05-04 13:00:34 -05:00
commy2
01cf551aba Merge pull request #3730 from acemod/cleanupReloadLaunchers 
Cleanup reload launchers
 2016-05-04 16:18:37 +02:00
Glowbal
83a8c488d9 Merge pull request #3751 from acemod/wipeoutWhitespace 
Cleaned up excessive whitespace
 2016-05-04 11:46:56 +02:00
Glowbal
59d101ea75 Merge pull request #3754 from acemod/removeLegacy 
Removed old occurances of AGM and CSE
 2016-05-04 11:46:11 +02:00
ir0n1e
9af55d741b added new load handling 2016-05-04 09:56:33 +02:00
ir0n1e
cbabae9253 Merge branch 'master' into gunbag 2016-05-04 06:39:26 +02:00
ir0n1e
ad7bd3efc1 Merge branch 'gunbag' of https://github.com/ir0n1e/ACE3 into gunbag 2016-05-04 06:32:17 +02:00
ir0n1e
ffbc5ca07d fixed idention and code style 2016-05-04 06:31:35 +02:00
PabstMirror
398b76f30b Get reload time from QGVAR(buddyReloadTime) 2016-05-03 23:13:43 -05:00
PabstMirror
98a74aca6e UI - Don't overwrite other showHud indexes 2016-05-03 22:49:05 -05:00
Glowbal
0652978c86 Merge branch 'master' into add-mine-detector 2016-05-03 22:44:16 +02:00
Glowbal
b4fca958aa Add mine detector port from ACE2 2016-05-03 22:37:02 +02:00
BaerMitUmlaut
012ce9fb16 Removed old occurances of AGM and CSE 2016-05-03 21:38:36 +02:00
BaerMitUmlaut
b6324e61e9 Improved params formatting 2016-05-03 21:24:10 +02:00
BaerMitUmlaut
304f1a22b4 Use blockeEngine status effect in refuel 2016-05-03 21:08:22 +02:00
BaerMitUmlaut
e125911c3b Added blockEngine status effect 2016-05-03 20:52:43 +02:00
Cuel
66c2bf0506 Fix dead bodies removal, when forced = 1 
- Removed unused(?) GVAR(Module)
- Removed "white space alignment" in module.sqf
 2016-05-03 20:10:28 +02:00
commy2
736807f994 fix typo, make variable global 2016-05-03 18:16:39 +02:00
commy2
8585ea5688 add framework to add virtual mass to containers 2016-05-03 18:12:47 +02:00