Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,967 Commits 8 Branches 78 Tags 202 MiB
d3acc2683b
Commit Graph

1967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
vbawol
6c551459a2 Merge pull request #885 from EpochModTeam/Ignatz-HeMan-patch-1 
Fixed Wet Variable
 2017-10-02 23:57:18 -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
DirtySanchez
77cb621f98 REMOTE*+\]" to REMOTE.+\]" for checkPlayer 2017-10-02 14:06:48 -05: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
vbawol
76307fe450 Merge pull request #882 from ravmustang/patch-3 
add remaining vehicle ammos
 2017-10-02 07:51:27 -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
vbawol
b0d3b21dde Merge pull request #881 from ravmustang/patch-2 
female outfits and new Halloween masks
 2017-10-02 07:15:22 -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
vbawol
c3cce9b4f9 Merge pull request #880 from ravmustang/patch-1 
add missing ,
 2017-10-01 18:51:15 -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
1bf10b5ddc BE: allow ghost and sim versions of tent Dome and A 2017-10-01 15:42:57 -05:00
vbawol
1903a7dd60 changelog updates 2017-10-01 15:12:28 -05:00
vbawol
e75b12e152 changelog updates 2017-10-01 14:59:58 -05:00
vbawol
01b102f982 more changelog updates 2017-10-01 14:48:15 -05:00
vbawol
30ee3d020d changelog update 2017-10-01 14:10:32 -05:00
vbawol
15f386f6f5 filter cleanup 2017-10-01 01:23:50 -05:00
vbawol
47bde63181 include closing tag 2017-10-01 00:46:40 -05:00
vbawol
a1459a5301 fix reported BE kick 2017-10-01 00:44:48 -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