Commit Graph

8396 Commits

Author SHA1 Message Date
VKing
fedfa94dcd Clean up 2016-01-21 15:01:41 +01:00
VKing
4406f270e2 Fix infantry rangefinders (again) 2016-01-21 14:44:23 +01:00
VKing
bf5eb78788 Merge branch 'fcs_fixWeaponInitspeed' into fcs_rewriteRangeFunctions
# Conflicts:
#	addons/fcs/functions/fnc_keyUp.sqf
2016-01-21 02:14:51 +01:00
VKing
b83be88571 Enhance ranging.
KeyDown will now apply a static range calculation. KeyUp calculates the target movement and reapplies the calculation as normal.
Sorry in advance for the merge conflicts
2016-01-21 02:02:50 +01:00
VKing
7d3044a5c2 Move display update stuff to fnc_getRange 2016-01-21 00:20:21 +01:00
VKing
5f14d17f98 Another fix for BIS' inconsistent implementations 2016-01-20 22:30:22 +01:00
VKing
43c9444fb8 Didn't need that isNil check, anyway 2016-01-20 15:51:07 +01: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
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
ae576e57e3 Fix the magazine name being broken in later code 2016-01-19 20:21:37 +01:00
VKing
59923710b7 Fix FCS not taking weapon initSpeed into account in some circumstances 2016-01-19 19:52:18 +01: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
6bbf48177b Merge pull request #3179 from acemod/rhs_compat_pso1m21
RHS Compat: Add PSO-1M2-1 windage adjust
2016-01-19 09:35:20 +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
VKing
569179e0bf Add the PSO-1M2-1 windage adjust 2016-01-18 14:59:38 +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
cea2b55d56 Merge pull request #3143 from acemod/pyConfigValidator
Python tool to validate configs (using MakePbo)
2016-01-16 16:05:42 -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
SilentSpike
dbcf94153d Merge pull request #3155 from acemod/spectatorFix
Fix some spectator errors
2016-01-15 15:43:45 +00: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
Thomas Kooi
b330393f4c Merge pull request #3164 from acemod/quickMedLitterFix
Move littler syncedEH install to after settingInit
2016-01-15 07:38:48 +01:00
PabstMirror
1affa0dd18 Cleanup multithreading, allow running from any dir 2016-01-14 17:42:35 -06:00
PabstMirror
1affbd7d2f Move littler syncedEH install to after settingInit 2016-01-14 17:06:46 -06:00
VKing
099648b6b6 Russian translation as suggested 2016-01-14 18:51:14 +01:00
SilentSpike
bcfac5db0b Merge pull request #3154 from acemod/spectatorUpdates
Add spectator text chat
2016-01-13 19:36:47 +00: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
Thomas Kooi
cd23228fbc Merge pull request #3148 from acemod/nerfReflectedBackblast
Nerf the amount of backblast received by the firer via reflection
2016-01-12 18:03:39 +01:00