Commit Graph

6750 Commits

Author SHA1 Message Date
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
ebaydayz b49270c3f8 Sync modular_build formatting change with player_build from #1707 2016-07-16 13:47:36 -04:00
oiad 41c9fde480 Plot for life fixes and typo fixes (#1707)
This fixes the issues I was having with APFL, Basically when downgrading
a locked door the ownerPUID was not getting transferred across so it was
getting a 0 PUID set on it once downgraded so you would then lose access
if there was no plot pole.

Now it correctly gets set and instead of doing 2 PVDZE_Obj_Swaps I am
using an if and else statement.

player_upgrade was also not sending the ownerID into the worldspace
field, this seems to differ from the original APFL script. I also added
in code so that if APFL was enabled and uid is 0 we claim the item with
players UID.

This fixes a typo @ebaydayz introduced to spam the .RPT on startup also
for the shotgun and a typo in the credits.
2016-07-16 13:25:14 -04:00
ebaydayz c9960e1ec3 Fix MP5 and MP5SD mag displayNames reversed
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/cb464b1add5e0fdb859b23ed2570f05af3a82e6d
2016-07-10 16:59:04 -04:00
ebaydayz da5c5bf6cc Credit updates for Sound Files.
Vanilla development commits:

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

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

Also synced spacing and tabs from:

https://github.com/EpochModTeam/DayZ-Epoch/commit/73d557806e30b65bfe4f7bfe0f2a863e06244414
2016-07-10 16:44:07 -04:00
ebaydayz 73d557806e Mag names, Attachments names, Translation fixes
Vanilla development commit:

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

- renamed magazines for better sorting
- renamed attachments for better sorting ([A] prefix added) some fixes,
some strings moved to proper section
- Remington 870 added to new attachment system (weapon flashlight)
- Double-barrel shotgun will now spawns with pellets and has Doubleshot
option (maybe this will make it more popular?)
2016-07-10 15:25:36 -04:00
ebaydayz 4ff088c80c Remove redundant access checks for upgrade and downgrade
Access control for upgrade and downgrade is now included in
fn_selfActions as per #1706

I moved _upgrade down in fn_selfActions so it is only checked it if the
right conditions are met.
2016-07-09 14:34:38 -04:00
ebaydayz 326fda70b1 Add missing SnapPro commit
Missing SnapPro update from
https://github.com/raymix/SnapPro/commit/52d5bf8af4946c690cd4d95aeac15b3e8f895a55

Fix Wood Floor short side snap point
2016-07-09 12:33:53 -04:00
oiad 06c8fef001 Various changes (snappoints, dooraccess and fn_selfactions) (#1706)
* Changes to snappoints.hpp fixes issues with metal floors snapping to a cinder wall. Cinder to cinder will create small gaps and then metal floors won't properly line up unless you start with a metal floor then snap cinders. By making both the same snap size, this fixes this issue.

Changes to doorAccess.hpp makes it possible to unlock doors and downgrade them again. It was setting dze_lock_door to the players UID instead of the door code as it should so the conditions would not be met in fn_selfActions to give you additional access.

Changes to fn_selfActions refine access to certain points more accurately (the way they should be IMO)

1) Adds a check to see if the building item can be upgraded anymore before presenting the menu, this stops you receiving the "upgrade item" action even when the item is fully upgraded
2) Adds access checks to the maintain individual item menu action so only item owner, plot owner and plot friends will see it, same with the above upgrade item menu action, this will also stop you receiving this when you are on someone elses plot that you may not have access to (I.e it's useless)
3) Changes modular building access to be item owner, plot owner and plot friend to remove modular items.
4) Changes plot managment action menu so item owner, plot owner and plot friend can access it. I thought there could be a situation where item owner != plot owner. This can be reverted if that is never possible.
5) Changes downgrading so only item owner, plot owner and plot friends can access it. If someone has the door code that doesn't mean they should be able to remove the combo (IMO)

* typo.
2016-07-09 12:28:39 -04:00
oiad e30f18190f This will fix an obvious typo for the variable s_player_upgradeStorage (#1705)
* Advanced trading fixes/modifcations

This adds combine currency option to the Advanced trading screen since
@Airwaves man noticed it didn't have a way of doing it.

Updated stringtables with correct "paid" spelling and differing text for
buying/selling.

This also addds proper currency checking/reporting for the log system
that has been introduced, it's untidy but it works, instead of getting
"user bought x for 1000 currency" in a non coins server, it will convert
it to the proper 1 brief 5 10oz gold etc system (uses a new function
z_calcDefaultCurrencyNoImg)

This also adds a check to see if the buy list is empty (as per the
selling list) and returns text to the user informing them.

Re-arranged buy and sell so buy is on top of sell, it's a bit easier to
read then.

* Advanced trading logging change

This was missing from my previous commit, this changes the
server_tradeobject to check if it's being passed a number (single
currency) or text (my logging currency changes)

