Commit Graph

455 Commits

Author SHA1 Message Date
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:

9b2092c9f7

674624d122
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
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
43b900835e Fix infectiousWaterholes init again 2016-11-21 20:28:07 -05:00
ebaydayz
6853263f3d Update zombie generate
Vanilla commits:

09aa9f8879

68be696c4d
2016-11-21 18:33:41 -05:00
ebaydayz
2f1c57047a Fix infectedWaterHoles init for non-cherno maps 2016-11-20 20:03:18 -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:

a8c4238c0c

350d73abe1
2016-11-20 19:47:21 -05:00
ebaydayz
b01a4165a8 Comment some unused achievement code
Vanilla commits:

3ec1cc3c5d

3171f68bee
2016-11-18 13:22:36 -05:00
icomrade
e398250489 Fix refuel trucks, add upgraded trucks to array
Issue was:
A. with locality, we were checking the wrong vehicle in one instance and

B. with variable names, since we called local_setFuel and _vehicle was
private already from the calling script we ran into an issue with
duplicate variables causing the command to fail. local_setFuel doesnt
really need any local variable so I removed them and this fixed the
issue (script filters may need to be adjusted accordingly)
2016-11-16 14:53:17 -05:00
ebaydayz
f994b95c1d Add dayz_onBack to surrender 2016-11-16 13:34:48 -05:00
ebaydayz
43330c2046 Diminish humanity reward for transfusion
As suggested on:
cdb9776
and
https://github.com/DayZMod/DayZ/issues/731
2016-11-15 15:31:58 -05:00
ebaydayz
cdb9776d4e Add bloodbag cooldown 2016-11-15 13:57:40 -05:00
ebaydayz
414fd7e1b7 Add auto open chute option to HALO 2016-11-14 20:25:26 -05:00
ebaydayz
89078d1611 Fix abort and gear menu staying open at same time 2016-11-13 14:49:04 -05:00
ebaydayz
abeb5f9383 Remove vehicle actions when unconscious 2016-11-12 17:54:27 -05:00
ebaydayz
6fb4290ffe Remove unused compile
Vanilla commit:

