Commit Graph

56 Commits

Author SHA1 Message Date
ebayShopper
e04f0fcac5 Add status icons disabled notification
Vanilla commit:
fe063a8896
2018-01-17 17:17:33 -05:00
ebayShopper
5e9a7271e9 Add option to toggle status icons
Vanilla commit:

44bb49e326
2017-12-04 18:14:48 -05:00
ebayShopper
c1110fc61c Fix a rare error with keyboard_keys
Some combo binds will cause actionKeys to return a number greater than
six digits. See AgentRev's note:
https://community.bistudio.com/wiki/actionKeys

An example is NumLock + P [1.15763e+009]. Using a number this large as
an index errors out. Example:
test_array = [];
test_array set [9999991,true];

But six digits or less will not error:
test_array = [];
test_array set [999999,true];
2017-11-13 17:34:43 -05:00
ebayShopper
a229057fc6 Readd shift + P block
My mistake in 780d5d8, I forgot actionKeys doesn't work on combination
binds.
2017-10-28 18:45:04 -04:00
ebayShopper
780d5d8775 Fix force save when pressing F4
Forgot to remove F4 from the blocked list in 5acad04 @icomrade so it was
being overwritten.

Shift + P is not a hardcoded engine bind. It is just the default
DSInterface bind, so actionKeys "DSInterface" covers that in f760896.
2017-10-28 18:34:37 -04:00
icomrade
f7608965df remove server control panel 2017-08-01 20:54:39 -04:00
icomrade
5acad04c43 should fix #1938
Also prevents logout on onPause conditions, i.e. logout if in combat, another player is near, or a zombie is near
2017-07-25 14:32:49 -04:00
ebayShopper
48858b2e6c Add medic anim function with proper interrupt
Closes #1386

Vanilla commits
applied:
f99a3deced
731b957e8e

Removed
two unused files and a few variables made redundant by actionInProgress
2017-06-06 15:25:14 -04:00
ebayShopper
0e244196e5 Update keyboard.sqf
Forgot to remove after
https://github.com/EpochModTeam/DayZ-Epoch/commit/d1d5fe5#diff-91da615cb902d0198b7cd4c9b91b6fd0L351
2017-03-31 12:33:17 -04:00
ebayShopper
61630e91b3 Update scripts.txt exceptions
- Removed some unneeded exceptions
- Moved tree chop PVEH to server compile only so client does not need
setdamage exception
- Replaced "showCommandingMenu" filter with stricter
"menu" filter
- Renamed two files with no changes for easier filtering of
"menu"

Vanilla
commits:
1d639b557b
3a29242537
5cdf249ea9
2017-02-28 18:26:37 -05:00
ebaydayz
76971cbaf4 Prevent sprint and prone through doors glitch 2017-02-02 16:57:30 -05:00
ebaydayz
d124a5d2f7 Make switch weapon interrupt autorun
Fixes #1850
2017-01-02 14:41:53 -05:00
ebaydayz
e4aeee37fd Use waterHoleProxy in drink water and fill water #1835
The slow searches are needed on other maps until waterHoleProxy objects
are added for them. They need to be added at every pond and
non-"Land_pumpa" well. Right now Chernarus is the only map that has them
placed.

Fixes #1835
Fixes #1841
2017-01-01 16:55:00 -05:00
ebaydayz
4d3f707417 Stop autoRun and remove drink from hands at ponds #1827
Fixes #1827
2016-12-22 21:52:22 -05:00
ebaydayz
f03f116dfc Fix Arma cheats still enterable under certain circumstances
Thanks to Epoch forums user Golgofinyanin for reporting.
https://epochmod.com/forum/profile/13156-golgofinyanin/
2016-12-03 16:50:55 -05:00
ebaydayz
416fdbc4ab Improve filterCheats and VON block
Filter cheats is now added to the main options menus that needed it.

It is not needed on the map (display 12) because KeyDown for display 46
also fires when it is open. So filterCheats was firing twice (once on
each display) in that case.

