Commit Graph

4534 Commits

Author SHA1 Message Date
ebaydayz
bc4cb49463 Remove redundant characterID check in server_playerSync
I made no changes apart from removing the (_characterID != "0") check
and the corresponding spacing/tabs.

If _characterID == "0" the script would have already exited on line 30.
2016-09-17 12:18:54 -04:00
ebaydayz
a63da4606d Speed up onPlayerDisconnect a little
Removed redundant diag_log since it is already done in dayz_recordLogin.

Removed noatlf4 variable because we use inCombat instead. Noatlf4 is
only set if the player is hit in the damage handler, while inCombat is
set any time the player is in combat.
2016-09-17 12:05:32 -04:00
ebaydayz
b9507b2eb4 Don't hideObject on debug floor
e8e5d24e80 (commitcomment-19060242)
2016-09-16 17:17:02 -04:00
ebaydayz
bcc16a0135 Roll back to old swimming in ground fix
See
e8e5d24e80 (commitcomment-19053648)
comments
2016-09-16 13:26:27 -04:00
ebaydayz
b4ad50bf8f Add comment about grass height 2016-09-16 12:27:32 -04:00
ebaydayz
0ab46abd52 Don't spawn epoch dynamic debris if town generator is on
Vanilla town generator debris can end up spawning inside of epoch
dynamic debris if both are enabled.
2016-09-15 17:07:11 -04:00
ebaydayz
6e57bc6f6f Revert fix invisible primary stance glitch
Partial revert from:

e8e5d24e80

Can't seem to reproduce this one now with this commit reverted. If
anyone has working repro steps let me know.
2016-09-15 16:49:19 -04:00
ebaydayz
7415c21c2b Small update to object_build
Vanilla commit:

a10173443b
2016-09-15 12:48:31 -04:00
ebaydayz
b2dfa058b0 Simplify double negative in fn_unconscious
Simpler than:

b609dcf519
2016-09-15 12:44:47 -04:00
icomrade
b609dcf519 Update fn_unconscious.sqf 2016-09-14 18:01:18 -04:00
icomrade
0802ecc0ed Do not require plot to build traps 2016-09-14 17:48:23 -04:00
icomrade
c0e0684841 Fix duplicate english string 2016-09-14 17:12:07 -04:00
icomrade
625333985d don't rearm horns 2016-09-14 16:52:51 -04:00
ebaydayz
815b54ec44 Fix gut dog
Body was disappearing because it had no meat on it (yield = 0). Thanks
@AirwavesMan
2016-09-14 16:42:25 -04:00
ebaydayz
b349150548 Don't auto disable sound mute when exiting vehicle
Let the player choose when to disable so there aren't any unexpected
drastic volume changes.

Vanilla commit:

60f4968f23
2016-09-14 15:36:35 -04:00
ebaydayz
ce6dffde3d Add A2OA translations for open and close door 2016-09-14 14:46:58 -04:00
ebaydayz
ea9c25f54b Merge pull request #1764 from AirwavesMan/master
Adding new german strings
2016-09-14 14:05:31 -04:00
icomrade
a5ffceeb17 Update 1.0.6_Updates.sql
comments need spaces otherwise MySQL workbench bitches
2016-09-14 12:47:23 -04:00
A Man
940efd1f2e Small Update 2016-09-14 02:53:13 +02:00
A Man
63c8a89514 Adding lots of new german strings
Ive changed some other strings too
2016-09-14 02:42:24 +02:00
ebaydayz
e8e5d24e80 Fix swimming in ground glitch
Also fixed invisible primary stance glitch when relogging with pistol
but no primary in inventory.

Fixed my mistake from:
e85f6ad1b5
2016-09-13 18:36:06 -04:00
ebaydayz
e85f6ad1b5 Consolidate transfusion scripts
Consolidated transfusion and transfusion_noBloodTypes to one script.

Selfbloodbag.sqf will never run if DZE_selftransfuse = false; because
the right click action is hidden.

Total blood quantity is now added in 1/4 increments during self bloodbag
as intended instead of all at once.
2016-09-13 15:02:16 -04:00
ebaydayz
a8e5aba517 Remove some redundant createVehicle filters part 2
These are covered by the first line now.

Vanilla commit:

cd52730484
2016-09-13 11:45:36 -04:00
ebaydayz
4a2bf1c006 Remove redundant createVehicle filters
These are covered by the first line now
2016-09-13 11:20:47 -04:00
ebaydayz
c7a6c71330 Disable vanilla base building actions for now
Since we are not going to use vanilla base building.
2016-09-12 16:11:29 -04:00
icomrade
a09e364ec1 Don't block damage from explosives 2016-09-12 14:42:18 -04:00
ebaydayz
29c16dc59f Consolidate duplicate sell distance variables 2016-09-12 14:14:38 -04:00
ebaydayz
2bb5c5942c Retire cone and pole plot previews in favor of dome
Thanks @oiad for pointing this out.

