W0LF/DayZ-Epoch
1
0 Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-10-03 21:01:36 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,030 Commits 20 Branches 18 Tags
e4d48cbf380c8078e9567a2d01e36584594a5d7e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ebaydayz e4d48cbf38 Revert pain effect to pre-1.8 version #1839 
Same as 1051

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/9b6d3dcd9c97671c26c2e5f5183afc57f08514a3
 2017-01-07 16:51:48 -05:00
ebaydayz 503206cad8 Update version numbers 2017-01-07 15:39:11 -05:00
ebaydayz fa89487f22 Revert pain effect to original #1839 2017-01-07 14:09:52 -05:00
ebaydayz 80def55420 Show respawn from player zombie or broken legs as suicide 2017-01-06 19:30:05 -05:00
ebaydayz ad556aa0cb Remove two hardcoded Chernarus checks 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/c8455bb718733aa89633c69fee0dd8a6a901d87e
 2017-01-06 17:58:13 -05:00
ebaydayz 58025f591f Fix certain buildables not removable #1859 2017-01-06 16:18:59 -05:00
ebaydayz 571e8d7b11 Add LightPole_DZ to DZE_isRemovable #1859 2017-01-06 15:53:38 -05:00
ebaydayz 33672d99ee Lower or remove nutrition hit for some actions #1857 
Fixes #1857
 2017-01-06 13:27:22 -05:00
ebaydayz 3a7744d18d Add back 1051 handling of RepairParts not listed in config 2017-01-06 12:36:08 -05:00
ebaydayz e074ef0d44 Fix rapid starvation and dehydration from chainsaw and chop wood 
Chainsaw is never used in player_chopWood.sqf. It is only called via
right click on Hatchet which was removed anyway.

The player already takes a nutrition hit on every swing of the hatchet,
and it can take up to twelve swings to chop down one tree.
 2017-01-05 19:38:03 -05:00
ebaydayz 731175f46b Prevent abuse of combine M24 and 2RndShotGun ammo #1848 
Prevents duping exploit described in #1848

Fixes #1848
 2017-01-04 16:16:15 -05:00
ebaydayz cfe01e609e Set RU crates cargo capacity back to normal 2017-01-04 12:43:04 -05:00
ebaydayz 8d7799d180 Update change log 2017-01-03 16:47:26 -05:00
ebaydayz 0c15002109 Fix tool loss due to duplicate matchbox and knife issue #1849 2017-01-03 15:30:50 -05:00
ebaydayz d124a5d2f7 Make switch weapon interrupt autorun 
Fixes #1850
 2017-01-02 14:41:53 -05:00
ebaydayz d5a3cdb2e3 Remove antiwall glitch blocks for vanilla hospitals 2017-01-02 13:36:59 -05:00
ebaydayz 5cb485ccfb Prevent purchasing negative number of items 
Fixes mistake from ffef031 @icomrade . _amount here is the quantity the
player enters in the quantity box when buying. The only time it is less
than or equal to zero is if the player enters zero or a negative number.
It has nothing to do with the buy or sell price.

Thanks Sercan for reporting.
 2017-01-01 18:32:20 -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 30f1827509 Prevent 'name' error when player is killed while logging in 
Prevents WARNING: Function 'name' - x is dead when player is killed
while logging in.
 2016-12-31 18:20:49 -05:00
ebaydayz 0b27653833 Add config variable DZE_ServerLogHits 2016-12-31 17:37:34 -05:00
ebaydayz 4fa36dfd94 Fix selling of Javelin, Stinger and some other items 
Fixes #1844
 2016-12-31 17:14:16 -05:00
ebaydayz 7ce4ba32a2 Add shadow to dayz_rollingMessages 2016-12-30 16:40:10 -05:00
ebaydayz d4b286660f Fix base objects duplicating when using plot take ownership #1811 
Fixes #1811
 2016-12-30 16:29:34 -05:00
ebaydayz e33519ffd4 Readd changes from #1836 
I accidentally removed these when resolving merge conflicts with 854c41c
.
 2016-12-30 14:16:18 -05:00
