W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-06-14 13:51:57 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,900 Commits 20 Branches 18 Tags
3a7f1bd90cd959aa120aaada6155e3778b2b5056
Commit Graph

4099 Commits

Author SHA1 Message Date
ebaydayz 3a203b2720 Cover map bug at Polana factory pond 
Vanilla development commits:

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

https://github.com/DayZMod/DayZ/commit/028490e21b431fdec6b746920e3dceebd20b9687
 2016-07-25 12:31:39 -04:00
ebaydayz 03c57f3b77 Fix for Confirmed Kills system on change clothes. 
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/d499246e2e711ff1efda9fed38ca589bcb7908f7
 2016-07-25 12:19:45 -04:00
ebaydayz 33538520d0 Removed Achievements from network send on login. 
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/0079818570b115cb9def88db6014c5306560eb15
 2016-07-25 12:16:22 -04:00
ebaydayz 55df36741b Diag_log Cleanup. 
Vanilla development commits:

https://github.com/DayZMod/DayZ/commit/1dbef192bb413526503aca89bb636e277ac59985

https://github.com/DayZMod/DayZ/commit/10cb0249f0dcfa80b5e4cfd89660bc6c33d6700a
 2016-07-25 12:06:53 -04:00
icomrade ff6e11708a Un-nerf DMR 2016-07-24 16:14:38 -04:00
icomrade 0563f621e2 Fix full cinder wall snap points 2016-07-24 15:28:18 -04:00
icomrade 51287651f2 Add logging for non-existent loot group small 
This can probably be removed for release but for now I noticed
HangarSmall doesn't exist, perhaps others as well.
 2016-07-24 13:15:37 -04:00
icomrade 90932d0061 Don't use weaponHolderBase here 
it causes the items that are created to be invisible
 2016-07-24 01:46:54 -04:00
oiad 2ca7bf59c7 Tidyness changes 
This changes a few functions that were being used to use the already
defined variables instead

Fixed a few string issues with Advanced trading and plot managment.
 2016-07-24 16:20:39 +12:00
icomrade b03afef460 A little neater 2016-07-23 19:55:24 -04:00
icomrade efaad30c32 Remove unneeded waitUntil 2016-07-23 18:11:37 -04:00
icomrade 72c529f94e Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-07-23 17:19:46 -04:00
icomrade a3c3ccc3bf Fix door/plot management friends not writing to DB 2016-07-23 17:19:06 -04:00
ebaydayz 8202f7d61b Sync debug check 
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/0baaac7a91a4eaf02c13e47ae51e2015af5549c2
 2016-07-23 15:23:00 -04:00
ebaydayz cc2aae59eb Change splint recipe 
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/6ea5d8ebee35adb3eadd1061f57c165049e36ad8
 2016-07-23 15:12:08 -04:00
ebaydayz 8ed5a9c7a9 Antibiotics combining 
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/0602d29530dfec6d0adc61fa6724bb201897a888
 2016-07-23 15:03:49 -04:00
ebaydayz 34f9f97aa3 Icons, 9mm silencer, m16a2 
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/896825693dfe7bc231af17a3dbbf48eccbd765e9
 2016-07-23 14:55:04 -04:00
ebaydayz f76b8493fd Fix category list alignment in advanced trade 
Since we changed the alignment back to default the ctrlSetPosition I
added is no longer needed. #1709. With the alignment changed it would
actually run off the background if the category list was too long.
Thanks @oiad
 2016-07-23 14:24:54 -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 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 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 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
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 c702d92231 Remove SQF Based Duplicate UID Fix 
Use the new DLL
 2016-07-17 10:52:40 -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