Commit Graph

523 Commits

Author SHA1 Message Date
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