Commit Graph

3264 Commits

Author SHA1 Message Date
ebaydayz 0525763ffb Update German translations from #1798
Submitted by @DAmNRelentless and reviewed by @AirwavesMan
2016-11-18 19:46:24 -05:00
ebaydayz f307386cb2 Fix cherno field hospital tent position
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/7e18cef9cbc6627e0c4209365b4eaf3544218f2c
2016-11-18 18:43:28 -05:00
ebaydayz da5285e0ec Update damage handler diag_log
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/21864d065c88b4c1f4579f4f20afc7bc6efc0097
2016-11-18 16:36:37 -05:00
ebaydayz bec4ccce38 Update dayz_server
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/95bf775fd2efaaa915f0fbcce3457eab888ff54f

https://github.com/DayZMod/DayZ/commit/6e638aeb8c18faeb5758e6acb3906b82b2d6eb60
2016-11-18 15:28:00 -05:00
ebaydayz 5072ea4e8b Update infectious waterholes init
Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/0d18630c11667894f0691a6f46ceb7b016322865
2016-11-18 14:16:45 -05:00
ebaydayz b01a4165a8 Comment some unused achievement code
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/3ec1cc3c5db3cb9c8a0a974ef6d11248b761cea0

https://github.com/DayZMod/DayZ/commit/3171f68beee73430d3236cfd4e43e13535209174
2016-11-18 13:22:36 -05:00
ebaydayz ad9a287d00 Remove unused Lada base class
Also removed some values that are already inhertied from 8429ad1
2016-11-18 12:18:13 -05:00
ebaydayz 8429ad1fbc Clear typicalCargo for some vehicles missing it
Prevents preloading units, may help with load times a little.
2016-11-17 15:40:08 -05:00
icomrade e398250489 Fix refuel trucks, add upgraded trucks to array
Issue was:
A. with locality, we were checking the wrong vehicle in one instance and

B. with variable names, since we called local_setFuel and _vehicle was
private already from the calling script we ran into an issue with
duplicate variables causing the command to fail. local_setFuel doesnt
really need any local variable so I removed them and this fixed the
issue (script filters may need to be adjusted accordingly)
2016-11-16 14:53:17 -05:00
ebaydayz f994b95c1d Add dayz_onBack to surrender 2016-11-16 13:34:48 -05:00
ebaydayz 43330c2046 Diminish humanity reward for transfusion
As suggested on:
cdb9776
and
https://github.com/DayZMod/DayZ/issues/731
2016-11-15 15:31:58 -05:00
ebaydayz cdb9776d4e Add bloodbag cooldown 2016-11-15 13:57:40 -05:00
ebaydayz 414fd7e1b7 Add auto open chute option to HALO 2016-11-14 20:25:26 -05:00
ebaydayz de44b32c83 Remove unneeded isBicycle check in fn_selfActions
Bicycles always have characterID=0, so there is no need to check.
2016-11-14 14:38:45 -05:00
ebaydayz 81013ace75 Fix gear menu bypass mistake from 89078d1 2016-11-13 15:02:36 -05:00
ebaydayz 89078d1611 Fix abort and gear menu staying open at same time 2016-11-13 14:49:04 -05:00
ebaydayz e506a97ad6 Remove redundant check in player_onPause
Switch executes the first case that matches and does not check any more
cases after that. So these conditions are always met when this case is
checked.
https://community.bistudio.com/wiki/switch_do
2016-11-12 21:22:11 -05:00
oiad be1fb51fe8 player_onPause fixes (#1796)
* player_onPause fixes

Properly displays the right message now for why you can't abort.

* Door Management/Plot Management isServer changes

Removes isServer, these are run on the client only so no need for this.

* dayz_server private tags

Fix a few missing private tags and remove a _forEachIndex tag.

Remove unused 1.0.5.1 dayz_server.pbo as it's no longer valid/needed
2016-11-12 20:56:58 -05:00
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:

https://github.com/DayZMod/DayZ/commit/f6e98f3be092c26fdf3405cb054fc254adcca8c8
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:

https://github.com/DayZMod/DayZ/commit/fbcabc6d602088a7843da793378703ff4e7524dc
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
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
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:

https://github.com/DayZMod/DayZ/commit/92ab8fe2d4dbb592a5f2624c762d0ee6d94a0315
2016-11-10 15:51:36 -05:00
ebaydayz 6fb4290ffe Remove unused compile
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/4a18d5023dab59983ae0326b112801e26d4bc547
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