Commit Graph

1141 Commits

Author SHA1 Message Date
A Man c5ac6e458b Changing Fire Barrel output (#1843)
The fire barrel output should be a fire barrel not a empty fuel barrel.
2016-12-29 15:50:29 -05:00
ebaydayz d694130fdc Remove a duplicate localization 2016-12-23 15:37:42 -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 f1b991acd2 Add M4SPR_DZE which spawns with 30Rnd Stanag default 2016-12-22 15:42:00 -05:00
ebaydayz c3bf1d29d6 Fix arrow and other WeaponHolderBase inherited destrType #1815
Prevents catching on fire when destroyed.
2016-12-09 13:28:31 -05:00
ebaydayz 4e92255749 Remove equip_Crossbow_Kit from loot tables for now #1814 2016-12-09 12:33:54 -05:00
ebaydayz 0d4d288d81 Fix DMR and M24 ammo price 2016-12-08 13:37:16 -05:00
ebaydayz 2db6692643 Fix undefined var dayz_clientPreload during intro.sqs 2016-12-05 11:14:06 -05:00
ebaydayz eacc362e38 Fix z_hunter texture #1805 2016-12-02 10:51:13 -05:00
ebaydayz 119470809f Disable moving of group dialog 2016-12-01 20:31:04 -05:00
ebaydayz 74cc99ddad Remove identical lootPos comment
There was no difference between the lootpos except spacing after the
commas.
2016-11-30 12:17:06 -05:00
icomrade c56e0d722c oops, these were already defined 2016-11-30 11:58:35 -05:00
icomrade fc98864db9 LootPos for @MGTDB 2016-11-30 11:55:20 -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
ebayShopper 429a6aec9b Disable moving group dialog 2016-11-29 12:14:08 -05:00
ebaydayz 19e3947669 Fix empty snack bags giving drink option
Thanks @Helios27

https://github.com/EpochModTeam/DayZ-Epoch/issues/1766#issuecomment-263117080
2016-11-27 12:02:29 -05:00
ebaydayz 6cdc0a51c9 Add extra animations to ArmoredSUV, MV22, UH1Y 2016-11-26 21:14:12 -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 b6d88b1329 Update vanilla building
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/9b2092c9f7f1bb57607452691cae7e6975ccb959

https://github.com/DayZMod/DayZ/commit/674624d1221e7f661189206631e066b48870e0c7
2016-11-25 16:25:26 -05:00
icomrade 1097eaba0c Add block for voice channels
use DZE_DisabledChannels as decribed in configvariables.sqf
2016-11-25 13:05:27 -05:00
ebaydayz cf64805d10 Disable RadioProtocol group chat spam
Works well with AI, still needs multiplayer testing.
2016-11-24 17:46:57 -05:00
ebaydayz ea389b59ea Remove unneeded isKindOf "Man" checks
"Man" includes animals and zombies:

https://community.bistudio.com/wiki/ArmA_2:_CfgVehicles#Man_Class_Vehicles
2016-11-23 14:43:59 -05:00
ebaydayz ec6b5eb679 Move Repair and Salvage back to fn_selfActions
Partial revert of: 3aad4b6

Unfortunately this will not support loading external vehicle addons
(with custom UserActions) which we can not include in Epoch. Child
UserActions overwrite inherited UserActions.
2016-11-23 13:34:22 -05:00
ebaydayz aea0bb1298 Update animal cleanup on log out
Partial revert of 0483fa6
2016-11-21 20:54:33 -05:00
ebaydayz 0483fa61f6 Fix live animals being deleted in front of players
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/e14d45a55bb46efe9d040866dd13d6f15f4797df

https://github.com/DayZMod/DayZ/commit/9d6be1731eca33172c340bc584771032ede92a69
2016-11-21 18:49:03 -05:00
ebaydayz 6853263f3d Update zombie generate
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/09aa9f8879b40013e852e2c8333ab2a219cff25e

https://github.com/DayZMod/DayZ/commit/68be696c4d91b59bc144267b189d90280abbcb46
2016-11-21 18:33:41 -05:00
ebaydayz 6aa0cb8215 Update vanilla building
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/a351c810d53bbd23121cff9da3978f6b2721c031

https://github.com/DayZMod/DayZ/commit/dfc46eff7b3188dfe65ffa616f9b7cb2985bc654
2016-11-21 14:57:02 -05:00
ebaydayz 2d394c32da Move sharpen action to ItemKnifeBlunt
Avoids confusing message "Missing ItemKnifeBlunt to do this"
2016-11-21 13:55:09 -05:00
ebaydayz 0c9fbc40c8 Remove Salvage from Bicycle in configs 2016-11-21 13:43:11 -05:00
ebaydayz 3aad4b61e9 Move some addActions to config UserActions
Should improve client FPS while still allowing conditions and scripts to
be customized.

Some special vehicles like MV22, UH1Y, etc. have UserActions overwritten
in their configs, so please let me know if you find any others that do
not get the option to repair or salvage because UserActions is
overwritten in their config. I think I got them all.

Vanilla commits:

https://github.com/DayZMod/DayZ/commit/a8c4238c0c1a35fbe8415b53c4ee220d28d18b92

https://github.com/DayZMod/DayZ/commit/350d73abe1e39f15b3b41d38400ce9ec2d0d74e8
2016-11-20 19:47:21 -05:00
ebaydayz efeadcfa35 Rename selectPlayer and selectGroupMember functions
Fewer scripts.txt exceptions needed
2016-11-19 19:39:08 -05:00
ebaydayz ad9a287d00 Remove unused Lada base class
Also removed some values that are already inhertied from 8429ad1
2016-11-18 12:18:13 -05:00
ebaydayz 8429ad1fbc Clear typicalCargo for some vehicles missing it
Prevents preloading units, may help with load times a little.
2016-11-17 15:40:08 -05:00
ebaydayz e266fee651 Fix right click on radio generic error 2016-11-12 19:16:19 -05:00
ebaydayz e4ede46f59 Fix tranquiliser bolt 2016-11-12 16:50:24 -05:00
ebaydayz 88870a6b2a Sync closeDisplay exit codes for easier scripts.txt filtering 2016-11-11 14:48:41 -05:00
ebaydayz eedf7dd12c Fix door and plot management display text for mustBeClose
Also removed unneeded uiNamespace vars.
2016-11-08 19:27:05 -05:00
ebaydayz ba43900036 Revert "Allow blunt knife for item actions"
This reverts commit 59a0548f5d.
2016-11-07 17:37:46 -05:00
icomrade 59a0548f5d Allow blunt knife for item actions 2016-11-07 17:14:30 -05:00
ebaydayz 01307f9a42 Remove some common and duplicate translations 2016-11-07 16:14:20 -05:00
ebaydayz e0c06692e2 Update scrollbar color in lobby and player list
To match 6732e5c
2016-11-07 15:21:56 -05:00
ebaydayz de46a173dc Fix errors when removing traps
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/b558351a0696724da9e17c31bd4c73b85e525a43
2016-11-06 13:05:46 -05:00
ebaydayz 677abe62aa Remove vanilla camo net
Duplicate of Epoch one.

Also had sliding issues when building because it did not have the proper
Epoch offset.
2016-11-05 20:53:22 -04:00
ebaydayz 754fc3744e Add delay at group startup 2016-11-05 19:18:51 -04:00
ebaydayz eaebdb7d93 Revert "Disable RadioProtocol spam"
This reverts commit ac99e45854.
2016-11-05 18:47:54 -04:00
ebaydayz 564144ee41 Revert vanilla work bench to player_buildVanilla
Partial revert of:

https://github.com/EpochModTeam/DayZ-Epoch/commit/2d9097a6af14ff21d0cd362eccaf62678c86060e

This workbench is currently not obtainable either by crafting or the
loot tables, so it is not used anyway. But with Epoch player_build
attempting to build it sends the player flying / sliding backwards at
high speed. Using the vanilla player_build that does not happen.

I tested building all the other items changed in the above commit and
none of them have this problem.
2016-11-05 16:34:00 -04:00
ebaydayz 13a3083bae Remove right click build sandbag action on shovel
Right click action on sandbag is more up to date
2016-11-05 15:32:49 -04:00