Poles are not used for previewing anymore. Cones do not give as much
information as the dome.

The dome is visible at night and under night vision too.
2016-09-12 13:39:00 -04:00
icomrade
26f9102a00 These are used
I didn't save all before commiting :(
2016-09-12 12:57:08 -04:00
icomrade
06202e753f Minor loot/crafting cleanup
removed DayZ fences and unused item, added some crafting supplies to
trader (marginal savings if you craft bandages as opposed to buying
them)
2016-09-12 12:55:47 -04:00
ebaydayz
d98025c8d9 Fix random spawned vehicle loot saving
Dynamic vehicle loot will save to database now even if no players
interact with the vehicle before restart.
2016-09-12 12:23:23 -04:00
ebaydayz
66ac72ea9d Add setPos.txt BE exception for WoodenArrowF
4214d99bb1
2016-09-11 18:12:34 -04:00
icomrade
252843dee7 should fix error 2016-09-11 16:40:15 -04:00
icomrade
82c8d4d538 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-09-11 16:38:30 -04:00
icomrade
203975def7 Rearm driver weapons (pook rearming) 2016-09-11 16:38:26 -04:00
ebaydayz
8bcd3a44e6 Keep Epoch strings in the dayz_epoch package of stringtable
@oiad Please keep Epoch specific strings in the dayz_epoch package.
Vanilla does not have any of these items.
2016-09-11 15:40:16 -04:00
ebaydayz
16e4dc7b30 Move HeliCrash and CarePackage area variables to markers
This allows finer grained control of crashsite, carepackage and infected
camp spawn positions and radii (further north, south, east, west, etc.).

Also removed some hardcoded checks for Chernarus, since
dayz_townGenerator should always be off on other maps for now. Someone
may add town generator coordinates for other maps later.

Related vanilla commits:

b20b402bf0

7c8b69eb82

7dfd3ef9cf
2016-09-11 14:45:49 -04:00
icomrade
48334e76d4 Update spawned vehicle inventory after publishing 2016-09-11 14:43:26 -04:00
icomrade
caddfafc78 oops 2016-09-11 14:24:20 -04:00
icomrade
b806043a4a Save player and vehicle after trade
Also forgot to commit a change yesterday
2016-09-11 12:52:38 -04:00
ebaydayz
b835059885 Merge pull request #1763 from oiad/master
Localization additions
2016-09-11 10:13:56 -04:00
oiad
64348b1f84 Localization additions
Adds some more text to localization, Moves sandbags around so they are
all next to each other.
2016-09-11 15:21:43 +12:00
icomrade
b305e7d793 Don't force save at login
Thanks for the heads up ebay
2016-09-10 20:45:39 -04:00
icomrade
286f7d6017 whitelist laser on turret 2016-09-10 16:07:38 -04:00
icomrade
0dcc75e5ec Limit to crew 2016-09-10 15:53:16 -04:00
icomrade
14bf9f9018 Fix combat in vehicles 2016-09-10 15:34:54 -04:00
icomrade
ed3227fa7a Fix dupe on disconnect
I moved the relocation code to player_sync, I didn't notice any errors
but just check to make sure it's working okay.
2016-09-10 13:43:56 -04:00
ebaydayz
bbe6be6c31 Rename Multiplayer Setup to Lobby
Vanilla commit:

fd90a380a7
2016-09-10 13:19:31 -04:00
ebaydayz
3b8f89f18d Add version number in mission briefingDescription
Provide some useful info here instead of just repeating the
briefingName.
2016-09-10 12:26:13 -04:00
oiad
fed89a0ed2 Advanced trading and safe GUI changes (#1762)
* Advanced trading and safe GUI changes

This adds displaying of item/backpack/weapon/vehicle descriptions
Moves Weapons display on vehicles to a modular type, so if the vehicle
has no weapons it wont display, same with Description

Fixes an issue with safes not sounding keyclicks, at present they are
only active if you have music turned on, since I don't play with music
on (and many others) you will never hear them and when you do, the DTMF
signals they use are really obnoxious.

Replaced the sound with the one from the lockboxes, it's still audible
but very reasonable.

* Advanced trading fixes

Rework for my previous commit @ebaydayz

* Localization additions

Missing from previous commit
2016-09-10 12:09:27 -04:00