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

2407 Commits

Author SHA1 Message Date
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
4faa1cbaab Set third parameter after findSafePos 
All other scripts using findSafePos either set the third parameter or
use a getPosATL/etc. instead before the position is saved to database.

Also partially reverted d6e78b2 since it is not needed.
 2016-10-02 18:51:46 -04:00
ebaydayz
de219116a8 Optimize save after trade 
See my comment on b806043

Veh_setFixServer only runs on the server, so the client does not need to
compile it.

The PVDZ_veh_Save PVEH is only added on the server, so it should never
be sent with regular publicVariable anymore.
 2016-10-02 15:44:51 -04:00
ebaydayz
91f168011c Remove unused variable from #1770 
_inventoryMoney was unused @oiad
 2016-10-02 14:11:20 -04:00
ebaydayz
c4f861630d Fix typo from 55910cc 
Variable is not defined in this script.
 2016-10-02 13:57:33 -04:00
ebaydayz
55910cc3d2 Remove humanity hit for killing player zombies 
If you kill a player zombie you should not lose humanity. Player_death
is now synced with the humanity hit code in the damage handler.

Also the killing blow set variable was moved up because the same
conditions were already checked above.
 2016-10-02 13:50:30 -04:00
ebaydayz
4509902822 Remove source object from Humanity hit network send 
Source object is always player and not needed anymore after 8ea21a2
 2016-10-02 13:26:11 -04:00
