Commit Graph

2365 Commits

Author SHA1 Message Date
ebaydayz b315c15cb0 Update vanilla chop wood
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/1bca53125459c2769af7bd6b583c8b8d9bbc16d9
2016-09-21 18:43:23 -04:00
ebaydayz 5e71793c17 Update vanilla building
Vanilla commits applied:

https://github.com/DayZMod/DayZ/commit/44f2552ff2b4baf9dd9391f7705bd05647c02267

https://github.com/DayZMod/DayZ/commit/213a333ce505b7e5e60bd1f5f0c2721f06a52267

https://github.com/DayZMod/DayZ/commit/423d53299dbddf37174133f3795b7050ab715df4

https://github.com/DayZMod/DayZ/commit/43bce6554f747e1831a13338523f6e2964236acb

https://github.com/DayZMod/DayZ/commit/f551cdac6e449d25ad30e373af30abb16fa98df0
2016-09-21 17:14:13 -04:00
ebaydayz 33cf7611ed Don't allow jerry fill from destroyed fuel source
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/90251abab3fd272527fc10d5ed673ce5c230e19f

https://github.com/DayZMod/DayZ/commit/9204c15d3f3874014842deafc4d825cc11b64252
2016-09-21 16:53:29 -04:00
ebaydayz ef065aeb35 Fix plot management buildables in range display count
See #1735
2016-09-21 15:52:14 -04:00
ebaydayz 01b45121d8 Fix dayz_townGeneratorBlacklist not working
I forgot to update it when these were moved to global spawn recently.
2016-09-20 20:19:47 -04:00
ebaydayz e94a66e9fd Merge pull request #1768 from AirwavesMan/master
Adding more loot table for zombies
2016-09-20 12:03:30 -04:00
ebaydayz ac95c6b0df Make plot and door friends lists backwards compatible
This prevents errors when upgrading 1051 databases that had plot or door
management installed.

See comments at:

https://github.com/EpochModTeam/DayZ-Epoch/commit/fe9b8fdcb4b5cf069e0cc287b97785a3448817c8
2016-09-19 20:21:27 -04:00
A Man 7b22d9dd14 New loot tables for zombies
Adding 3 new  loot tables
2016-09-20 01:28:42 +02:00
A Man 7ea6e9c7a4 Zombie loot update
Adding 3 more options for zombie loot to give admins better possibilities to customize the zombie loot.
2016-09-20 01:27:31 +02:00
A Man 5e3d4c7890 Zombie loot update 2016-09-20 01:25:20 +02:00
A Man b751ffb278 Small loot position update
Adding Land_stan to loot positions. It is the same like the Camp. Increasing the high of loot positions to prevent loot from spawning in the ground.
2016-09-19 21:45:19 +02:00
icomrade c97015fb9a Re-add removal of fuel tanks and engine
Thanks for the tip on fuel tanks @SmokeyBR
2016-09-19 14:11:45 -04:00
icomrade 91e5e875c2 Force save after building and maintain 2016-09-19 13:48:27 -04:00
icomrade 5f33fd3ef5 Fix R3F Tired 2016-09-19 13:39:58 -04:00
icomrade 37a717fe3f Fix generator gear display and Offroad hud
using generator as a tent should have no adverse effects.

Thanks @SmokeyBR
2016-09-19 12:08:25 -04:00
ebaydayz 61f38fc259 Use number instead of string for weapon slot type in configs
This is consistent with the rest of the weapon configs.

It also avoids issues with using isNumber or getNumber to check slot
type in scripts.
2016-09-18 14:58:35 -04:00
ebaydayz 29d9ed9211 Set unit posATL in switchModel if respawn is in water
Reverts:

https://github.com/EpochModTeam/DayZ-Epoch/commit/bcc16a013520dcc243c306b178d3864dc4fec456

See:

https://github.com/EpochModTeam/DayZ-Epoch/commit/e8e5d24e80f77268c8befa38680ccd9de6c03452
2016-09-17 15:41:49 -04:00
ebaydayz b9507b2eb4 Don't hideObject on debug floor
https://github.com/EpochModTeam/DayZ-Epoch/commit/e8e5d24e80f77268c8befa38680ccd9de6c03452#commitcomment-19060242
2016-09-16 17:17:02 -04:00
ebaydayz bcc16a0135 Roll back to old swimming in ground fix
See
https://github.com/EpochModTeam/DayZ-Epoch/commit/e8e5d24e80f77268c8befa38680ccd9de6c03452#commitcomment-19053648
comments
2016-09-16 13:26:27 -04:00
ebaydayz 0ab46abd52 Don't spawn epoch dynamic debris if town generator is on
Vanilla town generator debris can end up spawning inside of epoch
dynamic debris if both are enabled.
2016-09-15 17:07:11 -04:00
ebaydayz 6e57bc6f6f Revert fix invisible primary stance glitch
Partial revert from:

https://github.com/EpochModTeam/DayZ-Epoch/commit/e8e5d24e80f77268c8befa38680ccd9de6c03452

