Commit Graph

4831 Commits

Author SHA1 Message Date
ebaydayz
00f1f8537a Remove redundant unconscious checks in damage handler
This is already check above. My mistake from e4ede46
2016-11-12 20:12:04 -05:00
ebaydayz
e266fee651 Fix right click on radio generic error 2016-11-12 19:16:19 -05:00
ebaydayz
abeb5f9383 Remove vehicle actions when unconscious 2016-11-12 17:54:27 -05:00
ebaydayz
8b3376643d Fix unload patients action not being removed from vehicle 2016-11-12 17:23:52 -05:00
ebaydayz
e4ede46f59 Fix tranquiliser bolt 2016-11-12 16:50:24 -05:00
ebaydayz
e260d335ce Don't allow loading unconscious player into locked vehicle 2016-11-12 16:12:48 -05:00
ebaydayz
db3d9bf474 Update vanilla object_maintenance.sqf
Vanilla commit:

f6e98f3be0
2016-11-12 15:19:42 -05:00
ebaydayz
f87ac79acc Add missing private var in hotwire_veh.sqf 2016-11-12 14:54:29 -05:00
A Man
6ac9c879f0 Update german strings (#1795) 2016-11-12 14:44:05 -05:00
ebaydayz
e55960b6f9 Don't allow giving bloodbag to player with full blood
Reverted be214d3 because this is a more complete solution
2016-11-11 17:03:50 -05:00
ebaydayz
fe773bd571 Send notfication to player kicked from group 2016-11-11 15:46:44 -05:00
ebaydayz
f43348ebf6 Consolidate isServer checks for poi
Vanilla commit:

fbcabc6d60
2016-11-11 15:19:57 -05:00
ebaydayz
00b09a86c5 Remove self from saved group 2016-11-11 14:58:21 -05:00
ebaydayz
6db0c3380f Remove unneeded isServer check
Missed one from 88870a6
2016-11-11 14:54:23 -05:00
ebaydayz
88870a6b2a Sync closeDisplay exit codes for easier scripts.txt filtering 2016-11-11 14:48:41 -05:00
icomrade
489e0bbc77 Merge pull request #1794 from oiad/master
hotwire vehicle changes
2016-11-10 21:51:49 -05:00
oiad
d28ac4de22 Hotwire rework
Rework again! - Readd sleep
2016-11-11 15:49:08 +13:00
oiad
b0926b2a82 Hotwire rework
Hotwire rework
2016-11-11 14:45:48 +13:00
oiad
ef5b5ae38f Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-11-11 14:38:27 +13:00
ebaydayz
e927a759fe Fix load wounded mistake from 343003d 2016-11-10 20:33:24 -05:00
oiad
979323932c Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-11-11 13:15:50 +13:00
ebaydayz
dba59af7c1 Fix undefined vars in unload_act.sqf 2016-11-10 19:14:29 -05:00
ebaydayz
ed49630e0c Fix load wounded wrong variable 2016-11-10 19:13:40 -05:00
ebaydayz
343003d9dd Fix load wounded action undefined error 2016-11-10 19:12:43 -05:00
ebaydayz
be214d3cc5 Fix give bloodbag option showing when it shouldn't 2016-11-10 18:46:39 -05:00
ebaydayz
5d64449210 Add missing private var in antibiotics.sqf 2016-11-10 18:37:14 -05:00
oiad
dd0363b4e8 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-11-11 11:52:38 +13:00
ebaydayz
2f86984f93 Fix antibiotics not reducing when given to remote player 2016-11-10 17:51:54 -05:00
oiad
310fef893d Hotwire vehicle changes
Adds a localization for hotwire kit working
Updates localization for hotwire kit failing
Adds medic animation/sound and zombie notify
2016-11-11 10:45:07 +13:00
oiad
42beaa43b6 Merge branch 'master' of https://github.com/oiad/DayZ-Epoch 2016-11-11 10:38:15 +13:00
ebaydayz
2cb3dac0be Fix vehicle damage handler bug
Fixes vehicle appearing to repair itself on first hit. SetDamage 0 was
running if no parts were damaged because "totalDmg" is not a hitpoint.

Vanilla commit:

92ab8fe2d4
2016-11-10 15:51:36 -05:00
oiad
21fdbe3378 Merge remote-tracking branch 'refs/remotes/upstream/master' 2016-11-11 01:18:55 +13:00
ebaydayz
6fb4290ffe Remove unused compile
Vanilla commit:

4a18d5023d
2016-11-09 12:33:11 -05:00
ebaydayz
eedf7dd12c Fix door and plot management display text for mustBeClose
Also removed unneeded uiNamespace vars.
2016-11-08 19:27:05 -05:00
ebaydayz
e3bb7e11b9 Remove unneeded global var dayz_myGroup 2016-11-08 17:11:39 -05:00
ebaydayz
32b9c84784 Add notification messages for group changes 2016-11-08 16:39:50 -05:00
ebaydayz
ba43900036 Revert "Allow blunt knife for item actions"
This reverts commit 59a0548f5d.
2016-11-07 17:37:46 -05:00
ebaydayz
261dc4b373 Allow crafting with dull knife
Output is still reduced for dull knife when gutting animals.
2016-11-07 17:37:22 -05:00
icomrade
fb734e30c7 allow removal of generator 2016-11-07 17:24:54 -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
33ed3737a5 Fix gear pistol background image direction
Vanilla commit:

f1c883636a
2016-11-07 15:25:50 -05:00
ebaydayz
e0c06692e2 Update scrollbar color in lobby and player list
To match 6732e5c
2016-11-07 15:21:56 -05:00
icomrade
8bf41e1ed3 Tweak weather values
it doesn't have to be so gloomy all the time
2016-11-07 13:11:58 -05:00
ebaydayz
ecc1ca0aeb Add missing private var 2016-11-06 20:29:17 -05:00
ebaydayz
b312fc2685 Update test build 2016-11-06 20:24:28 -05:00
ebaydayz
fd44e0b7d3 Fix group save after kick 2016-11-06 20:01:27 -05:00
ebaydayz
4c6e2454c3 Prevent non-leader from disbanding group 2016-11-06 15:28:59 -05:00
ebaydayz
4317a6459a Don't show scoreboard on death
We already removed the scoreboard:

https://github.com/DayZMod/DayZ/blob/Development/SQF/dayz_code/Configs/CfgArma.hpp#L198-L209

So this just prevents the white line and redundant count down showing on
screen when you die:
https://community.bistudio.com/wiki/Description.ext#respawnDialog
2016-11-06 15:24:37 -05:00
ebaydayz
f0d89d5993 Round server fps diag_log 2016-11-06 14:06:40 -05:00