Commit Graph

145 Commits

Author SHA1 Message Date
ebayShopper efaf1f9399 Update ReadMes
@oiad please keep Epoch specific strings in the dayz_epoch package

The status icons translation was identical to English. @AirwavesMan the
second word is not capitalized for consistency with all other settings
in the game options menu. https://i.imgur.com/eIbPBlM.jpg
2017-12-18 17:53:27 -05:00
oiad e0b444c3fd Update stringtables, fix translations 2017-12-17 14:50:32 +13:00
icomrade 84a868bbda add consume back to FoodPumpkin
https://epochmod.com/forum/topic/44747-cannot-eat-pumpkins-after-106/
2017-12-16 18:58:56 -05:00
oiad edc6224bc3 Fix broken string table name
String STR_ITEM_DESC_tent_poles not found
2017-12-17 11:24:10 +13:00
oiad 373aeb2db7 Update stringtable.xml 2017-12-17 11:12:18 +13:00
A Man d56f3a68f4 7 new items, missing localizations (#2004)
7 new items - server admins can add them if desired

Adding a better and some missing localizations

Adding a localization for the car bomb
2017-12-14 13:29:20 -05: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
A Man a7f2c88c32 Fix Corepatch AS50 magazine spawn (#1955)
* Fix Corepatch AS50 magazine spawn

The Corepatch broke some of the AS50 magazine spawns. Im not sure why it happend sometimes and sometimes not.

This message showed up sometimes: No entry 'bin\config.bin/CfgMagazines-5Rnd_127x99_as50_CP'.

The CorePatch use that: 

https://github.com/Goliath86/CorePatch/blob/e0d06f7086fb0e3b3e6b7dc22beeca3b087967be/CorePatch_CIT_14888/config.cpp

This commit should fix that error message and the AS50 name as well.

* Define 5Rnd_127x99_as50_CP class

* Update AS50 fix

* Revert AS50 ammo fix
2017-06-24 09:34:53 -04: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
ebayShopper 53158a11ed Remove rtitleText in fillBloodBag.sqf
Not necessary to inform recipient and prevents two messages on screen at
once for instigator.

Classic bloodbag system is now added in vanilla too.

Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/bee9bd16382f4c1ece397cd029bb61c775024144
2017-03-19 16:35:17 -04:00
ebaydayz f8047167d8 Fix wrong output on ItemKiloHemp for HempSeed
Reported by Epoch forums user Runewulv
2017-01-22 13:23:01 -05:00
ebaydayz 198ef269d4 Combine player_fillWater and player_drinkWater to one function 2017-01-16 16:35:15 -05:00
ebaydayz f25f5e96a6 Fix light fire and build fireplace over water #1866
Fixes #1866
2017-01-11 15:25:29 -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
icomrade c64c181f95 Handle boiled waterbottles < 10oz
should fix #1838 Translation fixes are probably necessary
2016-12-29 15:50:53 -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 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 01307f9a42 Remove some common and duplicate translations 2016-11-07 16:14:20 -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
A Man 1223e08d79 Fixing string is not displayed correctly (#1791)
* Fixing not shown string

* Fixing not shown string
2016-11-04 20:42:24 -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
ebaydayz 866358e4d0 Add launcher handling to advanced trading 2016-10-31 13:07:07 -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
oiad 5bc36166a7 Rename plot pole from "30m_plot_kit" to "plot_pole_kit"
Sanity change since the plot pole is not fixed at 30 meters and is
configurable.
2016-10-08 12:51:21 +13:00
A Man e55b0b1ce5 GP25 wrong text
GP25 had the wrong description text.
2016-10-06 20:07:54 +02:00
ebaydayz 004a3bcde4 Fix wrong string used for Mountain Green soda
Mountain green was using the mountain dew strings too. These strings
were unused.
2016-10-02 20:31:52 -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
icomrade 413e86b521 Reconfigure pook and autogyro magazines
This allows players to carry the magazines, without modification to
ammo.sqf the side guns of the pook transport are supported to be
rearmed. Modification will be required to allow turrets assigned to the
pilot to be rearmed, such as the pook H13 gunship and mozzie grenades.
2016-09-02 12:24:39 -04:00
oiad f838739975 Supply crate localization fixes
Extends the displayName RSC width to the same as the description (Not
sure why this was so small, it truncated longer display names)
Added localization strings for all the supply crates so they were easier
to distinguish in the gear menu.
2016-08-28 00:02:27 +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
A Man 9cce8910c2 Adding many new weapons (#1743)
* Update stringtable.xml

Adding string support for AA12 ammo

* Update Rifles.hpp

Adding a few missing weapons.

* Update LMG.hpp

Adding one new LMG

* Update ShotgunAmmo.hpp

Adding AA12 ammo

* Update BanditAmmunition.hpp

Adding SCAR ammo

* Update BanditWeapons.hpp

Adding Mk17 Sniper and M110 NVG.

* Update FriendlyAssaultRifle.hpp

Adding Mk16 and L85 variations.

* Update FriendlyLightMachineGun.hpp

Adding L86A2 LSW

* Update NeutralBlackMarketAmmo.hpp

Adding new ammo AA12 and Mk17

* Update NeutralBlackMarketWeapons.hpp

Adding AA12 Shotgun and Mk17 variants.

* Update Weapons.hpp

Adding many new weapons.

* Update Ammo.hpp

Adding new AA12, Mk17 ammo to loot.

* Update AmmoBox.hpp

Adding SCAR ammo to eu2 box.

* Update Shotgun.hpp

Adding re-combine action for new AA12 ammo

* Update NeutralHelicopterUnarmed.hpp

Adding UH60M_MEV_EP1 to trader.

* Update NeutralBlackMarketAmmo.hpp

Removing AA12 HE

* Update Ammo.hpp

Comment out AA12 HE ammo

* Update Weapons.hpp

Lowering DMR spawnrate
2016-08-17 20:05:46 -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
A Man 4e65c4b473 Add missing re-combine actions for magazines (#1741)
* Updating strings for missing magazins

Adding new magazine names to make it similar to the dayz 1.8.7. names.

Adding 
Mk17
M17 SD
M107
KSVK
L115
VSS

* Adding missing magazines and re-combine option

Mk17
Mk17 SD

* Adding missing magazines and re-combine option

M107
KSVK
L115
VSS

* Update stringtable.xml

Moved new strings to epoch package

* Update 762x51.hpp

Adding the SD indicator. I think the SB instead of SD is too confusing. So everyone knows it is SD ammo.
2016-08-17 09:45:15 -04:00
A Man 1145f97e1b Adding the skin FR_Sapper (#1734)
* Added one new skin

* Added one new skin

* Added one new skin and class RepairVehicle

Added one new skin and class RepairVehicle: None { show = 0; };

* Added one new skin

* Added one new skin

* Update EpochSkins.hpp

* Added one new skin

* Added one new skin

* Added one new skin
2016-08-12 20:54:24 -04:00
A Man bbb8c803b6 Adding many new skins (#1732)
* New Skins

Added all new skins to the loot table.

* Added new skins

* New skins for trading

* New skins for trading

* New skins for trading

* Added new skins

* Added new skins

* Strings for new skins

* Added new skins to player classes

* Added weight for new skins
2016-08-12 15:37:48 -04:00
ebaydayz 36196661ea Update arrow and quiver classnames
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/1561c3cfd85db4eee2688d76a6e5a6fdb8faddda
2016-08-12 14:00:32 -04:00
ebaydayz b2394703f3 Update vanilla player build
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/20f992fcb74f9a8b6823ea466ea3aadb5eafd1b0
2016-08-11 20:01:53 -04:00
icomrade 4fc2a3b7d6 r_action_count needed for combine mags 2016-08-09 22:05:57 -04:00
ebaydayz c62e3147c8 Do not send purchased vehicle marker arrow over network
Only the player buying the vehicle needs to see the arrow.

Also fixed CfgMagazines error from:
https://github.com/EpochModTeam/DayZ-Epoch/commit/2c4c75c67c7b0230d5850b2a304a5b83020d3a3b#diff-fcf3df9a25b3d05402ab4e4809673194R6
@icomrade
2016-08-09 14:52:15 -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