Commit Graph

1807 Commits

Author SHA1 Message Date
af6589b8eb Fix typo 2017-10-05 11:20:11 -05:00
8a1b312f12 Merge pull request #897 from RC-Robio/patch-5
Add craftables
2017-10-05 11:12:32 -05:00
24d0bea5d3 Merge pull request #896 from RC-Robio/patch-4
Add craftables
2017-10-05 11:12:22 -05:00
ce1b8d8a65 Merge pull request #895 from RC-Robio/patch-3
Added more craftables\cleanup
2017-10-05 11:12:15 -05:00
3c590ab735 Add craftables
BurnBarrel|LightPole|SmallForestCamoNet|SmallDesertCamoNet|LargeForestCamoNet|LargeDesertCamoNet|FirePlace_02|FieldToilet|Scaffolding|Sink|PortableLight_Single|PortableLight_Double|WatchTower|SunShade|FuelPump|BagBunker|SandbagWall|SandbagWallLong|BarGate|WaterPump
2017-10-05 09:40:28 -05:00
02ce72a762 Add craftables
!"(Hesco3|Metal|Foundation|Garden|BurnBarrel|LightPole|SmallForestCamoNet|SmallDesertCamoNet|LargeForestCamoNet|LargeDesertCamoNet|FirePlace_02|FieldToilet|Scaffolding|Sink|PortableLight_Single|PortableLight_Double|WatchTower|SunShade|FuelPump|BagBunker|SandbagWall|SandbagWallLong|BarGate|WaterPump)_Ghost_EPOCH"
2017-10-05 09:37:13 -05:00
ac9efd705d Added more craftables\cleanup
Garden|BurnBarrel|LightPole|SmallForestCamoNet|SmallDesertCamoNet|LargeForestCamoNet|LargeDesertCamoNet|FirePlace_02|FieldToilet|Scaffolding|Sink|PortableLight_Single|PortableLight_Double|WatchTower|SunShade|FuelPump|BagBunker|SandbagWall|SandbagWallLong|BarGate|WaterPump
2017-10-05 09:35:41 -05:00
0eeea3d5b4 be kicks for garden 2017-10-04 22:16:26 -05:00
48b2ae43b8 fixes for cinder floor and garden 2017-10-04 21:57:08 -05:00
f4b5c9daec Merge pull request #890 from morgoth0/patch-1
New items for crafting and building
2017-10-04 15:13:39 -05:00
85ecd4d870 Update CfgBaseBuilding.hpp 2017-10-04 16:02:49 -04:00
90bbf75579 Update CfgItemInteractions.hpp 2017-10-04 16:02:06 -04:00
217f47cc92 Update cfgCrafting.hpp
Added crafting recipes for most of the new buildables
2017-10-04 15:47:39 -04:00
d5905df9ff Better Spawn Positions for Chopper 2017-10-04 20:19:16 +02:00
3890dbcf0d limit critical part damage to 0.8
per disscussion with @Ignatz-HeMan
2017-10-04 11:18:54 -05:00
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
46d6b042f5 kit garden and cinder floor 2017-10-04 09:11:08 -05:00
faa0bc4e1b Merge pull request #889 from morgoth0/patch-7
Update WorldInteractions.hpp
2017-10-04 08:59:35 -05:00
45ed3c9995 Update WorldInteractions.hpp
Added models for BI placed ATMs and phones
2017-10-04 09:50:51 -04:00
6cef8086cb Merge pull request #888 from morgoth0/patch-6
Update Malden.h
2017-10-04 08:50:19 -05:00
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
e347f9d258 Merge pull request #887 from morgoth0/patch-2
Updated WorldInteractions.hpp
2017-10-04 07:58:38 -05:00
3b60f68acf fix blood rise issue with bitePlayer 2017-10-04 07:57:28 -05:00
5375693469 remove duplicate 2017-10-04 07:45:40 -05:00
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
52bb68f696 shorten filters 2017-10-04 06:51:01 -05:00
8f74b9736e fix BE kick srifle_DMR_07_blk_F 2017-10-04 06:23:33 -05:00
59db3387b8 add variants 2017-10-03 20:26:26 -05:00
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
5c6cc9bac7 remove debug 2017-10-03 17:01:04 -05:00
d72af99663 loot fix test 2017-10-03 16:41:46 -05:00
3345cc28b4 debug loot 2017-10-03 16:23:20 -05:00
27ef4446e4 changelog and private updates 2017-10-03 15:59:49 -05:00
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
02eb814715 changelog update 2017-10-03 11:43:46 -05:00
34489fc2e5 simplify check player BE filter 2017-10-03 10:48:48 -05:00
fb08ef4a76 handle null objects 2017-10-03 10:42:42 -05:00
aa263d6e0b fix extra space 2017-10-03 10:26:51 -05:00
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
5f640933d9 optimize remoteexec usage for multiple targets 2017-10-03 09:11:18 -05:00
bbd958ed52 energy fixes 2017-10-03 09:04:30 -05:00
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
70b11bc5a1 can just use array as targets instead of foreach here 2017-10-03 08:04:54 -05:00
6c551459a2 Merge pull request #885 from EpochModTeam/Ignatz-HeMan-patch-1
Fixed Wet Variable
2017-10-02 23:57:18 -05:00
6cf522fc16 Fixed Wet Variable 2017-10-03 00:22:14 +02:00
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
f53933a2ee Added more ItemSorts 2017-10-02 21:14:54 +02:00
ba4801b008 Removed ; 2017-10-02 21:08:01 +02:00
77cb621f98 REMOTE*+\]" to REMOTE.+\]" for checkPlayer 2017-10-02 14:06:48 -05:00
84f1174983 Added more missing ItemSorts 2017-10-02 21:06:25 +02:00