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

4012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ebaydayz
c477304571 Forbid buying duplicate tools into gear 2016-05-08 11:59:25 -04:00
ebaydayz
41e653136f Add attachments compatibility list to trader 
Also reduced item info size a bit to better fit normal and large
interface sizes.
 2016-05-07 19:29:00 -04:00
ebaydayz
3d4d6f6544 Add SQL query for Precise Base Building 1.0.5 
You only need to run this if v1.0.4 was installed on your server
 2016-05-07 13:24:27 -04:00
ebaydayz
1fe8a7abf5 Fix typo from 26e6727 2016-05-07 13:14:22 -04:00
ebaydayz
26e67270cb Update Precise Base Building to v1.0.5 by @Mikeeeyy 
Note @icomrade : 1.0.6 test servers need to empty object_data or run the
SQL query linked below before applying this update.

http://epochmod.com/forum/topic/15813-release-v105-precise-base-building-persistent-bases-after-restart-updated-220915/#comment-118663
 2016-05-07 13:06:20 -04:00
ebaydayz
03e3293795 Add extra vehicle info in Adv. Trading 
Translations are from Arma2OA languagecore.pbo
 2016-05-06 18:57:53 -04:00
icomrade
6e430bdb84 Change self transfuse timeout to 2 min default 
Also properly handle the infection chance
 2016-05-06 11:52:36 -04:00
icomrade
6ab855fd9d Forgot to set this variable in selfbloodbag.sqf 2016-05-06 11:45:34 -04:00
ebaydayz
b0ffc1421e Prevent errors if zombie is deleted suddenly 2016-05-05 20:03:41 -04:00
ebaydayz
00cb76a496 Fix Adv. Trading pistol detection 
The secondaryWeapon command does not detect pistols. It returns the
unit's launcher.
https://community.bistudio.com/wiki/secondaryWeapon

This fixes the menu always showing your pistol slot as open, even when
you already have one.
 2016-05-05 17:25:47 -04:00
ebaydayz
7bc5d7f7f5 Fix full toolbelt showing -2 tool slots in Adv. Trade 
Correctly shows zero available tool slots when toolbelt, binocular and
NVG slots are full now.
 2016-05-05 16:50:09 -04:00
ebaydayz
fe54b78bdb Add backpack selling to Advanced Trading 
It was not possible to sell a backpack from your gear or vehicle.

Added option to sell from gear. Sell backpack from vehicle is still not
possible currently due to Arma limitations.
 2016-05-05 14:55:50 -04:00
ebaydayz
2c6ef2ced3 Don't show selected vehicleX message on Adv Trade startup 
Only show Selected vehicleX systemChat message when clicking the buy
in/sell from vehicle button. Previously it was showing every time the
menu opened.

Also added better logging to RPT. Shows "Trader Menu: %1 x %2 added" and
"Trader Menu: %1 added"
 2016-05-05 12:37:10 -04:00
ebaydayz
f900ee4520 Add isInTraderCity to BackpackAntiTheft check 2016-05-05 11:39:18 -04:00
ebaydayz
af14d673f5 Make LMG magazines only take up one slot 
All ammo in Configs\CfgMagazines\Magazines\ is back to taking one gear
slot now, same as 1.0.5.1.
 2016-05-05 11:14:08 -04:00
ebaydayz
ef2c910bfc Fix open gear backpack slots always showing zero 
IsNil returns true as long as the variable is defined. In this case it
is defined as objNull when you have no backpack.
 2016-05-04 19:09:10 -04:00
ebaydayz
cb381c5ce3 Fix another transportMaxBackpacks typo 
This was responsible for vehicles showing zero and negative numbers of
available backpack slots.
 2016-05-04 18:42:20 -04:00
ebaydayz
ed9253671e Always open Advanced Trading in buy mode 
Fixes the unintended behavior of swapping between buy and sell each time
the menu is opened.
 2016-05-04 16:50:46 -04:00
ebaydayz
349e0a103d Fix trade title showing "Buying in vehicleX" when in sell mode 
Tested and confirmed working as intended now.
 2016-05-04 16:46:35 -04:00
ebaydayz
85869b32f1 Fix Adv. Trade secondary vehicle check 
Forgot this one. See:

f503e53097
 2016-05-04 15:53:25 -04:00
ebaydayz
f503e53097 Fix Adv. Trade nearby vehicle check detecting animals 
Was getting "Buying in Rabbit" when one was nearby.

No need to check "AllVehicles", this is faster and will get all drivable
vehicle types.
 2016-05-04 15:47:47 -04:00
