Commit Graph

9709 Commits

Author SHA1 Message Date
PabstMirror
28c65c4bed Fix explosive sync on dedi 2016-05-05 14:36:56 -05:00
Nicolás Badano
153c6583b5 Merge pull request #3758 from acemod/overheatingSetting2
Overheating - Add Master Enabled Setting (barrelPR)
2016-05-04 20:07:45 -03: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
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
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
commy2
07977b9a9a Merge pull request #3752 from Cuel/remove-dead-bodies-fix
Fix "remove dead bodies on disconnect" when enabled and forced
2016-05-03 22:38:28 +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
Cuel
545ecc0f8e Merge remote-tracking branch 'refs/remotes/acemod/master' into remove-dead-bodies-fix 2016-05-03 20:10:20 +02:00
commy2
55aa4d08f8 Merge pull request #3750 from acemod/addLoadToUnitContainer
add framework to add virtual mass to containers
2016-05-03 18:39:10 +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
Glowbal
0c55d0ca06 Change start line number count sqf validation at 1 2016-05-03 15:15:55 +02:00
Glowbal
75cbe7df4f Change start line count of config validation at 1 2016-05-03 15:15:10 +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
bux578
13c089b181 Merge pull request #3740 from ProfessorCZ/master
Czech translation - Update
2016-05-02 08:47:05 +02: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
commy2
297c367fa5 Merge pull request #3729 from acemod/addCargoToPods
Add cargo to Taru pods
2016-04-28 07:48:11 +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
Glowbal
a90f48efb9 Merge pull request #3723 from acemod/syncErrorLog
Improve synced event error logging
2016-04-25 23:40:56 +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
commy2
93450b9e38 Merge pull request #1857 from jonpas/uiSettings
Selective UI Elements
2016-04-23 19:15:26 +02: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
8fba7a8286 Merge pull request #3714 from acemod/exploScope
Make explosives helpers hidden in eden.
2016-04-21 16:35:18 -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