Commit Graph

1926 Commits

Author SHA1 Message Date
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
vbawol
e0b6a011e8 split filter 2017-10-19 15:02:56 -05:00
DirtySanchez
e2b03323e0 be filter corrections 2017-10-19 14:11:48 -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
vbawol
04d3d1d64d Merge pull request #929 from morgoth0/patch-7
Patch 7
2017-10-19 10:53:43 -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
vbawol
90ee5cd992 Merge pull request #928 from morgoth0/patch-6
Update CfgPricing.hpp
2017-10-19 09:03:40 -05: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
vbawol
932808349d be fixes pt2 2017-10-18 21:01:20 -05:00
vbawol
f08fd91296 be fixes 2017-10-18 20:58:55 -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
268524a905 map marker zoom be filter 2017-10-18 13:20:18 -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