Commit Graph

47 Commits

Author SHA1 Message Date
A Man 3d8fa91c1d Move arrows to epoch crafting only 2019-11-04 11:10:39 +01:00
A Man 52c20fd512 Move fix bottle to epoch crafting 2019-11-04 10:59:06 +01:00
A Man 12bb378ea5 Streamline water bottle strings by @seelenapparat
Water bottles are sorted by the object model in the gear now.

Remove old canteen configs since it is in under pet waterbottle now.
2019-11-04 10:01:46 +01:00
A Man 3da345b865 Move craft strings, wood piles, planks to epoch crafting
There is no need to use the dayz mod craft if it can be done with the normal epoch craft.
Also allow crafting wood piles directly from wooden logs.
2019-11-02 14:45:54 +01:00
A Man 276615a8f1 Fuel container can be emptied now 2019-10-30 10:03:16 +01:00
A Man d4b46e4287 Fixing arrow crafting 2019-10-19 15:11:57 +02:00
ebayShopper b39a15cdd7 Update vanilla building
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/ad0d5141180043e1ff7ca89f4168cf3df96095e3
2017-12-04 13:49:12 -05:00
ebayShopper d6f88fbf8a Add new L85 and SVD variants
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/8951508770d2ec7fffb1e42bc5c2b15320a874fc

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

https://github.com/DayZMod/DayZ/commit/58e594553bd6ef776b1ddc2ad858d9b21e411abd

https://github.com/DayZMod/DayZ/commit/eaf964825390035776af6f4b1b47fe64b12dbad6
2017-11-26 17:39:02 -05:00
ebayShopper 39e05ad0e4 Update vanilla building
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/2ec04a7f8dc50be4a197b76291f06ceae0437b7c

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

https://github.com/DayZMod/DayZ/commit/156b90ccb54d44bfc7ac49ed55757282f82e5831
2017-06-10 10:45:14 -04:00
ebayShopper fa18cbce51 Add ghost models for tents
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/8c48716c43b895e5651d7c02e6a1345ad5f74eaa

