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,137 Commits 73 Branches 88 Tags 752 MiB
5f3588bae7
Commit Graph

7550 Commits

Author SHA1 Message Date
PabstMirror
6d6cbec5ef Add missing FUNC to FCS key (Rangefinders) 
#3160
 2016-01-19 09:02:51 -06:00
Thomas Kooi
c439036abe Deprecate execPersistentFnc 3.7.0 
Remove functions the second update after deprecation.
 2016-01-19 15:55:33 +01:00
Thomas Kooi
a612bdecf2 Deprecate execRemoteFnc in 3.7.0 
Remove functions the second update after deprecation.
 2016-01-19 15:54:59 +01:00
PabstMirror
69771d531d Merge pull request #3173 from acemod/fixInvintoryLock 
Fix Vehicle inventory is not locked
 2016-01-19 08:37:58 -06:00
PabstMirror
0ea1c0c03f Cleanup non-working code, and documentation 2016-01-19 08:31:52 -06:00
Thomas Kooi
e083e60e8c Merge pull request #3142 from acemod/switchUnitsCleanup 
Cleanup SwitchUnits, Possible fix for #3122
 2016-01-19 09:40:24 +01:00
Thomas Kooi
33479ffcae Merge pull request #3146 from acemod/Explosives_DetonateTrigger 
Function to detonate explosives via script
 2016-01-19 09:38:43 +01:00
Thomas Kooi
aa535c9167 Merge pull request #3177 from acemod/fixJavelinZeus 
Javelin - Fix zeus RC after switchCamera
 2016-01-19 09:36:08 +01:00
Thomas Kooi
4ee338c57e Merge pull request #3178 from acemod/scopes_hideNonAdjustments 
Scopes: Don't show adjustment or play click sound if the adjustment doesn't happen
 2016-01-19 09:35:01 +01:00
Thomas Kooi
5c1f55a0f1 Merge pull request #3181 from acemod/leaveMyPlugsAlone 
Do not add or remove earplugs if gear should be preserved
 2016-01-19 09:34:38 +01:00
Thomas Kooi
46f832379a Merge pull request #3120 from acemod/explosives_actionmenu_cleanup 
Clean up explosive interaction menu
 2016-01-19 09:32:26 +01:00
Thomas Kooi
f5d71ca03c Merge pull request #3183 from acemod/codeCleanupGforces 
Code cleanup of Gforces module V2
 2016-01-19 09:31:16 +01:00
Thomas Kooi
fbb358233b Merge pull request #3172 from acemod/overpressureCleanup 
Overpressure cleanup and fix distance check
 2016-01-19 09:30:43 +01:00
esteldunedain
f599542b8e gforces cleanup. Close #2130 2016-01-19 00:18:01 -03:00
commy2
8731e8e338 Merge pull request #3133 from acemod/gottaCacheEmAll 
Use Function Caching in CBA
 2016-01-18 20:27:39 +01:00
esteldunedain
0a91dfa7b2 Do not add or remove earplugs if gear should be preserved. Fix #3180. 2016-01-18 13:23:55 -03:00
VKing
2af3d9e769 Don't show adjustment or click sound if the adjustment doesn't happen 2016-01-18 16:16:53 +01:00
PabstMirror
67087d7c88 Capitalization 2016-01-18 00:27:19 -06:00
PabstMirror
a5c6c5579f #3175 - Javelin - Fix zeus RC after switchCamera 2016-01-17 12:12:05 -06:00
Glowbal
86158ac45b Stage improvements bandage effectiveness 2016-01-17 14:09:22 +01:00
Glowbal
7de1a7bc6c add initial implementation of drowning and collision damage handling 2016-01-17 13:21:18 +01:00
Glowbal
209d10065b Fix missing event log entries #3134 2016-01-17 12:28:37 +01:00
Glowbal
6e42a10d47 Add selectionDamage implementation 2016-01-17 12:28:08 +01:00
PabstMirror
48a1ddd401 #3166 - Fix Vehicle inventory is not locked 2016-01-16 21:58:59 -06:00
PabstMirror
35e6a181b5 opps 2016-01-16 17:48:58 -06:00
PabstMirror
893c6658a5 Fix debug msg order, re-add local check on eh 2016-01-16 17:29:57 -06:00
PabstMirror
a875d6a870 Overpressure cleanup and fix distance check 2016-01-16 15:53:28 -06:00
Glowbal
ee9a620a63 Merge branch '340handledamage' into medical-focus-feature 2016-01-16 22:03:28 +01:00
Thomas Kooi
c8c91d2af7 Merge pull request #3138 from acemod/increaseTrainingInLocations 
Medical Locations Boost Training
 2016-01-16 21:59:45 +01:00
VKing
e3123b3f56 Local check before setPosition 2016-01-16 01:13:01 +01:00
SilentSpike
dbcf94153d Merge pull request #3155 from acemod/spectatorFix 
Fix some spectator errors
 2016-01-15 15:43:45 +00:00
VKing
17aaf477fe Standardize displayName for the M26/Mk26/M152/whatever this is 2016-01-15 11:47:40 +01:00
VKing
cfea80bec8 Animate preplaced bottom attack SLAMs 2016-01-15 10:49:22 +01:00
VKing
248eb2143b Fix inconsistent detonator pictures for some IEDs 2016-01-15 10:20:49 +01:00
VKing
0078ad862a Remove redundant entries. 
Not removing them as it can be useful to have a reminder that those classes exist.
 2016-01-15 09:33:01 +01:00
Thomas Kooi
e38a80a712 Merge pull request #3119 from acemod/explosives_detonateAll 
Add action to detonate all explosives on a detonator
 2016-01-15 08:22:16 +01:00
VKing
4e8ea4f8e6 Fix detonate action pictures 2016-01-15 00:25:02 +01:00
PabstMirror
1affbd7d2f Move littler syncedEH install to after settingInit 2016-01-14 17:06:46 -06:00
VKing
05c80c2368 Gah stop that you jerk! 2016-01-15 00:04:12 +01:00
VKing
ed8b437a8f Prep function 2016-01-14 23:58:31 +01:00
VKing
32b33d7792 How the feck did this happen 2016-01-14 23:58:07 +01:00
VKing
8bdb2cb7f7 GVAR it. 2016-01-14 23:05:56 +01:00
VKing
575f37c8fd Add fnc_connectExplosive to add editor explosives to unit triggers 2016-01-14 23:05:26 +01:00
VKing
195f0a6874 GVAR it 2016-01-14 20:07:53 +01:00
VKing
1da2b69de4 Make fuel bladders work 2016-01-14 20:07:32 +01:00
VKing
099648b6b6 Russian translation as suggested 2016-01-14 18:51:14 +01:00
VKing
7158a89de9 Start 2016-01-14 18:48:16 +01:00
VKing
74435ba777 Style guide formatting 2016-01-14 18:47:51 +01:00
VKing
73e093ec07 Make stringtable a little more translatable 2016-01-13 22:39:37 +01:00
VKing
2c26d3836b Some fixes for the zeus modules 2016-01-13 22:39:14 +01:00
SilentSpike
49c814ccb3 Merge branch 'master' into spectatorUpdates 2016-01-13 19:19:00 +00:00
SilentSpike
d870a1f448 Fix nil spectator Draw3D event handler index 
Minor oversight introduced in pabst's fix for #2989, the icon handler is a mission event handler that isn't self terminating so the index needs to be preserved until after it is removed via `removeMissionEventHandler`. It is safe to let the `onUnload` event take care of that (and preferable so that icons disappear while temporarily closed).
 2016-01-13 19:03:24 +00:00
SilentSpike
65e981373b Store spectator display in a uiNamespace variable 
This allows me to explicitly close the right display and hopefully fix the interface staying open upon mission end.

@Commy2's theory is that perhaps the main display `46` is killed upon mission end, meaning that `findDisplay` can't find the spectator display to close it because the game thinks it doesn't exist.
 2016-01-13 18:38:51 +00:00
VKing
1ae21ad354 Change SLAM bottom attack ammo to be more bottom attacky 2016-01-13 15:41:20 +01:00
VKing
b87a6327ee Fix Zeus modules not showing up 2016-01-13 15:40:39 +01:00
VKing
058ea4e8f4 Actual editor mines 2016-01-13 01:03:50 +01:00
VKing
f90dd9fed8 Allow SLAMs to use long range transmitter 2016-01-13 00:14:17 +01:00
VKing
46643d44d0 Add editor/zeus modules for different trigger options 2016-01-13 00:13:56 +01:00
VKing
a07d456476 Change small IEDs to use smaller pressure plates 2016-01-12 23:17:10 +01:00
VKing
61f288c9cc Rename custom classes with ACE_ prefix 2016-01-12 23:16:49 +01:00
esteldunedain
455c53a084 Nerf the amount of backblast received by the firer via reflection. Fix #2890. 2016-01-12 13:09:41 -03:00
PabstMirror
091c807708 Restart specatator display if player in unitList 
Possible fix for #2677
 2016-01-12 00:30:03 -06:00
PabstMirror
8cbf31a375 Fix undefined variable error in FUNC(debug) 
possibly related to #2677 - threw error from switchToGroupSide
 2016-01-11 23:37:44 -06:00
VKing
4fc7c3065e Rename to fnc_scriptedExplosive 2016-01-11 23:41:33 +01:00
VKing
01dd663337 Add fnc_detonateExplosiveTrigger 2016-01-11 23:36:34 +01:00
bux
ec0ece059f use Killed event, fix missing public setVar 
add more text, don't delete dead unit
 2016-01-10 20:58:54 +01:00
bux
09e4a6a76e cleanup SwitchUnits 2016-01-10 19:08:28 +01:00
PabstMirror
c2f780e95f #1259 - Medical Locations Boost Training 2016-01-09 23:54:48 -06:00
PabstMirror
dd979676fd Remove use of CAManBase for all mans 
End use of bandaid from #1294
 2016-01-09 22:05:40 -06:00
