W0LF/DayZ-Epoch
1
0 Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-10-04 17:49:34 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,060 Commits 20 Branches 18 Tags
26c1bd9a8695db9a9ae5d52e43761e811bb1b496
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ebaydayz 26c1bd9a86 Properly disable town generator and plant spawner loops 
Stops intensive loop from running unnecessarily when dayz_townGenerator
= false; The comfrey plants are pointless atm since the only thing they
may be used for is crafting a sepsis bandage.

Also added waterHoleProxy for Napf and Namalsk placed by @skigoggles

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/b5a91250865db7f3bdce7f0d2bfc676be27d7884
 2017-01-21 21:44:43 -05:00
ebaydayz cc3b8801b7 Update zombie event handlers again 2017-01-20 14:27:55 -05:00
ebaydayz d8828d9df1 Fix "AI" text localization again 
This was my mistake from 131329f. SourceName needs to be checked, not
bodyName.
 2017-01-19 17:36:26 -05:00
ebaydayz 194bad12ea Remove some more unused variables 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/68ffe8b1582de007f5392b137634e2aa82247d75
 2017-01-19 12:27:36 -05:00
ebaydayz 6d45ecfcac Fix group dialog button scaling again 2017-01-18 17:10:56 -05:00
ebaydayz 0d2f96b299 Revert lobby and player list background colors to A2OA default 
Partial reverts of my changes in 6732e5c and e0c0669

It requires too many changes to make the whole A2OA UI match.
 2017-01-17 16:00:49 -05:00
ebaydayz 92ee58900c Fix trader menu server RPT logs partially localized on client 2017-01-17 14:39:31 -05:00
ebaydayz 9985f0adbd Fix Bandit1 and Bandit2 skins identical #1874 
Fixes #1874
 2017-01-16 20:27:15 -05:00
ebaydayz 13aaaa5b9a Remove NV cooldown for player zombies #1876 2017-01-16 19:03:49 -05:00
ebaydayz 0b0f2d3455 Update calls to zombie_agent.fsm #1877 
Forgot to update in 6853263

Fixes #1877
 2017-01-16 18:34:47 -05:00
ebaydayz 198ef269d4 Combine player_fillWater and player_drinkWater to one function 2017-01-16 16:35:15 -05:00
ebaydayz 0d2f91f3aa Fix trader menu server RPT log partially localized on client 2017-01-11 16:12:17 -05:00
ebaydayz f25f5e96a6 Fix light fire and build fireplace over water #1866 
Fixes #1866
 2017-01-11 15:25:29 -05:00
ebaydayz b9d8b5798c Hide group icons for units inside the player's vehicle #1865 
Fixes #1865
 2017-01-10 14:32:04 -05:00
ebaydayz 131329fd59 Fix "AI" text localized on wrong client in death message #1867 
Fixes #1867
 2017-01-10 13:38:00 -05:00
ebaydayz 5c8ae96887 Add military flashlight attachments 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/b6ba294b70a97adc571f6a8a6416d796053451f5
 2017-01-09 20:19:01 -05:00
ebaydayz 8ace89ff4d Update removeDamagedVehicles SQL event 2017-01-09 17:43:52 -05:00
ebaydayz 076bd22bfe Update vanilla fence_handleDam.sqf 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/ef243327b5ada720601867ece968ec02a580260f
 2017-01-09 17:34:58 -05:00
ebaydayz 9d28504ecf Remove comment in player_wearClothes.sqf 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/72b37dc108fa8af90bc44e5a52065374951a3372
 2017-01-09 17:22:41 -05:00
ebaydayz 7857272d82 Add loot pos for some more sahrani and tavi building types 
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/578e0f5c0a5cc984e14124bb5efac0b3e41b9e18

https://github.com/DayZMod/DayZ/commit/18d1852b56afa7e6e97510ab78b7b3f6cf92d299

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

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

https://github.com/DayZMod/DayZ/commit/56d0ab54cbe78afea38b938d76c7b01a74c4ad66

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

Added some new building types. No existing buildings were removed or
changed, just moved around to sync order.
 2017-01-09 17:01:13 -05:00
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