Commit Graph
100 Commits
Author SHA1 Message Date
icomrade d4f5881155 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-08-15 21:35:13 -04:00
icomrade 4a4e7952d0 Much faster server_monitor
in my testing createvehicle non-array is more than 2x as fast as
createvehicle array. Also includes some changes by @ndavalos in the RC1
issues thread.
2016-08-15 21:35:00 -04:00
icomrade 9d6c17d706 Update server pbo 2016-08-13 18:10:14 -04:00
icomrade 56d7ac8d4f Fix disableuserinput in unconcious 2016-08-13 16:50:26 -04:00
icomrade 341d45f440 Remove excessive anim on recover unconcious 2016-08-13 16:12:50 -04:00
icomrade 18643fec95 Move disableUSerInput in unconcious code 2016-08-13 11:52:05 -04:00
icomrade 8dde92b377 Fix unconcious warping
Also comment out the part where vehicles have their engine turned off or
the player is ejected, since this behavior makes no sense.
2016-08-13 10:32:28 -04:00
icomrade 92cb4f4493 Should fix #1733 2016-08-12 23:40:46 -04:00
icomrade cbf87cb1e4 Revert "Should fix #1733"
This reverts commit b6ffa37c1b.
2016-08-12 23:39:17 -04:00
icomrade fd3475a617 Should fix switching clothes 2016-08-12 23:07:01 -04:00
icomrade e8cd89a194 Switch to call compile
Should be much faster
2016-08-12 22:32:48 -04:00
icomrade b6ffa37c1b Should fix #1733 2016-08-12 22:14:52 -04:00
icomrade 8f58baf3f2 Slightly mroe performant server_monitor 2016-08-12 01:50:54 -04:00
icomrade c2b85718fa Wrong variable 2016-08-11 22:47:09 -04:00
icomrade 4019d0c351 Should stop vehicles from falling through buildables 2016-08-11 13:19:24 -04:00
icomrade a885c8c147 Should fix Dynamic Vehicle Issues 2016-08-10 20:50:33 -04:00
icomrade f186e256cb Tree chopping changes
Allow player to get more than 1 item out of a single tree. Using ItemLog
would allow the player to get too much wood if using a hatchet so I
changed it back to PartWoodPile.
2016-08-10 13:06:20 -04:00
icomrade f9fdb1f3f7 Re-add humanity gain on zombie kill
For some reason this was removed in
https://github.com/EpochModTeam/DayZ-Epoch/commit/77e760fe73a4bd1f1858b42bbabdb6f3c444dcfb
@ebaydayz
2016-08-10 12:13:11 -04:00
icomrade 4fc2a3b7d6 r_action_count needed for combine mags 2016-08-09 22:05:57 -04:00
icomrade 5c383c82dd More efficent evaluation for object spawning
We shouldn't need to check typenames since many of the DB columns don't
accept anything but appropriate values and the hive will check if some
fields are corrupt already.
2016-08-07 20:41:43 -04:00
icomrade 1f19147165 Update DLL 2016-08-07 14:51:41 -04:00
icomrade a9926bc073 Remove damage check from dayz_server
Moved to HiveEXT MySQL query. Thanks for the suggestion @ndavalos
2016-08-07 14:38:44 -04:00
icomrade 2c4c75c67c Fix crafting issue 2016-08-07 14:36:40 -04:00
icomrade 1b685581e3 Add condition 2016-08-03 22:18:42 -04:00
icomrade b10e73b1b8 Update SQL 2016-08-03 22:14:42 -04:00
icomrade b8c3aec4e0 New DLL + Test Build 2016-08-03 20:12:46 -04:00
icomrade aacd3b78f7 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-08-03 19:58:53 -04:00
icomrade 657fe60f26 Better maintain
Intensive commands are processed on the client only, as opposed to
twice. an array of objects, their corresponding UID and ID are sent to
the server. Sending the objects as an array, despite the size the array
can reach, should be better than the way this was set up before.

