Commit Graph

2621 Commits

Author SHA1 Message Date
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
288edfb77e Added new Uniforms and Masks to ItemSort 2017-10-02 19:17:00 +02:00
99682cca1b Added new Uniforms and Masks to ItemSort 2017-10-02 19:13:11 +02:00
888629ea2b Reverted last change and changed hint 2017-10-02 18:57:08 +02:00
9029bc7524 dyna-menu functionality on map 2017-10-02 11:49:27 -05:00
a73b6e5008 Added Kit_Garden to Itemsort 2017-10-02 18:43:41 +02:00
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
fe8c16d88f Moved 2nd local check behind sleep 2017-10-02 18:27:09 +02:00
8e0c7afc91 force first row to spawn 2017-10-02 11:10:22 -05:00
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
bf7d35b519 move rads for locations to client
locations cannot use public var option
2017-10-02 10:06:04 -05:00
8e698e95db Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-10-02 09:54:05 -05:00
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
16191f0400 Merge pull request #884 from ravmustang/patch-5
more assets pricing
2017-10-02 07:51:42 -05:00
a063a5af58 Merge pull request #883 from ravmustang/patch-4
add remaining plants and clean up tabs
2017-10-02 07:51:35 -05:00
76307fe450 Merge pull request #882 from ravmustang/patch-3
add remaining vehicle ammos
2017-10-02 07:51:27 -05:00
ada87955a5 more assets pricing 2017-10-02 07:41:23 -05:00
124d8922f1 add remaining plants and clean up tabs 2017-10-02 07:31:17 -05:00
09e4b6c4e3 add remaining vehicle ammos 2017-10-02 07:17:15 -05:00
b0d3b21dde Merge pull request #881 from ravmustang/patch-2
female outfits and new Halloween masks
2017-10-02 07:15:22 -05:00
78e150ce8c female outfits and new Halloween masks 2017-10-02 06:57:59 -05:00
d2daca6f46 add garden kit 2017-10-01 21:25:57 -05:00
6ac1e72a97 set read only vars
with failback to normal use.
2017-10-01 19:48:32 -05:00
662ef386b1 set bipod price to 0 2017-10-01 19:09:38 -05:00
c3cce9b4f9 Merge pull request #880 from ravmustang/patch-1
add missing ,
2017-10-01 18:51:15 -05:00
11b64381c8 add missing , 2017-10-01 18:26:47 -05:00
1ab0c68a45 use local var within loop 2017-10-01 18:18:38 -05:00
4f98071e8d dynamic radio active locations 2017-10-01 18:14:18 -05:00
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
f11f8a5a6c remove karma Item Interactions 2017-10-01 16:20:34 -05:00
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
1bf10b5ddc BE: allow ghost and sim versions of tent Dome and A 2017-10-01 15:42:57 -05:00
1903a7dd60 changelog updates 2017-10-01 15:12:28 -05:00
e75b12e152 changelog updates 2017-10-01 14:59:58 -05:00
01b102f982 more changelog updates 2017-10-01 14:48:15 -05:00
30ee3d020d changelog update 2017-10-01 14:10:32 -05:00
15f386f6f5 filter cleanup 2017-10-01 01:23:50 -05:00