DESKTOP-UH65DCE\MusTanG
e3373e9a97
remove extra ,0 in array EQ1
2017-10-25 17:06:01 -05:00
DESKTOP-UH65DCE\MusTanG
9a69b5d618
Update EQ1,EQ2 snapping points
2017-10-25 16:58:39 -05:00
Raymix
2b0119f574
Consume uses message_stack, trader chat colored in orange now
2017-10-25 22:27:17 +01:00
DESKTOP-UH65DCE\MusTanG
529078dbc2
fix missing data from merge
2017-10-25 16:14:58 -05:00
vbawol
ca60602095
remove comment
2017-10-25 15:42:25 -05:00
vbawol
14026115e6
Merge remote-tracking branch 'origin/experimental' into experimental
...
# Conflicts:
# Sources/epoch_config/Configs/CfgBaseBuilding.hpp
2017-10-25 15:41:19 -05:00
vbawol
8f9227e5be
config merge cleanup
2017-10-25 15:33:39 -05:00
DESKTOP-UH65DCE\MusTanG
93bdf4500a
remove github lines
2017-10-25 15:28:25 -05:00
Raymix
78352726bd
New message system - multi line support, fix for feedback #945 .
2017-10-25 21:04:18 +01:00
DESKTOP-UH65DCE\MusTanG
520819ddea
remove backup
2017-10-25 14:53:38 -05:00
DESKTOP-UH65DCE\MusTanG
d45603eecc
add quarter floor snapping points
...
clean up config with inherits for snapping points
2017-10-25 14:53:08 -05:00
He-Man
765bf01eb9
Snap Fix
2017-10-25 21:38:49 +02:00
He-Man
2e14b752d7
Metal + Cinder Upgrades / Crafting
2017-10-25 21:12:55 +02:00
DESKTOP-UH65DCE\MusTanG
1c3ef76e1d
metal - cinder full floors snapPointsPara update
2017-10-24 16:15:44 -05:00
DESKTOP-UH65DCE\MusTanG
d3b0a6f871
update metal and cinder snapping points
2017-10-24 15:48:30 -05:00
DESKTOP-UH65DCE\MusTanG
169a655551
metal / cinder full - half - quarter mission configs 3
2017-10-24 15:05:53 -05:00
DESKTOP-UH65DCE\MusTanG
cc1c4f8896
metal / cinder full - half - quarter mission configs 2
2017-10-24 15:05:31 -05:00
DESKTOP-UH65DCE\MusTanG
021fc1dfdc
metal / cinder full - half - quarter mission configs
...
Add pricing and change full cinder price
Add itemsort and add missing Wood half and quarter
2017-10-24 15:04:21 -05:00
DESKTOP-UH65DCE\MusTanG
7eb50281cf
another duplicate
2017-10-24 10:15:45 -05:00
DESKTOP-UH65DCE\MusTanG
acd7a749ea
remove duplicate entries
2017-10-24 10:11:08 -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
DESKTOP-UH65DCE\MusTanG
103cf4610a
add max range config
2017-10-23 01:31:39 -05:00
DESKTOP-UH65DCE\MusTanG
434c3159b9
geiger counter energy consumption
2017-10-22 19:18:19 -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
a893e7aa74
Geiger counter GUI release
2017-10-21 23:35:53 +01:00
vbawol
414013497c
increase loot bias for bunkers
2017-10-21 06:08:39 -05:00
He-Man
2d1835d455
SnapPoints for Floors
2017-10-20 23:15:17 +02: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
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
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
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
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
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
He-Man
b12d17d78c
Better readable color for Service Point
2017-10-19 19:47:56 +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
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
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
DirtySanchez
0ad31c38ec
remove nearby for several items
2017-10-18 20:38:30 -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
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
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
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
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
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
He-Man
ffa4ad32fd
Make Sharks Lootable under Water
2017-10-12 22:48:32 +02:00
DirtySanchez
3aa0d8dbb4
Change to call function
...
Switch over from deletmarkerlocal to function call
2017-10-10 04:50:13 -05:00
He-Man
49442da4d4
Restrict SP to local resources
...
Rearming not local turrets do not work, so make it similar to new
Dyna-Options to add / remove Magazines
- Driver can Refuel / Repair and Reload only Driver-Weapons
- All other Seats can only rearm they current available weapons
2017-10-09 22:51:22 +02:00
vbawol
9aeb1024c7
Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental
2017-10-09 08:31:17 -05:00
vbawol
6149c2ce3b
enable debug of login fsm
2017-10-09 08:31:14 -05:00
DirtySanchez
9fb35877ee
remove duplicate entry
2017-10-08 14:37:47 -05:00
DESKTOP-UH65DCE\MusTanG
df12dc1b61
marker sets (local)
...
Player Location Marker with Assigned GPS
Death Marker location saved only when assigned GPS on death
CfgEpochClient on/off toggle for hosts
DynaMenu on map toggle for players
New Marker Sets come to life!
First set of functions for Local Marker Sets as needed for the above
feature additions
2017-10-08 13:37:48 -05:00
vbawol
004b46ebed
add 75 compatible male uniforms
2017-10-08 13:13:40 -05:00
He-Man
4cf3c6c02e
BuildingLootPos + Bicycle compatible
2017-10-08 17:27:27 +02:00
DESKTOP-UH65DCE\MusTanG
756e6d6084
remove cmflare mags
2017-10-07 19:39:42 -05:00
DESKTOP-UH65DCE\MusTanG
3a0c4f1398
prep for lootable toilet
2017-10-07 14:54:07 -05:00
DESKTOP-UH65DCE\MusTanG
dc0063df99
clean up
2017-10-07 09:55:26 -05:00
DESKTOP-UH65DCE\MusTanG
698c1ee03c
rad treatments
2017-10-07 09:53:48 -05:00
DESKTOP-UH65DCE\MusTanG
88a9a53b10
add radiation mask
2017-10-07 07:47:43 -05:00
DESKTOP-UH65DCE\MusTanG
25f2dd6691
add configurable values
...
allows for hosts to setup their own default values instead of new player
defaults
2017-10-07 07:14:59 -05:00
vbawol
bdb168ba50
fix godmode with player vars
2017-10-06 21:17:14 -05:00
vbawol
4e22b33129
Merge pull request #901 from morgoth0/patch-2
...
Update WorldInteractions.hpp
2017-10-06 14:23:50 -05:00
Grahame
79d26a7fde
Update WorldInteractions.hpp
...
Added (correctly this time around) the trees and bushes for Chernarus Redux.
2017-10-06 12:58:10 -04:00
Grahame
6347db1fc6
Update CfgBuildingLootPos.hpp
...
Added most of the Malden buildings. Need some help with the loot positioning script, problems with copying to the clipboard. Will discuss separately
2017-10-06 12:42:01 -04:00
He-Man
ffdecf9dc8
Removed unused Item
2017-10-06 16:20:52 +02:00
He-Man
8564783aa2
Correct Classname
2017-10-06 15:28:56 +02:00
He-Man
c6bcbe81eb
Reworked Vehicle Rearm Scrips
2017-10-05 20:59:52 +02:00
vbawol
48b2ae43b8
fixes for cinder floor and garden
2017-10-04 21:57:08 -05:00
Grahame
85ecd4d870
Update CfgBaseBuilding.hpp
2017-10-04 16:02:49 -04:00
Grahame
90bbf75579
Update CfgItemInteractions.hpp
2017-10-04 16:02:06 -04:00
Grahame
217f47cc92
Update cfgCrafting.hpp
...
Added crafting recipes for most of the new buildables
2017-10-04 15:47:39 -04:00
vbawol
70b5f02011
interact actions updates
...
added action 16 that will repair most damaged player hitpoint and give
attributes
_unifiedInteract function now returns bool based on if item was removed.
added attributes to other new items
NOTE: will consider a digest system for 1.1
2017-10-04 11:17:41 -05:00
vbawol
46d6b042f5
kit garden and cinder floor
2017-10-04 09:11:08 -05:00
Grahame
45ed3c9995
Update WorldInteractions.hpp
...
Added models for BI placed ATMs and phones
2017-10-04 09:50:51 -04:00
vbawol
e347f9d258
Merge pull request #887 from morgoth0/patch-2
...
Updated WorldInteractions.hpp
2017-10-04 07:58:38 -05:00
vbawol
3b60f68acf
fix blood rise issue with bitePlayer
2017-10-04 07:57:28 -05:00
vbawol
5375693469
remove duplicate
2017-10-04 07:45:40 -05:00
Grahame
60abfb76c3
Updated WorldInteractions.hpp
...
Added new EPOCH water source buildables
Added Malden ATMs, phones, rocks, trees, trash and bushes
Added CUP vehicle wrecks
Added Chernarus Redux vehicle wrecks
2017-10-04 08:29:18 -04:00
DESKTOP-UH65DCE\MusTanG
a1e43911dc
add medical items
...
Morphine was the goal.
adrenaline, atropine, caffeine pills and orlistat added as well to
pricing, itemsort and iteminteractions
2017-10-03 19:38:32 -05:00
vbawol
50923897ef
changelog and bunker loot spawning fixes
...
respawn bunkers on first spawn, to see if this fixes animation issues
2017-10-03 15:05:37 -05:00
vbawol
bbd958ed52
energy fixes
2017-10-03 09:04:30 -05:00
vbawol
18dd7a5d80
Merge remote-tracking branch 'refs/remotes/origin/release' into experimental
...
# Conflicts:
# Sources/epoch_config/Configs/CfgItemSort.hpp
2017-10-03 08:08:13 -05:00
He-Man
f53933a2ee
Added more ItemSorts
2017-10-02 21:14:54 +02:00
He-Man
ba4801b008
Removed ;
2017-10-02 21:08:01 +02:00
He-Man
84f1174983
Added more missing ItemSorts
2017-10-02 21:06:25 +02:00
He-Man
288edfb77e
Added new Uniforms and Masks to ItemSort
2017-10-02 19:17:00 +02:00
He-Man
99682cca1b
Added new Uniforms and Masks to ItemSort
2017-10-02 19:13:11 +02:00
DESKTOP-UH65DCE\MusTanG
9029bc7524
dyna-menu functionality on map
2017-10-02 11:49:27 -05:00
He-Man
a73b6e5008
Added Kit_Garden to Itemsort
2017-10-02 18:43:41 +02:00
vbawol
8e698e95db
Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental
2017-10-02 09:54:05 -05:00
vbawol
da0d2c2ad8
add item requirements to crafting
...
making metal bars from gold now require Smelting Tools in players
inventory.
2017-10-02 09:54:02 -05:00
vbawol
16191f0400
Merge pull request #884 from ravmustang/patch-5
...
more assets pricing
2017-10-02 07:51:42 -05:00
vbawol
a063a5af58
Merge pull request #883 from ravmustang/patch-4
...
add remaining plants and clean up tabs
2017-10-02 07:51:35 -05:00
DirtySanchez
ada87955a5
more assets pricing
2017-10-02 07:41:23 -05:00
DirtySanchez
124d8922f1
add remaining plants and clean up tabs
2017-10-02 07:31:17 -05:00
DirtySanchez
09e4b6c4e3
add remaining vehicle ammos
2017-10-02 07:17:15 -05:00
DirtySanchez
78e150ce8c
female outfits and new Halloween masks
2017-10-02 06:57:59 -05:00
vbawol
d2daca6f46
add garden kit
2017-10-01 21:25:57 -05:00
vbawol
662ef386b1
set bipod price to 0
2017-10-01 19:09:38 -05:00
DirtySanchez
11b64381c8
add missing ,
2017-10-01 18:26:47 -05:00
vbawol
4f98071e8d
dynamic radio active locations
2017-10-01 18:14:18 -05:00
vbawol
f11f8a5a6c
remove karma Item Interactions
2017-10-01 16:20:34 -05:00
vbawol
121ea31ef2
Radiation Updates
...
Alcohol - absorb radiation by small amount
Tin canned foods - increases radiation by small amount
2017-10-01 16:11:30 -05:00
vbawol
8e017957aa
Merge pull request #879 from morgoth0/patch-1
...
Patch 1
2017-09-30 10:09:03 -05:00
Grahame
8b2dca3148
Added a working defibrillator
...
Adds the player_revive class which checks whether the target is a dead player and if a defibrillator is in inventory. if so will remoteexec Epoch_server_revivePlayer. Uses the Group Menu icon but would be better if there were a generic medical icon.
2017-09-30 10:46:47 -04:00
vbawol
57d85a8373
increase
2017-09-30 09:32:00 -05:00
Grahame
742d2b9ef8
Added dyna_magazinesPlayer
...
Added dyna_magazinesPlayer to return the magazines in a player's inventory
2017-09-30 10:27:43 -04:00
vbawol
8b2253bc69
increase max building height
2017-09-28 14:27:10 -05:00
vbawol
fc3ba3b3fb
customHeader test
...
moved debug monitor to master loop
dropped digest idea for now
removed file check on masterloop and keydown
2017-09-26 14:31:39 -05:00
vbawol
853d69d201
use setvar for digest
2017-09-26 09:08:22 -05:00
vbawol
f7691030b3
remove json file
2017-09-25 17:53:46 -05:00
vbawol
a1d4d411fc
Merge remote-tracking branch 'refs/remotes/origin/experimental' into exp-digest-test
...
# Conflicts:
# Sources/epoch_code/compile/setup/EPOCH_clientRevive.sqf
# Sources/epoch_code/init/client_init.sqf
# Sources/epoch_config/Configs/CfgEpochClient.hpp
2017-09-25 01:02:55 -05:00
vbawol
9b0b4bd4e7
changelog and headers
2017-09-25 00:52:20 -05:00
DESKTOP-UH65DCE\MusTanG
ed095efb48
update to notused var name
2017-09-24 17:47:08 -05:00
DESKTOP-UH65DCE\MusTanG
bc9f8f1ef7
corrections
2017-09-24 15:21:20 -05:00
DESKTOP-UH65DCE\MusTanG
d75fbeb046
add karma levels in array
2017-09-24 15:16:51 -05:00