PabstMirror
82179636f3 Cache hearing firedNear 2016-01-09 18:51:41 -06:00
PabstMirror
63a79b9920 Use Function Caching in CBA 2016-01-09 01:36:19 -06:00
PabstMirror
a161008eb7 Fix count/forEach 2016-01-09 01:15:09 -06:00
PabstMirror
ed4cc42897 Cleanup Interaction Menu 2016-01-08 23:29:32 -06:00
commy2
62f589ac84 remove deprecated functions 2016-01-08 15:56:32 +01:00
PabstMirror
54397abaa2 AB - Handle subsonic ammo when not defined 
Fix #3062
- Add basic AB configs for subsonic russian bullets.
- When building ab ammo cache, if round is subsonic and does not have AB
configured
attempt to use the parent's config, scaled down to the subsonic's round
speed.
 2016-01-07 15:06:12 -06:00
PabstMirror
066976766f Show beaufort dots on wind display -for color Blind 
Show dots on the wind display so color blind can still determine wind
level
Replace PR #1308
 2016-01-07 10:34:31 -06:00
PabstMirror
9d14ff8b03 Merge branch 'master' into deterministicOverheatingX 2016-01-06 23:25:24 -06:00
commy2
de13518177 explode macro to params 2016-01-06 22:49:22 +01:00
commy2
e56e18bff3 Code cleanup 1.54 2016-01-06 22:42:02 +01:00
VKing
9985988987 Change ACE_Player to _unit 2016-01-06 18:05:06 +01:00
jokoho48
daf2fc2669 remove ccp issue in settings 
prevent setCaptive if unit is wake up
 2016-01-06 18:01:24 +01:00
