Commit Graph

195 Commits

Author SHA1 Message Date
ebaydayz
155e5e5616 Remove more unused strings
Also add back call to fn_gearMenuChecks
2016-03-05 01:16:30 -05:00
ebaydayz
214a648bc1 Remove unused string and duplicate defines 2016-03-04 22:41:00 -05:00
ebaydayz
fbedaf9b8d Remove merge conflict markers
@icomrade - I'm going to start reviewing and testing the commits you've
done here. I'll commit any fixes and additional 1.8.7 stuff that is
needed to this 1.8.7-Rebase branch. Once we have it in a functional
state we can merge it into master if that's good with you.

Let me know if you are working on any files in particular so we don't
duplicate efforts. I'll be in discord while I'm working here too.
2016-03-04 14:59:12 -05:00
icomrade
61c64cb14a Fix Merge Conflict 1 2016-03-03 22:09:38 -05:00
ebaydayz
479097e7a8 1.8.7 player_switchWeapon updates 2016-03-03 21:31:32 -05:00
ebaydayz
e660704f97 Add journal and preliminary strings for crafting
The journal is now functional. Preliminary strings are added for the
1.8.7 crafting system, but it is disabled for now.

I've messaged @marceldev89 (ziellos2k) and @AlbyBDPK on the DayZ forums
to ask permission to use fn_updateCraftUI, player_checkRecipe and
player_craftItemGUI. Are you guys okay with us including these in DayZ
Epoch 1.0.6?
2016-03-03 20:11:11 -05:00
icomrade
61cbd16de1 Merge remote-tracking branch 'upstream/master' 2016-02-27 09:01:02 -05:00
ebaydayz
03353b9483 Add lock and unlock vehicle from inside
See: #1103
Made vehicle gear always accessible from inside.

Also added optional variable to prevent stealing from backpacks by
non-friendlies at traders.  Thanks to @maca134 for the method.
2016-02-24 20:56:13 -05:00
Adaptivity
dd40bae42f Russian localization update, safe localization
Fix quotes
2016-02-22 23:50:09 +03:00
icomrade
7f4f17421c one more duplicate string
ArmA 2 OA has some duplicate strings itself
2016-02-22 10:51:03 -05:00
icomrade
1710a87297 Update Stringtable to 1.8.7
stringtable is in DayZ_Code now, Epoch and legacy strings remain in
DayZ_Epoch_b
2016-02-22 10:41:09 -05:00
ebaydayz
0075b44c0e Add option to restrict wearable clothes
See #1560

Note: Already wearing check is not needed in player_humanityMorph
because it is already done in player_wearClothes. See:

0726311df5
2016-02-20 22:08:20 -05:00
ebaydayz
174e11dfdb Remove unused string from #1313 2016-02-19 17:52:24 -05:00
ebaydayz
9d1185409c Fix combine mags not working for M1911 and Revolver
See #1313
2016-02-19 17:37:52 -05:00
ebaydayz
fd78f27250 Fix copy key failing when player has no backpack
Related to #1567, so I made this a function so it can be reused. People
should call this whenever they are adding a toolbelt item which the
player may already have. It has localized strings and handles spawning
the weapon holder on water, land and rooftop.

