Commit Graph

497 Commits

Author SHA1 Message Date
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
DESKTOP-UH65DCE\MusTanG
1c5dc30f3b add karma levels in default array 2017-09-24 15:16:35 -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