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,234 Commits 73 Branches 88 Tags 752 MiB
97f5374118
Commit Graph

8451 Commits

Author SHA1 Message Date
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
ir0n1e
cd58eaf974 wrong command (removeAllPrimaryWeaponItems) 2016-05-03 12:52:06 +02:00
ir0n1e
def1d46152 remove weapon items player 2016-05-03 12:49:16 +02:00
ir0n1e
920b9b8e62 Update script_component.hpp 2016-05-03 12:44:58 +02:00
ir0n1e
a34490aca8 added missing } 2016-05-03 10:58:01 +02:00
ir0n1e
d3500d4bee ACE syntax 2016-05-03 10:51:41 +02:00
ir0n1e
9567b587c6 added gunbag 2016-05-03 10:21:21 +02:00
BaerMitUmlaut
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
PabstMirror
33b624c896 Tactical Ladder - Update model cfg 
#3745
 2016-05-02 12:10:44 -05:00
PabstMirror
7cc2da2bb1 Fix self swap action 2016-04-29 23:38:01 -05:00
ProfessorCZ
7d0fcde9fa CZ Translate - Update 
04/30/2016
 2016-04-30 00:57:24 +02:00
PabstMirror
4eb657bfc7 Merge pull request #3718 from acemod/vehLockACRE 
vehicle inventory lock - compatibility with acre
 2016-04-29 13:10:21 -05:00
PabstMirror
7665935641 Use constant reload time value instead of config 2016-04-29 13:00:35 -05:00
commy2
ab09e0989b Merge pull request #3722 from acemod/fixmacro 
fix wrong macro names
 2016-04-28 07:48:25 +02:00
PabstMirror
d826c91c99 Cleanup reload launchers 2016-04-28 00:43:33 -05:00
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
jonpas
ccaec31a90 Use new QFUNC and QEFUNC macros 2016-04-08 20:43:26 +02:00
jonpas
014421e8ed Remove redundant quoted function macro defines 2016-04-08 20:41:54 +02:00
jonpas
0c124a2af0 Remove redundant macro define 2016-04-08 20:35:50 +02:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02: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
BaerMitUmlaut
3710c04da4 Use head instead of body direction for compass 2016-03-08 19:22:04 +01: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
BaerMitUmlaut
f18094e7e4 MicroDAGR OS Upgrade 2016-03-08 19:21:28 +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
jonpas
858c68f8d7 Don't use modifier for rotation where not needed 2016-03-06 16:54:27 +01:00
jonpas
c378cd9f12 Disable action menu on mouse hint with inGameUISetEventHandler rather than showHud, as showHud disables UI script commands 2016-03-06 16:47:46 +01:00
jonpas
f956675d35 Merge pull request #3542 from acemod/refuelGlobalEvents 
Replace execRemoteFnc with events and increase fuel update delay in refuel
 2016-03-06 16:23:02 +01:00
jonpas
b47b887a21 Fix event name already being used 2016-03-06 16:20:16 +01:00
jonpas
9b46e8856e Merge modules, Add base allow client settings toggle, Add requires descriptions 2016-03-06 15:41:17 +01:00
jonpas
a064c0c98d Modernize code 2016-03-06 12:50:16 +01:00
jonpas
0dc1e37874 Merge branch 'master' into uiSettings 2016-03-06 12:41:27 +01:00
jonpas
52007fab6a Add sanity checks, fix explosives checks 2016-03-06 12:06:17 +01:00
commy2
79db282aca remove obsolete fix, fix #3545 2016-03-06 09:12:49 +01:00
commy2
8892aeed9d missed one 2016-03-06 07:55:34 +01:00
commy2
8603f2062a simplify 2016-03-06 07:14:43 +01:00
commy2
f43b287093 use namespace for cargo filters, fixes problem with save games 2016-03-06 06:53:59 +01:00
commy2
6a58af5b33 fix save game crash?, ref #3397 2016-03-06 06:22:38 +01:00
esteldunedain
ae8cbb4834 Add "check temperature" and "swap barrel" actions for AARs 2016-03-05 23:33:30 -03:00
jonpas
ae3a41e6d8 Move common event handlers closer to their counterparts 2016-03-06 02:38:05 +01:00
Nicolás Badano
de6af27912 Merge pull request #3492 from acemod/Fix3491_MortarBoxes 
Replace transportMax... with maximumLoad for mortar boxes.
 2016-03-05 22:09:07 -03:00
Nicolás Badano
9f205b4a54 Merge pull request #3509 from acemod/fix3379 
Increase interaction distance with explosives from 1m to 1.5m.
 2016-03-05 22:08:31 -03:00
Nicolás Badano
1d3950bfff Merge pull request #3497 from acemod/liteDrag 
Fix portable light floating / dir when carrying
 2016-03-05 22:07:43 -03:00
Nicolás Badano
e2c2495d52 Merge pull request #3496 from looterz/bftbug 
Fix for player markers not showing up correctly with BFT_ShowPlayerNames
 2016-03-05 22:05:33 -03:00
esteldunedain
e15d534fd1 Rename event, removing prefix. Back to square one. 2016-03-05 21:11:53 -03:00
BaerMitUmlaut
8e895e8cff Added gantry hiding animation 2016-03-05 23:21:10 +01:00
BaerMitUmlaut
b20e433f43 Fixed bug with fastroping simultaneously 2016-03-05 23:20:44 +01:00
BaerMitUmlaut
8039332743 Switched to preStart + XEH_PREP 2016-03-05 23:19:53 +01:00
BaerMitUmlaut
21d546ac1c Added note concerning BIS_fnc_guiMessage 2016-03-05 21:22:45 +01:00
PabstMirror
721aa94a29 Merge pull request #3536 from acemod/dediCaps 
Fix captivity system on dedicated
 2016-03-05 14:08:53 -06:00