ebaydayz 05e7a41c0e Update change log 2016-12-30 13:50:21 -05:00
ebaydayz 76e80a9388 Merge remote-tracking branch 'origin/master' 2016-12-29 21:06:54 -05:00
ebaydayz 101a6fc698 Fix wrong eventhandlers on viral zeds #1819 2016-12-29 20:53:35 -05:00
ebaydayz 3176e1619d Set POI and infectiousWaterHoles off by default 2016-12-28 17:33:03 -05:00
ebaydayz d509c15c82 Split player_death into scheduled and unscheduled #1833 
Death message was sometimes showing incorrectly due to spawn delay.

Also the sched_corpses two minute loop was occasionally deleting bodies
right away because bodyName setVariable was delayed by the time it took
PVDZ_plr_death to send (up to a few seconds). See #1825
 2016-12-28 16:16:46 -05:00
ebaydayz 0e938ba8f3 Fix misspelled variable names DayZ_Ignators and destorytent 2016-12-26 14:28:43 -05:00
ebaydayz 64f6a9daa3 Exit vanilla craft item when action is in progress 
Fixes #1826
 2016-12-25 20:01:55 -05:00
ebaydayz b962bd50b9 Use faster switch in repair and salvage 
https://github.com/EpochModTeam/DayZ-Epoch/commit/7496ef5d5cd01eea811261c110fb61120c300b96#commitcomment-20292237
 2016-12-25 17:51:32 -05:00
ebaydayz 1d0a1bf9a2 Add comment about disabling GemWorthArray 2016-12-25 17:29:53 -05:00
ebaydayz 7496ef5d5c Fix undefined color error in repair_vehicle.sqf 
Same color error as f92b751 .

Also same issue in salvage_vehicle.sqf as described in #1828

Added setVariable exceptions for tank hit points.
 2016-12-24 20:17:08 -05:00
ebaydayz 7e341739ee Readd hive shutdown code from 1051 #1822 
Fixes hive connection error when child 302 call fails.
 2016-12-24 18:09:01 -05:00
ebaydayz d694130fdc Remove a duplicate localization 2016-12-23 15:37:42 -05:00
ebaydayz 6f0c70989b Remove unnecessary check in player_spawn_2 
This doesn't run on the server.
 2016-12-23 14:59:55 -05:00
ebaydayz bf00c3f8bb Correct comment from 4d3f707 again 2016-12-22 22:20:47 -05:00
ebaydayz 0ffbdde2e8 Correct comment from 4d3f707 2016-12-22 22:17:27 -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 5b7b1d69bd Add HALO spawn height config var 
Height can be changed without overwriting player_monitor.fsm now.

Also
fixed my mistake from 3257d0f, need to HALO directly from debug pos for
antiTP compatibility.
 2016-12-13 19:50:22 -05:00
ebaydayz c9c31c1a32 Fix wrong bleeding icon on vanilla status UI 
Now using the correct updated icon from vanilla. All other icons are up
to date.
 2016-12-13 12:14:53 -05:00
ebaydayz b62569932d Fix missing return variable in sched_antiTeleport 
My mistake from 5058308
 2016-12-12 16:22:43 -05:00
ebaydayz b4c239729c Fix self actions duplicating when changing clothes and looking at a safe 
This was also a bug in 1051. Thanks to Epoch forums user jOoPs for
reporting.
 2016-12-12 15:23:31 -05:00
ebaydayz bff2a3091d Remove two unused files 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/64ea1eaa76f6d3dce9b3be3685a8642de9390f43
 2016-12-11 15:25:57 -05:00
ebaydayz 3257d0fd88 Move HALO spawn below enableSimulation in player_monitor.fsm #1809 
Fixes stuck floating in air on Napf when dayz_paraspawn = true; Should
also fix #1809.

Fixes #1809
 2016-12-11 13:44:01 -05:00
ebaydayz 46355aed38 Add back missing Epoch player_antiWall call #1817 2016-12-10 21:20:04 -05:00
ebaydayz 2a1bd74eca Fix no damage from hitting ground after HALO if autoOpenChute=-1 
My mistake when adding this.
 2016-12-10 20:25:36 -05:00
