Commit Graph

444 Commits

Author SHA1 Message Date
17fae05e4e some weird git bug, won't let me discard these. No changes 2017-10-24 17:23:13 +01:00
f8a7a569ce mapOnZoomSetMarkerSize upgrade
Add exitWith to remove wasted resizing during scrolling
Add config entry for custom adjustments
Change how adjustment calculation is made.
Added new min calculation.
Adjust cfg marker sets sizing to fit new setup

🤘
2017-10-23 22:31:38 -05:00
b71b86c4a7 move mod checks server side 2017-10-23 15:12:00 -05:00
0adc494b75 revert animation state test 2017-10-23 14:32:06 -05:00
0861ab0b97 move params 2017-10-23 13:57:55 -05:00
258d6c82d9 animation state
added missing var init server side
moved playMoveNow to master loop init and after display checks.
added config switch setAnimStateEnabled to test this, set
setAnimStateEnabled = true in CfgEpochClient to enable. Disabled by
default.
2017-10-23 13:43:27 -05:00
103cf4610a add max range config 2017-10-23 01:31:39 -05:00
d0d7c9d765 remove unused code 2017-10-22 20:54:22 -05:00
02d042b186 remove "location" type fixing serialization error 2017-10-22 20:52:08 -05:00
434c3159b9 geiger counter energy consumption 2017-10-22 19:18:19 -05:00
da55cfafb9 spoke too soon, another logic issue fixed 2017-10-22 18:59:37 +01:00
1b19df0cba another math issue, hopefully last 2017-10-22 18:49:47 +01:00
25528b59c3 revert location changes + fix math in rads calc 2017-10-22 18:39:29 +01:00
faa26dfe5a remove diag_log, oops 2017-10-22 17:39:18 +01:00
a3ff403d2c change back 2017-10-22 17:18:52 +01:00
a7f5f1ea8f Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-10-22 17:16:30 +01:00
e996d78695 Radioactive sickness calc 2017-10-22 17:15:58 +01:00
3e7a62560a cfglocations setVariable correction 2017-10-22 09:41:00 -05:00
02e4b822e4 conflicts 2017-10-22 00:10:45 +01:00
8b5f896424 Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-10-21 23:52:37 +01:00
a893e7aa74 Geiger counter GUI release 2017-10-21 23:35:53 +01:00
0ff57e294e Variable handling of accelerated HTA loss 2017-10-21 16:41:31 -04:00
035ff7aa09 Added variable handling of accelerated HTA loss 2017-10-21 16:40:44 -04:00
414013497c increase loot bias for bunkers 2017-10-21 06:08:39 -05:00
2ce47c3a3f comment 2017-10-20 17:05:01 -05:00
ae581880a4 fix possible random var collisions 2017-10-20 17:04:32 -05:00
2d1835d455 SnapPoints for Floors 2017-10-20 23:15:17 +02:00
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
6857111a02 remove comments, edit high value 2017-10-20 11:17:42 -05:00
9297fa539e onZoomMarkerScaling upgrade
use better mapScale value management and calculation
2017-10-20 11:15:09 -05:00
27ef146313 make use of config based snap points 2017-10-20 10:08:52 -05:00
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
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
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
7c43bc6e0d Trader Kill + BuildMode Keydown fixed 2017-10-19 20:45:41 +02:00
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
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
b28ed47141 Fix for Marker 2017-10-19 19:22:44 +02:00
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
4aa72d5a5d add config mapOnZoomSetMarkerSize 2017-10-19 11:30:42 -05:00
83363f693b added same change below for the counter to raise 2017-10-19 10:43:35 -05:00
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
d92e0f65be Update EPOCH_fnc_createLocalMarkerSet.sqf
Added EPOCH_ to the name of all local Epoch markers
2017-10-19 11:23:14 -04:00
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
6590d3d655 Check Slot for Veh Upgrade 2017-10-17 18:31:14 +02:00
3eb4d63eba vector building enhancements
rework tempTarget for vectored objects and snapping
2017-10-17 04:50:31 -05:00
0935cb3f08 Animations for Consumeitems 2017-10-17 00:24:38 +02:00
ae1f874dc8 Morphine Usage 2017-10-16 20:56:04 +02:00
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
35c9902232 Remove Ammo Tweaks 2017-10-15 18:19:41 +02:00