Needs testing on a full server however.
2016-08-03 19:54:06 -04:00
icomrade b2eacfbe73 Fix private array 2016-08-03 18:34:49 -04:00
icomrade ae78fde067 Add coin support to dayz_Server and login
New variables: DZE_groupManagement = false; //Enable or disable group
management. Enabled by default
DZE_MoneyStorageClasses = []; // If using a Single currency system
(Z_SingleCurrency = true;), this is an array of object classes players
can store coins in

if Z_SingleCurrency = true; the hive is now set up to handle coin
updates on players, characters, and objects.
if DZE_groupManagement = true; the hive is now set up to save groups

group and coin variables are set in player_monitor.fsm, for
vehicles/objects it's set in the server_monitor.sqf file for objects in
the DZE_MoneyStorageClasses array

Also, this commit includes a change to the way the hive spawns in
vehicles. vehicles are now created at [0,0,0] and moved using setPosATL
to their saved position. Thanks for the tip @ndavalos  @eraser1
2016-08-03 18:01:22 -04:00
icomrade 24f6a0ab9a Correct build text 2016-07-30 17:06:46 -04:00
icomrade 60c37e8b76 Fix duplicate action fix when crafting 2016-07-30 10:37:19 -04:00
icomrade ac63a7d903 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-07-29 15:20:36 -04:00
icomrade c628ad8873 Fix hit_glass kick for some vehicles 2016-07-29 15:20:32 -04:00
icomrade d0c09e7bac Copy paste typo 2016-07-29 12:06:14 -04:00
icomrade c694545bce Update server for playerGroup column in HiveExt
Requires DLL Published in this commit as well as a database update.
Execute the added SQL in the 1.0.6_Updates.sql on your database.

