Commit Graph

2005 Commits

Author SHA1 Message Date
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
f3c6d8b491 player marker be filter
player marker be filter 
scripts.txt Line 40
 !="(_x select 0) setMarkerPosLocal (position player);"
2017-10-08 18:28:37 -05:00
DirtySanchez
84e96493b9 player marker be filter
add
Line #40 setMarker
!="(_x select 0) setMarkerPosLocal (position player);"
2017-10-08 18:02:26 -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
b911897c31 add masks to loot table 2017-10-08 13:27:36 -05:00
vbawol
4fddeafd6e add female uniforms to loot table 2017-10-08 13:23:44 -05:00
vbawol
004b46ebed add 75 compatible male uniforms 2017-10-08 13:13:40 -05:00
He-Man
a4ec14e468 Inventory fix
Fix blocked Inventory after we set rating to -2001
Thx DirtySanchez for helping to fix it!
2017-10-08 17:38:31 +02: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
vbawol
c7fb51fb7e changelog 2017-10-07 16:57:35 -05:00
DESKTOP-UH65DCE\MusTanG
3a0c4f1398 prep for lootable toilet 2017-10-07 14:54:07 -05:00
He-Man
14c433581b Set Rating to -2001 2017-10-07 21:23:54 +02:00
DESKTOP-UH65DCE\MusTanG
2fe8f08adf add halloween and rad masks to ah 2017-10-07 12:11:01 -05:00
He-Man
b1775a68ba Wait for local _playerObject
Hitpoints and EH's were set before playerobjects is local, so wait for
it!
2017-10-07 18:37:09 +02:00
He-Man
4660975b05 Fix for empty _Primary array 2017-10-07 17:45:23 +02:00
vbawol
7ef339d958 changelog and comment cleanup 2017-10-07 10:41:44 -05:00
He-Man
e4fdf4d6a0 Workaround for unitloadout 2.0 2017-10-07 17:38:58 +02: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
vbawol
bfb60f526e add other masks BE filter 2017-10-07 08:49:56 -05:00
vbawol
5a284f6fb0 BE for rad mask 2017-10-07 08:43:16 -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
c9039929ab remove unused gm_enabled setvar
merge fix from @ravmustang 👍
2017-10-06 22:37:27 -05:00
vbawol
5d814a9442 just set once 2017-10-06 22:32:57 -05:00
DESKTOP-UH65DCE\MusTanG
b62a029d66 processed locally 2017-10-06 22:12:27 -05:00
vbawol
f49def0c47 Merge pull request #903 from morgoth0/patch-3
Thanks @morgoth0 !
Update Malden.h
2017-10-06 21:27:56 -05:00
vbawol
bdb168ba50 fix godmode with player vars 2017-10-06 21:17:14 -05:00
Grahame
42020032be Update Malden.h
Added Malden trader camps, one "North" (would be west if there were a south TP manhole cover), East and "West" (would be south if there were a south TP manhole cover) ;)
2017-10-06 20:53:09 -04:00
vbawol
b76ec767c1 changelog 2017-10-06 17:01:33 -05:00
vbawol
d29899acb0 changelog 2017-10-06 14:26:19 -05:00
vbawol
4e22b33129 Merge pull request #901 from morgoth0/patch-2
Update WorldInteractions.hpp
2017-10-06 14:23:50 -05:00
vbawol
bd6afe4417 Merge pull request #900 from morgoth0/patch-1
Update CfgBuildingLootPos.hpp
2017-10-06 14:23:41 -05:00
DESKTOP-UH65DCE\MusTanG
7bf39b7cad replace with FAK in comments 2017-10-06 12:07:32 -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
e1bc965fdd must be _x
magazineCargo return strings, not objects
2017-10-06 17:39:26 +02: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
f9a5c29fa8 Force Vehicle Save after adding / removing Mags 2017-10-06 14:01:29 +02:00
He-Man
8a4ab15fd1 override default action, if FavBar slot has item 2017-10-05 21:58:24 +02:00
vbawol
eadf92c1c0 Merge pull request #898 from RC-Robio/patch-7
Fix typo
2017-10-05 14:26:31 -05:00
He-Man
c6bcbe81eb Reworked Vehicle Rearm Scrips 2017-10-05 20:59:52 +02:00
Robio
af6589b8eb Fix typo 2017-10-05 11:20:11 -05:00
vbawol
8a1b312f12 Merge pull request #897 from RC-Robio/patch-5
Add craftables
2017-10-05 11:12:32 -05:00