ebaydayz 6ecdabc92d Fix swimming in ground glitch at certain spots on Napf 2016-12-10 16:36:51 -05:00
ebaydayz d0e8291159 Fix floating arrows 
Fixes #1815
 2016-12-10 15:06:48 -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 2c8f236f95 Fix death message in potential case of suicide 2016-12-08 14:37:04 -05:00
ebaydayz 0d4d288d81 Fix DMR and M24 ammo price 2016-12-08 13:37:16 -05:00
ebaydayz f92b751ae3 Fix undefined color error in salvage_vehicle.sqf 
Color was undefined if part damage was in any of these ranges:
0.2501 - 0.2599
0.5001 - 0.5999
0.7501 - 0.7599

Fixes related RPT errors:
Unknown attribute any>Remove
Unknown attribute -
Unknown attribute LFWheel
Unknown attribute (76%
Unknown attribute Damage)</t>
 2016-12-07 18:50:01 -05:00
ebaydayz a60c1931ee Update default steam ports and disable mission voting 
These default ports tend to work best for both A2 and A3 as recommended
here:

https://community.bistudio.com/wiki/Arma_3_Dedicated_Server#Port_Forwarding

Most Epoch servers only run one mission, so players should not be able
to vote for a mission change.
 2016-12-07 16:31:49 -05:00
ebaydayz 90977e4a31 Update painkillers 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/1596a17b09cfa9c31b38cf1e4f25ef149ff4f4aa
 2016-12-07 15:20:17 -05:00
ebaydayz 5094e61723 Update zombie pathing 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/f47d6fe5b94b96e11c26e9bf847455e0722dfc57
 2016-12-07 13:25:19 -05:00
ebaydayz dab70963d6 Update POI spawning again 
Vanilla commits:

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

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

https://github.com/DayZMod/DayZ/commit/5b85b311ed7702b46c784672ba3e518bffa4a575

https://github.com/DayZMod/DayZ/commit/55518ed792fdc29e3eb04c93e1f11756f6af17c1

https://github.com/DayZMod/DayZ/commit/4a5cb525ef9b0ca28a9b5297a29e571e08d85161
 2016-12-07 12:57:06 -05:00
ebaydayz 2160437e79 Convert POI to compact array format 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/c71d8cb23c42407978328418959cb258bd59228f
 2016-12-06 19:26:00 -05:00
ebaydayz 638c7dd8b8 Remove some unused variables 2016-12-06 15:02:18 -05:00
ebaydayz 9234244c72 Clarify diag_log 2016-12-06 14:31:30 -05:00
ebaydayz 66f87fac46 Move two localizations to epoch package in stringtable 
Vanilla doesn't refund modulars when deconstructing, Epoch does. Also
upgrade was moved to UserActions of dayz_buildings in vanilla.
 2016-12-06 13:59:25 -05:00
ebaydayz 86d16131bc Update change log 2016-12-06 13:10:07 -05:00
ebaydayz dd721ec572 Fix issue with tag friendlies #1807 2016-12-06 12:12:38 -05:00
ebaydayz c3af66b23a Fix ServerMagArray count error 
(select 2) selects 3rd element

From 252843d @icomrade
 2016-12-05 15:45:42 -05:00
ebaydayz 1bb76d2d22 Resolve merge conflict for #1807 2016-12-05 14:40:21 -05:00
ebaydayz 5058308f00 Prevent issues caused by respawn_west marker being moved 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/39bcedb4b6e6c1d61f8e8e837b35f28d3502e231
 2016-12-05 14:37:28 -05:00
ebaydayz 2db6692643 Fix undefined var dayz_clientPreload during intro.sqs 2016-12-05 11:14:06 -05:00
ebaydayz 4dc667ac7e Remove unnecessary quotes in scripts.txt 
They are only needed if the keyword contains spaces.
 2016-12-04 21:51:05 -05:00
ebaydayz 44e585343f Update for servers that had single currency 3.0 installed 
Makes life easier for people upgrading 1051 databases. Otherwise their
client will error out on loop in fn_selfActions because dayz_onBack will
be a number when it should be a string.