Use Hive child 204 to update the new column
_key = format["CHILD:204:%1:%2:%3:", (getPlayerUID player),
dayZ_instance,  [Array of playerUIDs of group members]];
_key call server_hiveWrite;
2016-07-29 12:05:01 -04:00
icomrade bdf0870f3e Fix keys not deleting
Should work fine, but more validation is always good, I tested selling
from all inventories with DZE_SaleRequiresKey true and false.
2016-07-29 00:55:20 -04:00
icomrade d31df4f1fc Typos 2016-07-28 21:12:51 -04:00
icomrade 2cdf9b5806 Small fix, revert 1 frame uisleep to regular sleep
I wasn't getting errors without if (gear_done) then {}; surrounding the
uiSleeps, so I don't quite trust the engine was executing them, I also
question the ability of uisleep to handle single frame precision (but I
haven't tested anything regarding this yet).
2016-07-28 14:54:50 -04:00
icomrade 82e2500cac Re-add magazine refill fix when changing clothes
This is the code from 1.0.5.2 before it became 1.0.6, it contains the
fix for backpack wipes in 1.0.5.1. I lightly tested it with 1.0.6 but it
will need more testing before release.
2016-07-28 13:27:30 -04:00
icomrade 21019056c3 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-07-28 12:54:33 -04:00
icomrade 9552ceea9e Require part to be damaged to be removed
see comments @ 3292d84b85
2016-07-28 12:54:30 -04:00
icomrade bd91044e7b Fix duplicate action check with vanilla objects
+ typo fix
2016-07-27 11:08:50 -04:00
icomrade 49222ac415 Part 2 of salvage change 2016-07-27 11:05:26 -04:00
icomrade 3292d84b85 Allow salvage any part < 100% damage
thanks for pointing this out @LunaCB
2016-07-27 11:02:06 -04:00
icomrade fd2db4f07d Fix kick when crashing planes 2016-07-27 01:23:38 -04:00
icomrade b704d6d081 Update CreateVehicle.txt
fixes kick when using Gyro/Mozzie grenades
2016-07-27 01:21:23 -04:00
icomrade b88cdf217a Repack RC1
Incorrectly packed the updated pbos
2016-07-26 22:32:06 -04:00
icomrade d8a85753da Update HiveExt.DLL to offset ObjectUID by 1
An ObjectID/UID of 1 is used by some special objects spawned by the
server, this should prevent any issues.
2016-07-26 22:21:32 -04:00
icomrade 5743439626 Update test build to RC1 2016-07-26 21:59:49 -04:00
icomrade c847f8c756 Remove create stash option 2016-07-26 21:01:21 -04:00
icomrade f61f5918cf Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-07-26 20:51:41 -04:00
icomrade e446603ea2 Fix combat logging
In the initialize section of the fsm r_player_unconscious and
r_player_timeout return their default values (false and 0). Also, the
Vanilla server-side combat check doesn't appear to work, or it doesn't
work with the antihack disabled (I haven't tested with it enabled).

New variable inCombat is set more quickly than the combatTimeout
variable
2016-07-26 20:51:10 -04:00
icomrade a72498671d Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-07-26 12:52:31 -04:00
icomrade 23a5584b52 Fix up combat icon + update changelog 2016-07-26 12:52:28 -04:00
icomrade 705057bedb Sync combattimeout on change clothes 2016-07-25 23:22:50 -04:00
icomrade e08bd750d0 Remove DebugBox_DZ - may fix changing clothes
DebugBox_DZ appears to cause issues when changing clothes. I haven't
died changing clothes ~100 times since its removal. It also solves the
issue of extreme exposure (brightness) after changing clothes

Note: CombatTimeout variable resets after changing clothes
2016-07-25 23:22:03 -04:00
icomrade 8542385142 Update building to also use r_action_count
This is the vanilla variable to prevent duplicate actions
2016-07-25 21:59:11 -04:00
icomrade fbc7754750 Add combat icon + toggle for Vanilla UI 2016-07-25 20:55:36 -04:00
icomrade b2289e35c5 Fix ear and eye not displaying in Epoch UI 2016-07-25 14:26:43 -04:00
icomrade 97a03c84d0 More Permissive Combat Checks
This commit puts the conditions in which a player is put into combat
more in line with 1.0.5.1. Putting the player in combat for having
another player nearby will ruin building for players that are part of a
group. Putting the player into combat if zombies are nearby would make
building way too frustrating (especially if building on an elevated or
enclosed area where zombies are not a threat) and will attack the player
if not dealt with anyway.
2016-07-25 13:00:34 -04:00
icomrade ff6e11708a Un-nerf DMR 2016-07-24 16:14:38 -04:00
icomrade 0563f621e2 Fix full cinder wall snap points 2016-07-24 15:28:18 -04:00
icomrade 51287651f2 Add logging for non-existent loot group small
This can probably be removed for release but for now I noticed
HangarSmall doesn't exist, perhaps others as well.
2016-07-24 13:15:37 -04:00
icomrade 61f59f32a5 Update createvehicle 2016-07-24 01:47:06 -04:00
icomrade 90932d0061 Don't use weaponHolderBase here
it causes the items that are created to be invisible
2016-07-24 01:46:54 -04:00
icomrade b03afef460 A little neater 2016-07-23 19:55:24 -04:00
icomrade efaad30c32 Remove unneeded waitUntil 2016-07-23 18:11:37 -04:00
icomrade 72c529f94e Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-07-23 17:19:46 -04:00
icomrade a3c3ccc3bf Fix door/plot management friends not writing to DB 2016-07-23 17:19:06 -04:00
icomrade 9c4e30ea08 Fix Advanced Trading Selling + new Var
New variable to configure whether or not the player will need to key to
sell a vehicle. DZE_SaleRequiresKey = false;
2016-07-23 01:16:37 -04:00
icomrade 855a72ca1f Fix kick when crashing UH1Y 2016-07-22 23:44:33 -04:00
icomrade 3da14b34dd Exclude flares
some Epoch helicopters have flares
2016-07-22 23:19:13 -04:00
icomrade 253f5516da more buildable exclusions 2016-07-22 23:09:46 -04:00
icomrade 28f6260c16 Building offset adjustments
Most items are now adjusted so you cannot rotate them and slide
backwards even while laying down. Also fixes full cinderwall build
height offset
2016-07-22 23:07:53 -04:00
icomrade 640e120590 Exception for plot preview 2016-07-22 21:58:12 -04:00
icomrade bb48baf75c More BE Filter Updates
objgather_Knockdown didn't work in the previous commit
2016-07-22 14:23:46 -04:00
icomrade 745f725c19 BE Filter Update 2016-07-22 12:45:45 -04:00
icomrade 19960f08e2 use player_makeFire to start a fire 2016-07-22 12:23:05 -04:00
icomrade f808bda2a9 New Config Entry buildText
Allows a string to replace the vehicle display name that will be created
which is typically displayed when building.
2016-07-22 11:06:45 -04:00
icomrade 082c0c13e6 Fix dog meat not being cookable 2016-07-21 19:56:37 -04:00
icomrade eeed1febad str_player_31_drink doesn't work for some reason... 2016-07-21 19:48:16 -04:00
icomrade 8d7b99e746 Automatically add player to door management 2016-07-21 19:34:42 -04:00
icomrade 75a9ca6848 Fix scaffolding 2016-07-21 17:53:43 -04:00
icomrade 0414c67284 No longer require key to sell a vehicle
Still requires the vehicle to be local, meaning you were the last person
to be in the driver seat.
2016-07-21 17:42:25 -04:00
icomrade 4544e743fd Chopping wood now gives PartWoodPile again 2016-07-21 17:04:18 -04:00
icomrade 51a0640855 Remove right click to harvest wood
You must now actually use the hatchet to chop wood (i think it was like
this in 1.0.5)
2016-07-21 17:03:51 -04:00
icomrade 96ddc8ff62 Add player to plot management by default
+ Some minor private array cleanup
2016-07-21 16:20:41 -04:00
icomrade 3519297e2d Add drinking and emptying of < 10 oz wattter
Amount of water and infection chance are proportional to the amount of
water.
2016-07-21 15:36:55 -04:00
icomrade e3fee60a8f Change water bottle image back to canteen image 2016-07-21 00:35:51 -04:00
icomrade 88c7d7d28b Fix < 10 oz water bottle filling 2016-07-21 00:21:52 -04:00
icomrade 92cbd8a7a9 only sleep if Hive call in loop fails
should improve vehicle spawning time slightly
2016-07-18 21:51:37 -04:00
icomrade b52c44dadc Rebuild Server PBO 2016-07-17 10:54:38 -04:00
icomrade c702d92231 Remove SQF Based Duplicate UID Fix
Use the new DLL
2016-07-17 10:52:40 -04:00
icomrade 8e87448fe7 Add new Hive DLL with ObjectUID Fix 2016-07-16 19:54:56 -04:00
icomrade 2889d8f010 Should fix building issues with player sliding
The change in module_build will only fix items that d ono have an offset
set in the config.

BoundingBox can be a bit generous but the player should be able to work
with any overestimation in size.
2016-05-18 11:01:38 -04:00
icomrade 8fd4c8eb8b Re-add plot check
Accidentally removed this when merging plot for life
2016-05-18 10:13:29 -04:00
icomrade 113dd0618a Add Little Bird killed EH 2016-05-17 20:45:54 -04:00
icomrade ef1d323ef0 Should Fix Issue #1569
Varchar(512) was truncating certain vehicle hitpoints and preventing
vehicle loading. The HiveExt dll handles hitpoints as a string which has
a char limit far greater than 512,  so simply updating the column should
fix the issue.

Also update the ChracterID column for #1371 - new Hive dll will be
required
2016-05-16 13:32:22 -04:00
icomrade 116caaa788 Revert "Remove dayz_objectUID2 from object loading"
This reverts commit 2df7279f1a.
2016-05-15 21:48:24 -04:00