Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,985 Commits 8 Branches 78 Tags 202 MiB
b113bd5209
Commit Graph

1332 Commits

Author SHA1 Message Date
DirtySanchez
9fa65ed1bd Rename cfgCrafting.hpp to CfgCrafting.hpp 2017-10-19 21:51:38 -05:00
DirtySanchez
0050071f50 add vehdocrara (top secret) price 2017-10-19 21:50:07 -05:00
DirtySanchez
9a3869bf30 update for helion4 new barbed wire ghost model 2017-10-19 21:47:19 -05:00
DirtySanchez
efd1745b52 loot marker correction 2017-10-19 21:36:23 -05:00
DirtySanchez
df3a7a3731 add raw meats 
saw Axles stream and he couldnt grab a raw meat for the dog. CfgPricing needs to have the entry for the admin menu to show the item
 2017-10-19 21:21:12 -05:00
DirtySanchez
a2724cf3d7 admin panel update 
raise check distances for ai, traders and loot
 2017-10-19 21:13:49 -05:00
DirtySanchez
fb0a15aa99 Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-10-19 20:39:16 -05:00
DirtySanchez
c21d6f0e03 fix base marker performance 
move to array and a 15 sec delay
 2017-10-19 20:38:19 -05:00
DirtySanchez
38f27a1d6e admin panel update 2 
add Trader Markers
change AI Markers to handle Mission Soldiers
 2017-10-19 20:25:08 -05:00
vbawol
6ca00b8484 make sure dead bit is set 2017-10-19 19:49:07 -05:00
vbawol
17f396b51b player stats changes 
logic to select low or high criticalAttributes
forced blood drop if player is hypothermic.
force blood pressure rise if toxicity or radiation is over 55
removed Radiation reduction in master loop so you can only reduce
radiation with treatments
players blood pressure must stay within 11-179 range or be killed.
 2017-10-19 19:44:05 -05:00
DirtySanchez
29e9520c85 admin panel update 1 
fix base markers toggle
add animal markers toggle
 2017-10-19 19:39:49 -05:00
vbawol
f39a79a7d2 for #931 2017-10-19 17:15:56 -05:00
vbawol
829682429d bunker update 2 2017-10-19 16:36:53 -05:00
DirtySanchez
cb2779777d Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-10-19 13:48:55 -05:00
DirtySanchez
09fd703bff remove rpt error for a3_characters_f 2017-10-19 13:48:43 -05:00
He-Man
7c43bc6e0d Trader Kill + BuildMode Keydown fixed 2017-10-19 20:45:41 +02:00
DirtySanchez
6fef4d8adb update text or code var details 2017-10-19 13:27:34 -05:00
DirtySanchez
f11ea12220 detailed info for marker sets 2017-10-19 13:17:18 -05:00
vbawol
d2bdbcb5d6 updates for toilet and kitchen sink 
kitchenSink positions can be added to kitchenSinkPos at any time and
should spawn without BE kicks.
 2017-10-19 13:16:34 -05:00
DirtySanchez
184b2da59e remove unused code 
added a compile for code sent from config entry, this need not apply anymore
 2017-10-19 12:58:46 -05:00
He-Man
b12d17d78c Better readable color for Service Point 2017-10-19 19:47:56 +02:00
He-Man
b28ed47141 Fix for Marker 2017-10-19 19:22:44 +02:00
He-Man
96f72fc98a Option to overwrite Marker Text 
Added Option to overwrite marker text and use it for Service Points
 2017-10-19 19:10:52 +02:00
DirtySanchez
6216fecf6a modify a few sizes 2017-10-19 11:32:18 -05:00
DirtySanchez
4aa72d5a5d add config mapOnZoomSetMarkerSize 2017-10-19 11:30:42 -05:00
DirtySanchez
83363f693b added same change below for the counter to raise 2017-10-19 10:43:35 -05:00
Grahame
4d26f9c858 Update EPOCH_server_createGlobalMarkerSet.sqf 
Prepended EPOCH_ to global marker names and removed the second underscore in the default setting for marker name
 2017-10-19 11:28:45 -04:00
Grahame
8f4420f88d Update Event1.sqf 
Only do the marker resizing of core Epoch mod markers since it causes issues with mission markers.

Also shrank the sizes a bit after discussion with @xDrokz
 2017-10-19 11:27:30 -04:00
Grahame
83016ee0a7 Update CfgMarkerSets.hpp 
Added EPOCH_ to the beginning of the PlayerMarker and DeathMarker markers
 2017-10-19 11:24:53 -04:00
