Commit Graph

765 Commits

Author SHA1 Message Date
ebaydayz
9d51fb2736 Fix plot management buttons color and text alignment
Fixes unintended black on black buttons and left aligned button text.

Plot management uses Zupa's older defines. The only changes for this
button type are the background color and text alignment.

https://github.com/DevZupa/PlotManagement/blob/master/MaintainVersion/plotManagement/defines.hpp#L568

https://github.com/DevZupa/PlotManagement/blob/master/MaintainVersion/plotManagement/defines.hpp#L588
2016-05-17 22:02:21 -04:00
icomrade
113dd0618a Add Little Bird killed EH 2016-05-17 20:45:54 -04:00
ebaydayz
dbe7bf0a17 Localize plot management dialog text 2016-05-17 19:14:05 -04:00
ebaydayz
3be1d4e6bf Update outhouse and plot pole descriptions
Outhouse no longer includes toilet paper.

Plot pole may cover an arbitrary radius and ownership may not be lost
after death depending on server settings.
2016-05-12 15:10:20 -04:00
ebaydayz
bd85693af7 Add categories view to Advanced Trading buy mode 2016-05-12 14:09:05 -04:00
icomrade
2d9097a6af Switch all buildables to Epoch building system
Didn't bother switching the stash over since it doesn't appear to be
implemented yet
2016-05-10 11:21:04 -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
icomrade
51be8aa8a5 Fix reloading 2016-05-03 20:19:01 -04:00
icomrade
2f67a058ba Complete Cinderwall as Item #1172 2016-05-03 15:57:37 -04:00
icomrade
6936a5dd24 Fix packing storage giving no refund 2016-05-03 14:02:57 -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
ebaydayz
d361abaec3 Fix Adv Trade localized string spacing 2016-05-02 19:51:48 -04:00
ebaydayz
adff6440ed Fix errors from #1689 localization
@Adaptivity
- STR_EPOCH_WALLWITHDOORLOCKED_DESC string was missing
- I see no reason STR_EPOCH_PLOTDEED_ACTION was renamed to a less
descriptive name, and it was missing the German translation from the old
one, so I changed it back
- These build actions in fn_selfActions are for vanilla building. They
shouldn't be in the Epoch package. I renamed them and submitted them to
vanilla too.
2016-05-02 14:03:41 -04:00
Anton
2a99cf8a63 more localization work (#1689) 2016-05-02 13:31:13 -04:00
icomrade
16fe17645f Don't redefine vehicle EH
doing so breaks the destruction fix
2016-05-01 22:10:38 -04:00
ebaydayz
51308c5b32 Fix typo from #1688
Also remove a duplicate string
2016-05-01 21:14:38 -04:00
icomrade
61ffe26fb8 More magazines taking too many slots 2016-05-01 21:00:00 -04:00
ebaydayz
2806d6a00d Localize some Advanced Trading strings 2016-05-01 15:45:07 -04:00
icomrade
d25ad694d8 Fix wrong bloodbag types spawning 2016-05-01 14:15:01 -04:00
icomrade
9e2728af07 Merge pull request #1686 from Bruce-LXXVI/pullrequest/plotManagement
Pullrequest/plot management
2016-05-01 11:05:54 -04:00
ebaydayz
ab7254a121 Add lower volume / earplugs hotkey and status UI icon 2016-04-30 21:19:24 -04:00
icomrade
ba751dad4a Fix Generator
Not sure what differences BuiltItems will have as opposed to using the
SkodaBase class.

Switch Off/On are removed because they do nothing anyway (the start/stop
options are in fn_selfAction anyway)
2016-04-30 19:04:52 -04:00
Anton
4e45b23f94 More work on localization support (#1687)
fix stringtable.xml

more fixes

added missing $
2016-04-30 15:54:31 -04:00
Bruce
98bfee8bdf added plotManagement by DevZupa 2016-04-30 02:01:15 +02:00
ebaydayz
4b9d6df0bb Finish localization support
Vanilla development commit:

33c6cafbcb
2016-04-28 22:13:48 -04:00
icomrade
47070ae4f5 Move advanced trading configs to mission
allows customization by server owners
2016-04-28 19:30:43 -04:00
ebaydayz
d2ba027863 Perform build checks before removing magazines
Also allow tents and stashes to be built without a plot pole (same as
1051).
2016-04-28 15:32:32 -04:00
icomrade
e03b5bdb37 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	CHANGE LOG 1.0.6.txt
2016-04-27 18:26:07 -04:00
icomrade
1585765ca6 Advanced trading by Zupa @Windmolders
Stock configuration and basic integration. WE still need config based
trader setups.
2016-04-27 18:23:55 -04:00
ebaydayz
244b84e74b Update weapon switch hotkey for DZE_TwoPrimaries=2
Also forgot new dropped class for SledgeHammer
2016-04-27 16:11:40 -04:00
ebaydayz
7753ae2859 Add drop weapon action to MeleeSledge 2016-04-27 15:01:34 -04:00
icomrade
53320178f1 Let Shovel build sandbags, fix errors with toolbox 2016-04-26 18:55:30 -04:00
icomrade
2411973de5 Fix CH53 Destruction
Let me know if we can't duplicate the code from the CH53 addon in the
file ch53_monitorSFX.sqf. If that's the case I will use an #include
instead, since the code that kicks and kills players out of the vehicle
goes at the bottom of the file anyway.
2016-04-26 15:16:20 -04:00
icomrade
c1eb07d99d Add to back for sledgehammer 2016-04-25 22:57:29 -04:00
ebaydayz
d63f48af85 Fix pond detection in player_goFishing
Fixes #1678
Fixed for vanilla too:

8a18fe957c

Ponds and lakes were not being detected at all, neither on foot nor in a
boat.

Tested land (failure), pond, lake and shore both on foot and in a boat.
Working as intended now.
2016-04-25 21:53:31 -04:00
ebaydayz
97ad2688bc Enable RedRyder in loot tables again
Config errors are fixed for the next test build.
2016-04-25 19:57:23 -04:00
ebaydayz
69b940704e Removed powerlines from loot tables,
Vanilla development commit, see:

Removed Zeds spawning at powerLines.

b577424e50
2016-04-25 18:02:55 -04:00
ebaydayz
a353f8e0e5 Fix hatchet remove from toolbelt text 2016-04-25 16:36:50 -04:00
Adaptivity
4dc46705f9 More progress on localization support 2016-04-25 15:47:09 +03:00
ebaydayz
6522cca7ce Fix typo from pull #1679
See #1679
2016-04-24 18:58:22 -04:00
icomrade
9624979785 Fix items taking more than 1 inventory slot 2016-04-24 17:44:58 -04:00
Adaptivity
52ee70394a More localization support 2016-04-24 14:11:14 +03:00
ebaydayz
619f65eef0 Remove canteen for now
Canteens were removed from cfgMagazines temporarily
2016-04-22 18:59:01 -04:00
ebaydayz
1879fb8707 Fix siphon fuel
ItemJerrycanEmpty no longer inherits from ItemJerrycan
2016-04-22 17:39:52 -04:00
ebaydayz
3c52278e4d Fix sedan and skoda getOut sound
Fixes RPT error when exiting skoda and sedan:
Cannot load sound
'ca\sounds\vehicles\wheeled\sedan\ext\ext-sedan-getout-1.wss'
Cannot load sound 'ca\sounds\vehicles\wheeled\bus\int\noise3.wss'
2016-04-22 14:29:17 -04:00
ebaydayz
796c607173 Fix vanilla chop wood error
Players can now chop wood either with hatchet in their hands (faster) or
via right click on toolbelt (slower).
2016-04-21 12:28:00 -04:00
ebaydayz
7da7b9e5dd Correct PVDZ_plr_Save for player zombies 2016-04-20 17:00:38 -04:00
ebaydayz
14dacf269c Add back player zombie faces
Also moved player zombie attack from 'v' key to an addaction with
localized string.
2016-04-20 14:50:12 -04:00
ebaydayz
f0c46a0764 Use Epoch player_harvest instead of player_chopWood 2016-04-19 16:51:20 -04:00