KeyDown does not fire on display 63 at all
regardless of whether PTT or VON is held down, toggled or chat open.
Keydown does fire on 55, but only after the mic icon is locked on, so it
is of limited use. MouseButtonDown does not fire on 55 or 63. So it is
useless to add to those displays. You can confirm this with:
(findDisplay 63) displayAddEventHandler ["KeyDown","systemchat
'fired';"];

Filter cheats is now only checked on display 46 when a
voice, channel, or cheat key is pressed instead of on every key press.
This still works 100% of the time for blocking cheat input. For
performance reasons it's probably not worth checking all the conditions
in filterCheats with every key press on display46 just for the VON
block. Doing so covers some edge combination bind cases better, so it
may be worth considering again if no better alternative is found. For
now this solution is good enough to cover the majority of cases without
slowing down the keyhandler during normal usage.

The VON message now
tells you exactly which channel block you triggered instead of listing
all of them.

Fixed issue mentioned in 52c9c7c with VON getting stuck on when using a
double tap keybind.

Tested:
1. Talk in side with regular/combo/mouse bind
2. Change channels
while mic is locked on with regular/combo/mouse bind
3. Change channels
with Up/Down arrows while chat is open.
4. Trying all cases in steps 1-3
with a dialog open.

It is possible to bypass the VON block with some different control
settings and combinations of the above, but for default controls and
common usage it works the majority of the time.
2016-11-29 23:44:28 -05:00
icomrade
52c9c7ceda Somewhat better VON Block
Not perfect, occasionally the player can double tap a button to lock VON
on - which now they cannot turn off unless they open the escape menu and
double tap to turn off.

Chat channel changes are now blocked when VON is active.

ActionKeys are now recalculated on key binding change, but it is
important to note that double tap bindings DO NOT work with the
ActionKeys command. This is why inputAction check is neccesary

Summary: Double tapping a key to lock von on (VoiceOverNet) is not
reliably blocked, nor is it blocked at all in secondary
displays/dialogs. otherwise, this works pretty well.
2016-11-26 18:48:11 -05:00
ebaydayz
d14416931a Fix VON block mistake from b9a5c59
I forgot filterCheats is already called in keyboard.sqf
2016-11-25 19:31:14 -05:00
ebaydayz
27f492f401 Fix typo in VON block
My mistake from b9a5c59
2016-11-25 18:42:38 -05:00
ebaydayz
b9a5c59660 Include all controls in VON block
Moved to display 46 keydown since keydown on 63 only fires after the VON
transmission has already started (slight delay).

Added mouseButtonDown so it can not be bypassed via assigning a mouse
button.
2016-11-25 18:22:41 -05:00
ebaydayz
f994b95c1d Add dayz_onBack to surrender 2016-11-16 13:34:48 -05:00
ebaydayz
0be3a8522e Add sleep before refreshing controls
Vanilla commit:

e6e0d057dd
2016-10-29 15:52:55 -04:00
ebaydayz
f770b0a85d Add group system
Initial commit, not tested in multiplayer yet. Some revisions still left
to do.
2016-10-27 16:06:49 -04:00
icomrade
f92d84f720 Fix issue laying down near buildables 2016-10-26 16:58:06 -04:00
ebaydayz
05fda7b229 Block binding multiple controls to hold breath
Vanilla commits:

d77c47fdc1

2ffe5b4337
2016-10-14 20:14:34 -04:00
ebaydayz
6cf740e7d4 Update _object_damage private array
Vanilla commits:

21ea5984c9

a13e7240dc
2016-10-14 16:07:03 -04:00
ebaydayz
5e51787e59 Remove rSwitchMove in Turbo key block
Vanilla commit:

8b551681d9
2016-10-14 15:03:53 -04:00
ebaydayz
05fa3e6a9a Update keyboard_keys after changing controls in-game
Vanilla commit:

e9b21a7e79

@icomrade we forgot to refresh keyboard_keys after the player changes
their controls in-game. The keyhandler was still using the old
keyboard_keys array since it is only set once at login time. The new
keys they set in-game wouldn't work until they relogged.
2016-10-11 15:34:10 -04:00
ebaydayz
7869288f39 Reblock turbo when on foot
Vanilla commit:

5bf403bb43

See:

46af339ce5
2016-10-10 16:34:40 -04:00
icomrade
58e90da07d Fix transfusion in vehicle 2016-09-27 12:46:13 -04:00
icomrade
6ae64eb622 Prevent player from dragging through walls 2016-09-22 14:03:23 -04:00
ebaydayz
eadbbb18bf Fix double tap bunny hop with no weapon glitch
Also makes it easier to bunny hop in quick succession. Previously double
tap triggered a bunny hop immediately followed by a regular vault.

Vanilla commit:

5833c76491
2016-09-09 11:41:09 -04:00
ebaydayz
c8b3053496 Remove unused keyboard_keys function
I moved the compile up in compiles.sqf since vanilla is now updated with
the change:

f5780256ee
2016-09-05 14:16:38 -04:00
ebaydayz
70ebd6dbcb MISSION_ROOT variable is no longer needed
Also @icomrade you accidentally committed the testkit code to
chernarus11 init.sqf. Removed it for you.
2016-09-03 16:33:17 -04:00
icomrade
d1d5fe54f3 Fix cheat handling
This adds keydown handler for chat, map, and diary displays.
Additionally, this can be used to handle malicious chat input without a
delay by modifying the associated compile
2016-09-02 19:14:21 -04:00
ebaydayz
b9dc98ac6f Revert move Shift +- to function
See:

51caa509cb (commitcomment-18834096)
2016-08-31 13:46:26 -04:00
ebaydayz
51caa509cb Comment out Gcam keys and move Shift+- to function
Vanilla commit:

8ed8ab6b5c
2016-08-30 14:18:38 -04:00
icomrade
92b4c8785d Disable shift + - input
shift + - is used to ented arma "chests" which allow the player to issue
endMission, and limit their fps (min 5 fps limit). This unfortunately
disables the flush cheat, but attempts to filter out input and allow
flush are not reliable.
2016-08-29 13:49:05 -04:00
ebaydayz
ae329db599 Add TurnLeft and TurnRight actionkeys to interrupt
Fixes #1753
2016-08-25 17:42:24 -04:00
ebaydayz
ac30e8addd Remove ctrl alt del force save
See
https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-239595150
2016-08-12 21:51:09 -04:00
ebaydayz
f314a39e43 Add better sound muted status UI icon and background
Icon contributed by Tugodoomer and AlexAFlorov. See
https://github.com/DayZMod/DayZ/issues/625 for details
2016-07-20 15:24:31 -04:00
ebaydayz
2911bffced Fix can't reload partial mag with flares in inventory
Vanilla development commits:

7f7d3e02e7

094f1f18d2

a078e84f11

805b9def10

Also reverted:
51be8aa8a5
since it was not the cause.

See https://github.com/DayZMod/DayZ/issues/641 for the details.
2016-07-18 21:43:08 -04:00
ebaydayz
ab7254a121 Add lower volume / earplugs hotkey and status UI icon 2016-04-30 21:19:24 -04:00
ebaydayz
244b84e74b Update weapon switch hotkey for DZE_TwoPrimaries=2
Also forgot new dropped class for SledgeHammer
2016-04-27 16:11:40 -04:00
ebaydayz
14dacf269c Add back player zombie faces
Also moved player zombie attack from 'v' key to an addaction with
localized string.
2016-04-20 14:50:12 -04:00
ebaydayz
58d54a8ce0 Add A and D keys to interrupt 2016-04-19 13:05:59 -04:00
ebaydayz
e13b5dbdff Fix RoadFlare RPT error
Fixes:

Error in expression <ehicles","WeaponHolder"], 50];
{ [_x,0] spawn
object_roadFlare } count (allMissi>
  Error position: <spawn
object_roadFlare } count (allMissi>
  Error Type Script, expected Bool
2016-04-17 20:10:54 -04:00
ebaydayz
a994e7107c Fix readd of halo keydown eventhandler 2016-04-17 18:44:58 -04:00
ebaydayz
993ce14da6 Remove unnecessary key event handler reset
No need to reset the key event handler again in player_monitor.fsm, it
is already done onPreloadFinished.
2016-04-15 20:16:13 -04:00
ebaydayz
9ce5a20417 Cleanup variables.sqf
Epoch variables are grouped together now for easy comparison with
vanilla.
2016-03-19 19:58:37 -04:00