Grahame
d92e0f65be Update EPOCH_fnc_createLocalMarkerSet.sqf 
Added EPOCH_ to the name of all local Epoch markers
 2017-10-19 11:23:14 -04:00
Grahame
fe45bdf30f Update CfgPricing.hpp 
Rationalized some pricing items:
(1) Raw and cooked fish
(2) Plywood packs
(3) Building Kits
 2017-10-19 09:46:47 -04:00
vbawol
9addf0f6fa rework admin menu spawn logic 2017-10-18 22:36:40 -05:00
DirtySanchez
0ad31c38ec remove nearby for several items 2017-10-18 20:38:30 -05:00
vbawol
3263cc4698 bunker updates 2017-10-18 17:07:37 -05:00
vbawol
6eb11ee7de fixed typo 2017-10-18 16:39:59 -05:00
vbawol
fdbe31ee69 bunker updates 
add selectRandomWeighted
disabled one pending hotfix for xmas
disabled invisible walls bunker by default (I think most will see this
as a bug, but maybe not?).
 2017-10-18 15:53:32 -05:00
vbawol
b1ea567035 Merge pull request #925 from morgoth0/patch-5 
Update CfgItemInteractions.hpp
 2017-10-18 15:27:07 -05:00
DirtySanchez
5f6380cebf correct inherit 2017-10-18 13:27:25 -05:00
DirtySanchez
8a4954455c add metal floor 2017-10-18 11:51:00 -05:00
He-Man
fd4c06c41c Crafting Preview Positions 2017-10-18 18:34:36 +02:00
DirtySanchez
b2cf56a7b6 global marker sets and map upgrade 
New global marker sets and functions.
Replace all markers for events and locations(fully configurable in CfgMarkerSets)
New MapScale marker zoom feature.
 2017-10-18 11:27:23 -05:00
Grahame
8579db0b1f Update CfgItemInteractions.hpp 
Added the eating of pumpkin and sunflower seeds with a small boost to hunger and some health benefits
 2017-10-18 12:26:05 -04:00
Helion4
90f7b5c0a3 Added missing A3 Buildings loot table additions #528 2017-10-18 13:04:14 +01:00
vbawol
d16a1d026d add new bunkers 2017-10-17 22:11:53 -05:00
Helion4
adbf8e9c79 added 15 bunkers to loot tables 2017-10-18 01:26:48 +01:00
Raymix
7f74469bc1 geiger counter hud (had to hold this due to prerequisite requirements in epochcore back then). 
Just need 2 ez functions to show/hide it and change display. Dunno about sounds though
 2017-10-17 20:23:07 +01:00
He-Man
61c86c22ce Added VehDocs to Loottables 2017-10-17 20:21:49 +02:00
DirtySanchez
7390f1a71f cfgCrafting updates 
add Half wood floor to usedIn for planks.
remove duplicate ItemSeedBag and change the original one to Part type
 2017-10-17 11:51:49 -05:00
He-Man
6590d3d655 Check Slot for Veh Upgrade 2017-10-17 18:31:14 +02:00
DirtySanchez
a1b8227831 return items corrections 2017-10-17 11:24:17 -05:00
vbawol
5d30eadcb2 add smelting tools part 2017-10-17 08:43:58 -05:00
vbawol
5e4d042868 crafting configs 
crafting of 2x seed from one plants.
crafting of Kilo of Hemp from 2x Hemp plant.
crafting of seed bag from 1x canvas
crafting of canvas from 1x kilo hemp
add seed bags, canvas, and burlap to loot table
 2017-10-17 08:29:49 -05:00
vbawol
2d4a7a0258 crafting changes 
reverted changes to check Nearby
added crafted item count, default is 1. Allows for crafting multiples of
the same item (for example 1 plant in and 2 Seeds out)
added item return after crafting, this allows the smelting tools to be a
recipe requirement that gets refunded to player.
 2017-10-17 07:51:53 -05:00
DirtySanchez
3eb4d63eba vector building enhancements 
rework tempTarget for vectored objects and snapping
 2017-10-17 04:50:31 -05:00
vbawol
8fbe8559d9 Merge pull request #917 from morgoth0/patch-4 
mission.sqm fixes
 2017-10-17 04:38:41 -05:00
