vbawol
06464c3266
separate restart and events
...
make events timer 1 second
2017-10-24 11:49:00 -05:00
vbawol
b21e394b7d
EPOCH_dynamicEvents
2017-10-24 11:25:38 -05:00
Raymix
17fae05e4e
some weird git bug, won't let me discard these. No changes
2017-10-24 17:23:13 +01:00
vbawol
67b8d6711f
add call and spawn support
...
also added append usage to inject events into the scheduler
2017-10-24 11:18:54 -05:00
DESKTOP-UH65DCE\MusTanG
7eb50281cf
another duplicate
2017-10-24 10:15:45 -05:00
vbawol
b668130984
removed containerPos array from CfgEpoch
...
added shipwreckLootEnabled = 1 by default, set to 0 to disable for maps
with no water.
2017-10-24 10:14:10 -05:00
DESKTOP-UH65DCE\MusTanG
acd7a749ea
remove duplicate entries
2017-10-24 10:11:08 -05:00
vbawol
f076f5bff5
use nearestTerrainObjects for Shipwreck loot
2017-10-24 09:58:39 -05:00
DESKTOP-UH65DCE\MusTanG
24d059f0c9
malden underwater shipwrecks
2017-10-24 09:22:39 -05:00
DESKTOP-UH65DCE\MusTanG
04e922d544
correct inherit and malden wreck
2017-10-24 09:11:13 -05:00
DESKTOP-UH65DCE\MusTanG
70df6a8038
add malden blue barrel
2017-10-24 09:03:46 -05:00
vbawol
029fa396be
also add models for baked in map items
2017-10-24 08:58:52 -05:00
DESKTOP-UH65DCE\MusTanG
28042eb84a
add large and small pipes to salvage
2017-10-24 08:53:09 -05:00
DESKTOP-UH65DCE\MusTanG
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
vbawol
b71b86c4a7
move mod checks server side
2017-10-23 15:12:00 -05:00
vbawol
d3d1e98310
missed something
2017-10-23 14:38:02 -05:00
vbawol
0adc494b75
revert animation state test
2017-10-23 14:32:06 -05:00
vbawol
0861ab0b97
move params
2017-10-23 13:57:55 -05:00
vbawol
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
Raymix
31401b5b39
geiger: remove unused fnc, reduce tick volume by half.
2017-10-23 19:09:21 +01:00
Raymix
6826cd6ad9
dynamenu: anim jitter fix, zoom from center fix, increased icon size by 50%
2017-10-23 18:51:24 +01:00
vbawol
e90096c30c
Revert "let server handle playMoveNow"
...
This reverts commit 06d6a642d1
2017-10-23 11:29:01 -05:00
vbawol
06d6a642d1
let server handle playMoveNow
2017-10-23 11:07:01 -05:00
vbawol
0f6abe3b15
add playMoveNow
2017-10-23 11:01:44 -05:00
vbawol
178c844f66
add animation state tracking
...
todo make use of animation state via login fsm
2017-10-23 10:53:34 -05:00
DESKTOP-UH65DCE\MusTanG
f7c71e1d5a
custom radioactive locations with radiated objects
2017-10-23 01:45:14 -05:00
DESKTOP-UH65DCE\MusTanG
103cf4610a
add max range config
2017-10-23 01:31:39 -05:00
DESKTOP-UH65DCE\MusTanG
d0d7c9d765
remove unused code
2017-10-22 20:54:22 -05:00
DESKTOP-UH65DCE\MusTanG
02d042b186
remove "location" type fixing serialization error
2017-10-22 20:52:08 -05:00
DESKTOP-UH65DCE\MusTanG
a210dfa60a
blacklist rework
2017-10-22 19:59:09 -05:00
DirtySanchez
858f0827ab
formatting correction
2017-10-22 19:56:11 -05:00
DESKTOP-UH65DCE\MusTanG
434c3159b9
geiger counter energy consumption
2017-10-22 19:18:19 -05:00
DESKTOP-UH65DCE\MusTanG
431e10ee58
rad zone blacklist obj and distance
2017-10-22 18:55:12 -05:00
DESKTOP-UH65DCE\MusTanG
b113bd5209
config number -1 for true number of locations
2017-10-22 17:07:44 -05:00
DESKTOP-UH65DCE\MusTanG
ba339d518b
fix trader brain array error
2017-10-22 17:06:10 -05:00
Raymix
cf34a30b57
geiger low energy warning
2017-10-22 19:45:38 +01:00
Raymix
da55cfafb9
spoke too soon, another logic issue fixed
2017-10-22 18:59:37 +01:00
Raymix
1b19df0cba
another math issue, hopefully last
2017-10-22 18:49:47 +01:00
Raymix
25528b59c3
revert location changes + fix math in rads calc
2017-10-22 18:39:29 +01:00
Raymix
faa26dfe5a
remove diag_log, oops
2017-10-22 17:39:18 +01:00
Raymix
a6aade38b9
disable geiger by default
2017-10-22 17:28:51 +01:00
Raymix
a3ff403d2c
change back
2017-10-22 17:18:52 +01:00
Raymix
a7f5f1ea8f
Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental
2017-10-22 17:16:30 +01:00
Raymix
e996d78695
Radioactive sickness calc
2017-10-22 17:15:58 +01:00
DESKTOP-UH65DCE\MusTanG
3e7a62560a
cfglocations setVariable correction
2017-10-22 09:41:00 -05:00
Grahame
81855104e9
Fix path for geiger buttons
2017-10-22 10:15:30 -04:00
He-Man
bf4cd25dcd
Readded lost changes
2017-10-22 16:05:57 +02:00
Raymix
02e4b822e4
conflicts
2017-10-22 00:10:45 +01:00
Raymix
8b5f896424
Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental
2017-10-21 23:52:37 +01:00
Raymix
a893e7aa74
Geiger counter GUI release
2017-10-21 23:35:53 +01:00
He-Man
d3acc2683b
Merge pull request #940 from morgoth0/patch-9
...
Add code to handle enable/disable vehicle TIE
2017-10-21 23:13:22 +02:00
Grahame
0ff57e294e
Variable handling of accelerated HTA loss
2017-10-21 16:41:31 -04:00
Grahame
035ff7aa09
Added variable handling of accelerated HTA loss
2017-10-21 16:40:44 -04:00
Grahame
4fb7b9df98
Add variable to control accelerated HTA loss
2017-10-21 16:38:58 -04:00
Grahame
6851716f1b
Add code to handle enable/disable vehicle TIE
2017-10-21 15:37:01 -04:00
Grahame
d896c57af9
Add code to handle enable/disable vehicle TIE
2017-10-21 15:35:28 -04:00
Grahame
e951b12fe7
Add code to handle enable/disable vehicle TIE
2017-10-21 15:34:41 -04:00
Grahame
867da0aa91
Add code to handle enable/disable vehicle TIE
2017-10-21 15:33:50 -04:00
Grahame
e4ec7b1d87
Add code to handle enable/disable vehicle TIE
2017-10-21 15:32:35 -04:00
vbawol
414013497c
increase loot bias for bunkers
2017-10-21 06:08:39 -05:00
DirtySanchez
555e350b5d
dynamic trader brain marker corrections
...
old marker handlers removed and replaced with global marker sets
2017-10-20 23:45:14 -05:00
vbawol
2ce47c3a3f
comment
2017-10-20 17:05:01 -05:00
vbawol
ae581880a4
fix possible random var collisions
2017-10-20 17:04:32 -05:00
vbawol
e14a730eda
make sure this only runs once
2017-10-20 16:44:30 -05:00
He-Man
2d1835d455
SnapPoints for Floors
2017-10-20 23:15:17 +02:00
vbawol
2a1c909068
bunker updates
...
reduce bunker size a tad
2017-10-20 14:39:06 -05:00
vbawol
4003e6d49c
bunker update
...
revert to normal object for first spawn
inrease size by 10
2017-10-20 14:38:00 -05:00
vbawol
c51b21bd24
revert back to simple object
2017-10-20 14:19:50 -05:00
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
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
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