* Advanced trading fixes (again)

* Advanced trading rework

Fixes all problems @ebaydayz

* Rename typo'd variable "s_player_upgradestorage"

This renames an obviously typo'd variable to what it should be.

* fixes derp string.

* asdf (#3)

asdf
2016-07-05 21:40:31 -04:00
ebaydayz f7d765e669 Fix STR_ACTIONS_LIGHTFIRE listed twice
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/ca8434a9b9b9c34d2734a96a8bad8519f15ce512
2016-07-03 12:26:56 -04:00
ebaydayz 452ce57618 Temperature badges + heatpack changes + some translation fixes
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/e89176d565b5f71479baf5f4ae8daad4108e00c3
2016-07-03 12:01:32 -04:00
ebaydayz cc2918989e Remove duplicate status UI icon files 2016-06-25 10:32:46 -04:00
ebaydayz eae4428e9f Update SQL maintain event for door management
Since door management uses the inventory field to store doorFriends the
last condition was always returning false and locked doors would never
get damage set on them.
2016-06-22 19:54:06 -04:00
ebaydayz 680659babc Add AirwavesMan and oiad to contributors 2016-06-21 21:25:27 -04:00
ebaydayz 3c76f3c800 Add some new vanilla items to R3F weight
@AirwavesMan - For future reference, if you notice any more new stuff we
forgot to add to the traders we probably forgot to add them to R3F
weight too.
2016-06-21 21:17:22 -04:00
ebaydayz 19285d677a Merge pull request #1704 from AirwavesMan/master
Some more Changes
2016-06-21 20:58:13 -04:00
oiad 801145d664 Advanced trading fixes/modifications (#1698)
* Advanced trading fixes/modifcations

This adds combine currency option to the Advanced trading screen since
@Airwaves man noticed it didn't have a way of doing it.

Updated stringtables with correct "paid" spelling and differing text for
buying/selling.

This also addds proper currency checking/reporting for the log system
that has been introduced, it's untidy but it works, instead of getting
"user bought x for 1000 currency" in a non coins server, it will convert
it to the proper 1 brief 5 10oz gold etc system (uses a new function
z_calcDefaultCurrencyNoImg)

This also adds a check to see if the buy list is empty (as per the
selling list) and returns text to the user informing them.

Re-arranged buy and sell so buy is on top of sell, it's a bit easier to
read then.

* Advanced trading logging change

This was missing from my previous commit, this changes the
server_tradeobject to check if it's being passed a number (single
currency) or text (my logging currency changes)

* Advanced trading rework

Fixes all problems @ebaydayz
2016-06-21 20:18:41 -04:00
A Man a7bd47054e Add crafting full cinder wall kit
Add crafting full cinder wall kit.
2016-06-21 23:12:14 +02:00
A Man 999f5fd5c2 Added another string
Added another string for full cinder wall kit.
2016-06-21 23:09:32 +02:00
A Man 6f13f8a36e Changed Cinder Wall Strings
The full cinder wall and the half cinder half kit had the same name ingame.
2016-06-21 22:27:41 +02:00
A Man b8f95b7f75 Changed Cinder Wall Strings
The full cinder wall and the half cinder half kit had the same name ingame. I tried to correct it but I saw that the string was too long when you click right on a full cinder wall kit to build it. I renamed both kits so that both kits stand by each other.
2016-06-21 22:25:02 +02:00
A Man 25fbaf5757 Small Loot Tweaks
Increased the chance for MortarBucket and CinderBlocks to spawm. Removed the flashlight from spawn in industrial loot.
2016-06-21 21:58:06 +02:00
A Man 4848c3ef5c Changed Prices for balance
Changed prices for balance.
2016-06-21 21:55:01 +02:00
A Man 6d3a76704c Items Added/ Combo Lock Price Changed
I've added a few vanilla items and changed the price of the Combo Lock.
2016-06-21 21:53:48 +02:00
A Man f47c4e0f2a Reordered Attachments
Reordered the attachments. Similar items should be next to each other
2016-06-21 21:52:20 +02:00