Commit Graph

4505 Commits

Author SHA1 Message Date
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
ebaydayz
f57e303355 Update vanilla fence building
Vanilla commits applied:

e88a5c42bc

fe95643511

9a82b8307c

5a305198c7

be872601c9

44a25b1b4a

7bfeab3c13

cc5f02a41a
2016-09-10 11:25:10 -04:00
ebaydayz
11a3df0177 Add note about database in Test Build Readme 2016-09-09 14:55:20 -04:00
ebaydayz
cb09377d26 Add GPS, Rangefinder and NVG back as sell only
Partially reverts
7435548582
@AirwavesMan now that buy or sell only is available via:

ffef031863
2016-09-09 14:05:06 -04:00
ebaydayz
8f25cc70db Localize sell and buy only messages
PrimaryWeapon always returns "", never nil unless the player object
isNull (in which case this script would not be running).

Fixed cases where a nil variable would throw an error when checking the
next condition.
2016-09-09 13:53:20 -04:00
ebaydayz
e5e212bbc2 Add comment about salvage vehicle work around 2016-09-09 12:58:41 -04:00
ebaydayz
eadbbb18bf Fix double tap bunny hop with no weapon glitch
Also makes it easier to bunny hop in quick succession. Previously double
tap triggered a bunny hop immediately followed by a regular vault.

Vanilla commit:

5833c76491
2016-09-09 11:41:09 -04:00
ebaydayz
32db983f34 Fix undefined amount when bloodbagging remote player 2016-09-08 20:00:38 -04:00
ebaydayz
a666389026 Merge pull request #1761 from oiad/master
Salvage vehicles last changes
2016-09-08 17:48:09 -04:00
oiad
75f4f2fa1f Salvage vehicles last fixes.
Add changelog and enable by default
2016-09-09 09:46:51 +12:00
oiad
51f85acb9e Toggle for salvaging from locked vehicles (#1757)
* Toggle for salvaging from locked vehicles

This adds the ability to remove salvaging from locked vehicles which
helps avoid griefing
Fixes a spelling mistake for a localization string
Makes it possible to salvage 0% damaged items again, this was disabled
as per
3292d84b85
I've had this running on my server for a year or so with no issues (not
that it doesn't affect it, i've just never seen it)

* Toggle salvagable locked vehicles changers

@ebaydayz fixed
2016-09-08 17:32:27 -04:00
ebaydayz
4731780f5a Fix diag_log when vehicle spawn limit is reached
Prevents benchmark diag_log showing negative number of vehicles spawned.
2016-09-07 11:18:37 -04:00
ebaydayz
771284a297 Auto select main weapon after throwing
Also added to gear unload so player will auto select pistol if picking
one up with flares in their hands.

Vanilla commit:

08449fdfda
2016-09-06 16:36:45 -04:00
icomrade
bbf0ac583d whitelist pook grenades 2016-09-05 15:39:58 -04:00
ebaydayz
c8b3053496 Remove unused keyboard_keys function
I moved the compile up in compiles.sqf since vanilla is now updated with
the change:

f5780256ee
2016-09-05 14:16:38 -04:00
ebaydayz
cab627e3de Add note about server_timeSync name change 2016-09-04 14:40:03 -04:00
ebaydayz
530ed4b3b4 Only exit for playerNear if supply crate wreck or mine wreck 2016-09-03 20:16:21 -04:00
ebaydayz
70ebd6dbcb MISSION_ROOT variable is no longer needed
Also @icomrade you accidentally committed the testkit code to
chernarus11 init.sqf. Removed it for you.
2016-09-03 16:33:17 -04:00
icomrade
ffef031863 Allow disabling of buying or selling
Set price of the item to -1 in the Cfg traders files to disallow buying
or selling
2016-09-03 14:26:43 -04:00
icomrade
1b60d0d963 I should be more careful 2016-09-02 19:18:33 -04:00
icomrade
d1d5fe54f3 Fix cheat handling
This adds keydown handler for chat, map, and diary displays.
Additionally, this can be used to handle malicious chat input without a
delay by modifying the associated compile
2016-09-02 19:14:21 -04:00
ebaydayz
7be75c4674 Remove random unused faco code 2016-09-02 13:25:51 -04:00
icomrade
413e86b521 Reconfigure pook and autogyro magazines
This allows players to carry the magazines, without modification to
ammo.sqf the side guns of the pook transport are supported to be
rearmed. Modification will be required to allow turrets assigned to the
pilot to be rearmed, such as the pook H13 gunship and mozzie grenades.
2016-09-02 12:24:39 -04:00
ebaydayz
ab6fa80697 Wait for BIS_fnc_init on login
Fixes occassional case of undefined errors for BIS functions on client
when login completed very fast.
2016-09-02 12:03:14 -04:00
icomrade
678acff706 cleanup comment 2016-08-31 18:08:58 -04:00
icomrade
04b6707191 Fix Mozzies/gyrocopters
Fixes wrecks bouncing 500m into the sky, players not dying when crashing
these vehicles, and sound falloff (someone verify in a multiplayer game,
I teleported away from a flying mozzie and it appeared fixed).

I made a new startup and stop sound for the mozzie which is acceptable I
think, but I'm using the MV22 Osprey noise startup and stop noises for
the gyrocopter. The osprey startup is fairly well fitting, but the stop
noice is out of place, if anyone can come up with a better noise please
change it otherwise if it's out of place enough I'll just remove it
altogether.
2016-08-31 18:04:40 -04:00
ebaydayz
b9dc98ac6f Revert move Shift +- to function
See:

51caa509cb (commitcomment-18834096)
2016-08-31 13:46:26 -04:00
ebaydayz
51caa509cb Comment out Gcam keys and move Shift+- to function
Vanilla commit:

8ed8ab6b5c
2016-08-30 14:18:38 -04:00
icomrade
92b4c8785d Disable shift + - input
shift + - is used to ented arma "chests" which allow the player to issue
endMission, and limit their fps (min 5 fps limit). This unfortunately
disables the flush cheat, but attempts to filter out input and allow
flush are not reliable.
2016-08-29 13:49:05 -04:00
icomrade
78d17a5f87 Use real path 2016-08-29 13:31:07 -04:00