Can't seem to reproduce this one now with this commit reverted. If
anyone has working repro steps let me know.
2016-09-15 16:49:19 -04:00
ebaydayz 7415c21c2b Small update to object_build
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/a10173443b4d47d4f9739a50759d68c27b6340df
2016-09-15 12:48:31 -04:00
ebaydayz b2dfa058b0 Simplify double negative in fn_unconscious
Simpler than:

https://github.com/EpochModTeam/DayZ-Epoch/commit/b609dcf5190293d6cd6bfe741b968889749042fe
2016-09-15 12:44:47 -04:00
icomrade b609dcf519 Update fn_unconscious.sqf 2016-09-14 18:01:18 -04:00
icomrade 0802ecc0ed Do not require plot to build traps 2016-09-14 17:48:23 -04:00
icomrade c0e0684841 Fix duplicate english string 2016-09-14 17:12:07 -04:00
icomrade 625333985d don't rearm horns 2016-09-14 16:52:51 -04:00
ebaydayz 815b54ec44 Fix gut dog
Body was disappearing because it had no meat on it (yield = 0). Thanks
@AirwavesMan
2016-09-14 16:42:25 -04:00
ebaydayz b349150548 Don't auto disable sound mute when exiting vehicle
Let the player choose when to disable so there aren't any unexpected
drastic volume changes.

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/60f4968f2317bdb79f8d7d158f2e787d81d6b639
2016-09-14 15:36:35 -04:00
ebaydayz ce6dffde3d Add A2OA translations for open and close door 2016-09-14 14:46:58 -04:00
A Man 940efd1f2e Small Update 2016-09-14 02:53:13 +02:00
A Man 63c8a89514 Adding lots of new german strings
Ive changed some other strings too
2016-09-14 02:42:24 +02:00
ebaydayz e8e5d24e80 Fix swimming in ground glitch
Also fixed invisible primary stance glitch when relogging with pistol
but no primary in inventory.

Fixed my mistake from:
https://github.com/EpochModTeam/DayZ-Epoch/commit/e85f6ad1b598afb07327b81a50d853e76cbb7f2c
2016-09-13 18:36:06 -04:00
ebaydayz e85f6ad1b5 Consolidate transfusion scripts
Consolidated transfusion and transfusion_noBloodTypes to one script.

Selfbloodbag.sqf will never run if DZE_selftransfuse = false; because
the right click action is hidden.

Total blood quantity is now added in 1/4 increments during self bloodbag
as intended instead of all at once.
2016-09-13 15:02:16 -04:00
ebaydayz c7a6c71330 Disable vanilla base building actions for now
Since we are not going to use vanilla base building.
2016-09-12 16:11:29 -04:00
icomrade a09e364ec1 Don't block damage from explosives 2016-09-12 14:42:18 -04:00
ebaydayz 29c16dc59f Consolidate duplicate sell distance variables 2016-09-12 14:14:38 -04:00
ebaydayz 2bb5c5942c Retire cone and pole plot previews in favor of dome
Thanks @oiad for pointing this out.

Poles are not used for previewing anymore. Cones do not give as much
information as the dome.

The dome is visible at night and under night vision too.
2016-09-12 13:39:00 -04:00
icomrade 26f9102a00 These are used
I didn't save all before commiting :(
2016-09-12 12:57:08 -04:00
icomrade 06202e753f Minor loot/crafting cleanup
removed DayZ fences and unused item, added some crafting supplies to
trader (marginal savings if you craft bandages as opposed to buying
them)
2016-09-12 12:55:47 -04:00
icomrade 82c8d4d538 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-09-11 16:38:30 -04:00
icomrade 203975def7 Rearm driver weapons (pook rearming) 2016-09-11 16:38:26 -04:00
ebaydayz 8bcd3a44e6 Keep Epoch strings in the dayz_epoch package of stringtable
@oiad Please keep Epoch specific strings in the dayz_epoch package.
Vanilla does not have any of these items.
2016-09-11 15:40:16 -04:00
ebaydayz 16e4dc7b30 Move HeliCrash and CarePackage area variables to markers
This allows finer grained control of crashsite, carepackage and infected
camp spawn positions and radii (further north, south, east, west, etc.).

Also removed some hardcoded checks for Chernarus, since
dayz_townGenerator should always be off on other maps for now. Someone
may add town generator coordinates for other maps later.

Related vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/7c8b69eb82a8c741d01251b2552d009abe2687c4

https://github.com/DayZMod/DayZ/commit/7dfd3ef9cf3cf1751759fd76f8eae10c0b1740dc
2016-09-11 14:45:49 -04:00
icomrade caddfafc78 oops 2016-09-11 14:24:20 -04:00
icomrade b806043a4a Save player and vehicle after trade
Also forgot to commit a change yesterday
2016-09-11 12:52:38 -04:00
oiad 64348b1f84 Localization additions
Adds some more text to localization, Moves sandbags around so they are
all next to each other.
2016-09-11 15:21:43 +12:00
icomrade b305e7d793 Don't force save at login
Thanks for the heads up ebay
2016-09-10 20:45:39 -04:00
icomrade 0dcc75e5ec Limit to crew 2016-09-10 15:53:16 -04:00
icomrade 14bf9f9018 Fix combat in vehicles 2016-09-10 15:34:54 -04:00