Tested both the sledgehammer and key copying. Confirmed all three
conditions are working.
2016-02-18 22:12:13 -05:00
icomrade
254fbff602 Fix #1274 2016-02-18 00:24:50 -05:00
ebaydayz
698a50a3ef Merge pull request #1667 from ebaydayz/patch-2
Add strings for sledgehammer crafting fix
2016-02-16 17:36:54 -05:00
ebaydayz
74f06a2562 Fix Russian translation 2016-02-16 15:42:23 -05:00
icomrade
546e59e959 auto login
I hate sitting in the lobby for the full 90 seconds before loading.
- Default login delay is 10 seconds, can be set in the mission
- Players cannot deselect or change character slots
- Players can click OK or disconnect before timeout
2015-12-29 17:59:40 -05:00
ebaydayz
62bf26ace3 Add strings for sledgehammer crafting fix
See https://github.com/vbawol/DayZ-Epoch/pull/1567
2015-07-22 17:00:40 -04:00
Zupa
f701affda8 Merge pull request #1548 from githubmil/master
Fix UAZ Cargo Upgrade & Balance Armor Upgrades & Fix L85A2 Price in config traders.
2015-07-01 23:49:54 +02:00
ebaydayz
0aa91b082f Update version number 2015-04-18 15:32:01 -04:00
Geodar
666b0fd7b2 Another batch of Czech
Fix not showing Bought vehicles in Czech language
2014-11-06 13:40:12 +01:00
Geodar
348e102ef0 Another batch of czech for latest commits 2014-11-01 20:55:20 +01:00
Geodar
af8382a5e6 Czech for latest commits 2014-11-01 20:19:10 +01:00
Uro1
b3246ec80d Update CfgServerTraders to match #1508
Updated the CfgServerTrader to match my changes in dynamic_vehicles &
SQL changes.
2014-08-27 16:40:33 +01:00
githubmil
309655a89b Update NeutralAssaultRifle.hpp
Fixed typo making L85A2 Holo 90 gold to buy.
2014-08-26 04:08:10 -06:00
githubmil
7b6d565b54 Update FriendlyAssaultRifle.hpp 2014-08-26 04:06:15 -06:00
githubmil
ff5c55cc13 Update FriendlyAssaultRifle.hpp
Fixed typo making L85A2 Holo 90 gold to buy.
2014-08-26 04:01:01 -06:00
Mikeeeyy
5ae7f920dd Update cannot build plot pole within 45m.
Updates the cannot build plot pole within 45m message to use the DZE_PlotPole variable.
2014-08-15 00:08:21 +01:00
Marko
f2145b6b8d Add "Cannot fish ehile in combat" text
To avoid confusion when players try to fish while in combat, google translate was used, so excuse any wonky translations.
2014-08-09 11:38:36 +02:00
ebaydayz
2c1d0825d1 Add CH53_DZE 2014-07-19 16:59:59 -04:00
ebaydayz
ed879fbef5 Update BanditHelicopterArmed.hpp
Add CH53_DZE
2014-07-19 16:56:14 -04:00
[VB]AWOL
1e5614e34a more version bumps 2014-07-01 15:50:30 -05:00
Uro1
c1f9c5e1f1 dayz_epoch_b CfgLootPos > CfgBuildingPos
Update CfgLootPos with new enterable building positions to match code in
config files.
Rename CfgLootPos to CfgBuildingPos.

Issue #1360
2014-06-29 15:09:05 +01:00
icomrade
b80bb88467 Add missing variable + RPT cleanup
fix 2 dup string warnings
fix "Cannot delete class rscdisplayinfo" warning.
Start extended vehicle damage debugging.
2014-03-26 02:40:24 -04:00
icomrade
1c4290ffd6 Missing string 2014-03-21 14:22:22 -04:00
icomrade
22bfba6573 Add optional self transfuse
Right click on blood bag, if enable it will show the self transfuse
button.
Currently replenishes all blood.
May be used once every 5 minutes.
2014-03-19 18:03:11 -04:00
icomrade
3c28809247 Add switch seats + fix 0 divisor
Also fix CFG error
2014-03-16 16:32:30 -04:00
[VB]AWOL
a1fe8ff336 added text message to combine bars 2014-02-23 09:56:34 -06:00
Florian Kinder
4f82e8e380 Added variable DZE_ForceNameTagsInTrader 2014-02-21 00:53:44 +01:00
Florian Kinder
a3885ac187 Added german translation 2014-02-20 21:23:49 +01:00
[VB]AWOL
96f9e1009b version bump to 1.0.5 2014-02-18 13:48:36 -06:00
Florian Kinder
d66bf8d909 Updated PROPREFIX 2014-02-16 16:51:49 +01:00
Florian Kinder
1e578fff9b Added C130J_US_EP1_DZ
fixes  #1131
2014-02-16 16:46:20 +01:00
Florian Kinder
07b41f143f Updated CfgServerTraders
refs #1129
2014-02-15 14:58:29 +01:00
Florian Kinder
34444e3494 Added ItemARM 2014-02-15 00:23:57 +01:00
[VB]AWOL
2a3fb1b22d added some loot positions for Napf and some more in farm building 2014-02-11 17:14:23 -06:00
[VB]AWOL
4c0b769a6e version bump on all pbos 2014-02-11 12:28:34 -06:00
Florian Kinder
94b6ac805c Updated Trader Category 2014-02-05 22:11:43 +01:00