ebaydayz
c4d3f01f38 Don't show enter/leave text when changing clothes in trader 2016-05-04 15:08:19 -04:00
ebaydayz
e6c5930415 Fix unit icon in Advanced Trading selling from gear box 
Adds a nice icon of the unit in the top right below "Gear" text.
 2016-05-04 14:39:40 -04:00
ebaydayz
800182f7e2 Fix can't buy backpack into vehicle with Advanced Trading 
The typo here was causing all vehicles to return 0 for
transportMaxBackpacks.
 2016-05-04 14:20:23 -04:00
ebaydayz
5043fafae4 Fix default currency display in Adv. Trading bag item info 
Fixes currency display name and picture not showing when looking at
backpack item info.

Also fixed localized string for weps and mags order reversed in item
info for backpacks and vehicles.
 2016-05-04 12:54:36 -04:00
ebaydayz
085b6d32f9 Enable R3F weight by default 
Since we are keeping "everything takes up one gear slot" weight should
be enabled by default. Moved to init.sqf so admins can easily change it.

Also added RedRyder and Anzio_20 weight.
 2016-05-04 11:23:50 -04:00
icomrade
8a361a1b44 Wrong order 2016-05-03 23:28:32 -04:00
icomrade
e8abd8f403 Add percent damaged display for maintenance #1583 2016-05-03 23:25:25 -04:00
icomrade
51be8aa8a5 Fix reloading 2016-05-03 20:19:01 -04:00
ebaydayz
ee70dd49d3 Prevent rags duping 
Vanilla development commit:

31167114e7
 2016-05-03 17:28:33 -04:00
icomrade
3f10228b95 should fix knockout issue with self bloodbag 
issue most likely happened if you used a typed bag not matching your
blood type when the classic system is enabled.
 2016-05-03 16:34:28 -04:00
icomrade
2f67a058ba Complete Cinderwall as Item #1172 2016-05-03 15:57:37 -04:00
icomrade
fcb6d1ab26 Fix some items missing removal option #1135 2016-05-03 15:41:33 -04:00
icomrade
cf29731620 Configurable weather effects 2016-05-03 15:21:38 -04:00
Anton
75ae8ad3c0 a couple localization updates (#1690) 
* a couple localization updates

* fix merge conflicts

* fix

* fixes
 2016-05-03 15:15:44 -04:00
icomrade
5cde6cba69 should fix undefined variable errors 2016-05-03 15:09:13 -04:00
icomrade
7bcc9f305f Configurable temperature effects 2016-05-03 14:31:20 -04:00
icomrade
6936a5dd24 Fix packing storage giving no refund 2016-05-03 14:02:57 -04:00
icomrade
b0df4c7f51 Fix unlocking vehicles after adding plot for life 2016-05-03 13:50:59 -04:00
ebaydayz
1eeaa3e792 Add epoch_generateKey function 2016-05-03 13:35:50 -04:00
ebaydayz
2f98fc0451 Prevent MeleeMagazines being counted by BIS_fnc_inv 2016-05-03 13:35:50 -04:00
icomrade
f8b3ba2105 Fix mistake from Plot for Life addition 2016-05-03 12:53:48 -04:00
icomrade
c2ce8aaf8b better fix for CH53 and add toggle for #1198 2016-05-03 11:14:26 -04:00
icomrade
ea8c14c5fb Fix #1187 
keypadCancel returns false when a combo/keypad dialog is not open and
when reset by calling the code keyPadReset = {uiSleep 2; keypadCancel =
false;};

There is a 2 second delay which makes brute forcing very very time
consuming. Note there must be a delay when resetting the variable since
fn_selfactions will update so quickly it will display the
unlock/lock/remove option before onUnload is executed.
 2016-05-03 01:19:36 -04:00
icomrade
3c27f76c7c use self actions to spawn plot radius, fixes #1566 2016-05-02 23:06:50 -04:00
icomrade
3c0573258a update changelog 2016-05-02 21:44:45 -04:00
icomrade
eddcf02ab3 Precise Base Building fix 2016-05-02 21:06:44 -04:00
icomrade
5f054393e5 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	SQF/dayz_code/compile/fn_damageActions.sqf
#	SQF/dayz_code/compile/fn_selfActions.sqf
 2016-05-02 20:44:50 -04:00
icomrade
575682b7c8 Add A Plot For Life modification by RimBlock 
A Plot For Life also includes Precise Base Building by Mikeeeyy. Precise
base building has no variable to switch it on or off, I don't think it
should.

Seems to work well enough, this may conflict with the duplicate object
uid fix, it appears to spam my server rpt.
 2016-05-02 20:42:37 -04:00
ebaydayz
d361abaec3 Fix Adv Trade localized string spacing 2016-05-02 19:51:48 -04:00