Commit Graph

4212 Commits

Author SHA1 Message Date
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
6f4303b825 Update half cinderblock wall class in sql 2016-07-26 14:38:12 -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
5b23e9f7af Merge pull request #1711 from oiad/master
Snap point changes
2016-07-25 23:49:23 -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
oiad
744f162d71 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-07-26 13:25:19 +12:00
oiad
ad9694844d Snap point changes
This correctly fixes snap points for all cinder related to metal floors.

Anything cinder will now correctly snap to full cinder walls and vice
versa
Metal floors will not have gaps so you can correclty create a 1x1 cube
(as it should be)

Renamed cinder_wall_kit to half_cinder_wall_kit to be in line with
full_cinder_wall_kit since I felt it was confusing. cinder_wall_kit
seems like it would be full to me.

Fixed a string issue when building cancelling to make it more readable.
2016-07-26 13:22:10 +12:00
icomrade
fbc7754750 Add combat icon + toggle for Vanilla UI 2016-07-25 20:55:36 -04:00
ebaydayz
66e35d1629 Add new 1.8.7 meat names to 1.0.6 SQL updates 2016-07-25 19:04:17 -04:00
icomrade
b2289e35c5 Fix ear and eye not displaying in Epoch UI 2016-07-25 14:26:43 -04:00
ebaydayz
28a522ba64 Fix PV value kick for player names with special characters
Vanilla development commit:

6b7a55b1ea
2016-07-25 13:37:33 -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
ebaydayz
3a203b2720 Cover map bug at Polana factory pond
Vanilla development commits:

bd9ec53854

028490e21b
2016-07-25 12:31:39 -04:00
ebaydayz
03c57f3b77 Fix for Confirmed Kills system on change clothes.
Vanilla development commit:

d499246e2e
2016-07-25 12:19:45 -04:00
ebaydayz
33538520d0 Removed Achievements from network send on login.
Vanilla development commit:

0079818570
2016-07-25 12:16:22 -04:00
ebaydayz
55df36741b Diag_log Cleanup.
Vanilla development commits:

1dbef192bb

10cb0249f0
2016-07-25 12:06:53 -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
9cdb9eb305 Merge pull request #1710 from oiad/master
Tidyness changes
2016-07-24 00:48:13 -04:00
oiad
2ca7bf59c7 Tidyness changes
This changes a few functions that were being used to use the already
defined variables instead

Fixed a few string issues with Advanced trading and plot managment.
2016-07-24 16:20:39 +12: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
ebaydayz
8202f7d61b Sync debug check
Vanilla development commit:

0baaac7a91
2016-07-23 15:23:00 -04:00
ebaydayz
cc2aae59eb Change splint recipe
Vanilla development commit:

6ea5d8ebee
2016-07-23 15:12:08 -04:00
ebaydayz
8ed5a9c7a9 Antibiotics combining
Vanilla development commit:

0602d29530
2016-07-23 15:03:49 -04:00
ebaydayz
34f9f97aa3 Icons, 9mm silencer, m16a2
Vanilla development commit:

896825693d
2016-07-23 14:55:04 -04:00
ebaydayz
f76b8493fd Fix category list alignment in advanced trade
Since we changed the alignment back to default the ctrlSetPosition I
added is no longer needed. #1709. With the alignment changed it would
actually run off the background if the category list was too long.
Thanks @oiad
2016-07-23 14:24:54 -04:00
ebaydayz
14f49409dd Merge pull request #1709 from oiad/master
Advanced trading changes
2016-07-23 14:14:33 -04:00
oiad
9efc671abb Advanced trading changes
This changes a few things in Advanced trading, mainly cosmetically.

> Removes all the commented out lines that were the same in defines.sqf,
let me know if these are there for a reason?
> fixes the buying list to have localization support and has a total
item count that works properly.
> cosmetic change displaying backpack info on trader to bring it in line
with the other menus
> adds total item count to the selling list and added localization for
that
2016-07-23 23:30:05 +12: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