oiad
9fd2f2270b Advance trading gem fixes/localizations (#1771) 
* Advanced trading combine/return change

Fixes combining/returnChange to squash gems into usable currency so they
can properly be used in the economy
Stringtable fixes for duplicates

* Localization additions

More localizations
 2016-10-02 13:06:31 -04:00
ebaydayz
f353967abb Remove duplicate transfusion in progress messages 
In addition to 11fa6a6

Vanilla commit:

f4aac518c1
 2016-10-01 20:06:59 -04:00
ebaydayz
17b30a7a2e Fix AI damage scaling 
Fixes shots from AI using default scaling. For example AK_74 was doing
200 blood per shot or 60 shots to kill.
 2016-10-01 17:45:46 -04:00
ebaydayz
8ea21a2c81 Fix humanity hit for units in vehicles 
The only change is a removal of this check and the corresponding
tabs/spacing:

if (_object == player) then {

That returns false if the player is in a vehicle. It is not needed since
PVCDZ_plr_Humanity EH only fires on the intended player now (sent with
PVC instead of PV).
 2016-10-01 13:43:30 -04:00
ebaydayz
0a17804e36 Change inCombat to bool instead of number 
When a variable is only going to be 0 or 1 it makes more sense to use a
bool.

Also avoided unnecessary network broadcasts of inCombat from e446603
 2016-10-01 13:07:59 -04:00
ebaydayz
76273d06cd Fix undefined error _hasBloodBag in fn_damageActions 
When this function was passed an empty array (like a player with no
magazines) it returned undefined because the inside of the forEach loop
did not execute.
 2016-10-01 11:31:24 -04:00
oiad
11fa6a631c Minor fixes (#1770) 
* Minor fixes

Simplifies the serverside logging to be more human readable
Removes duplicate transfusion text

* Minor fix

Minor fix for syntax
 2016-09-30 22:10:56 -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
ebaydayz
ff8fb18cbf Correct stringtable explosion death grammar 
Proper grammar when used in:
His name was %1, it appears he died from %2
and
%1 died from %2
 2016-09-30 21:05:20 -04:00
ebaydayz
d9b785750d Fix death messages vehicle detection again 2016-09-30 20:51:34 -04:00
ebaydayz
88c1b83c31 Fix mine detection in death messages again 2016-09-30 20:06:18 -04:00
ebaydayz
d335ee2b1c Fix death message mine and satchel detection 2016-09-30 19:14:11 -04:00
ebaydayz
b45d6d9a24 Color new killfeed death messages 
The player who died is colored red and the killer is colored green. The
weapon now points in the direction of the player who died.

Also reverted 66fd5be since it did not help. It is already done globally
in player_death.sqf anyway. I tested again and this actually fixes the
problem.
 2016-09-29 20:26:26 -04:00
icomrade
1b91e808dd remove unused variable 2016-09-29 15:59:52 -04:00
icomrade
e49d786e2a Fix gear access on locked vehicles 
This will be annoying in bases for sure, but cursorTarget just doesn't
work reliably.
 2016-09-29 15:58:28 -04:00
ebaydayz
b4be955a0d Update new runover death message 2016-09-28 18:57:09 -04:00
icomrade
c746d98853 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-09-27 20:55:13 -04:00
icomrade
869f98efd7 Fix change clothes dupe 2016-09-27 20:55:06 -04:00
ebaydayz
dbd84e419b Use spawn for dynamicText kill feed 
My mistake from 9b13bd0
 2016-09-27 20:54:38 -04:00
ebaydayz
15b05dc84b Fix return change free space check when buying into vehicle 
This fixes incorrect return of "not enough space to accept change" when
purchasing large quantities of magazines into a vehicle.

Thanks @oiad for noticing this.
 2016-09-27 19:09:54 -04:00
ebaydayz
f15db73072 Update vanilla player_build 
Vanilla commits:

f1e12509e1

ce98e0b1d5
 2016-09-27 17:15:43 -04:00
ebaydayz
79c6d605a5 Add back playMoveNow in fn_unconscious.sqf 
Partially reverting 341d45f

See comment on 341d45f
 2016-09-27 16:50:59 -04:00
ebaydayz
cc28d43d25 Remove unit's local event handler anticheat check 
The createUnit remote execution locality exploit was fixed in current
A2OA stable patch 131129:
https://forums.bistudio.com/topic/186695-a2a2oa-patch-18122015/

This is now unnecessary and would needlessly restrict modders.
 2016-09-27 16:04:14 -04:00
ebaydayz
9b13bd0e5e Update new death messages 2016-09-27 15:08:41 -04:00
icomrade
58e90da07d Fix transfusion in vehicle 2016-09-27 12:46:13 -04:00
icomrade
514ac67650 Better OnPause 2016-09-25 20:31:38 -04:00
oiad
c02053176d Advanced trading bugfix, Snap building typo and snap point fixes 
Fixes a bug with advanced trading green "you have this item" text in
buyables list, this was showing you had the item when you didn't.
Snap building typo
Snap building snap points for large cinder walls as reported by
@SmokeyBR
https://github.com/EpochModTeam/DayZ-Epoch/issues/1766#issuecomment-248021073
 2016-09-24 18:53:02 +12:00
icomrade
40d419e475 Re-add abort timeout 
Timeout is no longer restarted when you click abort and the loop now
closes the gear menu so the player cannot attempt to dupe with the gear
menu and abort menu open at the same time.
 2016-09-23 19:10:39 -04:00
icomrade
770378b3af Private array 2016-09-23 17:22:57 -04:00
icomrade
cabf978fe7 Modify linebreaks in stringtable for parsetext 2016-09-23 16:59:17 -04:00
icomrade
e8006a40af Non-blocked messages 
Displays at the bottom center of the screen. This now accepts formated
(structured) text, see https://community.bistudio.com/wiki/parseText for
more info
 2016-09-23 14:02:31 -04:00
ebaydayz
c1763171db Fix damage on local trader city objects 
This fixes local trader city objects taking damage from being run over.
 2016-09-23 12:08:51 -04:00
ebaydayz
cc03256475 Update purchased vehicle spawn location 
If there was no helipad available findSafePos was called. If that failed
it spawned the vehicle in the debug zone.

Calling findSafePos is no longer necessary since we are now using
createVehicle "NONE".
 2016-09-22 18:12:52 -04:00
icomrade
7f0935c639 add floors to drop array 2016-09-22 15:14:05 -04:00
icomrade
6ae64eb622 Prevent player from dragging through walls 2016-09-22 14:03:23 -04:00
ebaydayz
b315c15cb0 Update vanilla chop wood 
Vanilla commit:

1bca531254
 2016-09-21 18:43:23 -04:00
ebaydayz
5e71793c17 Update vanilla building 
Vanilla commits applied:

44f2552ff2

213a333ce5

423d53299d

43bce6554f

f551cdac6e
 2016-09-21 17:14:13 -04:00
ebaydayz
33cf7611ed Don't allow jerry fill from destroyed fuel source 
Vanilla commit:

90251abab3

9204c15d3f
 2016-09-21 16:53:29 -04:00
ebaydayz
ef065aeb35 Fix plot management buildables in range display count 
See #1735
 2016-09-21 15:52:14 -04:00
ebaydayz
01b45121d8 Fix dayz_townGeneratorBlacklist not working 
I forgot to update it when these were moved to global spawn recently.
 2016-09-20 20:19:47 -04:00
ebaydayz
e94a66e9fd Merge pull request #1768 from AirwavesMan/master 
Adding more loot table for zombies
 2016-09-20 12:03:30 -04:00
ebaydayz
ac95c6b0df Make plot and door friends lists backwards compatible 
This prevents errors when upgrading 1051 databases that had plot or door
management installed.

See comments at:

fe9b8fdcb4
 2016-09-19 20:21:27 -04:00
A Man
7b22d9dd14 New loot tables for zombies 
Adding 3 new  loot tables
 2016-09-20 01:28:42 +02:00