Grahame
4cc5f3a1dc Update mission.sqm 2017-10-16 18:29:00 -04:00
Grahame
514d631f97 Update mission.sqm 2017-10-16 18:28:30 -04:00
Grahame
f8993a6c82 Update mission.sqm 2017-10-16 18:27:58 -04:00
Grahame
dc40e0a370 Update mission.sqm 2017-10-16 18:27:26 -04:00
Grahame
eba38f8489 Update mission.sqm 2017-10-16 18:26:55 -04:00
Grahame
4fb34064ab Update mission.sqm 2017-10-16 18:26:28 -04:00
Grahame
3df0a63395 Update mission.sqm 2017-10-16 18:25:56 -04:00
Grahame
6c2b288e46 Update mission.sqm 2017-10-16 18:25:28 -04:00
Grahame
d66bf8ef2d Update mission.sqm 2017-10-16 18:24:57 -04:00
He-Man
0935cb3f08 Animations for Consumeitems 2017-10-17 00:24:38 +02:00
Grahame
b283d2bb87 Update mission.sqm 2017-10-16 18:24:29 -04:00
Grahame
0c3b16a99a Update mission.sqm 2017-10-16 18:24:03 -04:00
Grahame
c436c96533 Update mission.sqm 2017-10-16 18:23:32 -04:00
Grahame
e6be79395a Update mission.sqm 2017-10-16 18:22:50 -04:00
Grahame
f9e7af0d5b Update mission.sqm 2017-10-16 18:22:02 -04:00
Grahame
5b5a749852 Update mission.sqm 2017-10-16 18:21:30 -04:00
Grahame
a0fb2050c6 Update mission.sqm 2017-10-16 18:20:55 -04:00
Grahame
cc0d4c809a Update mission.sqm 2017-10-16 18:20:02 -04:00
Grahame
29dffdebb9 Update mission.sqm 2017-10-16 18:19:31 -04:00
Grahame
98da25bbe2 Update mission.sqm 2017-10-16 18:18:58 -04:00
Grahame
903007c881 Update mission.sqm 2017-10-16 18:18:21 -04:00
Grahame
e84eb92344 Update mission.sqm 2017-10-16 18:17:28 -04:00
Grahame
7f044de99b Update mission.sqm 2017-10-16 18:16:52 -04:00
Grahame
f2a2f2001c Update mission.sqm 2017-10-16 18:16:03 -04:00
Grahame
2cef012614 Update mission.sqm 2017-10-16 18:14:26 -04:00
Grahame
c5a933226c Update mission.sqm 
Removed additional player slot
 2017-10-16 18:11:29 -04:00
He-Man
ae1f874dc8 Morphine Usage 2017-10-16 20:56:04 +02:00
He-Man
0b08199404 item -> magazine 2017-10-16 19:09:42 +02:00
vbawol
853586def5 reworked mineral node harvesting 
Can only use sledge hammer only to harvest nodes
seperated loot tables per mineral nodes
chance to loot on first strike 1 in 3
 2017-10-16 11:02:09 -05:00
Helion4
144db2b065 Ply window upgrade options added to WoodWall1 2017-10-16 11:35:13 +01:00
Helion4
7482a4a9c4 cinder wall > window upgrade > ply to follow 2017-10-16 01:52:42 +01:00
He-Man
2ec7809852 Fix Mini Map 2017-10-15 22:42:33 +02:00
He-Man
bcb311a703 BarbedWire Price & Itemsort 2017-10-15 22:10:49 +02:00
He-Man
f3742f8223 BarbedWire Configs 2017-10-15 22:00:36 +02:00
He-Man
35c9902232 Remove Ammo Tweaks 2017-10-15 18:19:41 +02:00
He-Man
3957d3e028 Crafting Update 2017-10-15 18:07:22 +02:00
He-Man
6d609921b5 Missing Interaction for Garden 2017-10-15 18:04:46 +02:00
He-Man
7326d9cc3f More Config Fixes / Changes 2017-10-14 21:31:42 +02:00
He-Man
cb7ae983b7 Toilet Loot positions Altis 2017-10-14 20:28:45 +02:00
He-Man
3ebb48fe3f Some Config Fixes / Adds 2017-10-14 18:56:11 +02:00
He-Man
7c332e5c3e Recipes update 2017-10-14 12:13:51 +02:00
vbawol
aaf7b215c9 make use of underwater command 2017-10-13 16:15:03 -05:00
He-Man
ffa4ad32fd Make Sharks Lootable under Water 2017-10-12 22:48:32 +02:00
vbawol
63fc23b8cb fix snap checks 2017-10-12 07:04:34 -05:00