BaerMitUmlaut
b8a4349c10 Added deployment API and waypoint 2016-03-05 20:25:35 +01:00
jonpas
9463b05218 targetEvent -> objectEvent 2016-03-05 18:16:09 +01:00
jonpas
881eaf951a Move setVectorDirAndUp and setHitPointDamage events to common, Make refuel set nozzle position execute only on target where local 2016-03-05 18:07:07 +01:00
jonpas
589ca27b60 Fix missing comma 2016-03-05 18:02:21 +01:00
jonpas
015a60e6c4 Increase fuel update to 1s 2016-03-05 17:44:03 +01:00
jonpas
401d457a46 Replace execRemoteFnc with global/targetEvent in refuel 2016-03-05 17:41:47 +01:00
esteldunedain
6cf9787fd1 Fix travis warning 2016-03-05 13:18:41 -03:00
esteldunedain
ebfd76107e The function name was changed in CBA 2016-03-05 13:15:56 -03:00
esteldunedain
62f598b2a6 Use the correct CBA function name, defining it in ACE as long as it doesn't exist already. 2016-03-05 13:11:20 -03:00
jonpas
b37b1a39b2 Allow string input for isBackpack 2016-03-05 14:29:04 +01:00
nomisum
e36198561f Merge remote-tracking branch 'refs/remotes/acemod/master' 2016-03-05 12:43:27 +01:00
PabstMirror
4826a89ef5 Fix captivity system on dedicated 
Fix #3532
 2016-03-04 11:45:38 -06:00
GitHawk
0b3abd55d3 Disallow refueling with running engine 2016-03-04 13:59:14 +01:00
esteldunedain
5450954fc2 Rename the event as "ace_tagging_tagCreated" 2016-03-04 09:16:42 -03:00
esteldunedain
02616ebbb2 Throw a globalEvent when a tag is created. Close #3521. 2016-03-03 19:43:26 -03:00
PabstMirror
e3deebff7e Fix empty callback for hr adjustment 
Fix #3526
Same issue as #3384
 2016-03-03 13:23:53 -06:00
PabstMirror
53a36f8783 Add REQUIRED_CBA_VERSION macro to script_mod.hpp 2016-03-03 13:00:47 -06:00
PabstMirror
56c5343bd7 Set sandbag side to civ to show in 3den 
ref #3102 #2633
 2016-03-03 12:54:13 -06:00
jonpas
ef95e278f9 Fix Cancel Action by moving it to MouseButtonDown display EH 2016-03-03 17:35:43 +01:00
PabstMirror
137a512a9e close main display if using incompatible cba 2016-03-02 16:33:29 -06:00
commy2
e6c6e55968 Merge pull request #3507 from acemod/mouseZChangedEH 
Replace addScrollWheelEventHandler with MouseZChanged Display EH
 2016-03-02 23:15:50 +01:00
commy2
92fddff833 also fix modifier key 2016-03-02 23:14:23 +01:00
nomisum
76468d326b fixed license file 2016-03-02 22:49:25 +01:00
nomisum
9b55aa1555 Merge remote-tracking branch 'refs/remotes/acemod/master' 2016-03-02 22:40:33 +01:00
nomisum
48e9e9c9e4 added CBA-PFH, added QUOTE 2016-03-02 22:36:42 +01:00
commy2
9a0c839ced Merge pull request #3508 from acemod/fix3504 
Make the FRIES inherit from Helicopter_Base_F. Fix #3504
 2016-03-02 22:28:01 +01:00
ColdEvul
80bada0365 Fixed carrying rotation. 2016-03-02 22:27:29 +01:00
nomisum
730e79def0 added fastroping sounds 2016-03-02 22:17:49 +01:00
ColdEvul
8b4892598a added EventHandlers 2016-03-02 22:17:19 +01:00
commy2
303f8d93b9 simplify inheritance 2016-03-02 22:16:40 +01:00
FFAAMOD
95007d8ccd Spanish translation of FastRope fixed 
Fixed wrong tag in Spanish Translation of Fast Rope module.
 2016-03-02 21:00:46 +01:00
esteldunedain
e0493458c0 Reduce interaction distance for defusing back to 1m 2016-03-02 16:19:38 -03:00
PabstMirror
e6a5d2dacd Add CBA 2.3.1 to versioning check 2016-03-02 13:19:20 -06:00
FFAAMOD
6b13ea287e Added Spanish Translation to fastroping module 
Added Spanish Translations, some of these can have multiple translations but according to the context, they match properly their meanings.
 2016-03-02 19:56:50 +01:00
esteldunedain
928a9b9485 Increase interaction distance with explosives from 1m to 1.5m. Fix #3379 2016-03-02 15:25:41 -03:00
esteldunedain
0399335a3f Make the FRIES inherit from Helicopter_Base_F. Fix #3504 2016-03-02 14:41:41 -03:00
jonpas
4918dbacb0 Replace and depreacate EFUNC(common,addScrollWheelEventHandler) with MouseZChanged Display EH 2016-03-02 17:33:46 +01:00
ColdEvul
b91897de3b Added comment 2016-03-02 16:41:45 +01:00
ColdEvul
e7ec87d284 Added carry and interaction for case. 2016-03-02 16:38:23 +01:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00