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
Grahame
0c3b16a99a
Update mission.sqm
2017-10-16 18:24:03 -04:00
Grahame
c436c96533
Update mission.sqm
2017-10-16 18:23:32 -04:00
Grahame
e6be79395a
Update mission.sqm
2017-10-16 18:22:50 -04:00
Grahame
f9e7af0d5b
Update mission.sqm
2017-10-16 18:22:02 -04:00
Grahame
5b5a749852
Update mission.sqm
2017-10-16 18:21:30 -04:00
Grahame
a0fb2050c6
Update mission.sqm
2017-10-16 18:20:55 -04:00
Grahame
cc0d4c809a
Update mission.sqm
2017-10-16 18:20:02 -04:00
Grahame
29dffdebb9
Update mission.sqm
2017-10-16 18:19:31 -04:00
Grahame
98da25bbe2
Update mission.sqm
2017-10-16 18:18:58 -04:00
Grahame
903007c881
Update mission.sqm
2017-10-16 18:18:21 -04:00
Grahame
e84eb92344
Update mission.sqm
2017-10-16 18:17:28 -04:00
Grahame
7f044de99b
Update mission.sqm
2017-10-16 18:16:52 -04:00
Grahame
f2a2f2001c
Update mission.sqm
2017-10-16 18:16:03 -04:00
Grahame
2cef012614
Update mission.sqm
2017-10-16 18:14:26 -04:00
Grahame
c5a933226c
Update mission.sqm
...
Removed additional player slot
2017-10-16 18:11:29 -04:00
He-Man
ae1f874dc8
Morphine Usage
2017-10-16 20:56:04 +02:00
He-Man
0b08199404
item -> magazine
2017-10-16 19:09:42 +02: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
35c9902232
Remove Ammo Tweaks
2017-10-15 18:19:41 +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
vbawol
aaf7b215c9
make use of underwater command
2017-10-13 16:15:03 -05:00
He-Man
ffa4ad32fd
Make Sharks Lootable under Water
2017-10-12 22:48:32 +02:00
vbawol
63fc23b8cb
fix snap checks
2017-10-12 07:04:34 -05:00
Grahame
63898bff77
Fixed spawn chamber positioning
...
@xDrokz asked me to add this commit for him since he's off to bed ;) His fix!
2017-10-11 17:01:32 -04:00
He-Man
cc04eac4fb
Login Fix 3.0
...
Bypass BI's SetUnitLoadout used on Items in Clothings, because it is not
correct working atm
2017-10-11 19:16:32 +02:00
vbawol
9242b01f3b
extra debug
2017-10-11 11:30:34 -05:00
vbawol
a572570e83
fix usage
2017-10-11 08:31:23 -05:00
vbawol
28340c2311
Base Building: spawn only ghost
...
used to spawn static version then swap, now it just spawns ghost version
first.
should also fix Garden_Epoch and other new item kicks.
2017-10-11 00:42:11 -05:00
vbawol
cd4f557f66
revert side changes for male
...
unlocked additional uniforms for side = 0,
Side =1 is still reserved for females
2017-10-10 21:29:04 -05:00
He-Man
a971f5f7cc
Removed multiple Uniform
2017-10-10 23:00:48 +02:00
vbawol
cd32c98def
cleanup 2
2017-10-10 14:57:11 -05:00
vbawol
3cb74266dd
minor cleanup
2017-10-10 14:55:43 -05:00
vbawol
1eb4e5417b
comment fixes
2017-10-10 10:50:07 -05:00
vbawol
ebf28e6dae
optimize EPOCH_fnc_weightedArray and usage
...
added isClass check to make sure item exists before adding to loottable.
updated for use with single array syntax of selectRandomWeighted
2017-10-10 10:50:07 -05: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
b911897c31
add masks to loot table
2017-10-08 13:27:36 -05:00
vbawol
4fddeafd6e
add female uniforms to loot table
2017-10-08 13:23:44 -05:00
vbawol
004b46ebed
add 75 compatible male uniforms
2017-10-08 13:13:40 -05:00
He-Man
a4ec14e468
Inventory fix
...
Fix blocked Inventory after we set rating to -2001
Thx DirtySanchez for helping to fix it!
2017-10-08 17:38:31 +02: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
He-Man
14c433581b
Set Rating to -2001
2017-10-07 21:23:54 +02:00
DESKTOP-UH65DCE\MusTanG
2fe8f08adf
add halloween and rad masks to ah
2017-10-07 12:11:01 -05:00
He-Man
b1775a68ba
Wait for local _playerObject
...
Hitpoints and EH's were set before playerobjects is local, so wait for
it!
2017-10-07 18:37:09 +02:00
He-Man
4660975b05
Fix for empty _Primary array
2017-10-07 17:45:23 +02:00
vbawol
7ef339d958
changelog and comment cleanup
2017-10-07 10:41:44 -05:00
He-Man
e4fdf4d6a0
Workaround for unitloadout 2.0
2017-10-07 17:38:58 +02: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
c9039929ab
remove unused gm_enabled setvar
...
merge fix from @ravmustang 👍
2017-10-06 22:37:27 -05:00
vbawol
5d814a9442
just set once
2017-10-06 22:32:57 -05:00
DESKTOP-UH65DCE\MusTanG
b62a029d66
processed locally
2017-10-06 22:12:27 -05:00
vbawol
f49def0c47
Merge pull request #903 from morgoth0/patch-3
...
Thanks @morgoth0 !
Update Malden.h
2017-10-06 21:27:56 -05:00
vbawol
bdb168ba50
fix godmode with player vars
2017-10-06 21:17:14 -05:00
Grahame
42020032be
Update Malden.h
...
Added Malden trader camps, one "North" (would be west if there were a south TP manhole cover), East and "West" (would be south if there were a south TP manhole cover) ;)
2017-10-06 20:53:09 -04:00
vbawol
4e22b33129
Merge pull request #901 from morgoth0/patch-2
...
Update WorldInteractions.hpp
2017-10-06 14:23:50 -05:00
vbawol
bd6afe4417
Merge pull request #900 from morgoth0/patch-1
...
Update CfgBuildingLootPos.hpp
2017-10-06 14:23:41 -05:00
DESKTOP-UH65DCE\MusTanG
7bf39b7cad
replace with FAK in comments
2017-10-06 12:07:32 -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
e1bc965fdd
must be _x
...
magazineCargo return strings, not objects
2017-10-06 17:39:26 +02: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
f9a5c29fa8
Force Vehicle Save after adding / removing Mags
2017-10-06 14:01:29 +02:00
He-Man
8a4ab15fd1
override default action, if FavBar slot has item
2017-10-05 21:58:24 +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
He-Man
d5905df9ff
Better Spawn Positions for Chopper
2017-10-04 20:19:16 +02:00
vbawol
3890dbcf0d
limit critical part damage to 0.8
...
per disscussion with @Ignatz-HeMan
2017-10-04 11:18:54 -05: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
Grahame
c73a2ab44f
Update Malden.h
...
Added ATMs and Phones in gas stations and towns. Note, if a phone looks like it attached to the side of a house then it probably is part of the house model itself and will not work as an ATM
2017-10-04 09:05:43 -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
vbawol
59db3387b8
add variants
2017-10-03 20:26:26 -05: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
5c6cc9bac7
remove debug
2017-10-03 17:01:04 -05:00
vbawol
d72af99663
loot fix test
2017-10-03 16:41:46 -05:00
vbawol
3345cc28b4
debug loot
2017-10-03 16:23:20 -05:00
vbawol
27ef4446e4
changelog and private updates
2017-10-03 15:59:49 -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
fb08ef4a76
handle null objects
2017-10-03 10:42:42 -05:00
vbawol
aa263d6e0b
fix extra space
2017-10-03 10:26:51 -05:00
vbawol
5060394989
Simple Garden Manager v1
...
currently set to run 24 minutes between each "grow" cycle, so from seed
to mature should take around 1.2 hours from seed to fully mature. Option
to also have mature items spoil on the next cycle (24 minutes).
2017-10-03 10:25:59 -05:00
vbawol
5f640933d9
optimize remoteexec usage for multiple targets
2017-10-03 09:11:18 -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
vbawol
70b11bc5a1
can just use array as targets instead of foreach here
2017-10-03 08:04:54 -05:00
He-Man
6cf522fc16
Fixed Wet Variable
2017-10-03 00:22:14 +02:00
DESKTOP-UH65DCE\MusTanG
f3700efba7
vector corrections and improvements
...
Correct vector snap issues clientside
Correct vector placement issues server side
Correct remoteExec reveal to clients(fixes incorrect placement during
swap)
2017-10-02 17:05:53 -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
He-Man
888629ea2b
Reverted last change and changed hint
2017-10-02 18:57:08 +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
c479e04607
move say3d below second local check
...
Only want this to repair sound to play if the repair worked and did not
get stopped by second check
2017-10-02 11:42:00 -05:00
He-Man
fe8c16d88f
Moved 2nd local check behind sleep
2017-10-02 18:27:09 +02:00
vbawol
8e0c7afc91
force first row to spawn
2017-10-02 11:10:22 -05:00
vbawol
381fdd44ea
change loot bubble
...
use nearObjects instead of nearestObjects
use _lootClasses as filter for objects array, force array to lower to
prevent case issues.
This should allow loot spawn for simple objects.
2017-10-02 11:05:48 -05:00
vbawol
bf7d35b519
move rads for locations to client
...
locations cannot use public var option
2017-10-02 10:06:04 -05: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
6ac1e72a97
set read only vars
...
with failback to normal use.
2017-10-01 19:48:32 -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
1ab0c68a45
use local var within loop
2017-10-01 18:18:38 -05:00
vbawol
4f98071e8d
dynamic radio active locations
2017-10-01 18:14:18 -05:00
vbawol
cce0f4aa2b
toxic sapper updates
...
Increase range for toxic smoke from 6m to 12m.
toxic sapper.:
trigger smoke at unit spawn
readd smaller explosive charge
2017-10-01 17:15:42 -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
2c8ace3a8d
use player object for RE instead of netID
2017-09-30 22:06:47 -05:00
vbawol
0de36abd6b
testing
...
if this is cause of duping on login
2017-09-30 15:40:42 -05:00
vbawol
0b71db3917
fix ai spawning
2017-09-30 10:14:43 -05:00
vbawol
675348b160
fix blood pressure
2017-09-30 10:12:32 -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
e11e60d209
debug
2017-09-30 09:34:16 -05: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
84a2c7b721
debug 2
2017-09-29 22:44:17 -05:00
vbawol
4da51a45f3
add debug
2017-09-29 21:48:32 -05:00
vbawol
9e7cc6843d
private arrays
2017-09-29 11:29:20 -05:00
vbawol
8b2253bc69
increase max building height
2017-09-28 14:27:10 -05:00
vbawol
cb17f01b56
fix inverted logic
2017-09-28 12:00:48 -05:00
vbawol
a5894bca15
debug spawn units
2017-09-28 11:30:26 -05:00
vbawol
7b37ed7c07
fix radio active site
2017-09-27 15:59:38 -05:00
vbawol
f122c2db0a
fix nuisance
2017-09-27 15:46:15 -05:00
vbawol
bec28218f4
play local sound on repair
2017-09-27 14:33:38 -05:00
vbawol
2ebbfa70b8
mixed up with Nuisance
2017-09-27 11:22:28 -05:00
vbawol
74aecd3849
init playerspawnarray var
...
since we are using an gvar array here edits to it externally should not
require redefining local var for use in other events.
2017-09-27 11:10:20 -05:00
vbawol
7459f9d3a0
last typo 🎱
2017-09-27 11:01:33 -05:00
vbawol
8f1b71a26e
player stats fixes part 6
2017-09-27 10:38:18 -05:00
vbawol
0ad1a967d8
player stats fixes part 5
2017-09-27 10:13:42 -05:00
vbawol
5db8af19f8
push change back to gvar
...
debug
2017-09-27 08:58:36 -05:00
vbawol
a3a0e7e2d9
Changes to default var loading
2017-09-26 21:20:41 -05:00
vbawol
38d704468d
one more?>
2017-09-26 21:02:58 -05:00
vbawol
8903145ffa
fixes part 4
2017-09-26 20:52:13 -05:00
vbawol
0f9eacd28a
fixes part 3
2017-09-26 17:20:04 -05:00
vbawol
e675d29752
fixes part 2
2017-09-26 17:16:13 -05:00
vbawol
c4bf9c65ee
one last fix...
2017-09-26 16:51:53 -05:00
vbawol
69a869ed2c
fix error with wrong var
2017-09-26 16:32:57 -05:00
vbawol
91f998a7ed
should be string here
2017-09-26 16:11:06 -05:00
vbawol
f3774c855a
debug 2
2017-09-26 15:54:30 -05:00
vbawol
8b1a4d0f3c
debug
2017-09-26 15:14:51 -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
05cb38f4f7
force hitpoints to reset
2017-09-26 14:21:23 -05:00
vbawol
853d69d201
use setvar for digest
2017-09-26 09:08:22 -05:00
vbawol
532dc34e86
test fix
2017-09-25 17:59:03 -05:00
vbawol
f7691030b3
remove json file
2017-09-25 17:53:46 -05:00
vbawol
2154402d85
fixes
...
fix error if EPOCH_playerEnergyMax was nil
another test case for swapBuilding if still not fixed.
removed hitpoints var from heal and godmode as it is not used.
2017-09-25 17:19:53 -05:00
vbawol
d318d99a86
setVectorDirAndUp after setpos
...
All uses of setVectorDirAndUp in arma code is after setpos not before.
2017-09-25 16:58:28 -05:00
vbawol
a2e9b150cc
Merge pull request #873 from Ignatz-HeMan/patch-5
...
Fix for Vehicle Maintainance
2017-09-25 15:46:30 -05:00
He-Man
0ddc7d638d
Fix for Vehicle Maintainance
2017-09-25 19:06:08 +02:00
He-Man
39f45eb855
Fix for Vehicle Maintainance
2017-09-25 19:04:24 +02: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
vbawol
c67d642ef8
suppress NotUsed stat
2017-09-24 17:51:35 -05:00
DESKTOP-UH65DCE\MusTanG
ed095efb48
update to notused var name
2017-09-24 17:47:08 -05:00
DESKTOP-UH65DCE\MusTanG
bf41fb5b7d
remove from default vars and add to debug
2017-09-24 17:38:56 -05:00
DESKTOP-UH65DCE\MusTanG
7efdfd5b4c
corrections
2017-09-24 17:00:52 -05:00
DESKTOP-UH65DCE\MusTanG
480ee26dbb
config controls karma levels
2017-09-24 15:28:42 -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
DESKTOP-UH65DCE\MusTanG
1c5dc30f3b
add karma levels in default array
2017-09-24 15:16:35 -05:00
DESKTOP-UH65DCE\MusTanG
01446e50ad
karma changes(deaths, suicides, pvp, revives, trades, tradersKilled)
2017-09-24 15:01:54 -05:00
DESKTOP-UH65DCE\MusTanG
2f292d889a
move karma and upgrade community stats coding
2017-09-24 12:26:11 -05:00
DESKTOP-UH65DCE\MusTanG
3b11fc7f75
Inventory space checks
2017-09-24 04:46:20 -05:00
DESKTOP-UH65DCE\MusTanG
bf004a92d8
corrections
2017-09-23 23:07:09 -05:00
DESKTOP-UH65DCE\MusTanG
f6c706379d
increase driver and commander selections
...
add driver select 1 and 2
add commander select 1
2017-09-23 22:58:57 -05:00
DESKTOP-UH65DCE\MusTanG
19b5a06215
Commander Reload and Remove Turret Mags
2017-09-23 22:29:45 -05:00
DESKTOP-UH65DCE\MusTanG
122cb8b96c
Gunner and Driver Turrets
...
Reload and remove mags from gunner and driver turrets.
Will expand for more slots
2017-09-23 20:58:48 -05:00
DESKTOP-UH65DCE\MusTanG
359efd8d68
towers and grahame config udpates
2017-09-23 17:31:43 -05:00
vbawol
8e7de09a2e
remove as it was added to normal functions
2017-09-22 16:26:22 -05:00
He-Man
a8c4297c7d
Fix teleporter pos if debug is above Water
...
modeltoworld returns "swimming" values above water (dependent on waves).
using modeltoworldworld fix it
2017-09-22 21:23:56 +02:00
He-Man
1e4db5573e
Added missing server fnc arrayToLogic
2017-09-22 21:20:47 +02:00
vbawol
c56c159334
Merge pull request #867 from xDrokZ/experimental
...
Added Map support for Chernarus Redux
2017-09-21 15:48:56 -05:00
xDrokZ
a8fb5c9bcd
Added Map support for Chernarus Redux
...
Added Map support for Chernarus Redux
2017-09-21 21:43:42 +02:00
He-Man
90efc9258b
fix for addrating
2017-09-20 20:17:41 +02:00
He-Man
e756568334
fix for addrating
2017-09-20 19:39:55 +02:00
He-Man
2afc23914f
fix for addrating
2017-09-20 19:35:46 +02:00
vbawol
a0e9ec0153
digest concept
...
-use the second set of GVARs to track adding and removing attributes.
-Epoch_player* vars moved to local vars only accessible inside the
master loop.
-TODO: finish digest system with a config entry to control digest
limits. Some extra logic is needed.
Basically, when you consume some food, it will not increase your hunger
level immediately but raise over time.
Each of these should have limits on how much you can store in the digest
and how much each tick the digest var can affect the local player var in
the master loop.
2017-09-20 09:23:46 -05:00
He-Man
39ae07e488
Fix Debug Classname from Config
2017-09-19 18:53:56 +02:00
vbawol
104721eced
bunker loot pos
2017-09-18 11:55:58 -05:00
vbawol
d0a69fa7d1
set HandleRating to 0 as we already set players to -2000 and 0 will result in no changes
2017-09-17 21:17:43 -05:00
vbawol
6c199b43d4
remove extra debug
2017-09-17 12:45:58 -05:00
vbawol
37d782bde2
event fixes
2017-09-17 12:45:25 -05:00
vbawol
3b64735d64
debug
2017-09-17 12:35:40 -05:00
vbawol
7bf14c00f7
bunker fixes
2017-09-17 12:20:14 -05:00
vbawol
78a7829a62
fix typo 🎱
2017-09-17 12:18:19 -05:00
vbawol
acfba073fc
added disallowed events per worldName
...
bunker test code updates
2017-09-17 12:11:40 -05:00
vbawol
f9fb1d69f1
change method to remove events
...
old was causing an error and index issues
2017-09-17 11:04:48 -05:00
vbawol
f50d8ae57c
disable vehicle spawning
2017-09-17 10:26:11 -05:00
vbawol
6ce26b05b7
fix path
2017-09-17 10:21:44 -05:00
vbawol
74fc73b380
cleanup Bunker
2017-09-17 10:06:29 -05:00
vbawol
cf2244d3b3
fix lexer warning
2017-09-17 09:53:52 -05:00
vbawol
faf82b97b2
make debug box config based
...
lightPos: controls the positions of light props inside the box (uses
modelToWorld offset), set to {} to disable.
debugBoxClass: Controls the class that is used for the debug box, "" to
disable debug box.
cloneClasses: What classes to use for clone vat props, set to {} to
disable
2017-09-17 09:47:48 -05:00
vbawol
6387f32f8b
Dynamic bunker v1
2017-09-16 12:45:07 -05:00
vbawol
f4a95f6ab4
Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental
2017-09-15 11:07:15 -05:00
vbawol
589c05f597
handle incorrect index with param command
2017-09-15 11:07:10 -05:00
He-Man
02dbb34b8d
Prevent filling inside Vehicles
2017-09-14 19:51:06 +02:00
He-Man
a67bb3b3c5
Fix for 1st Trader not spawning
2017-09-14 17:56:40 +02:00
vbawol
b9fffd4cb9
Better event driven cameraView checks
...
uses MissionEH PlayerViewChanged
removed fsm infinite loop checks
2017-09-12 16:29:42 -05:00
vbawol
80c3ba0917
testing for civ males
2017-09-12 13:50:25 -05:00
vbawol
ba45f5449c
remove Karma changes via HandleRating
...
also add HandleScore EH hook
2017-09-11 11:40:40 -05:00
DESKTOP-UH65DCE\MusTanG
4f9fa717cb
Add new assets configs entries
2017-09-10 18:58:53 -05:00
vbawol
eee733d90a
remove unused function
2017-09-08 12:21:49 -05:00
vbawol
58c0481b6c
add GeigerCounter price and to loot table
2017-09-08 12:21:42 -05:00
vbawol
a3a2de0841
Merge pull request #859 from Ignatz-HeMan/experimental
...
Fixes and Cleanups for VehRepair + ServicePoint
2017-09-08 11:43:30 -05:00
He-Man
3543ce892d
Fixes and Cleanups for VehRepair + ServicePoint
...
- Added CinderWall Door to DoorCount in UpgradeBuild
- Added Option to prevent repairing full damaged HitPoints in
ServicePoint
- Added Option to disable removing Parts in Advanced Vehicle Repair
- Added CinderWallDoorwHatch_EPOCH to cfgBaseBuilding
- Fix in cfgCrafting for KitVehicleUpgradeI_200_EPOCH
- Added an "isdamageallowed" check in EPOCH_server_repairVehicle for
repairing untouched Vehicles in Bases
https://github.com/EpochModTeam/Epoch/blob/experimental/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_vehicles.sqf#L202-L203
- Some Cleanups of commented out lines
2017-09-08 18:34:56 +02:00
vbawol
26da7904f7
bump arma min version
2017-09-07 11:51:01 -05:00
vbawol
f4ff04590f
selectRandomWeighted is available now
2017-09-07 11:50:31 -05:00
He-Man
671b2d4030
Block BarrelBombs from FavBar + Sort/Pricing adds
2017-09-06 23:41:55 +02:00
vbawol
2cffcbc740
cleanup
2017-09-06 14:00:03 -05:00
vbawol
47e16a8318
use local vars for player stats
2017-09-06 09:43:15 -05:00
vbawol
73d5d95fc5
use apply to optimize
2017-09-06 09:39:34 -05:00
vbawol
3c13af5944
move AliveTime to local pt2
2017-09-05 16:28:07 -05:00
vbawol
422fdcc487
move AliveTime stat to local loop
2017-09-05 16:16:20 -05:00
vbawol
6e378ee221
Merge pull request #856 from Ignatz-HeMan/patch-3
...
Additional Check
2017-09-05 15:25:54 -05:00
He-Man
35f8e38923
Fixed some Crafting Previews
2017-09-05 20:39:18 +02:00
He-Man
3cb8db20ec
Additional Check
2017-09-05 18:06:30 +02:00
He-Man
1efddd17c1
Fix for Duping by remove Building
2017-09-04 23:18:54 +02:00
He-Man
5fea5ba136
Fix for undefined var on environment Animals
...
https://github.com/EpochModTeam/Epoch/issues/850
2017-09-04 19:10:52 +02:00
vbawol
ac92ca4415
Merge pull request #851 from ravmustang/Vector-Snapping-Wall2Wall
...
Vector Snapping Wall 2 Wall
2017-09-04 11:54:11 -05:00
DESKTOP-UH65DCE\MusTanG
53e0e45b08
Snap Wall 2 Wall
...
Wall 2 Wall Snapping with rotation fixes.
Move around code for use in both para and perp snapping
2017-09-04 11:19:29 -05:00
vbawol
31f65f6bee
comments
2017-09-04 10:54:55 -05:00
vbawol
9fc38dd537
BE fixes for 1.76 and radiation fixes
2017-09-04 10:37:29 -05:00
vbawol
4449412c2d
fixed double var usage
2017-09-04 08:36:15 -05:00
vbawol
a5fb7a0a53
add tents #829
2017-09-04 08:11:37 -05:00
DESKTOP-UH65DCE\MusTanG
df8346af2c
Snap Wall to Floor Fixes and Upgrades
...
[Fixed] Snapping Stud Walls to Floors tilted on their left or right(had
forward and back working)
[Added] Checks for Tilt Left / Right / Forward / Back
[Added] Checks for Snap Points N,S / E,W
[Added] Checks for Snapping Direction 0,2 / 1,3
[Fixed] Snapping Direction's failed to keep level with tilt of floor on
some snap points with specific directions requiring the above checks
2017-09-03 18:45:56 -05:00
vbawol
c76b2badf9
move save stats to master loop and basic radiation system
2017-09-03 17:11:52 -05:00
vbawol
fcbdd594ae
Screen effect when taking radiation damage #796
2017-09-03 17:11:52 -05:00
He-Man
6f3a68bd7f
Workaround for login-issue (BlackScreen)
2017-09-03 19:18:35 +02:00
He-Man
e286914461
Fixe for exploding new spaned Vehicles
...
"HitHull" > 0.95 causes exploding Landvehicles
2017-09-03 16:03:41 +02:00
vbawol
52e02b954c
Optimize: nearestObjects use object instead of pos
2017-09-02 17:06:27 -05:00
vbawol
8c28ebc1a9
Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental
2017-09-02 16:51:58 -05:00
vbawol
ab5ea172a4
move weather temp and toxic feaver stats to master loop
2017-09-02 16:51:54 -05:00
vbawol
acd1d02f23
Merge pull request #844 from Ignatz-HeMan/patch-7
...
Usage of "unitloadout" on player revive
2017-09-02 15:45:53 -05:00
He-Man
2484804c7a
Usage of "unitleadout" on player revive
2017-09-02 19:56:59 +02:00
He-Man
15bd919dd1
Fixed some craftings
2017-09-02 18:27:59 +02:00
He-Man
eb3b86dfad
Corrected "Epoch_ServerVersion" variable
2017-09-02 16:56:18 +02:00
He-Man
c3f7dede38
Changed Icon Path to epochcore
2017-09-01 19:54:16 +02:00
vbawol
6f95e6b0d3
remove backup
2017-08-31 08:34:13 -05:00
DESKTOP-UH65DCE\MusTanG
33a663f72d
Revert "missing ; 's"
...
This reverts commit 9230db9c7a
2017-08-31 00:42:45 -05:00
DESKTOP-UH65DCE\MusTanG
f2fc2c9d6a
Add TODO reminder
2017-08-31 00:28:30 -05:00
DESKTOP-UH65DCE\MusTanG
7d136cddb3
selectRandomWeighted not ready
...
Switch to BIS_fnc_selectRandomWeighted
2017-08-30 23:46:13 -05:00
DESKTOP-UH65DCE\MusTanG
9230db9c7a
missing ; 's
2017-08-30 23:39:08 -05:00
DESKTOP-UH65DCE\MusTanG
6d9ba4b0ec
Add to DynaMenu actions target
...
Could not see the groups menu at all if looking directly at another
player.
This adds all groups menus and invitation menus to dynamenu player
targets.
2017-08-30 20:47:36 -05:00
DESKTOP-UH65DCE\MusTanG
a53149a5d1
Link new paa's to EpochCore
2017-08-30 20:44:39 -05:00
DESKTOP-UH65DCE\MusTanG
71f6c3db70
fixes
...
Added the _allPlayers variable to complete the delete and readd to
original Perm Group.
Optimized forEach statements.
Fixed use of _groupId with _permGroup
2017-08-30 20:43:19 -05:00
vbawol
a59fc4aee2
make AI spawn every 5 minutes instead of 10
2017-08-30 17:55:39 -05:00
vbawol
9028cec8df
add missing plant classes thanks to @morgoth0
2017-08-30 17:27:02 -05:00
vbawol
7ab0e2694b
Merge remote-tracking branch 'origin/experimental' into experimental
...
# Conflicts:
# Sources/epoch_config/Configs/CfgClientFunctions.hpp
2017-08-30 17:19:05 -05:00
vbawol
01c8641ff2
Conditional Loot table feature and reworking antagonist spawning
...
- We no longer spawn antagonists on opening loot containers or trash.
Instead we have the client spawn them from a new weighted array. Note:
Admins can control what AI are spawning by removing from array
(antagonistChances) or setting chance to 0
- moved EPOCH_spawnIndex and EPOCH_spawnLimits to master loop init
instead of both_init as it is only needed client side.
- loot table updates for extra logic condition.
2017-08-30 17:15:14 -05:00
vbawol
f7f839abf8
Satellite Event Starter
2017-08-30 17:06:18 -05:00
vbawol
e4903fd870
move weightedArray to Cfgfunctions for both server and client use
2017-08-30 17:00:06 -05:00
vbawol
a81088645c
call compile to parseSimpleArray
2017-08-30 16:44:55 -05:00
vbawol
dddeb6c866
optimize unit spawn
...
only one getMissionConfig is needed, 10:1 reduction 👍
2017-08-30 16:40:42 -05:00
vbawol
ff4471552a
improve earthquake event
2017-08-30 16:38:48 -05:00
DESKTOP-UH65DCE\MusTanG
f30582cc9f
Function name change and fix be filter
2017-08-30 14:30:27 -05:00
DESKTOP-UH65DCE\MusTanG
963ab30581
No temp group invite if in main group
2017-08-30 04:02:25 -05:00
DESKTOP-UH65DCE\MusTanG
3b82e8b0b0
clean up server side temp groups
2017-08-30 03:36:37 -05:00
DESKTOP-UH65DCE\MusTanG
d90eb4774f
epoch groups system
...
move "Delete Group" button check to onLoad from button click.
Remove owner from EPOCH_sendRemoteExecClient calls.
Add UI update push to leader on Delete Group.
Add UI update push to client on remove in case they clicked leave group.
2017-08-30 03:14:13 -05:00
DESKTOP-UH65DCE\MusTanG
56283e0c08
Temp Group System
...
Credit goes to AWOL for the original Epoch Group System.
Temp Groups do not allow outsiders access to bases, vehicles or safes.
Easily switch to Temp Group for Co-Op mission, then back to Perm Group.
Full access to Kick, Set Mod, Leave Group/Delete Group.
When leaving or deleting group, you will be put back into the actual
group of your teammates if online.
Fixed Leave/Delete Button to show Delete Group onLoad of Temp Group UI
Added refresh to Group UI's so all players are in sync after changes
2017-08-30 02:43:37 -05:00
vbawol
c89dffa1d0
move to functions
2017-08-28 16:26:49 -05:00
vbawol
ff5d56af46
better way to handle login fsm variables
...
CfgEpochClient "debug" variable to control extra debug and is currently
used in login fsm.
2017-08-26 09:57:59 -05:00
vbawol
30d8107d75
configClasses fixes thanks to @ravmustang
2017-08-26 07:12:50 -05:00
vbawol
fa3577473e
Merge pull request #834 from ravmustang/Bool-spam-fix
...
Bool spam fix
2017-08-25 19:02:18 -05:00
DESKTOP-UH65DCE\MusTanG
b98f6e042a
remove backup
2017-08-25 18:45:11 -05:00
DESKTOP-UH65DCE\MusTanG
e5fea7a53a
correct configClasses usage
2017-08-25 18:44:26 -05:00
DESKTOP-UH65DCE\MusTanG
69acb31fd3
move icons to core
2017-08-25 16:36:27 -05:00
vbawol
901047eaef
revert define test
2017-08-25 16:15:02 -05:00
vbawol
23b1710d7c
test out of bounds checks
...
added _isOnFoot var to init that refreshes with event1 every second and
is reused in any events
2017-08-24 10:22:13 -05:00
vbawol
db18932055
Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental
2017-08-24 09:29:01 -05:00
vbawol
5d044b3d9b
proper use of copy operator
...
https://community.bistudio.com/wiki/Operators
2017-08-24 09:28:57 -05:00
He-Man
ecf904415b
Remove forbidden Wpns / Ammo after upgrade
2017-08-22 23:40:41 +02:00
vbawol
383d67c28c
Check to see if define true/false will fix bool conversion errors
2017-08-21 11:25:56 -05:00
He-Man
25e24b98e8
Fixed Ratio for DynaMenu Pics
...
Fix by @raymix
2017-08-21 17:05:08 +02:00
He-Man
2d0ef031c6
Moved Vehicle Upgrade to DynaMenu
...
- Vehicle Upgrade moved to DynaMenu
- Hitpoints now also will be given to Vehicles from other BaseClasses
(controlled by HitPointNames)
- Added a security Check that Players must have a bit distance to
upgrade
- Fixed some errors in Colorscript for upgraded Vehicles. If it is only
an upgrade, same color is used. If it is another Class, a new random
color will be taken.
- Removed Upgrade Vehicle from Inventory Click
- Changed DynaMenu to make it possible to call a script to get iconpath
(use "iconcode" instead of "icon" then)
2017-08-21 14:26:13 +02:00
vbawol
f7c3f748f7
add currentweapon to data new format
2017-08-18 15:00:30 -05:00
vbawol
94c5fee877
allow/setDamage and disableAI tweaks
2017-08-18 12:06:46 -05:00
vbawol
f0fbbe2cbb
fixed spelling on Shipwreak
2017-08-18 11:12:47 -05:00
vbawol
35cd51d748
disable nite light by default
2017-08-18 11:09:14 -05:00
vbawol
065de1c165
make nitelight only work at night
...
https://community.bistudio.com/wiki/setLightDayLight
2017-08-18 11:07:02 -05:00
vbawol
763bc80e49
fixes
2017-08-18 09:45:27 -05:00
vbawol
b08e092cd4
Vehicle Damage On Spawn #824
2017-08-18 08:40:14 -05:00
vbawol
aea096ce68
add showHUD settings #822
...
Thanks to @Ghostrider-DbD-
2017-08-18 08:37:39 -05:00
vbawol
129d60b0b0
private update
2017-08-18 08:36:48 -05:00
vbawol
ab195d145b
re-add hitpoints stats client side
...
removing it caused array index issues with other stats. Note: should be
able to repurpose the stat for something else instead of removing and
needing a workaround.
2017-08-18 08:25:07 -05:00
vbawol
1a211407b9
updates to login system and hitpoints
...
- No longer track hitpoints from client side, now saved server side only
and pushed to clients on login.
https://community.bistudio.com/wiki/getAllHitPointsDamage
- Changed use set / getUnitLoadout and should still have legacy player
data support that will upgrade automatically on first save.
- Default loadout can be controlled via new variables in epochconfig.hpp
- Made data validation check dynamic using isEqualTypeParams as it does
type checking and still fails if input is shorter than the default.
https://community.bistudio.com/wiki/isEqualTypeParams
- Added back server side damage protection for the new player body. If
the new unit dies before the player switch it could cause login issues
and should not cause issues with scripted setdamage or hitpoints as
first thought. https://community.bistudio.com/wiki/allowDamage
2017-08-15 14:19:03 -05:00
vbawol
ba3041ce8d
Merge pull request #823 from Ignatz-HeMan/patch-5
...
Fixed wrong EPOCH_InteractedItem on crates
2017-08-13 23:46:22 -05:00
He-Man
8185d0dbf5
Fixed wrong EPOCH_InteractedItem on crates
...
This has no effect to Epoch, but if you are working with EPOCH_InteractedItem in custom scripts, the crate items are from the wrong wh (if a crate and a groundWH is in target.
2017-08-13 20:43:33 +02:00
He-Man
e9499d6b17
Missing config for upgrading Cinder Floor
2017-08-09 19:10:00 +02:00
Raimonds Virtoss
5420ce3dc5
Merge pull request #820 from Ignatz-HeMan/patch-3
...
Fix "throw items" from Fav-Bar
2017-08-08 17:42:40 +01:00
vbawol
f28cc43cd5
b826
2017-08-07 18:53:00 -05:00
He-Man
c1cbb626fb
Fix "throw items" from Fav-Bar
2017-08-07 23:10:21 +02:00
He-Man
aff46f13f7
Fix "throw items" from Fav-Bar
2017-08-07 22:57:59 +02:00
He-Man
236da86acb
Upgrade for CinderFloor
2017-08-06 19:22:49 +02:00
He-Man
370896c150
Update CfgLootTable_MADCUP.h
2017-08-06 02:37:48 +02:00
He-Man
e0a002f808
Update CfgLootTable_MAD.h
2017-08-06 02:37:27 +02:00
He-Man
4609b4e236
Update CfgLootTable_CUP.h
2017-08-06 02:37:02 +02:00
He-Man
7028ad8011
Update CfgLootTable.h
2017-08-06 02:36:36 +02:00
He-Man
497db196ad
Added missing Loot / Pricing / ItemSort
2017-08-05 20:56:36 +02:00
vbawol
163d702271
b824
2017-08-04 15:16:51 -05:00
He-Man
5388ca2210
changes for Vehicle Repair + iteminteracts
2017-08-04 21:50:26 +02:00
vbawol
6e3dcd090a
b823
2017-08-04 14:39:46 -05:00
DESKTOP-UH65DCE\MusTanG
c783e6854b
update killed EH
...
if killer is unit exit handler
2017-08-04 13:44:03 -05:00
vbawol
02c6e96f0c
b822
2017-08-03 19:19:27 -05:00
vbawol
6a78895879
Merge branch 'experimental' into Community-Stats-#1
2017-08-03 18:20:00 -05:00
DESKTOP-UH65DCE\MusTanG
c19847b156
updates
...
local antagonists killed by non-local entity needed to be handled.
Local and Non-Local stat changes are now sent to server first then back
to the appropriate client after pToken check is verified.
2017-08-03 18:11:10 -05:00
vbawol
0074d505a8
Merge pull request #810 from Ignatz-HeMan/experimental
...
Option to prevent selling damaged veh
2017-08-03 14:55:42 -05:00
He-Man
c7f467be77
Option to prevent selling damaged veh
2017-08-03 20:43:58 +02:00
Raymix
3abac17557
trade: calc damage %, return new cost
2017-08-03 19:32:55 +01:00
He-Man
ff4b401b5f
Some Fav-Bar Tweaks
...
- Moved configs to cfgepochclient
- Changed Keydown-Check from EPOCH_Buildmode to EPOCH_Target
- Replaced "resetonLogin" to only remove "forbidden items"
2017-08-03 18:18:18 +02:00
DESKTOP-UH65DCE\MusTanG
a2a3b7e3bd
Zombie Stat
...
addEventHandler in 2 places for same zombie _unit, removed from unit
spawn function.
2017-08-03 10:46:46 -05:00
DESKTOP-UH65DCE\MusTanG
c49ee69265
add some tidybowl
2017-08-03 09:42:49 -05:00
DESKTOP-UH65DCE\MusTanG
4f88928bd0
Missions simplified
...
Category changed to TraderMissions.
Removed CompletedMissions.
2017-08-03 09:37:08 -05:00
DESKTOP-UH65DCE\MusTanG
43958142b8
Community Stats System #1
...
Fully customizable system.
Base system laid out more so as an example.
Included:
-Murders
-Deaths
-Suicides
-Revives
-AIKills
-AntagonistKills
-ZombieKills
-MissionsAttempted
-CompletedMissions
Client side stat change with optional send to server.
Server side stat change with optional send to client.
Server is backed up with token check if sent from client.
2017-08-02 22:16:21 -05:00
Raymix
97cf50183e
FavBar: build mode fix
2017-08-02 23:16:50 +01:00
Raymix
49e67d24d4
FavBar: perf optimization - new 5 sec event
2017-08-02 22:07:55 +01:00
Raymix
a09c53b723
favbar: return on void 2
2017-08-02 21:53:31 +01:00
Raymix
ec701873f7
favbar: returns on void
2017-08-02 21:53:04 +01:00
Raymix
a0e9ddbbef
FavBar: performance optimization
2017-08-02 21:48:09 +01:00
Raymix
082036236a
favbar: cleanup + private declares
2017-08-02 19:33:53 +01:00
vbawol
4cdc67cf9d
Merge pull request #804 from Ignatz-HeMan/experimental
...
Advanced Vehicle Repair
2017-08-01 16:47:39 -05:00
Raymix
366068fd82
Customize HUD option removed from ESC menu #800
2017-08-01 22:42:06 +01:00
Raymix
2f5fe0f149
Favbar added: Banned items list and reset favbar on every login
2017-08-01 21:25:31 +01:00
Raymix
80329a9b16
Favbar: dupe fix (sorry lol, needs more field testing)
2017-08-01 21:09:50 +01:00
He-Man
826ddcc234
New item Classnames
2017-08-01 14:44:50 +02:00
vbawol
e022e6bfb3
b821
2017-07-31 23:19:08 -05:00
Raymix
45b6bf1fb2
Favorites bar - full release
2017-08-01 03:00:28 +01:00
vbawol
2c99640040
b820
2017-07-31 16:12:41 -05:00
He-Man
5dd672cb68
Advanced Vehicle Repair
2017-07-31 18:28:18 +02:00
vbawol
586261f587
b819
2017-07-28 11:57:10 -05:00
vbawol
29e530d62c
AH updates
...
- change a few call compile + callExtension calls to parseSimpleArray +
callExtension as they return arrays.
- allow anti teleport check to be disabled with
antihack_antiTeleportCheck = "false" inside epochah.hpp
- optimized and made EPOCH_server_getRealTime command a normal server
function.
2017-07-28 11:56:30 -05:00
DESKTOP-UH65DCE\MusTanG
39d8f05029
add virtual obj for setDir
2017-07-27 15:16:16 -05:00
vbawol
1a806fbfec
fixed type error on createTeleport
2017-07-27 14:15:30 -05:00
vbawol
c38766286d
b815
2017-07-27 09:51:19 -05:00
vbawol
aaef107e3e
Merge pull request #795 from ravmustang/Vector-Building-and-Snapping-#1
...
Fix snapping with Vector Tilt
2017-07-27 08:16:49 -05:00
DESKTOP-UH65DCE\MusTanG
f8461d247e
Fix snapping with Vector Tilt
...
I feel crazy after this one.
2017-07-26 21:38:33 -05:00
He-Man
f70d2f7a4a
Clear Veh Cargo after upgrade
2017-07-26 22:40:34 +02:00
vbawol
f2b0aab6e6
disable fuel after player is already in the server
2017-07-25 12:19:23 -05:00
vbawol
45a02c7b91
for #340 disable refuel client side
2017-07-25 12:02:17 -05:00
vbawol
ce5312930c
b813
2017-07-25 11:41:54 -05:00
DESKTOP-UH65DCE\MusTanG
05655d0cb2
crafting menu load fix
...
Change incoming variables from params to _this.
2017-07-25 09:59:55 -05:00
vbawol
3808c2c95a
b812
2017-07-25 07:58:55 -05:00
Raymix
014f094f04
Fixes #790
2017-07-25 03:19:40 +01:00
vbawol
ec262e59f0
b810
2017-07-24 16:20:15 -05:00
vbawol
f7a1ef393d
Merge pull request #789 from Ignatz-HeMan/patch-7
...
Fixed msg "Not all Items sold"
2017-07-24 15:53:31 -05:00
Raymix
c9e382c1b4
Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental
2017-07-24 21:26:10 +01:00
Raymix
9ebfe6765d
cfgCrafting.hpp Maintenance + Fixes #785
2017-07-24 21:25:25 +01:00
He-Man
4982b1ec03
Fixed msg "Not all Items sold"
2017-07-24 20:05:26 +02:00
vbawol
10a762b541
Merge pull request #788 from ravmustang/Dynamic-Simulation-#3
...
DynSim #3 Configs
2017-07-24 12:50:38 -05:00
DESKTOP-UH65DCE\MusTanG
e52fc1ee25
DynSim #3 Configs
...
Added cfgDynamicSimulation.
Toggle entire system.
Toggle individual sections player/bases/vehicles
Set mulitpliers and distances.
Will continue to add to these configs as BIS adds more scripting
commands for us to use.
2017-07-24 12:34:58 -05:00
vbawol
97e1b5d328
Merge pull request #787 from ravmustang/non-Epoch-Teleporter-UserAction
...
Action change
2017-07-24 12:31:25 -05:00
DESKTOP-UH65DCE\MusTanG
f68f616fea
Action change
...
Change selection in array to "" as the current selection is not built
into these non-epoch objects.
2017-07-24 12:26:14 -05:00
vbawol
6ff599a578
use same array for worldpos
2017-07-24 11:20:32 -05:00
vbawol
5fe2d99731
fix error line 110
2017-07-24 10:05:07 -05:00
vbawol
77ae1625a6
allow direction and force addactions on other objects
2017-07-24 09:31:27 -05:00
vbawol
9d9ea54612
b809
2017-07-20 22:32:50 -05:00
vbawol
691c9d0a86
Merge pull request #784 from ravmustang/Barrel-Bomb-#2
...
Barrel Bomb crafting kit
2017-07-20 20:07:50 -05:00
vbawol
4d66562459
b808
2017-07-20 18:08:16 -05:00
vbawol
63e8a887c9
rem old simulation code, recount arr after upgrade
2017-07-20 18:06:33 -05:00
vbawol
3ef5fa1fe3
b807
2017-07-20 14:10:06 -05:00
vbawol
292108715b
fixed minor typo in vars
2017-07-20 11:07:24 -05:00
DESKTOP-UH65DCE\MusTanG
d90d8cf079
Barrel Bomb crafting kit
...
Add crafting recipe for barrel bombs
2017-07-19 22:39:16 -05:00
vbawol
e45e3d0abe
b806
2017-07-17 05:58:51 -05:00
vbawol
015dd1f37c
Merge pull request #781 from ravmustang/Missing-;-
...
This little ; went to the market..... lol
2017-07-17 04:47:05 -05:00
vbawol
312868bc70
Merge pull request #780 from ravmustang/Dynamic-Simulation-System-#1
...
Dynamic Simulation #1
2017-07-17 04:46:35 -05:00
DESKTOP-UH65DCE\MusTanG
98e8bcb6ab
This little ; went to the market.....
...
This silly guy went home. ROFL
2017-07-16 23:15:51 -05:00
DESKTOP-UH65DCE\MusTanG
44a7b78980
Dynamic Simulation #1
...
Init dynSim for server and client.
Load configured settings.
Enable dynSim for Buildings, Vehicles, Clients.
2017-07-16 15:26:19 -05:00
vbawol
7ccf6d85c4
b805
2017-07-12 11:19:53 -05:00
vbawol
4fa13b7a91
corrected comments
2017-07-12 09:54:03 -05:00
vbawol
07e9e1ac5c
add private
2017-07-12 09:53:53 -05:00
vbawol
fd5f4cb1f9
maxBuildingHeight now var as it is used oneachframe
2017-07-12 09:53:39 -05:00
He-Man
96b4a33677
Fixed flip storages, added height check
2017-07-09 21:34:32 +02:00
He-Man
3539a43734
Fixed flip Storages, added height-check
2017-07-09 21:08:00 +02:00
He-Man
b95b845b9a
Fixed flip storages above Water
2017-07-09 20:57:08 +02:00
vbawol
043290d5d2
b804
2017-07-09 05:30:52 -05:00
vbawol
28498f3b89
update comment
2017-07-08 18:53:24 -05:00
vbawol
b2354dc5a6
enable dynamic simulation on vehicles
2017-07-08 18:52:42 -05:00
vbawol
0efc699370
b803
2017-07-08 18:51:32 -05:00
vbawol
2c7bf2e87c
Merge pull request #774 from ravmustang/Vehicle-Upgrade-System-#1
...
Vehicle upgrade system 1
2017-07-08 11:55:05 -05:00
vbawol
cdf1e709ae
update private array
2017-07-08 08:07:06 -05:00
He-Man
6820969989
Fix for SetSpawnPoint above Water not working
2017-07-07 20:43:11 +02:00
DESKTOP-UH65DCE\MusTanG
ff8c2a27cd
Offroad 5th upgrade(Rare)
...
Remove unknown Document
Add recipe for Police Offroad
Adds police lights and siren to the offroad.
2017-07-06 19:53:00 -05:00
DESKTOP-UH65DCE\MusTanG
98f7e92e9f
Rare Document Upgrades
...
new item was created Top Secret(Rare Document) for special vehicle
upgrades
2017-07-06 19:19:36 -05:00
DESKTOP-UH65DCE\MusTanG
3fd8a502f7
Zamak veh upg recipes
2017-07-06 14:20:29 -05:00
DESKTOP-UH65DCE\MusTanG
8445a328f4
Van veh upg
...
Van transport and van box vehicle upgrades 3 and 4 added to recipes.
transport can be upgraded into box with more materials
2017-07-06 14:01:41 -05:00
DESKTOP-UH65DCE\MusTanG
0817764cad
Clean Up
2017-07-06 10:20:37 -05:00
DESKTOP-UH65DCE\MusTanG
43052e9ec7
More Vehicles Upgrades
...
Add in Hunter / Ifrit / Strider vehicle upgrades to configs
2017-07-06 10:14:12 -05:00
DESKTOP-UH65DCE\MusTanG
972328ac01
Update VehUpgKits recipes
...
The kits are already a crafted item of all required upgrade items, so
these should only require themselves when upgrading.
2017-07-05 17:25:20 -05:00
DESKTOP-UH65DCE\MusTanG
a151cd21c5
Fixes
...
Bad mistakes on my part :(
2017-07-05 16:19:19 -05:00
DESKTOP-UH65DCE\MusTanG
7db5f1c36d
Fix config class array
2017-07-05 16:11:34 -05:00
DESKTOP-UH65DCE\MusTanG
aabcb3f069
Added new crafting
...
new kits crafting recipes and data
fix upgrade IV recipes
2017-07-04 14:30:48 -05:00
DESKTOP-UH65DCE\MusTanG
f0fdc9844d
add new crafted veh upg kits
...
Added to Item Interactions for READ button on click
Added to Reading Documents for info on each kit
Added inherits from the respective ItemVehDoc so that it can be used for
upgrading.
2017-07-04 14:18:36 -05:00
DESKTOP-UH65DCE\MusTanG
657d4c7b29
Check and Correct Old Vehicle DB array
...
When hosts upgrade they will have vehicles saved in their DB with the
old dataFormat.
This check by @He-Man will do the trick to solve this issue moving
forward with vehicle upgrades
2017-07-04 10:25:23 -05:00
DESKTOP-UH65DCE\MusTanG
1e77e0a22b
Add reading documents
...
Add configs for easy editing of readable documents messages
Array for multiple messages, even a story. lol
Default messages are a hoot!
2017-07-03 19:08:04 -05:00
DESKTOP-UH65DCE\MusTanG
9faac57e27
Add new Vehicles to CfgPricing
2017-07-03 17:39:37 -05:00
DESKTOP-UH65DCE\MusTanG
e906d29c9c
More upgrades and new functions
2017-07-03 15:59:40 -05:00
DESKTOP-UH65DCE\MusTanG
44eb34445d
Msg for missing item
2017-07-03 07:40:47 -05:00
DESKTOP-UH65DCE\MusTanG
711e7aba06
Update VUS#1
...
Change call to configFile to new missionConfigFile CfgVehicleUpgrades.
Add check for crypto client side before sent off to server for
completion
2017-07-03 07:35:42 -05:00
DESKTOP-UH65DCE\MusTanG
1dc4d147be
VUS #1
...
ItemInteractions for VehDoc's set for UPGRADE
CfgVehicleUpgrade added for customizing materials needed
Server function for upgrading vehicle
CfgRemoteExec addition for server function above.
2017-07-03 07:22:20 -05:00
He-Man
0030953a71
Changed path for Drink Icon
2017-06-28 17:45:14 +02:00
He-Man
c53557ed1a
Changed path for Drink Icon
2017-06-28 17:44:24 +02:00
vbawol
ae5458a775
b801
2017-06-26 08:08:13 -05:00
vbawol
21d762eaa7
Merge pull request #772 from Ignatz-HeMan/patch-4
...
Fixed Trader Count
2017-06-26 06:48:04 -05:00
vbawol
d3472d2638
Merge pull request #771 from ravmustang/Epoch-Assets-#2
...
Epoch Assets #2
2017-06-26 06:47:37 -05:00
He-Man
929760808a
Fixed Trader Count
2017-06-26 00:46:51 +02:00
DESKTOP-UH65DCE\MusTanG
2a2c2d464e
Epoch Assets #2
...
Wood Half Floor
Wood Quarter Floor
Create CfgMagazine for inventory kits
Create entries in the CfgItemInteractions/CfgBaseBuilding/CfgCrafting
Create CfgVehicles for built / SIM / Ghost models
Models in Object Builder
Fix penetration link to arma 2 ca folder, replaced with a3 wood_plate as
is on the full wood floor
create new memory points C, CB, CinE, CinW, CinS, CinN, E, EF, W, WF, S,
SF, N, NF
Tweak for proper snapping points in game
Assets:
Briefcase Silver (100oz)
Silver Bar (10oz)
Aluminum Bar (10oz)
Copper Bar (10oz)
Tin Bar (10oz)
KitWoodHalfFloor
KitWoodQuarterFloor
500Rnd_127x99_mag and tracer mags
200Rnd_127x99_mag and tracer mags
100Rnd_127x99_mag and tracer mags
2000Rnd_762x51_Belt
40mm_G_belt (200Rnd, 32, 64, 96)
30mm_G_belt (200Rnd, 40)
mas_50Rnd_127x107_DSHKM
mas_150Rnd_127x107_DSHKM
2017-06-24 23:28:12 -05:00
He-Man
394074c71d
Updated missing ServiePoint Changes
2017-06-25 03:51:48 +02:00
He-Man
093e600ae2
Updated missing ServiePoint Changes
2017-06-25 03:21:31 +02:00