https://github.com/DayZMod/DayZ/commit/67c031697bf4596d2e75544832f79111d6693b74
2017-03-20 18:32:44 -04:00
ebaydayz f25f5e96a6 Fix light fire and build fireplace over water #1866
Fixes #1866
2017-01-11 15:25:29 -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
ebaydayz 2d394c32da Move sharpen action to ItemKnifeBlunt
Avoids confusing message "Missing ItemKnifeBlunt to do this"
2016-11-21 13:55:09 -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 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 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
oiad 497b065663 Localization changes/additions. (#1787)
* Localization changes/additions.

Fixes a few localizations, extends range for removing camo nets from
toolbox by 10m, I have found that 5m is just not enough.

* Toolbox change

Update camonet removal to 10m instead of 5m

* Safe zone no building near/blacklisted buildings no building near

Adds a check in dze_buildChecks to disallow building within a certain
distance of a safezone or a blacklisted object name.

* typo

fix typo

* Safezone/blacklisted changes

As per requests.

* Rework

Rework

* Remove unused variables

as per subject

* Misc changes

Fix unprivated var in calcfreespace
Made single currency buy/sell reporting more englishery
Localization cleanup of extra spaces

* rework

rework
2016-11-04 12:08:47 -04:00
A Man aa267bda2c Adding many new strings (#1781)
* More Stringtable updates

Ive added and corrected more german strings. Some german strings were too long. Lots of building items needed a localization. Adding after request the Winter Ghillie Suit localization for Namalsk compatibility.

* Update for new localization

* Update for localization

* Update for new localization

* Update again

* localization update

* Update stringtable.xml

* Update Doors.hpp

* Update ModularBuilding.hpp

* Update stringtable.xml

* Update stringtable.xml

* Update Doors.hpp

* Update Prop_Defs.hpp
2016-10-28 15:05:35 -04:00
ebaydayz 341e734373 Change satchel and mines to single gear slot
For consistency with all other items in Epoch.
2016-09-30 21:47:48 -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
ebaydayz c2b16f0828 Consolidate DZE_ActionInProgress and r_action_count to one variable
There is no point in having two variables for the same purpose.

It is also pointless to keep an action count tally like r_action_count
was doing, since it is only ever checked for being 0 or 1. Any count
higher or lower than that is irrelevant.

I will make this change in vanilla too.
2016-08-25 15:38:27 -04:00
ebaydayz fd90eda8ae Update vanilla player build
Vanilla development commits applied:

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

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

https://github.com/DayZMod/DayZ/commit/2de1d90edd773883c17db80c5905e0b44a2b4ef6

https://github.com/DayZMod/DayZ/commit/8a914606cff65bb50c1b8c48178d7eab67d0285f
2016-08-21 11:58:32 -04:00
ebaydayz f0e0f6d6e4 Temp Bypass for tents and stashes for collision checks.
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/143f8e4dcb824cc0c8d1f21f8e7fbf40dbb9b9cd
2016-08-21 11:39:19 -04:00
ebaydayz a345b69a77 Swap vanilla ItemPadLock for Epoch ItemComboLock
This greatly simplifies things over having two separate combo lock
classes.
2016-08-17 13:27:08 -04:00
icomrade 2c4c75c67c Fix crafting issue 2016-08-07 14:36:40 -04:00
ebaydayz b1ae6c4a60 Fix unknown entity RPT error for Padlock and Frank&Beans
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/955c7a263ca4d1069c340c074c76181aade24ce4
2016-07-29 14:34:45 -04:00
icomrade bd91044e7b Fix duplicate action check with vanilla objects
+ typo fix
2016-07-27 11:08:50 -04:00
icomrade c847f8c756 Remove create stash option 2016-07-26 21:01:21 -04:00
icomrade 19960f08e2 use player_makeFire to start a fire 2016-07-22 12:23:05 -04:00
icomrade e3fee60a8f Change water bottle image back to canteen image 2016-07-21 00:35:51 -04:00
ebaydayz f7d765e669 Fix STR_ACTIONS_LIGHTFIRE listed twice
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/ca8434a9b9b9c34d2734a96a8bad8519f15ce512
2016-07-03 12:26:56 -04:00
ebaydayz 301c4348e9 Remove vanilla generator fill actions 2016-05-19 18:35:11 -04:00
icomrade 2d9097a6af Switch all buildables to Epoch building system
Didn't bother switching the stash over since it doesn't appear to be
implemented yet
2016-05-10 11:21:04 -04:00
ebaydayz 4b9d6df0bb Finish localization support
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/33c6cafbcbffca2624ed5753d9b4882419626c70
2016-04-28 22:13:48 -04:00
icomrade 9624979785 Fix items taking more than 1 inventory slot 2016-04-24 17:44:58 -04:00
ebaydayz 666ace6d54 Cleanup duplicate and unused strings
Cargo count is shown at the top of the gear menu now
2016-04-04 16:58:59 -04:00
ebaydayz 6b25d3594e Add strings for desert dome tent 2016-04-04 14:04:21 -04:00
ebaydayz eda82156be Move CfgServerTrader to dayz_code\configs folder
Also moved the dayz_epoch_b stringtable into a dayz_epoch package in the
dayz_code stringtable.

This makes it easier to maintain and search for code strings. Epoch_b
only holds extra models and textures now.
2016-04-04 13:10:01 -04:00
ebaydayz 8de50c4619 New variable for match stick counting 2016-03-31 16:23:09 -04:00
ebaydayz 01529e51bc Update shotgun ammo names
See:
https://github.com/DayZMod/DayZ/commit/634214570c2a6c3efe53e2b09bf01250fcc3d2e2
2016-03-11 14:10:45 -05:00
ebaydayz 02564a2d30 Move more stuff out of DZE\Misc.hpp
Better organization
2016-03-10 15:44:50 -05:00
ebaydayz 6ca57a099a Move tents to Tent.hpp
This is better organized than having everything in Misc.hpp
2016-03-10 15:02:53 -05:00
icomrade 9d52fb0595 Should be all scope entries 2016-03-05 20:36:07 -05:00
icomrade 8cdc8e6e36 CfgMagazines - still need script tweaks for buldables 2016-02-22 13:31:14 -05:00
icomrade f885e06c2a CfgVehicles and Scope issues done 2016-02-21 13:14:03 -05:00
icomrade dfb7bba743 CFG WEAPONS DONE 2016-02-21 13:09:16 -05:00