W0LF/DayZ-Epoch
1
0 Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-10-03 14:21:36 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,006 Commits 20 Branches 18 Tags
6e430bdb849765f92213f6036b704e1941a52d7f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
icomrade 16fe17645f Don't redefine vehicle EH 
doing so breaks the destruction fix
 2016-05-01 22:10:38 -04:00
icomrade ad4f3d7556 Kill and eject players from all vehicle types except boats 
The code in the CH53 SFX file must remain there.

Boats/ships do not properly call the destruction EH files so this fix
doesn't work for them. maybe a killed event handler must be added from
the server?
 2016-05-01 21:03:09 -04:00
icomrade 61ffe26fb8 More magazines taking too many slots 2016-05-01 21:00:00 -04:00
icomrade d6236dcb91 Fix improper total price in advanced trading 
Also sort gems by value when giving total price.
 2016-05-01 16:24:38 -04:00
icomrade 3d3c3abe8c remove unused CA folder 2016-05-01 16:24:05 -04:00
icomrade d25ad694d8 Fix wrong bloodbag types spawning 2016-05-01 14:15:01 -04:00
icomrade 3f8d79b6ae Update Changelog 2016-05-01 13:41:58 -04:00
icomrade 1e65f7a959 Plot Management cleanup + improvement 
New compile DZE_GetPlotFriends

DZE_PlotManagementAdmins allows admin management of plot poles and
buildables near poles

DZE_MaxPlotFriends allows servers to allow more than 6 friends on a pole
at once
 2016-05-01 13:20:21 -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
icomrade deee47b703 Disable OK button before role is selected 2016-04-30 18:33:18 -04:00
icomrade 7a11b508e1 No building in trader 
string needs localization
 2016-04-30 18:05:58 -04:00
icomrade 6deb1a69f1 Tweak gem values 
Any value should work for gems.
 2016-04-30 11:31:12 -04:00
icomrade 83694a452e Gem Trading mostly finished 
Sometimes displays incorrect total price in advanced trading menu.
 2016-04-30 11:17:41 -04:00
icomrade b5c2c6c7bd Fix remove object option 2016-04-29 20:48:16 -04:00
icomrade 6fa3365b70 check if player is alive for humanity change 2016-04-29 17:19:48 -04:00
icomrade 89eea668f5 better math 2016-04-29 17:00:56 -04:00
icomrade 9e5d2f1038 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-04-29 16:48:16 -04:00
icomrade 8158245b83 Possible fix for #1645 2016-04-29 16:48:14 -04:00
icomrade a86b28b0a7 Fix spawn height for boats, and buying bikes 2016-04-29 00:19:22 -04:00
icomrade bc0d5027f5 Adv. Trading handle other and free vehicle types 
Allow players to sell vehicles without keys and add boat and bike
trading classes to buy/sell
 2016-04-28 23:40:28 -04:00
icomrade 9df5c5a156 Update test build 2016-04-28 19:38:25 -04:00
icomrade 47070ae4f5 Move advanced trading configs to mission 
allows customization by server owners
 2016-04-28 19:30:43 -04:00
icomrade b0afc402e2 Require Config Traders for Advanced Trading 
Since advanced trading can now handle vehicles I don't think there's any
point to have the old dialog if using advanced trading.
 2016-04-28 18:59:50 -04:00
icomrade 55f3a9dc79 Vehicle selling for advanced trading 
This should work fairly okay but I expect there may be a couple exploits
and glitches
 2016-04-28 18:35:03 -04:00
icomrade b5af74b72b Add Vehicle Purchasing to Advanced Trading 
Allows 1 vehicle purchase at a time.
Vehicles will still spawn inside each other if one is already parked on
the pad.
 2016-04-27 22:04:47 -04:00
icomrade 17c31a5f21 Fix buying from backpacks/vehicles dupe 2016-04-27 19:29:03 -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
icomrade 1a6593d198 Revert to old chainsaw RTM files 2016-04-27 14:42:50 -04:00
icomrade 7ea9a270f2 New building functions, vanilla building checks 
DZE_RequiredItemsCheck returns bool, displays an error of all the tools
the player is missing to build the item.

DZE_BuildChecks returns array of bools, canBuild and if the item is a
plotPole.  Also has the ability to check if the player has required
tools to build using DZE_RequiredItemsCheck.

The vanilla build script still needs to be modified to work over water
and allow players to place floating objects, but now uses plot checks.
It would be easiest to just modify the configs to use the epoch building
scripts instead.

fnc_getSetPos now accepts a position as the second element of the input
array. the object will be set to this position if it is used. This
change requires no code updates

Note: scripts with build and/or tool checks should be updated to use the
new functions
 2016-04-27 14:30:11 -04:00
icomrade 0e0a1e340f Safezone whitelist for eject/destruction fixes 
This commit prevents players who destroy their vehicle in god-mode
safezones to be spared by the fixes in #2411973 and #ec7351d

Configurable variable for this change is DZE_SafeZonePosArray = [];

Update suggestion to use the stable branch of A2 OA in the changelog
 2016-04-27 00:17:54 -04:00
icomrade f102240821 Fix death board undefined variable error 2016-04-26 22:46:44 -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 ec7351dbbc Kill and eject player when their vehicle explodes 
Previous changes to the destruction effects file broke previous fixes
that resolved the world is on fire glitch. I reverted those in this
commit.

Note: the CH53 is still broken in this commit
 2016-04-26 14:47:52 -04:00
