PabstMirror
be8afe507c
Few more privates
2016-01-20 17:19:08 -06:00
PabstMirror
3dac426bc6
Merge pull request #3132 from acemod/interactionMenuCleanup
...
Cleanup Interaction Menu
2016-01-20 17:04:10 -06:00
PabstMirror
abb01e0653
Merge pull request #3129 from acemod/frag-cacheIfWillFrag
...
Frag - only run addPfhRound on ammo that will frag (for master)
2016-01-20 17:03:55 -06:00
VKing
43ab126c1f
Add FCS to botes RCWS
2016-01-20 23:06:06 +01:00
VKing
5f14d17f98
Another fix for BIS' inconsistent implementations
2016-01-20 22:30:22 +01:00
Thomas Kooi
232fe62d8d
Merge pull request #3195 from acemod/fix3194
...
Fix typo in ACE_hearing config
2016-01-20 22:26:13 +01:00
esteldunedain
9d13cc6f60
Move the weapon caching code to a different function. Add compatibility for legacy overheating properties. Add some comments.
2016-01-20 15:19:46 -03:00
esteldunedain
851615a234
Inherit custom gesture classes.
2016-01-20 13:44:51 -03:00
esteldunedain
7860f375c2
Better func description
2016-01-20 13:07:51 -03:00
esteldunedain
89106f6953
Replace addPerFrameHandler for waitAndExecute
2016-01-20 13:05:47 -03:00
esteldunedain
80b9a8961a
Improve reload animations
2016-01-20 12:48:39 -03:00
PabstMirror
a140f29784
Remove inherited classes that were not used
2016-01-20 09:45:03 -06:00
esteldunedain
bce572e1df
Derp
2016-01-20 12:15:25 -03:00
esteldunedain
19ccf52425
MRBS to mrbs
2016-01-20 12:05:35 -03:00
VKing
43c9444fb8
Didn't need that isNil check, anyway
2016-01-20 15:51:07 +01:00
esteldunedain
1a115e7f9c
Fix #3194
2016-01-20 11:48:12 -03:00
esteldunedain
6b4b8b707c
Prefix new configs for consistency
2016-01-20 11:42:05 -03:00
esteldunedain
2f7cac68a5
Small fixes
2016-01-20 10:59:58 -03:00
VKing
a9511936fd
LayZ evaluation
2016-01-20 12:35:53 +01:00
VKing
05ce4f824c
Rewrite fnc_getRange to work with specified minimum and maximum ranges
...
Also cleaning up fnc_keyUp a bit
2016-01-20 00:10:27 +01:00
VKing
757436140b
fnc_getTargetDistance rewritten to use LineIntersectsSurfaces.
...
Turns out it wasn't really needed after all, but better is better :p
2016-01-20 00:06:06 +01:00
PabstMirror
3d4fc66bb1
Cargo Cleanup, Add makeLoadable
2016-01-19 14:51:58 -06:00
esteldunedain
c78f2f8479
Gotcha travis
2016-01-19 17:29:58 -03:00
esteldunedain
5b90fd8b81
Set default particle effect on for the local player, as per current and historic behaviour.
2016-01-19 17:25:14 -03:00
esteldunedain
9bcabd081b
Reorder the fireEH function to allow particle effects for nearby remote players. Add a setting for that (default off).
2016-01-19 17:24:01 -03:00
VKing
968f7c000b
Simplify
2016-01-19 21:16:41 +01:00
SilentSpike
ca5f6df3d0
Merge pull request #3147 from acemod/spectatorBandAid
...
Restart specatator display if player in unitList
2016-01-19 20:15:24 +00:00
VKing
c8bcf44561
Increase M307 FCS range
2016-01-19 21:08:03 +01:00
esteldunedain
8b7ed38990
Add a PFH to cool down all player weapons at (infrequent) regular intervals
2016-01-19 17:04:51 -03:00
esteldunedain
0313e7b322
Divide the weapon state variable into two: a temp variable, and a time variable. Only broadcast the temp part and only approximately
2016-01-19 17:03:47 -03:00
esteldunedain
782934c4b2
Add the setApproximateVariablePublic function to common
2016-01-19 16:58:07 -03:00
VKing
ae576e57e3
Fix the magazine name being broken in later code
2016-01-19 20:21:37 +01:00
esteldunedain
3792acd7f7
Merge branch 'master' into deterministicOverheatingX
2016-01-19 15:57:38 -03:00
VKing
59923710b7
Fix FCS not taking weapon initSpeed into account in some circumstances
2016-01-19 19:52:18 +01:00
VKing
838945c1db
Add FCS for the M307 GMG
2016-01-19 18:53:42 +01:00
PabstMirror
04bccf47d7
Replace all use of deprecated commands
2016-01-19 09:39:07 -06:00
esteldunedain
8e2d489312
Add warnings to deprecated functions
2016-01-19 09:39:06 -06:00
PabstMirror
7e84a9d9b0
Add getter, readd old public funcs, add blockSprint
2016-01-19 09:39:06 -06:00
PabstMirror
d2e006397d
cleanup, don't setVar public if no change
2016-01-19 09:39:05 -06:00
PabstMirror
9a3972de76
Unified Status Effect Handler
2016-01-19 09:39:05 -06:00
Thomas Kooi
b99be6122b
Merge pull request #3187 from acemod/fixFCS
...
Add missing FUNC to FCS key (Rangefinders)
2016-01-19 16:05:56 +01:00
PabstMirror
6d6cbec5ef
Add missing FUNC to FCS key (Rangefinders)
...
#3160
2016-01-19 09:02:51 -06: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
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
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
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
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
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
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
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
