Commit Graph

7075 Commits

Author SHA1 Message Date
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
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
ebaydayz 67f6d86440 Use smaller sound muted UI icon and better alignment
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/6aba95d2517ad72b9b3f04b9316f0f0f0ac6e537
2016-07-21 14:58:03 -04:00
ebaydayz 9ea9af3272 Change player list and lobby icons to grey instead of blufor
Vanilla development commits:

https://github.com/DayZMod/DayZ/commit/36337e3c080d1b1e12fc891a4b47f7c77ef2ca8b

https://github.com/DayZMod/DayZ/commit/3a2d3ac20dbf0640fbd19a93814500cc9f980f44

Connecting and normal icons are the same so players can not tell when
someone is in the lobby.

Also removed:
- player name and rank text shown in the top right of diary
- "Current task:" text shown above player list
- "Pool:" text shown in lobby
2016-07-21 14:50:02 -04:00
ebaydayz f2687345cd Testing Confirmed Kills System.
Vanilla development commit:
https://github.com/DayZMod/DayZ/commit/4881e00ecfd7c022e49dc4ee6b3ad52ba9ad0e03

New - Journal Kills will only update during the session on confirmed
Kills (study dead body).
2016-07-21 11:31:47 -04:00
ebaydayz 9ae21dd4f5 Rifle flashlight fix, translations
Vanilla development commit:
https://github.com/DayZMod/DayZ/commit/a850f25e14a4745ddef22ebb6a6bd1d9a3f1e839

- Attachment_FL_Rfl -> Attachment_FL
- Sherbet desc
- Take blood translation
- weapons/mods translation fixes for better strings fitting
2016-07-21 11:12: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
ebaydayz 1fb1dc9d89 Prevent toggleSoundMute at gender selection screen 2016-07-20 19:21:54 -04:00
ebaydayz 2f844060ec Add handling of other fadeSound events in player_toggleMuteSound
Fixes icon staying up after fadeSound to 1 by unconscious and low blood
events.
2016-07-20 17:36:40 -04:00
ebaydayz f314a39e43 Add better sound muted status UI icon and background
Icon contributed by Tugodoomer and AlexAFlorov. See
https://github.com/DayZMod/DayZ/issues/625 for details
2016-07-20 15:24:31 -04:00
icomrade d0a2260fb1 Update CHANGE LOG 1.0.6.txt 2016-07-20 13:23:30 -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
ebaydayz 2911bffced Fix can't reload partial mag with flares in inventory
Vanilla development commits:

https://github.com/DayZMod/DayZ/commit/7f7d3e02e786b0a2fee9cb9af1353f5b28a9eda6

https://github.com/DayZMod/DayZ/commit/094f1f18d2444c4e3ecca5a5b4b3538cc333d606

https://github.com/DayZMod/DayZ/commit/a078e84f11c7829e4830f5397cc50956eaee381a

https://github.com/DayZMod/DayZ/commit/805b9def10b8d26d00950e98fe87dcf74e8e06ea

Also reverted:
https://github.com/EpochModTeam/DayZ-Epoch/commit/51be8aa8a5009b471c9dcfcd3ae3c0a362b7121b
since it was not the cause.

See https://github.com/DayZMod/DayZ/issues/641 for the details.
2016-07-18 21:43:08 -04:00
icomrade 2f4815cb39 Update add_recommended_mysql_events.sql
Fix dead link
2016-07-18 16:38:12 -04:00
ebaydayz e62c882127 Remove duplicate ObjectUID fix variables
No longer needed as per:

https://github.com/EpochModTeam/DayZ-Epoch/commit/51be8aa8a5009b471c9dcfcd3ae3c0a362b7121b

https://github.com/EpochModTeam/DayZ-Epoch/commit/8e87448fe740b976fa7d6061111bc3acf66c3f56
2016-07-17 17:17:38 -04:00
ebaydayz 3a5fc91329 Fix missing string typo
My mistake from
https://github.com/EpochModTeam/DayZ-Epoch/commit/77519144286851d0c2013cdacdc9cf64e5319618
2016-07-17 16:00:12 -04:00
ebaydayz 7751914428 Rename vanilla strings from #1708
When localizing vanilla strings please do not put "EPOCH" in their name
or include them in the dayz_epoch package of the stringtable. This
creates more work to backport common translation updates and vice versa.
2016-07-17 14:02:04 -04:00
icomrade b9f4aa3ae0 Update ReadMe.md 2016-07-17 12:38:14 -04:00
icomrade 2ecd35ad89 Update ReadMe.md 2016-07-17 12:37:53 -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 42db0a9108 Merge pull request #1708 from oiad/master
New test build for 17th July
2016-07-17 10:51:27 -04:00
oiad ff2097c3bd Localization goof
Forgot a localize, oops.
2016-07-17 22:35:27 +12:00
oiad 3d75c67574 Localization updates
Some localization updates and some code optimization.
2016-07-17 22:23:25 +12:00
oiad d47d887a66 APFL more fixes
This moves all the PFL stuff into the one if statement for tidyness, no
point having 2 ifs.
2016-07-17 17:03:55 +12:00
oiad 195553c348 Revert "More changes to modular_build"
This reverts commit 707e2ec66d.
2016-07-17 17:00:26 +12:00
oiad 707e2ec66d More changes to modular_build
I wasn't aware modular_build had permanentPlot stuff in it so i've moved
the ownerPUID setting to inside the main PFL stuff. Saves having 2 if
statements.
2016-07-17 16:56:05 +12:00
oiad c205eda7c9 New test build for 17th July
Updates test build to 17th of July and updates dayz_server with missing
advanced trader fixes from a while ago.
2016-07-17 12:20:16 +12:00
icomrade 8e87448fe7 Add new Hive DLL with ObjectUID Fix 2016-07-16 19:54:56 -04:00
ebaydayz f60262aff1 Consolidate duplicate Remove Suppressor translations
Vanilla development commit:
https://github.com/DayZMod/DayZ/commit/66af3465ac4335bfedbb96b46bf551702f040246
2016-07-16 14:48:53 -04:00