4a18d5023d
2016-11-09 12:33:11 -05:00
oiad
d7f35c0cf3 Fix spelling mistake of classname DZ_Czech_Vest_Pouch (#1792)
* Fix spelling mistake of classname DZ_Czech_Vest_Pouch

As per subject

* Fix typo from 1.0.5.1 and rename DZ_Czech_Vest_Puch to DZ_Czech_Vest_Pouch.

As per subject

* Fix typo from 1.0.5.1 and rename DZ_Czech_Vest_Puch to DZ_Czech_Vest_Pouch.

As per

* More typo SQL goodness

As per subject
2016-11-04 21:40:27 -04:00
ebaydayz
93a988955f Use shorter file names for groups 2016-11-02 17:25:25 -04:00
A Man
41324139eb Adding CanvasHut_DZ to DZE_isRemovable (#1785)
* Adding CanvasHut_DZ to DZE_isRemovable

CanvasHut_DZ had no remove option.

* Update Prop_Defs.hpp
2016-10-31 19:26:40 -04:00
oiad
b1171c5f9b player_wearclothes changes, string changes and maintain area moving (#1783)
* player_wearclothes changes, string changes and maintain area moving

Adds 2 toggles for admins to modify:

DZE_backpackRemove forces the player to drop his/her backpack when they
change gear.
DZE_maintainCurrencyRate modifies the amount of worth each item is worth
to maintain.

Changes the error message in player_wearClothes to tell the player why
they can't change gear yet
Remove some debug lines that spam RPT

* Rework

Rework as per @ebaydayz

* Rework

Rework
2016-10-30 14:11:54 -04:00
ebaydayz
abb0475d28 Use joinSilent instead of join 2016-10-30 13:54:55 -04:00
ebaydayz
6d8afc9d32 Revert "Send new group to server for update"
This reverts commit 3f83354066.
2016-10-30 12:50:37 -04:00
ebaydayz
3f83354066 Send new group to server for update 2016-10-29 18:38:53 -04:00
ebaydayz
0be3a8522e Add sleep before refreshing controls
Vanilla commit:

e6e0d057dd
2016-10-29 15:52:55 -04:00
ebaydayz
07525388a6 Hide group buttons on use 2016-10-29 15:08:46 -04:00
ebaydayz
dbb9e97efc Update group dialog 2016-10-28 20:10:18 -04:00
oiad
1c7e96a0ff Advanced trading modifications, maintain_area modifications (#1780)
* Advanced trading modifications, maintain_area modifications

This lot of changes brings forth the following:

Sets up a "default" set of compiles that are the minimum needed for
maintain_area.sqf and custom scripts to utilize the gem based currency
that @icomrade added.

maintain_area.sqf: This will now utilize the gem based currency system.

Removed the redundant Z_Vehicle and replaced it with the Epoch built in
DZE_myVehicle

z_at_buyItems: Code tidying and optimization

z_at_checkCloseVehicle: Tidied up the code since removing Z_Vehicle
allowed us to remove some now useless code.

z_at_getVehicleItems: Removed the nearestObjects check for your vehicle
since we now do z_checkCloseVehicle on Advanced trading start up.

* Advanced trading missed redundant variables

As per description

* Advanced trading rework

We don't need to check for close vehicle anymore now for backpack money
since we've made z_vehicle redundant.

* Revert "Advanced trading rework"

This reverts commit a589bd19b9.

* Advanced trading rework

We don't need to check for close vehicle anymore now for backpack money
since we've made z_vehicle redundant.

* Advanced trading rework

More rework

* Remove single currency add/remove coins functions

at request of @ebaydayz.
2016-10-28 19:29:04 -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
ebaydayz
d13aafcd0c Add streamer mode game options setting
The chat list does not appear to be toggleable on the fly because it is
a display with no accessible controls. Giving it an idd and using
closeDisplay did not work. So it needs to be manually set off screen in
its config or covered up.
2016-10-19 15:49:30 -04:00
ebaydayz
fffcf43bbb Spawn infectious waterholes locally on each machine
Vanilla commits:

2d47c7250c

94a0bac524

44b7114129
2016-10-17 16:49:24 -04:00
ebaydayz
f21b4f0f41 Remove t_stub_picea.p3d from dayz_trees
See:

bf31d8f6e7 (commitcomment-19441154)
2016-10-15 16:48:29 -04:00
ebaydayz
7044b0095d Get player name before death
Vanilla commit:

3e8c9410c5
2016-10-13 16:01:55 -04:00
icomrade
bf31d8f6e7 Update tree array for NAPF
thanks @ndavalos
2016-10-12 14:55:24 -04:00
icomrade
b25b7636a7 Direct menu to cursortarget or player
Please test the living hell out of this.
2016-10-07 13:46:53 -04:00
oiad
5472eda2a8 Add M240Nest_DZ to maintain classes variable. (#1773)
* Add M240Nest_DZ to maintain classes variable.

This makes it so M240Nest can be maintained. (Which it should be)
2016-10-06 14:46:35 -04:00
ebaydayz
2ee06afea7 Sync chopped down trees for JIP players
Vanilla commit:

a57478fb1a
2016-10-05 17:24:10 -04:00
ebaydayz
de219116a8 Optimize save after trade
See my comment on b806043

Veh_setFixServer only runs on the server, so the client does not need to
compile it.

The PVDZ_veh_Save PVEH is only added on the server, so it should never
be sent with regular publicVariable anymore.
2016-10-02 15:44:51 -04:00
ebaydayz
88c1b83c31 Fix mine detection in death messages again 2016-09-30 20:06:18 -04:00
ebaydayz
d335ee2b1c Fix death message mine and satchel detection 2016-09-30 19:14:11 -04:00
ebaydayz
b45d6d9a24 Color new killfeed death messages
The player who died is colored red and the killer is colored green. The
weapon now points in the direction of the player who died.

Also reverted 66fd5be since it did not help. It is already done globally
in player_death.sqf anyway. I tested again and this actually fixes the
problem.
2016-09-29 20:26:26 -04:00
ebaydayz
b4be955a0d Update new runover death message 2016-09-28 18:57:09 -04:00
icomrade
c746d98853 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-09-27 20:55:13 -04:00
icomrade
869f98efd7 Fix change clothes dupe 2016-09-27 20:55:06 -04:00
ebaydayz
dbd84e419b Use spawn for dynamicText kill feed
My mistake from 9b13bd0
2016-09-27 20:54:38 -04:00
ebaydayz
9b13bd0e5e Update new death messages 2016-09-27 15:08:41 -04:00
icomrade
40d419e475 Re-add abort timeout
Timeout is no longer restarted when you click abort and the loop now
closes the gear menu so the player cannot attempt to dupe with the gear
menu and abort menu open at the same time.
2016-09-23 19:10:39 -04:00
icomrade
770378b3af Private array 2016-09-23 17:22:57 -04:00
icomrade
e8006a40af Non-blocked messages
Displays at the bottom center of the screen. This now accepts formated
(structured) text, see https://community.bistudio.com/wiki/parseText for
more info
2016-09-23 14:02:31 -04:00
icomrade
7f0935c639 add floors to drop array 2016-09-22 15:14:05 -04:00