https://epochmod.com/forum/topic/28493-alpha-release-single-currency-30-storage-default-hive-no-global-banking/
 2016-12-04 19:00:46 -05:00
ebaydayz eb150a8289 Fix typo from 9ae0e7e 2016-12-04 14:52:57 -05:00
ebaydayz 9ae0e7eb11 Fix conversion of medical array for old characters 
Fixes some converted characters having a <null> value in the "rh_factor"
slot of their medical array causing them to fail to save.
 2016-12-04 14:38:47 -05:00
ebaydayz 7ab09b9a9f Fix error with converted characters medical array 
Select 12 actually selects the 13th item in an array, so the rh_factor
line will error if the array is equal to twelve.

This was responsible for some converted characters having a <null> value
in the "rh_factor" slot of their medical array causing them to fail to
save.
 2016-12-04 14:18:37 -05:00
ebaydayz 7af0cb2910 Lower numpad minus keydown timer for block cheats 
Fewer false positives
 2016-12-04 11:37:03 -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 45159d81c2 Update pain sound effect 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/7cdb2e67fde01bb1cff9be98eb76af199c7c065b
 2016-12-03 13:25:31 -05:00
ebaydayz 43d14dbdba Avoid potential issues with double private vars 
_message is a commonly used var name
 2016-12-02 14:39:04 -05:00
ebaydayz 5d1a6939e6 Fix refuel at gas station with generator #1806 
Fixed mistake from: e398250

The refuel code was only running if a fuel truck was passed to the
script.

Also removed fuel truck classes that do not exist from the
dze_fueltruckarray.
 2016-12-02 12:34:51 -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 baae92f9d8 Remove unused file 2016-12-01 16:28:19 -05:00
ebaydayz 40ea519fd3 Temp fix for vault_pitch.sqf error in 1.0.6 release 2016-12-01 15:31:09 -05:00
ebaydayz c0d5fcf17c Fix vault_pitch PVDZ_obj_Publish array 
106 server_publishObject expects inventory as 4th element.
 2016-12-01 15:15:04 -05:00
ebaydayz 1cd069e2d8 Uncomment PVDZ_dayzCarBomb 
Not sure if functional atm, but still in use if ItemCarBomb is script
spawned and right clicked (not obtainable by default). My mistake from
b6d88b1
 2016-12-01 10:32:25 -05:00
ebaydayz 1dd337b8ed Add @ndavalos and @SmokeyBR to credits in README 
Both contributed numerous corrections and bug reports. Thanks
 2016-12-01 10:28:10 -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
ebaydayz 4ffa25adf2 Improve rejoined group message grammar 2016-11-30 11:58:29 -05:00
ebaydayz 546dc4fc41 Update scripts.txt 2016-11-30 11:54:26 -05:00
ebaydayz bee00e9a57 EnableRadio if globalChat death messages are on 2016-11-30 00:36:51 -05:00
ebaydayz 27ee69695c Update my username in readmes 2016-11-30 00:08:52 -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
ebaydayz 185d84f14f Remove unneeded global var Z_AT_FolderLocation 
This variable is not useful. If you change it you need to copy all the
AT files to your mission.

It is fewer files in the mission to just overwrite the path in compiles
and fn_selfActions.

Also fixed mistake with not replacing macros in scripts.txt with their
actual values.
 2016-11-27 20:30:34 -05:00
ebaydayz ca73853179 Update readme 2016-11-27 19:02:10 -05:00
ebaydayz 5986b00823 Update server install readme 2016-11-27 14:42:55 -05:00
ebaydayz a8ab2f5d54 Allow drinking from hands at ponds on Cherno 
Town generator configs may be added for other maps in the future.
 2016-11-27 14:04:18 -05:00
ebaydayz 6abd92034a Make bloodbag interrupt message more accurate 
The blood bag isn't actually removed in any of the three cases this
message is used.
 2016-11-27 12:21:44 -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 15fa1fc7a7 Update test build 2016-11-26 21:34:58 -05:00