icomrade 16c81e7ce2 Allow players to carry primary weapon on back 
Configurable by DZE_TwoPrimaries

0 do not allow primary weapon on back.
1 allow primary weapon on back, but not when holding a primary weapon in
hand.
2 (default) allow player to hold two primary weapons, one on back and
one in their hands
 2016-04-26 14:05:37 -04:00
icomrade c1eb07d99d Add to back for sledgehammer 2016-04-25 22:57:29 -04:00
icomrade 7db6f63935 Update string for gutting zombies 2016-04-24 21:15:26 -04:00
icomrade 9624979785 Fix items taking more than 1 inventory slot 2016-04-24 17:44:58 -04:00
icomrade a551a45092 Duplicates 2016-03-05 22:34:25 -05:00
icomrade 68da397c52 Finish Medical and Sleep to UiSleep 2016-03-05 22:34:25 -05:00
icomrade 9d52fb0595 Should be all scope entries 2016-03-05 20:36:07 -05:00
icomrade 9863c0765a Pointless merge conflict 2016-03-04 15:23:22 -05:00
icomrade 61c64cb14a Fix Merge Conflict 1 2016-03-03 22:09:38 -05:00
icomrade bad0a2e461 add 2 new vars and fix up variable names 
DZE_HeartBeat
DZE_UseBloodTypes
 2016-03-01 00:23:14 -05:00
icomrade a3dac45061 Some small changes 2016-02-29 11:53:49 -05:00
icomrade b667d01c1c Actions Done 2016-02-29 10:45:53 -05:00
icomrade a47c3dc137 Fixes 2016-02-29 01:20:37 -05:00
icomrade 84eb6f815a Missing Files 2016-02-29 00:55:29 -05:00
icomrade 64c251d95d Chernarus Mission File 2016-02-29 00:37:03 -05:00
icomrade 58acf95dc7 Server Done I Think 2016-02-29 00:29:23 -05:00
icomrade b96cd2d971 Update compiles - 2 more files to do 
fn_selfActions.sqf
player_updateGui.sqf
 2016-02-29 00:26:12 -05:00
icomrade a83909b918 System is done (i think) 2016-02-28 15:28:59 -05:00
icomrade c034f43d0b Additional Folders/Files in System 2016-02-27 22:34:50 -05:00
icomrade 3ba3781432 Traps and Utill Folders/Files 2016-02-27 22:31:43 -05:00
icomrade cfbebe7ffd Init more or less done 2016-02-27 22:30:15 -05:00
icomrade e418e921c5 Compiles more or less done 2016-02-27 16:48:21 -05:00
icomrade 18c9e72e15 Some compiles, start separation of blood system 2016-02-27 09:56:53 -05:00
icomrade 61cbd16de1 Merge remote-tracking branch 'upstream/master' 2016-02-27 09:01:02 -05:00
icomrade dde3215f9a CFGLoot should be done 
Make sure there's no attachments or NEW _DZ weapons that support
attachments!!!!
 2016-02-26 11:24:20 -05:00
icomrade 43b9da7c17 I hate loot tables 2016-02-25 13:23:15 -05:00
icomrade 0309e1de40 re-add mil-industrial 2016-02-25 13:08:45 -05:00
icomrade 6c550faf27 move includes to CfgBuildingPos 
for consistency with old releases
 2016-02-25 11:59:34 -05:00
icomrade 71d045875b BuildingPos Done and Separated/Sorted 2016-02-25 11:43:55 -05:00
icomrade a118851ca8 Loot Defines done, need to do building loot now 
Add legacy loot defines, needs new blood bags if server wants to use
bloodtype system.
 2016-02-25 09:49:29 -05:00
icomrade 3b272776b3 Ammo still, and needs to implement weapon groups 2016-02-24 10:02:15 -05:00
icomrade 468accce2a Tents config magazine 2016-02-24 09:04:21 -05:00
icomrade 71956df248 CfgLootSmall Done, left off at tents[] in CfgLoot 2016-02-23 10:39:33 -05:00
icomrade 8cdc8e6e36 CfgMagazines - still need script tweaks for buldables 2016-02-22 13:31:14 -05:00
icomrade ab2976f98c CfgAmmo Update 2016-02-22 10:58:33 -05:00
icomrade 7f4f17421c one more duplicate string 
ArmA 2 OA has some duplicate strings itself
 2016-02-22 10:51:03 -05:00
icomrade 1f8118c1cb Remove RedRyder from Required Addons 2016-02-22 10:41:43 -05:00
icomrade 812bef4c49 Fix some config errors 2016-02-22 10:41:23 -05:00
icomrade 1710a87297 Update Stringtable to 1.8.7 
stringtable is in DayZ_Code now, Epoch and legacy strings remain in
DayZ_Epoch_b
 2016-02-22 10:41:09 -05:00
icomrade 46bc08c9a4 cfg fix 2016-02-22 00:09:44 -05:00
icomrade 7365238177 Wrong addon required 2016-02-21 23:58:48 -05:00
icomrade 186bc48231 Move Waves to CfgWorlds 2016-02-21 18:12:57 -05:00
icomrade dc3d042726 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	SQF/dayz_code/Configs/CfgVehicles/Car/M113.hpp
#	SQF/dayz_code/config.cpp
 2016-02-21 13:20:28 -05:00
icomrade accb9e9032 Dup strings note 2016-02-21 13:16:20 -05:00