W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,485 Commits 20 Branches 18 Tags
13c90993fc394d51e1af45452bae443b03c312cb
Commit Graph

230 Commits

Author SHA1 Message Date
ebayShopper
13c90993fc Sync Zupa dialog colors 
Heights on the trader menu filter search box and amount box have also
been fixed.
Old: https://imgur.com/a/ld4XF
New: https://imgur.com/a/9T8VP
 2017-12-08 18:03:23 -05:00
ebayShopper
5e9a7271e9 Add option to toggle status icons 
Vanilla commit:

44bb49e326
 2017-12-04 18:14:48 -05:00
ebayShopper
d6f88fbf8a Add new L85 and SVD variants 
Vanilla commits:

8951508770

aad4569581

58e594553b

eaf9648253
 2017-11-26 17:39:02 -05:00
ebayShopper
2e01a8d8eb Update stringtable.xml 
Vanilla commit:

39927eaa47
 2017-11-25 16:05:20 -05:00
ebayShopper
4ea3f36830 Update PVDZ_sec_atp logs 
This reverts commit 7b287a2

Vanilla commit:

a81dd8164c
 2017-11-21 15:05:07 -05:00
ebayShopper
6acd3c30ef Fix a stringtable typo 2017-11-14 17:11:32 -05:00
A Man
b904ba4ca7 update 2017-10-26 15:02:35 +02:00
A Man
150068a205 Adding door localization 2017-10-26 02:14:27 +02:00
A Man
7a8d23bdeb German stringstable overhaul again (#1991) 
* German stringstable overhaul

* update

* update

* update
 2017-10-22 20:11:35 +13:00
W0LF
765ed17a78 Update russian translation. 2017-10-10 23:43:05 +03:00
BigEgg
820d8bdf2b Update stringtable.xml 2017-10-07 23:42:00 -05:00
oiad
5fc0b36e5b Fix bad sentences for locking/packing fails. 2017-08-20 23:00:35 +12:00
ebayShopper
84556c9d03 Revert group menu color scheme to A2OA default 2017-07-30 12:44:58 -04:00
ebayShopper
75ba14a68d Fix stringtable typo 2017-06-11 17:52:59 -04:00
ebayShopper
e0d271671a Remove unused crafting recipes 
Vanilla commits:

809de6a0a3

93c128085a
 2017-06-10 13:06:16 -04:00
ebayShopper
72df07bdf2 Remove medic animation from lock and unlock safe 
Closes #1942 in combination with 48858b2

The "packing" variable was made redundant by dayz_actionInProgress
because it was only set locally.

DisableUserInput is unnecessary now because server_handleSafeGear is
called unscheduled. Getting the cargo, creating the new safe and
deleting the old one should complete in the same frame with no window
for players to remove gear:

https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_server/compile/server_handleSafeGear.sqf#L51-L67

The "claimed" check is also no longer needed because
server_handleSafeGear is called unscheduled and exits if the object is
null, so two players attempting to unlock at the same time will not
work.
 2017-06-06 18:53:44 -04:00
ebayShopper
48858b2e6c Add medic anim function with proper interrupt 
Closes #1386

Vanilla commits
applied:
f99a3deced
731b957e8e

Removed
two unused files and a few variables made redundant by actionInProgress
 2017-06-06 15:25:14 -04:00
dreamforceinc
d003c62872 Update stringtable.xml (#1951) 
Added russian translation for "STR_EPOCH_PLOTMANAGEMENT_CANT_REMOVE" and "STR_EPOCH_DOORMANAGEMENT_CANT_REMOVE" (#1948)
 2017-04-20 13:13:15 -04:00
oiad
2f0774d531 Forbid removing the plot/door owner from objects (#1948) 
This makes it so only the door or plot owner can remove them selves from
doors/plots or the UIDS in
DZE_PlotManagementAdmins/DZE_DoorManagementAdmins.
 2017-04-17 13:52:36 -04:00
dreamforceinc
740e171d86 stringtable.xml (#1947) 
* stringtable.xml

Improvement russian translation.

* Update stringtable.xml

* Update stringtable.xml
 2017-04-17 13:37:14 -04:00
ebayShopper
78fbd7ac53 Remove some unnecessary translations 
Using "Wait for the previous action to complete to perform another" is
more accurate in these cases, because dayz_actionInProgress could have
been set by any action, not necessarily the same one.
 2017-04-15 14:19:26 -04:00
ebayShopper
e99792d0f4 Update jerry_fill.sqf 
Vanilla commit:

ef236938c1
 2017-04-14 11:26:23 -04:00
ebayShopper
267f34572e Update object_upgradeStorage.sqf 
Vanilla commit: 6e4a697
 2017-04-13 14:38:07 -04:00
ebayShopper
272fd5f1ef Update stringtable.xml 2017-04-13 13:02:57 -04:00
dreamforceinc
1bd70a3d2d stringtable.xml (#1943) 
Adding and reworking some russian translation. Again.
 2017-04-13 12:56:24 -04:00
ebayShopper
1065e722a6 Allow removal of RIS from SA58_RIS_DZ 
Note RIS can not be removed from higher variants due to other
attachments depending on the RIS being attached first.

Closes #1940
 2017-04-12 13:42:39 -04:00
dreamforceinc
abdca1bd30 Russian translations in stringtable.xml (#1935) 
Adding and reworking some russian translation. Not completed yet!
 2017-04-07 17:42:11 -04:00
ebayShopper
4b14397c7b Fix purchased boat not spawning on helipad 
https://epochmod.com/forum/topic/43644-problem-with-napf-boat-spawn-in-1061/
 2017-04-05 15:49:16 -04:00
oiad
5abdefe792 Update german string 2017-03-25 10:06:48 +13:00
oiad
9d6d1386cd Add german string 2017-03-24 06:52:34 +13:00
oiad
73899d520f Add DZE_limitPlots so admins can limit plot poles to 1 per UID. 
This adds DZE_limitPlots where admins can restrict a player to only
having 1 plot pole. Disabled by default.
 2017-03-23 22:39:22 +13:00
ebayShopper
8b3f28dc0c Update player_sharpen.sqf 
Fixes extra knife being deleted if player already had a fully sharpened
knife on their toolbelt (duplicate weapon).

Vanilla commit:

0332fcbe71
 2017-03-20 18:18:04 -04:00
A Man
098f580c3d german string update (#1912) 
* german string update

* Updating german death messages

* Update

* update
 2017-03-20 13:38:23 -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:

cb71d926ed

bee9bd1638
 2017-03-19 16:35:17 -04:00
A Man
496ae979b3 Update strings for two missing german translations (#1900) 2017-03-02 12:43:38 -05:00
ebayShopper
62312a85c7 Add message for already wearing clothes 
Because it isn't always obvious.
 2017-02-26 15:31:59 -05:00
ebayShopper
9e0c251baf Update vanilla building again 
Vanilla commits:

ddcc7c7349

e4144e561f
 2017-02-19 18:44:47 -05:00
oiad
b06cb360b6 Update stringtable.xml to be more englishy (#1893) 2017-02-05 14:15:32 -05:00
ebaydayz
59b1d1ea60 Update vanilla building 
Vanilla commits:

8fdd0e915a

6afd0bc103
 2017-02-02 15:28:39 -05:00
ebaydayz
9afb74ff26 Remove plot take ownership feature #1811 
See #1811
 2017-01-31 15:22:23 -05:00
A Man
0fd3034d54 Adding 13 new items and a DZE version of the vss vintorez (#1890) 
* strings for new items

* adding new documents.hpp

* adding new documents

* adding vss vintorez dze

vss vintorez dze spawns with 20 rounds magazine like in epoch 1.0.5.1

* adding vss vintorez dze

* Update stringtable.xml
 2017-01-31 14:52:54 -05:00
ebaydayz
9270050bc6 Update damage handler again 
This fixes hits from players shooting from vehicle weapons not showning
in server RPT.
 2017-01-28 20:38:35 -05:00
ebaydayz
c10a7c3bc9 Update damage handler 
- Added damage and selection to server RPT hit log
- Increased damage a bit for RunOver due to consistently low damage in
testing
 2017-01-28 16:08:56 -05:00
ebaydayz
6c2f5448e1 Update a Russian translation 
e009aee8de (commitcomment-20629913)
 2017-01-26 14:34:21 -05:00
ebaydayz
fc40845583 Remove a duplicate translation 2017-01-25 13:45:09 -05:00
A Man
e009aee8de Update stringtable.xml (#1882) 
* Update stringtable.xml

* Move new safe zone strings down to epoch package
 2017-01-18 19:06:32 -05:00
icomrade
490fb90303 Disallow salvage in DZE_SafeZonePosArray locations 
by request of JohnnyBravo666 on the epoch forums
 2017-01-18 16:43:23 -05:00
ebaydayz
5c8ae96887 Add military flashlight attachments 
Vanilla commit:

b6ba294b70
 2017-01-09 20:19:01 -05:00
oiad
6f072982c3 Add harder penalties for wrong combination on doors, More spelling mistakes. (#1847) 
* More spelling mistakes

Further to commit:
0e938ba8f3

* Add harder penalties for wrong combination on doors

This adds a variable (DZE_doorManagementHarderPenalty) to make attempts
at code breaking doors harder. This will exponentially increment the
time between attempts or if you set it to false will make it 5 seconds
between attempts.

Unlike the original (that was useless TBH) this will actually lock out
the combo lock UI until the timer is set.

Will reset completely after 120 seconds.

* Add German translations

* Resolve merge conflict

* Resolve merge conflict
 2017-01-03 16:39:05 -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