Commit Graph

1947 Commits

Author SHA1 Message Date
DirtySanchez
5427db38fe mapOnZoomSetMarkerSize upgrades to maintain preset size scaling
all markers now scaled based on sizing desired in the cfgMarkerSets.
Adjustment of 2.25 to the mapScale was added to achieve smaller markers sooner and maintain non cluttered map markers
2017-10-20 13:49:16 -05:00
vbawol
3307fdc54c move bunker spawn to server init 2017-10-20 12:03:43 -05:00
vbawol
eee45dc682 use atl for spawning 2017-10-20 11:29:09 -05:00
DirtySanchez
6857111a02 remove comments, edit high value 2017-10-20 11:17:42 -05:00
DirtySanchez
9297fa539e onZoomMarkerScaling upgrade
use better mapScale value management and calculation
2017-10-20 11:15:09 -05:00
vbawol
f202217f46 removed static BarbedWire_EPOCH from BE filter
not needed as client should now be spawning ghost preview or sim
2017-10-20 10:14:55 -05:00
vbawol
27ef146313 make use of config based snap points 2017-10-20 10:08:52 -05:00
vbawol
ec756c3134 test using normal object for first spawn 2017-10-20 10:03:32 -05:00
vbawol
7c3ea0e936 convert memory points to config 2017-10-20 10:03:06 -05:00
vbawol
760547789f item interaction fixes
Allow eating of all seeds
Fixed no effect from nanite injector, nanite cream, nanite pills, iodide
pills
Provide feedback when attempting to use morphine when you dont need it.

NOTE:
when using Default as parent class InteractAction defaults to ammo
repack = 0
interactActions 1,2 ,6,7,8,9 are all do the same thing via
_unifiedInteract function
2017-10-20 08:06:41 -05:00
DirtySanchez
2148634c58 add barbed wire sim and ghost 2017-10-20 08:04:58 -05:00
vbawol
f9e4e51d55 add looting of Satellite with sledge hammer 2017-10-20 07:30:12 -05:00
vbawol
0bb4c7f985 fix ah error 2017-10-20 06:51:09 -05:00
DirtySanchez
2f6e0bf4c6 snapping corrections and direction lock for similar constructions
Add direction lock.
If direction lock it only allows 0 and 180 degrees adjustment.
Will force 90 to 180 an 270 to 0
This keeps all snaps in proper order during tests
2017-10-20 00:50:22 -05:00
DirtySanchez
834d8bcb40 admin panel update
single out LandVehicle, Air, Ship and Tanks only for vehicle markers.
much better performance toggling vehicle markers on
2017-10-19 22:39:52 -05:00
DirtySanchez
ca2a7acfa3 2nd correction 2017-10-19 21:58:07 -05:00
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
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