jokoho48
6d49bbda28 add delay to Unconsciousness Captivity(posible fix for #3121) 2016-01-06 17:46:59 +01:00
commy2
abf516aeb1 manual merge 2016-01-06 15:57:09 +01:00
PabstMirror
4c229c92f5 Add Stringtable Entry 2016-01-05 17:29:01 -06:00
PabstMirror
b6dce03c90 Fix Header 2016-01-05 17:16:47 -06:00
VKing
1706ca0adc Move detonate actions from "Detonate" layer to "Explosives" layer. 
Remove inconsistent ">>" from explosive actions.
 2016-01-06 00:06:06 +01:00
VKing
cc8ac69feb Add function and action to detonate all explosives on a detonator 2016-01-05 23:47:01 +01:00
Glowbal
c042703786 Merge branch 'release' 2016-01-05 22:55:34 +01:00
Glowbal
509e142de8 bump version 3.4.2 2016-01-05 22:42:37 +01:00
PabstMirror
175624620c Fix inverting wind direction each sync update 
Fix #1052 (and maybe #1708)
 2016-01-05 15:29:52 -06:00
commy2
7eaa55f9df Merge pull request #3022 from acemod/bodybagevent 
add event for placing units in body bags
 2016-01-05 21:59:47 +01:00
commy2
74f78c2dd1 Merge pull request #3010 from acemod/cargoboxfilters 
Add more filters to ammo boxes
 2016-01-05 21:55:24 +01:00
commy2
279b48f112 Merge pull request #3110 from acemod/gogglesfiredBIS 
fix usage of deprectated fired XEH, fix #3088
 2016-01-05 21:52:53 +01:00
commy2
3854a5c989 Merge pull request #3109 from acemod/ThingX 
fix ThingX capitalization, fix #3076
 2016-01-05 21:52:42 +01:00
PabstMirror
e2c08d2c26 Privates, Headers, Merge 4 PFEH into one 2016-01-05 01:39:29 -06:00
PabstMirror
46cb90254a Add ACE_HashLocation to common 2016-01-04 21:48:26 -06:00
Luigi
7f9c766770 Fixed and added French Translation 2016-01-04 16:47:15 +01:00
Luigi
a079f213c0 Fix French translation 
Fix an error in a French translation
 2016-01-04 16:19:23 +01:00
PabstMirror
a72e07fcaa Goggles - change some events to be client only 
all these events have `if (_unit != ACE_player) exitWith {true};`
 2016-01-03 11:01:14 -06:00
Alessandro Foresi
bafde22c71 Fix: Indentation 2016-01-03 16:47:41 +01:00
commy2
3974c255a0 fix usage of deprectated fired XEH, fix #3088 2016-01-03 15:27:16 +01:00
commy2
427628045c fix ThingX capitalization, fix #3076 2016-01-03 15:21:38 +01:00
commy2
ecad63e34d integrate filters pbo into inventory pbo 2016-01-03 14:47:37 +01:00
jonpas
b93183fef9 Shorten if check 2016-01-03 14:05:50 +01:00
Alessandro Foresi
2d152675fc Add: IT small translations, DE removed duplicate 2016-01-03 13:02:01 +01:00
Alessandro Foresi
c16d97cad0 Merge branch 'master' into translation/15bn/alef 2016-01-03 12:23:27 +01:00
Braxton Williams
ce069c8f3c Change Sandbag category 2016-01-02 18:25:48 -06:00
jonpas
6edd7ab093 Change ACE_HeadlessClientJoined event to be global and always triggered 2016-01-02 14:42:05 +01:00
jonpas
a1866a561b Add Headless 2016-01-02 14:23:14 +01:00
bux
977bda83e5 add 2 new events, add unit to place event 
defuse and explodeOnDefuse
 2016-01-01 21:47:39 +01:00
Braxton Williams
99e2ee6110 Add sandbag to editor 2016-01-01 13:09:11 -06:00
PabstMirror
76c9e1560d Frag - only run addPfhRound on ammo that will frag 
If spall is not enabled (default) then calculate which ammo types will
actually cause a frag event, cache and then only track those.
 2016-01-01 02:33:08 -06:00
PabstMirror
79a7bb54aa Kill Spectator PFEH when exiting spectator 
Should fix #2989
There is a race condition between these 4 PFEH and the "onUnload" event
in handleInterface.
If the PFEHs run first they will use nil variables and throw a script
error.
This sets them to nil immediately when exiting spectator
 2016-01-01 00:14:48 -06:00
PabstMirror
5f74daec42 Fix dupe german stringtable entry 2015-12-31 22:28:35 -06:00
jonpas
33f91b2ee7 Remove duplicated line caused by merge 2016-01-01 03:52:37 +01:00
jonpas
ebf1321c0b Merge branch 'release' into fixFuelHoseExceededAfterDisconnect 2016-01-01 03:51:44 +01:00
PabstMirror
fb0738bd30 Merge branch 'master' into release 2015-12-31 20:27:26 -06:00
PabstMirror
32b4416c29 Merge pull request #3064 from GitHawk/refuel 
Adaptation of fnc_makeJerryCan to new interact_menu
 2015-12-31 20:12:43 -06:00
VKing
222b15634f Increase prep time for guided projectiles 2015-12-31 22:26:04 +01:00
PabstMirror
586449eef9 Merge pull request #3084 from acemod/cbaZeusIntegration 
CBA zeus integration
 2015-12-31 15:15:23 -06:00
PabstMirror
19f54071f1 Merge pull request #3052 from acemod/isPlayerRemoteZeus 
Add support for non local Zeus RC in common-isPlayer
 2015-12-31 15:14:44 -06:00
PabstMirror
62a94759c4 Merge pull request #3092 from acemod/minorSittingCleanup 
Sitting Cleanup
 2015-12-31 14:50:31 -06:00
PabstMirror
8bdd5d0597 Merge remote-tracking branch 'brGuy/Translations-December' into fixStringtablesMerge 2015-12-31 14:30:29 -06:00
licht-im-Norden87
2d64d54d98 Update German Stringtable 
Iam sure there was a translation some time ago. Someone must have deleted it.

spelling mistake

Update Stringtable

100% some of them already existed in german language

Update stringtable.xml

spelling mistake

Update stringtable.xml

Iam not sure if SSWT is a Scharfschützenzweibein. However, it was used before, i just adpated it.

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Handelt es sich bei dem Modell den auch um das Produkt von Sharpshooters® http://shop.centermassinc.com/Sharpshooters-Sniper-Weapon-Tripod-Kit-764737932766.htm bzw ist ads erkennbar. Ich persönlich halte die Bezeichnung SSWT-Kit für ein wenig ungünstig.

Update stringtable.xml
 2015-12-31 14:17:13 -06:00
PabstMirror
cf27571b5a Merge pull request #3007 from dudakov/master 
Russian Translations - Update
 2015-12-31 14:11:45 -06:00
PabstMirror
7b077c5f19 Merge pull request #3078 from acemod/fixGoggles3rd 
Fix Third Person Goggle Effect Not Displaying
 2015-12-31 10:24:23 -06:00
Thomas Kooi
40afa45417 Merge pull request #3058 from freghar/isturnedout 
fix inverted isTurnedOut for map lighting
 2015-12-31 13:03:42 +01:00
bux
23bec6d9a8 Merge master into branch 2015-12-31 10:20:47 +01:00
PabstMirror
2e211c5a04 Fix Medical Triagecard Macro 
Fix #3087
 2015-12-31 01:46:24 -06:00
PabstMirror
f11c2af921 Update XEH_clientInit.sqf 2015-12-30 14:55:25 -06:00
PabstMirror
d372111d3f Sitting Cleanup 
- Add modern privates
- Don't add actions, canInteractWith, or EH if not enabled
 2015-12-30 12:23:35 -06:00
bux
0e8eb5fac4 Remove obsolete hotkey entries 2015-12-30 11:23:52 +01:00
bux
d6c5643790 improve code style 2015-12-30 09:43:19 +01:00
bux
2a6042bf61 add interaction position and defuse object position 
and reduce interaction distance
 2015-12-30 09:11:57 +01:00
PabstMirror
72fe95c797 Add "isNotInZeus" to canInteractWith 
Re-fix #1951 (CTRL+V from climb blocking paste in zeus)
 2015-12-30 01:48:43 -06:00
PabstMirror
1e29c0286f Remove Keybinds/Events for Zeus now handeld in CBA 
Close #2937
 2015-12-30 01:07:55 -06:00
bux
112c002b0b remove ace_offset entry 
Ported from AGM and simply renamed. It wasn't even used in AGM.
 2015-12-29 20:57:55 +01:00
dixon13
356bd36728 Changed action name 
- Changed display name for extraction action on civilians to match the new action name 'Get Out'.
- Changed class name for extracting civilians out of vehicles to match the action name
 2015-12-29 09:27:43 -07:00
dixon13
f2b3275538 Changed action name 
Changed extraction action to 'Get Out' to match other civilian actions.
 2015-12-29 09:25:33 -07:00
dixon13
d410fe42d9 Fixed misspell 
'_targe' is suppose to be '_target'
 2015-12-28 22:00:08 -07:00
PabstMirror
462e37e6d1 Update Heating / Cooling physics numbers 
Attempting to update numbers based on real physics.
Effects will increase heat generated per shot and decrease cooling
- ~1.333x increased heating
- ~1.45x less cooling
 2015-12-28 21:01:56 -06:00
PabstMirror
415402b5ad Cleanup and debug 
Fix missing weapon configs

Fix Dispersion (Radians / Degrees)

Fix comment
 2015-12-28 16:08:32 -06:00
PabstMirror
42b350a40c Cache Weapon Configs 2015-12-28 16:04:56 -06:00
PabstMirror
e587a6e6e3 Modernize code 2015-12-28 16:04:56 -06:00
PabstMirror
3020023f58 setVariablePublic - Use waitAndExecute 2015-12-28 16:04:55 -06:00
esteldunedain
c1e8b3dba9 Fix temperature bar color 2015-12-28 16:04:55 -06:00
esteldunedain
f132955d9f Reenable refraction fx but make it optional for the moment. 2015-12-28 16:04:55 -06:00
esteldunedain
d001131314 Tweak and optimize the smoke effect to increase smoke and reduce performance impact 2015-12-28 16:04:54 -06:00
esteldunedain
3c74c4bada Fix temperature indicator to max out red at half the bar 2015-12-28 16:04:54 -06:00
ulteq
4122d68684 Adjusted temperature display (red above 600°C) 2015-12-28 16:04:54 -06:00
ulteq
a1ee99cc8a Remove debug code 2015-12-28 16:04:53 -06:00
ulteq
7858b65fde Fixed misspelled function name 2015-12-28 16:04:53 -06:00
ulteq
0a27c309cb Added missing variable definitions 2015-12-28 16:04:52 -06:00
commy2
f83206353d jamming 2015-12-28 16:04:52 -06:00
Nicolás Badano
4264789631 Refactored code so the weapon temperature is correctly updated when checking it 2015-12-28 16:04:52 -06:00
Nicolás Badano
ac67e45098 overheating: sync weapon temperature across the net, deterministic pseudo-random bullet dispersion 2015-12-28 16:04:51 -06:00
Nicolás Badano
932e17cea4 fix 2015-12-28 16:04:51 -06:00
Nicolás Badano
fb56350217 small fixes 2015-12-28 16:04:51 -06:00
Nicolás Badano
de902ca4fd Modify setVariablePublic so it published inmediately if the variable hasn't being publishes recently. Then establish an embargo time before it can be published again. 2015-12-28 16:04:50 -06:00
jonpas
c0aaf05eaf Prevent interaction if unit(s) climbing the ladder, Disable tilting, Split adjust string into adjust and tilt 2015-12-27 19:28:29 +01:00
PabstMirror
dc60860421 Fix Third Person Goggle Effect Not Displaying 
#3074
 2015-12-26 23:31:49 -06:00
dixon13
a4781a20d3 Authors 2015-12-23 19:27:55 -07:00
dixon13
2a98aa57ed Delete fnc_canInteractWithCivilianVehicle.sqf 
No need to create another funciton
 2015-12-23 11:54:41 -07:00
dixon13
d3a1110250 Removed a portion of the condition 2015-12-23 11:52:23 -07:00
dixon13
5f7e833d43 Removed "PREP(canInteractWithCivilianVehicle)" 
Function is being removed
 2015-12-23 11:51:19 -07:00
dixon13
21daa331dc Changes to ACE_Unload 
- added semi-colon
- changed the condition
- changed the statement
 2015-12-23 11:49:17 -07:00
dixon13
1aa192f7e0 Extract civilans from vehicles, rmeoved actions from civilians in vehicles 2015-12-23 00:19:41 -07:00
Githawk
2432ac3319 Changed scope for carried objects 2015-12-22 17:54:16 +01:00
Githawk
d16417a00b Changed scope on nozzle 2015-12-22 17:49:58 +01:00
Githawk
ebb28177b1 More fixes to make jerryCan work 2015-12-21 17:54:52 +01:00
Glowbal
c1fa81f28b Fix tabs in sqf files 2015-12-21 17:05:48 +01:00
Githawk
d9e7a43bf7 Fixes error with new interact_menu 2015-12-21 16:53:25 +01:00
jokoho48
0addb592d3 remove Unused Varaible in AB 
fix private in AB
 2015-12-21 02:29:10 +01:00
VKing
38fb97aeac Fixed init problem; added mortar ammo boxes 2015-12-20 20:51:44 +01:00
VKing
73720f9313 Too hasty 2015-12-20 18:20:34 +01:00
VKing
b7bd468fdd That ought to not have worked before 2015-12-20 18:18:33 +01:00
freghar
a383da5b2d fix inverted isTurnedOut for map lighting 
According to the comment, the idea is to provide unobscured map when
inside an enclosed vehicle (!isTurnedOut).

Signed-off-by: freghar <freghcz@gmail.com>
 2015-12-20 11:53:08 +01:00
PabstMirror
9b0641c06f Add nil return for count 2015-12-19 21:17:36 -06:00
PabstMirror
74aec45921 Fix medical menu not closing on range, litter dir 
- Medical Menu didn't close when target moved out of range
- Litter was always created in the same direction
 2015-12-19 20:50:57 -06:00
VKing
450a18e13a Forgot to disable in case the setting's set to "no" (but why would you ever want to 2015-12-19 21:29:37 +01:00
VKing
f75311917c Upped mortar round mass 2015-12-19 20:49:09 +01:00
VKing
b4cb5c2ba7 Changed mortar initialization to getIn; Zeus-controlled AI will not trigger the init. 2015-12-19 19:54:45 +01:00
VKing
85270e4521 Fix init issue 2015-12-19 18:22:54 +01:00
VKing
a37d97103f Erk 2015-12-19 16:37:30 +01:00
VKing
a336707623 Fixed initialization, added exclude variable to prevent initialization of individual guns (for e.g. AI mortars) 2015-12-19 16:30:01 +01:00
VKing
dfe7c07936 Fix fnc_mortarInit, fnc_loadMagazine, some other stuff 2015-12-19 12:10:12 +01:00
VKing
2c4a25a6c0 Mortar init functions 2015-12-19 02:18:35 +01:00
PabstMirror
4d041c3c94 Merge pull request #3049 from acemod/fixlaserdesignator 
Remove undefined laser selfdesignate macro
 2015-12-18 12:09:04 -06:00
Jonathan Pereira
ad48f51ec7 Added PT-BR translations 
All remaining translations of gestures, hearing, interact_menu,
interaction, nightvision, rearm, refuel, viewdistance were done!
 2015-12-18 15:14:19 -02:00
PabstMirror
c53a0541a4 Add support for non local Zeus RC in common-isPlayer 2015-12-18 11:08:10 -06:00
Jonathan Pereira
db7074b6cf Removed duplicated German entry 2015-12-18 14:45:20 -02:00
commy2
e3ecc64771 remove undefined macro 2015-12-18 13:53:25 +01:00
VKing
579f861b8f Unload to player inventory 2015-12-17 19:25:22 +01:00
VKing
27890a8dab First try at some module control 2015-12-17 11:00:46 +01:00
VKing
a0fdc58ed7 Remove unused variables, spaces 2015-12-17 09:13:23 +01:00
VKing
d8c8d02177 Port inventory picture and model 2015-12-17 00:21:54 +01:00
VKing
e0a21ce144 Completed code porting and interaction 2015-12-16 23:47:14 +01:00
VKing
3e6fc52733 First working iteration. 
Todo:
Implement in module (Choose new or old/don't break old missions)
Magazine UI+model
Add preparing delay
Fix function readmes
Cleanup in functions?
Credits
MP Testing
 2015-12-16 20:22:18 +01:00
PabstMirror
43a9865fa2 Use isNil for better future compatiblity 2015-12-16 12:10:53 -06:00
PabstMirror
360bdcb50e Optics - Don't modify camera for ThreeDen Editor 
Fix broken ThreeDen Camera when returning to editor from preview.
PIP will still work in preview.
Will have to take a look at 1.56 RC to see if command exists and
eventually cleanup.
 2015-12-16 11:28:43 -06:00
PabstMirror
ff3ddbe287 Building Interact - Dummy object instead of hiding 
Fix #3038
InteractiMenu now checks `isObjectHidden`,
So now use dummy object instead of hiding a real one
 2015-12-15 12:04:03 -06:00
PabstMirror
7258a0084a Merge pull request #2995 from acemod/repairThreshholdToolkit 
Fix PostRepairDamage and toolkit consumtion setting
 2015-12-14 19:30:19 -06:00
PabstMirror
f2bcd66784 Toolkit also consumed on fullRepair 2015-12-14 19:28:31 -06:00
PabstMirror
886c13f6a9 Merge pull request #3013 from acemod/bloodyLitter 
Fix litter for adv - Add bloody p3d for Pack/qClot
 2015-12-14 19:23:51 -06:00
PabstMirror
0b5b11c966 Merge pull request #3014 from acemod/fixNameSanatize 
Sanitize less/greater-than symbol to square
 2015-12-14 19:23:07 -06:00
PabstMirror
e5abb59f1d Merge pull request #3011 from acemod/rhsMergeERA 
RHS Compat - Combine all ERA Hitpoints
 2015-12-14 19:22:51 -06:00
commy2
e6be1537cd replace more private with private keyword in common 2015-12-14 13:17:48 +01:00
commy2
bfa29246be replace private with private keyword in other half of common 2015-12-14 13:08:19 +01:00
PabstMirror
9064579a65 Send string to serverLog instead of strucText 
Fix `Performance warning: SimpleSerialization::Read
'ace_common_remoteFnc' is using type of ,'TEXT' which is not optimized
by simple serialization, falling back to generic serialization, use
generic type or ask for optimizations for these types`
 2015-12-13 13:27:46 -06:00
VKing
170095ae35 Initial commit for mortar ammunition handling. 2015-12-13 18:27:13 +01:00
commy2
bd3c79f739 add function to retrieve the control of the stamina bar 2015-12-12 20:25:42 +01:00
commy2
7f63d51ccb add event for placing units in body bags 2015-12-12 18:21:11 +01:00
commy2
2839cff753 common code fixes 2015-12-12 17:26:47 +01:00
commy2
3d5ea74c7e replace private with private keyword in first half of common 2015-12-12 16:48:54 +01:00
jonpas
4c2d92d360 Negate fuel hose connected condition 2015-12-12 15:12:50 +01:00
PabstMirror
a501c7e1c3 Remove new models and just combine existing litter 2015-12-11 19:47:40 -06:00
jonpas
e5f64bcdc1 Fix refuel PFH not exiting on nozzle disconnect 2015-12-11 22:45:28 +01:00
PabstMirror
24d77d1b7c Fix Typo 2015-12-11 12:17:05 -06:00
PabstMirror
db50b5313d getName can return raw or sanatized html tags 2015-12-11 12:01:50 -06:00
commy2
ff95aab100 remove helmets from items filter 2015-12-11 15:05:43 +01:00
commy2
ee7f8f82f5 remove debug 2015-12-11 14:24:54 +01:00
commy2
5d9a057165 add more filters to ammo boxes 2015-12-11 14:18:11 +01:00
commy2
2b63b2efa8 add more filters to ammo boxes 2015-12-11 13:14:58 +01:00
PabstMirror
c7b6375092 Sanitize less/greater-than symbol to square 
Fix #2912
The raw `&lt;` showed up in nametags and anything besides strucText
`[ / ]` is fairly close and will work in either text mode.
 2015-12-10 23:29:05 -06:00
PabstMirror
e9be05209a Fix litter for adv - Add bloody p3d for Pack/qClot 
Fix #2950
Get correct bloodLossOnSelection for both basic and advanced
Adds bloody versions of packing bandage and quickClot
 2015-12-10 22:58:44 -06:00
PabstMirror
ee0812ad15 RHS Compat - Combine all ERA Hitpoints 
Put all ERA hitpoints (up to 46 of them) onto a single point
and put that point on the main interaction point
 2015-12-10 20:57:23 -06:00
commy2
68388bc976 add more filters to ammo boxes 2015-12-11 01:02:15 +01:00
bux
8e6a057f52 fix common stringtable 2015-12-10 18:48:00 +01:00
kaban
fd06472f4d Russian Translations - Update 2015-12-10 20:32:16 +03:00
[OMCB]kaban
aec2c3fef2 HotFix: removed duplicated key. 
Removed duplicated German key for STR_ACE_Common_DoNotForce.
It caused Tabler.exe couldn't read stringtable files.
 2015-12-10 18:24:28 +03:00
PabstMirror
f3b7b3b94f Merge pull request #2994 from acemod/microDagrListBoxKeyblock 
MicroDagr - Prevent Home Key being blocked
 2015-12-10 09:20:06 -06:00
PabstMirror
a71cce1981 Merge pull request #2987 from acemod/gesturesCleanup 
Setting For Gestures - Fix BI* gestures
 2015-12-10 09:19:35 -06:00
commy2
077b9827e8 code cleanup fcs 2015-12-10 16:00:14 +01:00
commy2
7748131e73 code cleanup markers 2015-12-10 15:32:31 +01:00
commy2
a08cf69149 tweak size of laserpointer, fix #2975 2015-12-09 22:56:14 +01:00
havena
6f0568c370 fix Unexpected stringtable format 
Unexpected stringtable format inside <Text ID="STR_ACE_Common_CheckPBO_Action_WarnPerm"><German>
 2015-12-09 20:18:15 +01:00
PabstMirror
3ae7cd15bd cleanup stringtable phrasing 2015-12-09 12:27:47 -06:00
PabstMirror
3d560108a3 Setting For Gestures - Fix BI* gestures 2015-12-08 23:08:09 -06:00
PabstMirror
0eed4799af MicroDagr - Prevent Home Key being blocked 
Fix #2974
 2015-12-08 21:31:03 -06:00
PabstMirror
e964b2c135 Fix PostRepairDamage and toolkit consumtion setting 
Fix #2982
 2015-12-08 20:31:40 -06:00
PabstMirror
cae9f436f6 Merge branch 'release' 2015-12-08 15:14:33 -06:00
Glowbal
0599b35fc6 Bump version to 3.4.1 2015-12-08 14:47:48 +01:00
PabstMirror
38bf869f07 Also Fix Rearm 2015-12-07 14:07:03 -06:00
PabstMirror
cd68f9b320 Fix refuel unconc error - Man unloading for air 2015-12-07 13:54:41 -06:00
Thomas Kooi
05c56f73b5 Change disable NVG with sights by default 
As discussed on Slack, we are changing the default behaviour infavor of excepted gameplay.
 2015-12-07 18:33:20 +01:00
PabstMirror
39edd205f0 Merge pull request #2942 from acemod/CzechTables 
Czech Translations - Update
 2015-12-07 09:32:00 -06:00
bux578
fbde1dd794 Merge pull request #2941 from acemod/DieStringtables 
Update German Stringtables
 2015-12-07 10:27:11 +01:00
bux578
821ccf5726 fix medical menu stringtable name 2015-12-07 10:21:48 +01:00
bux578
af31d43567 fix german typos 2015-12-07 10:20:35 +01:00
PabstMirror
358228f5bb Cleanup De Stringtables 2015-12-06 15:03:15 -06:00
commy2
9fa62c6d2a clean up vehicles config 2015-12-06 11:18:07 +01:00
gienkov
56e919dccc nozzle additonal check condition 2015-12-06 06:47:19 +01:00
gienkov
1132efaf48 ceil number of wounds 2015-12-06 02:57:21 +01:00
gienkov
f6e7cad678 remove Original entries 2015-12-05 22:08:39 +01:00
PabstMirror
b13656e54b addDamageToUnit - Disable debug / testing code 2015-12-05 12:19:34 -06:00
Thomas Kooi
761d6e28d8 Merge pull request #2939 from acemod/fixMicroDagrDefines 
MicroDagr - Add #undef to config for pboProject
 2015-12-05 11:29:25 +01:00
Thomas Kooi
8e88740730 Merge pull request #2924 from acemod/woundReopeningArray 
Don't update openWounds if not bandaged
 2015-12-05 11:28:56 +01:00
ProfessorCZ
cf41ac5fba Czech Translations - Update 2015-12-04 22:28:10 -06:00
licht-im-Norden87
291f4df072 Update German Stringtables 
Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

kommas...........................................................................................................................................................

Rallypoint

Update stringtable.xml

slideshow, not finished yet

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

What does Curator mean in this context?
l. 294, l 302

cargo

Update stringtable.xml

Update stringtable.xml

I left a few things out. I'd like if someone gives me  advice
Z.698 Pionier oder Instandsetzer o.Ä. Was genau ist die deutsche Bezeichung der Klasse in ACE bzw Arma?
Z.707 Ich habe mich einfach mal auf Mechatroniker festgelegt, da Reperaturspezialist sich doch ein wenig ungelenk anhört...

Update stringtable.xml

Habe engineer als Pionier übersetzt (halte es selbst für etwas unpassend) Der specialist ist bei mir zum Mechatroniker geworden.

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Fix Mistakes from merge

Fix Empty Entries

Fix Mistake

Fix
 2015-12-04 22:06:44 -06:00
PabstMirror
f5aae81465 MicroDagr - Add #undef to config for pboProject 
#2936
 2015-12-04 20:08:30 -06:00
PabstMirror
43a168f0b9 Flashbangs - Make event radius match effect radius 2015-12-04 15:16:17 -06:00
commy2
e418cfcf11 Merge pull request #2935 from acemod/fixbinoculars2 
Fix binocular related bugs
 2015-12-04 21:27:53 +01:00
commy2
5d43fa93c6 fix FUNC(binocularMagazine), fix #2916, fix #2917, fix #2918, fix #2922, fix #2928, fix #2933 2015-12-04 19:37:37 +01:00
PabstMirror
875b3980ac Don't update openWounds if not bandaged 
Fix #2921
 2015-12-03 15:23:38 -06:00
PabstMirror
91ace4fc9b Fix whitelist string -> array error in checkPbo 
Fix #2913
Use splitString instead of call compile to convert string into an array
 2015-12-02 23:58:41 -06:00
PabstMirror
c928a0d6cb Remove Sleep/WaitUntil from checkPBO 
Fix #2910
 2015-12-01 22:50:28 -06:00
PabstMirror
46c43b56db Merge branch 'release' 2015-12-01 15:54:57 -06:00
PabstMirror
419af195e9 #2902 - Remove error and don't exit if veh has no hit points 
B_UAV_01_F has no hitpoints and would throw error
Don't exit so "fullRepair" action still gets added
 2015-12-01 13:43:27 -06:00
Glowbal
dacfe4d6cb Bump version to 3.4.0 2015-12-01 17:05:08 +01:00
commy2
861262e41c revert false captitalization change 2015-11-30 17:56:25 +01:00
commy2
411a8d58f3 fix more setVariable and getVariable capitalization 2015-11-30 17:53:57 +01:00
commy2
5a1aae6028 manual merge 2015-11-30 17:44:15 +01:00
commy2
e422388484 fix waitUntil capitalization 2015-11-30 17:28:01 +01:00
commy2
a9ebcf8543 fix setVariable and getVariable capitalization 2015-11-30 17:27:09 +01:00
commy2
d037f00a92 fix forEachIndex capitalization 2015-11-30 17:25:16 +01:00
commy2
b3950bd7f0 fix forEach capitalization 2015-11-30 17:23:48 +01:00
commy2
a8228f60c2 fix configFile capitalization 2015-11-30 17:23:02 +01:00
commy2
2b05f6f451 fix isNil capitalization 2015-11-30 17:22:16 +01:00
commy2
5e41643cff fix pushBack capitalization 2015-11-30 17:21:28 +01:00
commy2
d9b90258bc fix typeOf capitalization 2015-11-30 17:19:57 +01:00
commy2
34d351c652 fix exitWith capitalization 2015-11-30 17:14:05 +01:00
commy2
0b84bb514b fix Cfg capitalization 2015-11-30 17:09:26 +01:00
commy2
dcf0a68b80 Revert "fix Cfg capitalization" 
This reverts commit 43bda9c462.
 2015-11-30 17:00:32 +01:00
commy2
43bda9c462 fix Cfg capitalization 2015-11-30 16:52:20 +01:00
commy2
ca9b909e75 fix CBA_fnc capitalization 2015-11-30 16:45:20 +01:00
commy2
ae1f35c042 remove superfluous private 2015-11-29 16:55:44 +01:00
commy2
caa5585044 simplify getRandomAnimation in sitting 2015-11-29 16:50:08 +01:00
commy2
ff4406e411 manual merge, more selectRandom command useage 2015-11-29 16:48:23 +01:00
commy2
e5c4d35969 1.55 use new selectRandom command 2015-11-29 16:33:25 +01:00
Thomas Kooi
02eee05cf4 Merge pull request #2884 from acemod/speedLimiterUGVFix 
fix that in UGV dont work speedLimiter
 2015-11-29 12:41:13 +01:00
Thomas Kooi
081106d6a3 Merge pull request #2892 from acemod/TheHidden 
Remove nametags and actions on hidden units
 2015-11-29 12:38:27 +01:00
bux578
35ecef454f Merge pull request #2825 from gienkov/pl-translation 
pl translation
 2015-11-29 07:35:04 +01:00
PabstMirror
8d2b612570 Remove nametags and actions on hidden units 
Fix #2596
 2015-11-28 21:35:25 -06:00
SilentSpike
c426bfc9c1 Merge pull request #2888 from acemod/repairPositions 
Define custom repair points for a few vehicles
 2015-11-28 20:09:37 +00:00
Thomas Kooi
5282e95668 Merge pull request #2876 from acemod/medicalTranslateHP 
Medical Fixes
 2015-11-28 20:58:08 +01:00
Thomas Kooi
ced94d73a7 Merge pull request #2797 from ColdEvul/RoadBarrierRoadCone 
[REMADE] RoadCone_F and its inhered RoadBarrier_F intractable
 2015-11-28 20:51:39 +01:00
Thomas Kooi
d7a19cf0a6 Merge pull request #2882 from acemod/fixUGVNametag 
fix UGV Nametag issue
 2015-11-28 20:50:23 +01:00
Thomas Kooi
7dd0af33b4 Merge pull request #2871 from acemod/cleanupLaserpointer 
cleanup laserpointer
 2015-11-28 20:43:31 +01:00
Thomas Kooi
c132ef86cf Merge pull request #2133 from jonpas/dynamicViewDistance 
Mk 1 eyeballs Integration
 2015-11-28 20:40:29 +01:00
Thomas Kooi
e669f3e2cb Merge pull request #2699 from BaerMitUmlaut/disable-nvgs-in-sight 
Disable nvgs in sight
 2015-11-28 20:37:30 +01:00
gienkov
f25a181d8e fix my error 2015-11-28 20:37:29 +01:00
Thomas Kooi
cef01baf0b Merge pull request #2856 from acemod/isEqualTypeRepalcement 
1.54 - Replace typeName with isEqualType
 2015-11-28 20:36:07 +01:00
Thomas Kooi
b807d1db48 Merge pull request #2886 from acemod/bandageReopen 
Add all wound types to bandage treatment configs
 2015-11-28 20:32:13 +01:00
SilentSpike
a8cf9c6f48 Fix missing boolean inversion 2015-11-28 13:58:56 +00:00
gienkov
2c83fe4a11 refuel translation fixes 2015-11-28 13:45:59 +01:00
gienkov
a906c180ce remove alpha entries 2015-11-28 13:34:54 +01:00
PabstMirror
a42c2153cc Error handling for bad setting values array 2015-11-28 01:57:15 -06:00
PabstMirror
f676e6d9c9 Add some more typeNames replacements 2015-11-27 21:23:27 -06:00
PabstMirror
5850f78c1f Merge branch 'master' into isEqualTypeRepalcement 2015-11-27 21:08:21 -06:00
gienkov
adae379445 fixes 2015-11-27 21:55:05 +01:00
gienkov
b091b73e24 fixes 2015-11-27 21:54:04 +01:00
gienkov
3250245587 3.4.0 translations and fixes 2015-11-27 21:50:57 +01:00
PabstMirror
6031eb8c6e Add all wound types to bandage treatment configs 
Fix by adding all config entries;
instead of trying to modify classname
 2015-11-27 14:19:26 -06:00
gienkov
7eecff4296 Merge remote-tracking branch 'origin' into pl-translation 
Conflicts:
	addons/captives/stringtable.xml
	addons/map_gestures/stringtable.xml
	addons/zeus/stringtable.xml
 2015-11-27 21:19:25 +01:00
SilentSpike
0ffb9ea5ad Define custom repair points for a few vehicles 
Some helicopters have the main rotor point on the tip of a single blade which can be problematic depending on the orientation of the helicopter so those have been moved to the center (to match others). The tail rotor is also in the complete wrong position for some.
 2015-11-27 20:06:57 +00:00
ViperMaul
8d4364350c Fix for "double semicolon detected" error 2015-11-27 10:43:30 -08:00
jokoho48
76435ec228 posible fix for overlapping Speedlimiters 2015-11-27 15:48:03 +01:00
PabstMirror
e51f658ce0 Try base wound class in bandage treatment configs 
Gets the correct wound for the bandage treatment config
Used for selecting most effective bandage and reopening
_className was something like "velocityWoundMedium"
but configs only had base class "velocityWound"
 2015-11-26 23:18:39 -06:00
jokoho48
f364c2a5c3 fix some stuff i mixed up 2015-11-26 23:44:42 +01:00
jokoho48
5f2840bf39 fix that in UGV dont work speedLimiter 2015-11-26 23:39:17 +01:00
jokoho48
5df7eba1eb remove debug Code 2015-11-26 22:27:46 +01:00
jokoho48
59708ec2f7 fix UGV Nametag RPT Issue #2873 2015-11-26 22:24:06 +01:00
jokoho48
52a6eddb44 fix missing PBOPREFIX 2015-11-26 20:53:14 +01:00
PabstMirror
4aeeefdfe8 Fix UBC and increase Heli_04 Pod interaction distance 2015-11-26 11:47:25 -06:00
PabstMirror
a5c45c137f Medical - addDamageToUnit Helper 2015-11-26 09:53:12 -06:00
Thomas Kooi
581f71f8a1 Merge pull request #2141 from GitHawk/refuel 
Adding vehicle refueling
 2015-11-26 16:16:13 +01:00
Thomas Kooi
bba0e999ff Merge pull request #2164 from GitHawk/rearm 
Adding vehicle rearming
 2015-11-26 16:15:09 +01:00
Thomas Kooi
81ab280cb4 Merge pull request #2670 from acemod/simplifyFragConfig 
Simplify frag config
 2015-11-26 16:13:21 +01:00
Thomas Kooi
15267c0433 Merge pull request #2219 from acemod/handSignals 
Hand signals enhancement
 2015-11-26 16:04:41 +01:00
PabstMirror
ca0cfc9bbf Merge pull request #2861 from acemod/repairRebass 
Repair Overhaul
 2015-11-25 17:00:32 -06:00
PabstMirror
988a5c76bb Medical - 1.54 Changes 
1.54 Armor
Translate selectiosn to hitpoints
Calc newDamage using hitIndex (because sel is translated)
Fix isFalling never being reset

Cache hitpointIndex to reset damage

Normalize Limb Armor to 1.54

Cleanup

Cleanup
 2015-11-25 11:49:20 -06:00
PabstMirror
0b9044e3c7 Merge pull request #2753 from acemod/showHudSetter 
Showhud setter
 2015-11-25 11:16:21 -06:00
PabstMirror
ac6390c0b3 Add array info to header 2015-11-25 11:07:56 -06:00
PabstMirror
185cae2fe5 Remove Old Gestures from interaction 2015-11-25 11:00:45 -06:00
PabstMirror
095252ef76 Cleanup 
revert `format ["'%1'", QGVAR()];` as it crashes the game
 2015-11-25 10:16:37 -06:00
SilentSpike
c731d83642 Merge pull request #2848 from acemod/fixForEachDeleteAt 
fix Issue with forEach Loops and deleteAt Index
 2015-11-25 14:00:37 +00:00
Thomas Kooi
08c5374a99 Merge pull request #2390 from BaerMitUmlaut/pass-magazine 
Added interaction to quickly pass a magazine
 2015-11-25 14:04:07 +01:00
PabstMirror
36bf2d9cb5 Merge pull request #2803 from BaerMitUmlaut/remove-team-synching 
Remove manual team synching
 2015-11-24 21:37:50 -06:00
PabstMirror
20bf90f3e9 Medical - Fix Hitpoints Macro when building 2015-11-24 16:30:09 -06:00
PabstMirror
575fabb69d #2872-Map time support for subclasses of ItemWatch 2015-11-24 16:17:06 -06:00
jokoho48
fd1c38c612 Merge branch 'master' of https://github.com/acemod/ACE3 into handSignals 2015-11-24 22:44:32 +01:00
jokoho48
352db4cb66 remove some crap code 
replace some variables with macros
 2015-11-24 22:43:42 +01:00
PabstMirror
cfefb1c40e Cleanup spotting scope configs 2015-11-24 15:24:14 -06:00
PabstMirror
2c6cfcf294 Merge pull request #2832 from p1nga/Spotting-Scope-Update 
Updated spotting scope model.
 2015-11-24 15:23:12 -06:00
PabstMirror
9ecffcd133 Merge pull request #2746 from acemod/fixFlashlightPrivates 
fix privates in Map module
 2015-11-24 15:18:38 -06:00
IngoKauffmann
f9266764fb Moved module to ACE_Logistics 2015-11-24 21:33:38 +01:00
IngoKauffmann
1a6730340c Move module to ACE_Logistics category, removed single interact point 2015-11-24 21:30:08 +01:00
PabstMirror
2c76bc3b10 Merge pull request #2605 from TheNiner/master 
Fixed Laser Update Position Bug
 2015-11-24 13:43:53 -06:00
BaerMitUmlaut
818466d296 Added ACE setting to hide interaction 2015-11-24 19:07:17 +01:00
PabstMirror
51a463de24 Fix tap shoulder msg display 
Missing efunc on displayTextStructured
Calculate a shoulder side when using keybind
 2015-11-24 11:25:56 -06:00
IngoKauffmann
8fc52a4dfb Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel 2015-11-24 17:57:21 +01:00
PabstMirror
86f7ee2ad2 Merge pull request #2834 from acemod/addEarPlugsLoudness 
Hearing - Add earplugs based on loudness and give to MGs and fix respawn issues
 2015-11-24 10:52:11 -06:00
IngoKauffmann
d4c708e731 Missing ; 2015-11-24 17:33:33 +01:00
PabstMirror
ddc8b16db2 Merge pull request #2857 from acemod/invResize154 
Inventory Resize UI - changes for 154 GL-Mags
 2015-11-24 10:24:06 -06:00
PabstMirror
4ae209ab44 Merge pull request #2865 from acemod/154UBC 
Fix UBC for 1.54
 2015-11-24 10:23:48 -06:00
jokoho48
773b30df33 Merge branch 'master' of https://github.com/acemod/ACE3 into handSignals 2015-11-24 15:14:30 +01:00
PabstMirror
7981faad64 private -> local 2015-11-23 17:47:58 -06:00
PabstMirror
0273dd1d4d Merge branch 'master' into fixFlashlightPrivates 2015-11-23 17:45:41 -06:00
commy2
1d315bee6f cleanup laserpointer 2015-11-23 20:52:04 +01:00
IngoKauffmann
fd2fd3241e Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm 2015-11-23 19:37:10 +01:00
IngoKauffmann
cbe8d98f86 Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel 2015-11-23 19:29:05 +01:00
IngoKauffmann
931c6830fc Added reset 
It's now possible to reset a fuel truck by console command:
[fuel_truck] call ace_refuel_fnc_reset
 2015-11-23 19:28:51 +01:00
IngoKauffmann
763df43fbc Added possibility to disallow rearm 
> vehicle setVariable ["ace_rearm_disabled", true, true];
Also added ammo compatibility for RHS Mi24 with turret
 2015-11-23 17:08:06 +01:00
commy2
3be60a2f6e Merge pull request #2842 from acemod/fcsUpdateDisplay 
Update FCS display after distance adjust
 2015-11-23 16:34:09 +01:00
SilentSpike
d2538c6ff2 Add spectator text chat 
Turns out custom radio channels are kind of a pain to work with. However this should work fine assuming the radioChannelAdd commands will work on client machines.
 2015-11-22 20:03:10 +00:00
IngoKauffmann
113ac0f370 Minor improvements 
fnc_reset is still WIP
 2015-11-21 23:24:24 +01:00
SilentSpike
f07f06c843 Merge pull request #2760 from acemod/spectatorUpdates 
Spectator updates
 2015-11-21 15:00:44 +00:00
PabstMirror
c2564de5ef Fix UBC for 1.54 
Soldiers no longer inherit hitpoints from CaManBase
Adds a macro to deal with them
 2015-11-20 23:27:29 -06:00
PabstMirror
ab769757d9 Skip Depends Hitpoints - Use HitPoints selPos for wheels 
Stuff

Normalize Depends - Skip Glass Repair

Fix spawned wheel/track not having correct damage

getHitpointString robustness, hatchback fuelHitpoint, fix count errors

-

Formatting

local -> private

Fix Stuff
 2015-11-20 21:11:50 -06:00
SilentSpike
839c022b84 Fix broken repair point selection code 
Only valid hit selection + hit point combinations are usable for repair points:

- Empty hit points mean there isn't enough information to display to the user
- Empty hit selections mean that the hit point doesn't actually exist
 2015-11-20 21:11:23 -06:00
PabstMirror
4e93b9c72d 2307 - Repair sub-turrets 
Privates

Cleanup debug

Add repair actions for sub turrets

Cleanup

Fix Header

Error Handling

Cleanup setHitpointDamage

Fix common ACE_isEngineer to handle scalar or bool

Claim and release repair objects (wheel/track)

Repair sub-turrets
 2015-11-20 21:11:05 -06:00
Glowbal
d0cb09196d Merge branch 'master' of github.com:acemod/ACE3 2015-11-20 23:29:33 +01:00
Glowbal
67345b0178 Fix incorrect variable 
_items was the old variable name.
 2015-11-20 23:28:52 +01:00
PabstMirror
979ff8b479 Local -> private 2015-11-20 16:13:20 -06:00
PabstMirror
0f62168250 Merge pull request #2840 from acemod/fixOverpressure 
Overpresure - Misc fixes
 2015-11-20 15:38:24 -06:00
PabstMirror
08813c1b75 Convert local keywords to private 2015-11-20 15:36:37 -06:00
Thomas Kooi
801120fb39 Merge pull request #2841 from acemod/medicalAiBandage 
Move bandage log before basic exit
 2015-11-20 22:28:55 +01:00
Thomas Kooi
4a19fcc5a5 Merge pull request #2771 from BaerMitUmlaut/inWater-deprecation 
inWater -> isUnderwater
 2015-11-20 22:28:43 +01:00
Thomas Kooi
a652be8248 Merge pull request #2847 from BaerMitUmlaut/cleanup-moduleAmbianceSound 
Cleanup ambient sounds module
 2015-11-20 22:27:57 +01:00
PabstMirror
063042cb36 Merge pull request #2777 from acemod/interactionAnimationSetting 
Interaction Menu Animation Setting And PreExpand First Level
 2015-11-20 14:56:37 -06:00
PabstMirror
7b526a99a3 Cleanup 2015-11-20 14:53:16 -06:00
PabstMirror
c4117e1283 Merge branch 'master' into settingsErrorChecking 
Conflicts:
	addons/map_gestures/stringtable.xml
 2015-11-20 14:37:23 -06:00
PabstMirror
69b53af1d3 1.54 - Replace typeName with isEqualType 2015-11-20 11:40:31 -06:00
PabstMirror
9a9029fa49 Merge pull request #2839 from acemod/abFixTwist 
AB - Fix ACE_twistDirection
 2015-11-20 10:32:28 -06:00
PabstMirror
e81dd0729e Inventory Resize UI - changes for 154 GL-Mags 2015-11-19 15:54:43 -06:00
SilentSpike
f8e293d04d Localise spectator hotkeys in help window 2015-11-18 15:18:21 +00:00
SilentSpike
0567d1c2a1 Fix spectator unit list key press handling 
By setting maxHistroyDelay really high, the unit list shouldn't be messed with via key press very often.
 2015-11-18 15:02:17 +00:00
SilentSpike
0110ada1b5 Fix zeus waypoint formation actions 2015-11-18 14:54:17 +00:00
SilentSpike
d1dff4a24a Merge branch 'master' into fixForEachDeleteAt 
# Conflicts:
#	addons/common/XEH_postInit.sqf
 2015-11-18 13:27:04 +00:00
SilentSpike
49d4f233d9 Revert commit a718c82780 2015-11-18 13:19:12 +00:00
bux578
3b2b7fd78d Merge pull request #2821 from dudakov/master 
Russian Translations - Update
 2015-11-18 08:30:46 +01:00
PabstMirror
ebbf2b373a goggles - prevent CBA PFEH warning 
fix "x\cba\addons\common\fnc_removePerFrameHandler.sqf:30","WARNING:
Invalid or not existing PFH ID."
 2015-11-17 23:44:50 -06:00
kaban
da16fc1038 \addons\captives\stringtable.xml - resolving conflicts. 2015-11-18 06:50:00 +03:00
kaban
f8481ae5f2 Merge branch 'master' of https://github.com/acemod/ACE3.git into develop 
Conflicts:
	addons/captives/stringtable.xml
 2015-11-18 06:39:58 +03:00
PabstMirror
d6000ae985 local -> private 2015-11-17 14:33:17 -06:00
PabstMirror
3ec9fca73e local -> private 2015-11-17 14:06:12 -06:00
PabstMirror
75d80be143 Merge branch 'master' into interactionAnimationSetting 2015-11-17 14:05:31 -06:00
PabstMirror
5cbfe4f2a5 local -> private 2015-11-17 14:02:20 -06:00
PabstMirror
896615beb1 Merge pull request #2826 from acemod/settingsParamsArray 
Read settings from paramsArray (params in description.ext)
 2015-11-17 14:01:16 -06:00
PabstMirror
5823749f0c Merge branch 'master' into settingsErrorChecking 2015-11-17 14:00:22 -06:00
PabstMirror
6d04156f69 local -> private 2015-11-17 13:56:55 -06:00
commy2
a57d1bca75 replace local keyword with private 2015-11-17 17:43:07 +01:00
SilentSpike
a718c82780 Implement nice index deletion iteration solution 
Previously when iterating over an array and modifying the same array via deletion of the current index, incorrect means was used to account for the change in index resulting in any further deletions being applied to the wrong elements.

This solution does not require duplication of the array or the use of external variables to track the number of deleted elements. We simply lower the `_forEachIndex` by 1 whenever an element is removed.
 2015-11-17 16:02:56 +00:00
SilentSpike
23e110d7ce Remove depreciated spectator hotkey 2015-11-17 15:26:34 +00:00
commy2
b6f9a2b776 Merge pull request #2703 from jonpas/removeAdjustedProneOptics 
Remove enable optics in adjusted prone stances
 2015-11-17 16:24:27 +01:00
jokoho48
561f6126dc fix missing bracket 2015-11-17 13:34:34 +01:00
jokoho48
f3c5c64390 fix Issue with forEach Loops and deleteAt Index 2015-11-17 04:31:17 +01:00
BaerMitUmlaut
e008f87fb8 Cleanup ambience sound module 2015-11-16 19:00:02 +01:00
Jonathan Pereira
6ebd76ff2f Added PT-BR translations to Cargo 2015-11-14 12:24:01 -02:00
SilentSpike
cf368f240f Remove ear ringing upon spectator entry 
Volume updating was disabled, however any existing ringing would persist. Setting the volume to 0 should make the hearing PFH stop playing sound.
 2015-11-13 13:00:04 +00:00
PabstMirror
a621eaab24 #2750 - Update FCS display after distance adjust 2015-11-13 02:57:06 -06:00
PabstMirror
c3e6990d00 #2528 (6) - Move bandage log before basic exit 
In advanced medical without enableFor AI. Bandaging an AI would exit
before adding log.
 2015-11-12 01:06:29 -06:00
PabstMirror
9b2c79e7e1 getDistance - use lineIntersectsSurfaces 2015-11-11 14:12:42 -06:00
PabstMirror
391bfc160a Overpresure - Misc fixes 
- Fix passing magazine/ammo to overpressure event
- Use AGL for nearEntities
- Fix getDistance returning nil
 2015-11-11 13:24:27 -06:00
PabstMirror
9d2d5b9c7c AdvanBalls - Fix ACE_twistDirection 2015-11-11 01:58:12 -06:00
PabstMirror
e72c1d874a Merge branch 'master' into fixFlashlightPrivates 
Conflicts:
	addons/map/functions/fnc_determineMapLight.sqf
 2015-11-10 21:21:06 -06:00
PabstMirror
99852f2071 Merge pull request #2718 from acemod/rangeCards-scriptError 
RangeCard / AB fixes
 2015-11-10 21:02:16 -06:00
PabstMirror
4ff31771d3 DAGR - missing ( 2015-11-10 20:51:00 -06:00
PabstMirror
87b9ff9785 Hearing - Reset earplugs on respawn, addItem setting 
Fix #2835 - readd item on respawn
Fix #2837 - setVariable false on respawn
 2015-11-10 20:44:55 -06:00
PabstMirror
e2e74e0f5d DAGR - Fix degrees (° - seems to need UTF-8 BOM) 2015-11-10 16:17:22 -06:00
PabstMirror
830e7d9be4 Merge pull request #2278 from jokoho48/codeCleanUpDagr 
Code cleanup of Dagr module
 2015-11-10 16:15:12 -06:00
Thomas Kooi
d91ae9082e Merge pull request #2628 from acemod/cargoClassnames 
Add support for virtual cargo
 2015-11-10 08:38:17 +01:00
Thomas Kooi
ec1187e79b Merge pull request #2830 from acemod/mixedMedicalDisplay 
Display basicMed wounds for AI in mixed mode
 2015-11-10 08:33:21 +01:00
PabstMirror
845909f8af #2833 - Add earplugs based on loudness (+MGs) 
Use same loudness calc as firedNear (replacing old audibleFire)
Give ear plugs to machine gunners (depends on magzine size)
 2015-11-08 14:02:00 -06:00
PabstMirror
28738517e8 Merge pull request #2829 from acemod/FlashlightProxyModel 
Fix empty flashlightProxy model + Delete map glow lights from disconnecting players
 2015-11-08 11:25:06 -06:00
PabstMirror
5b16638ae5 Always force param settings 2015-11-08 11:22:41 -06:00
P1NGA
6dd3aebe63 Authors.... 2015-11-08 15:26:17 +11:00
P1NGA
5ffa646ded updated spotting scope model and textures. 2015-11-08 15:18:31 +11:00
PabstMirror
dad1388eec RealisticNames - add ka-60 v2 (black and white) 2015-11-07 18:34:46 -06:00
[OMCB]kaban
2dd90824aa Map Gestures translations update 2015-11-08 02:52:16 +03:00
PabstMirror
01d679c5dc #2810 - Delete map glow light from DC players 2015-11-07 14:33:41 -06:00
PabstMirror
ff60cdcfa3 #2828 - Fix empty flashlightProxy model 2015-11-07 11:44:31 -06:00
[OMCB]kaban
34163b5e56 Nametags translations are rolled back 2015-11-07 19:54:48 +03:00
Jonathan Pereira
7ec480c98e Added ace_captives translation to PT-BR 2015-11-07 11:39:02 -02:00
Glowbal
caa36aa4f6 Merge pull request #2819 from acemod/medicalTranslateHitpoints 
Medical - Better handle odd selection/hitpoint names
 2015-11-07 11:06:49 +01:00
PabstMirror
4a6730341a Fix p3d paths 2015-11-07 00:16:08 -06:00
PabstMirror
826b4fd20b Cleanup 2015-11-06 20:53:05 -06:00
PabstMirror
e0506f29bc Read settings from paramsArray (params in description.ext) 
for now just limited to SCALAR/BOOL
 2015-11-06 20:46:06 -06:00
PabstMirror
c91789f3c4 Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking 2015-11-06 20:30:12 -06:00
SilentSpike
6e30e9e0df Fix overpressure priority evaluation 
The code was checking the wrong configs for priority because of some missing variables.
 2015-11-06 19:02:54 +00:00
PabstMirror
9161f8e2fb Merge pull request #2824 from acemod/acreIsSpeaking 
Nametags - Cleanup isSpeaking for ACRE
 2015-11-06 09:58:16 -06:00
PabstMirror
c326bc2f87 #2772 - Display basicMed wounds for AI in mixed mode 2015-11-06 01:05:25 -06:00
gienkov
0b6fcacaf0 pl translation 2015-11-06 00:56:15 +01:00
ViperMaul
4b200d6909 bump to v3.3.3 2015-11-05 14:00:01 -08:00
PabstMirror
fabbf6d14d Nametags - Cleanup isSpeaking for ACRE 2015-11-05 13:13:37 -06:00
[OMCB]kaban
59b9e9a7df Missing periods added. 2015-11-05 03:45:34 +03:00
kaban
e2763dde27 Russian Translations - Update 2015-11-05 03:28:53 +03:00
PabstMirror
38105136fa #2820 - Fix target event error 2015-11-04 17:43:51 -06:00
PabstMirror
1cebe613fa Fix Capitialzation 2015-11-04 14:38:32 -06:00
PabstMirror
c5da32e470 Medical Handle Damage - check hitpoints if selection is weird 2015-11-04 14:36:26 -06:00
PabstMirror
39d4383a04 Merge pull request #2781 from acemod/updateWirecutters 
Wirecutters - Update Fence Configs, Use faster getModelInfo
 2015-11-04 13:17:15 -06:00
PabstMirror
c88f77403b Merge pull request #2805 from jonpas/cleanupMacros 
Cleanup Macro Definitions
 2015-11-04 13:16:14 -06:00
PabstMirror
a3443cae43 Merge pull request #2780 from acemod/fixTimeInComments 
Changed ACE_time back to time in comments where appropriate
 2015-11-04 13:04:05 -06:00
PabstMirror
cfba7c01e8 Merge branch 'master' into settingsErrorChecking 
Conflicts:
	addons/map_gestures/stringtable.xml
 2015-11-03 12:09:36 -06:00
PabstMirror
50ab2aa904 MicroDagr - move drawEH array define to preInit 
Fix load order problems (init.sqf can be before postInit)
 2015-11-02 15:21:34 -06:00
Glowbal
ac22ca3637 Merge pull request #2813 from acemod/medical-hitpoints-fix 
Add method to deal with new hitpoints
 2015-11-02 20:20:23 +01:00
Joko
bd97c1ee96 fix Docu in waitUntilAndExecute 2015-11-02 12:05:43 +01:00
ColdEvul
03b82e5859 Adjusted interaction nod, changed carrying height for he barrier. 2015-11-01 22:38:55 +01:00
Broström.A | Evul
100c20fc83 Fixed missing strings 
XEH_ENABLED
carryPosition
carryDirection
dragPosition
dragDirection
 2015-11-01 20:33:18 +01:00
Glowbal
8f6e9be636 Add method to deal with new hitpoints 
This addition tries to deal with the new hitpoints introduced in Arma3 v1.50 and above. It converts new selection names to by the current medical system usable selection names.

This is only a temporarily patch, while we are still working on a larger overhaul to account both the new hitpoints and any potential new features / polishing.
 2015-11-01 16:35:25 +01:00
bux578
03d3d1c764 Merge pull request #2789 from ToasterBR/translation02 
Remaining PT-BR translations
 2015-10-31 06:14:37 +01:00
jonpas
998f3e996c Cleanup macro definitions 2015-10-30 21:59:46 +01:00
BaerMitUmlaut
8f473b4a27 Removed all assignTeam occurrences 2015-10-30 16:50:13 +01:00
ColdEvul
b82350baa2 Made ``RoadCone_F` and its inhered `RoadBarrier_F`` dragable, carryable and storeable. 
I remade it and removed comments and unnecessary strings. I also removed the unworking one from the last version.
 2015-10-28 21:33:00 +01:00
PabstMirror
10d17a8117 Merge pull request #2783 from acemod/captivesStuff 
Captives Fix duplicate animEH and add handcuffing module
 2015-10-28 14:09:13 -05:00
commy2
7d69b7a3f4 fix merkava, patria tracer color 2015-10-28 19:48:49 +01:00
commy2
97999cde04 Merge pull request #2708 from acemod/amvGunSmoke 
- Fix gun smoke on AMV
 2015-10-28 19:33:47 +01:00
commy2
d424eadd48 delete superfluous space ocd 2015-10-28 19:25:59 +01:00
commy2
09ba2c8216 Merge pull request #2793 from ColdEvul/CargoFixForTheAutonomus 
Fixed small UAV carrying allot of cargo.
 2015-10-28 19:10:56 +01:00
commy2
049d40b96e change description in function header 2015-10-28 19:02:54 +01:00
commy2
a0bfcdd04c Revert "rename hasHatch to canTurnOut, change description in function header" 
This reverts commit 932f09ce60.
 2015-10-28 19:01:47 +01:00
commy2
932f09ce60 rename hasHatch to canTurnOut, change description in function header 2015-10-28 18:57:47 +01:00
BaerMitUmlaut
7d7aa5b67f !hasHatch condition part 2 2015-10-28 17:15:46 +01:00
BaerMitUmlaut
a1d72b81bf Switch to unit namespace, added !hasHatch condition 2015-10-28 17:13:05 +01:00
ColdEvul
6ac1d8361d Fixed small UAV carrying allot of cargo. 2015-10-28 16:00:24 +01:00
commy2
643f4d36dc add FUNC(hasHatch) 2015-10-28 08:01:25 +01:00
Jonathan Pereira
ce5364d7af Added PT-BR translations 
Added all remaining translations, including dagr, dragging, map,
map_gestures, medical, repair, tacticalladder and zeus.
 2015-10-26 22:04:03 -02:00
PabstMirror
2c995f9c2c Minor Cleanup 2015-10-26 10:49:39 -05:00
PabstMirror
fefe24b7eb Disable debug in parachute 2015-10-24 19:07:23 -05:00
Glowbal
b5539db27f Merge pull request #2767 from acemod/canTreatLocation 
Fix medical location check when set to disabled for PAK/Surgical
 2015-10-24 00:55:51 +02:00
PabstMirror
1c26f6c9f5 Captives - Module to set handcuffing 
also add player check for GVAR(requireSurrender) in canApplyHandcuffes
 2015-10-23 14:17:31 -05:00
PabstMirror
ef681e4332 Captives - Fix adding duplicate animEH 2015-10-23 13:11:11 -05:00
PabstMirror
e340f5164c Wirecutters - Update Fence Configs, Use faster getModelInfo 2015-10-22 20:54:09 -05:00
VKing
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
VKing
a899c74133 ace_fcs_ace_time -> ace_fcs_time 2015-10-21 22:17:28 +02:00
VKing
0936238862 Fix lead calculation for vehicle FCS 2015-10-21 21:52:48 +02:00
PabstMirror
554c303be0 InteractionMenu - Auto Expand First Level 2015-10-20 13:31:09 -05:00
PabstMirror
7db5a34b24 Interaction Menu - Add setting for animation speed 2015-10-20 13:26:42 -05:00
jonpas
349447c5ea Readd prone down optics removal 2015-10-20 19:37:49 +02:00
BaerMitUmlaut
c227f05f8a Deprecated isWater 2015-10-19 23:28:50 +02:00
Glowbal
57abe3b885 Merge pull request #2743 from acemod/medicalStuff 
Medical Menu Fixes
 2015-10-19 22:47:13 +02:00
PabstMirror
acc3504d7b Merge branch 'master' into fixFlashlightPrivates 
Conflicts:
	addons/map/stringtable.xml
 2015-10-19 13:59:15 -05:00
PabstMirror
cfde11d2fa Fix medic treatment location check as well 2015-10-19 01:45:30 -05:00
PabstMirror
aad6cab896 #2765 - Fix location check when set to disabled 2015-10-19 01:20:11 -05:00
bux578
602832cc0c adjust german translations 2015-10-19 07:29:02 +02:00
bux578
f7b717db64 Merge branch 'patch-11' of git://github.com/licht-im-Norden87/ACE3 into licht-im-Norden87-patch-11 2015-10-19 07:23:51 +02:00
PabstMirror
af80635a3f ST Map Gesture Force Color Settings 2015-10-18 23:59:40 -05:00
PabstMirror
64de91ed06 Add warning for duplicate setting modules. 2015-10-18 23:34:11 -05:00
PabstMirror
16180686d2 PV GVAR(settings) after modules, add error debug 2015-10-18 18:49:03 -05:00
PabstMirror
26c051d397 Sitting - Fix missing semicolon 2015-10-18 11:48:21 -05:00
IngoKauffmann
1804215dbb Readded caliber for ACE_Hydra70_DAGR 2015-10-18 13:21:20 +02:00
IngoKauffmann
f02c57b599 Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm 
Conflicts:
	addons/missileguidance/CfgAmmo.hpp
 2015-10-18 13:19:27 +02:00
IngoKauffmann
5a453a7074 Fixed flying 
Moved attached ammo further away
 2015-10-18 13:11:28 +02:00
IngoKauffmann
8a4b3a117a Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm 2015-10-18 12:49:36 +02:00
Glowbal
843eb16837 Merge pull request #2650 from acemod/setDefaultChannel 
Set Default Channel at mission start
 2015-10-18 12:28:13 +02:00
Glowbal
f57eb08ce5 Merge pull request #2620 from jonpas/sittingFramework 
Sitting Framework
 2015-10-18 12:26:53 +02:00
Glowbal
8e4bc264cc Merge branch 'master' into map_gestures 
Conflicts:
	AUTHORS.txt
 2015-10-18 12:20:54 +02:00
Glowbal
9a0aa2b14c Merge pull request #2152 from jokoho48/codeCleanupKestrel4500 
Code cleanup of Kestrel 4500 module
 2015-10-18 12:16:44 +02:00
Glowbal
76efdbcc1c Merge pull request #2257 from jonpas/parseList 
Parse List Common Function
 2015-10-18 12:14:18 +02:00
Glowbal
ebe2bf96cd Merge pull request #2277 from jokoho48/codeCleanUpConcertina_wire 
Code cleanup of Concertina_wire Module
 2015-10-18 12:13:44 +02:00
Glowbal
3682a1710b Merge pull request #2527 from alef/issues/titan_miss 
Fix: Titan hitting ground instead of vehicle
 2015-10-18 12:11:09 +02:00
PabstMirror
da2d140a39 Cleanup unnecessary statement 2015-10-17 14:30:59 -05:00
jokoho48
bfcf057dab extract Gestures to own Module and Port THS to ACE 2015-10-17 21:17:37 +02:00
SilentSpike
b6dd7b941f Reduce overhead of spectator map icons 
Fixes #2514 by only rendering individual unit icons when zoomed in and only rendering the units currently within the screen bounds.

Behaves as expected, but whether or not it has a significant performance increase under scaled up testing conditions remains to be seen.
 2015-10-17 13:23:51 +01:00
PabstMirror
fa7299ba1b Add array info to header 2015-10-16 08:28:54 -05:00
PabstMirror
94e3cd1f79 Replace old use of showHud 2015-10-15 22:45:35 -05:00
PabstMirror
bec884e581 showHud handler 2015-10-15 22:33:05 -05:00
SzwedzikPL
98f6bb3589 Merge branch 'master' of https://github.com/acemod/ACE3 into interactions_lamps 
Conflicts:
	addons/cargo/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/interaction/XEH_preInit.sqf
	addons/interaction/stringtable.xml
 2015-10-15 11:49:08 +02:00
PabstMirror
6ffde8150f Simplify Map Light Interactions 2015-10-14 14:36:40 -05:00
jokoho48
2dcdd224bd fix privates in Map module 2015-10-14 19:56:54 +02:00
PabstMirror
f7fe0c08e0 #2391 - Use AGL for sitting setPos 2015-10-14 11:15:44 -05:00
PabstMirror
680f52cd27 Handle Distance when mounted 2015-10-13 13:40:16 -05:00
PabstMirror
8ffe1b4e01 #2528 (2) - Integrate Dragging 2015-10-13 02:20:19 -05:00
PabstMirror
ad1191cdd5 #2528 - Medical Menu Work 
(1) Verify target is valid and in reasonable range
 2015-10-13 02:01:59 -05:00
PabstMirror
5d76395914 #2734 - Map effects / flashlights for TrippleHead 2015-10-12 11:27:38 -05:00
PabstMirror
7062f60f0a Fix UBC from #2726 2015-10-12 01:07:20 -05:00
Glowbal
1e26fee3ba Merge pull request #2683 from acemod/commonCleanupX 
Common cleanup x
 2015-10-11 12:15:27 +02:00
Glowbal
8db8e87c53 Merge pull request #2560 from acemod/lockingMissles 
#2349 - Don't disable locking for base RocketPods
 2015-10-11 12:06:11 +02:00
Glowbal
94ed78a173 Merge pull request #2578 from alganthe/strings_fix 
PAK and Surgical Kit strings normalized inside modules.
 2015-10-11 12:05:11 +02:00
PabstMirror
4ba0d72bfd #2580 (1) - Fix bandages always created at terrain level. 2015-10-10 23:09:52 -05:00
IngoKauffmann
b5568ca0db Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel 
Conflicts:
	optionals/compat_bwa3/config.cpp
 2015-10-10 13:13:30 +02:00
PabstMirror
53f833b68c #2702 - Cargo: Make "Supply Box" pallets heavy 2015-10-10 00:19:09 -05:00
PabstMirror
f2c66240ca #2717 - Cleanup Coax Weapon Mempoints 2015-10-08 22:32:07 -05:00
PabstMirror
f8ca3693fd #2709 - Fix AB handleFired _muzzleVelocityShift 2015-10-08 21:22:00 -05:00
PabstMirror
326d549510 #2696 - Rangecard check bounds before select 2015-10-08 20:32:14 -05:00
BaerMitUmlaut
2fe53431c7 Split event handlers 2015-10-08 19:29:30 +02:00
BaerMitUmlaut
e50a28874f Fix for BI bug, FFV support 2015-10-08 11:31:29 +02:00
PabstMirror
f3c4ff66ca #2701 - Fix gun smoke on AMV 2015-10-08 02:51:54 -05:00
jonpas
e6a5d8c990 Remove enable optics in adjusted prone stances 2015-10-07 23:00:35 +02:00
BaerMitUmlaut
edb76ffae4 Initial commit 2015-10-07 20:11:07 +02:00
PabstMirror
39b838c7ab Merge pull request #2681 from acemod/vehDetachLocalfix 
Attach getIn/Out run on local unit
 2015-10-06 13:49:58 -05:00
commy2
9c22052871 Merge pull request #2685 from acemod/340removeactionsondead 
remove check ammo action on destroyed static weapons
 2015-10-06 19:36:19 +02:00
BaerMitUmlaut
1effe61aa9 Removed parent condition 2015-10-06 19:09:51 +02:00
BaerMitUmlaut
090384c014 Fixed canPassMagazine header 2015-10-06 17:56:32 +02:00
BaerMitUmlaut
d6dcd4112e Resolved merge conflicts 2015-10-06 17:50:55 +02:00
SilentSpike
e5b29727a5 Merge pull request #2617 from jonpas/zeusSpareparts 
Add Zeus Modules for Adding Spare Parts
 2015-10-05 19:01:50 +01:00
SilentSpike
780e0aa270 Add vision mode support to spectator external cam 
Since external view is actually another camera, vision modes should also apply to it too.
 2015-10-04 19:26:53 +01:00
SilentSpike
4079ca354e Update spectator function headers 2015-10-04 18:30:07 +01:00
SilentSpike
c1dc8a6493 Fix spectator 3D icons not rendering 
Fixes #2676 as per voiperr's suggestion (working with camera can be really strange, I swear this worked before)
 2015-10-04 18:17:07 +01:00
SilentSpike
52d703c2eb Improve spectator seagull handling 
Previously they were only hidden, but this didn't account for the annoying audio they play so now they're entirely staged like a spectator unit would be.
 2015-10-04 18:17:02 +01:00