Commit Graph

537 Commits

Author SHA1 Message Date
He-Man
aa2f7b02ce Added Service Point to Rearm, Repair and Refuel
- I have no idea, where to upload the new needed pics for DynaMenu, so I
have added them into the root folder. Please move to the correct
location.
- Added needed "PayCrypto" function serverside. This function can only
remove Crypto from player. If someone try to add crypto, he will be
killed (could also changed to ban?!)
- I tried to avoid all Battleye filters (excepted remoteexec, of
course). But I have not tested it with Battleye for now.
2017-03-26 20:15:24 +02:00
vbawol
4acb24c8b2 update usage of createGroup to 1.68+ 2017-03-26 10:21:26 -05:00
vbawol
2c49a8ad93 add previous location check
If you had set a spawnpoint previously at another location and attempt
to set a new one, it would say "spawnpoint removed" instead of "set".
2017-03-24 07:24:35 -05:00
vbawol
f4c0d24e42 0.5 b708 2017-03-23 20:24:58 -05:00
vbawol
ea1e96d807 0.5 b707 2017-03-23 16:11:25 -05:00
vbawol
28baecfd71 0.5 b705 2017-03-23 14:45:19 -05:00
vbawol
4edfec94b5 add example x64 battleye.cfg 2017-03-23 13:46:53 -05:00
vbawol
2156309fcf MORE WIND! 2017-03-23 10:38:01 -05:00
vbawol
6e9e5ff9d3 server b703 2017-03-23 10:09:17 -05:00
vbawol
77b6ed4f18 0.5 b701 2017-03-22 17:37:02 -05:00
vbawol
3bf59bfa46 recompiled 2017-03-21 15:54:43 -05:00
vbawol
52d78a3325 untested Linux x64 support
pending release of x64 Arma 3 Linux dedicated server support to test
2017-03-21 14:57:09 -05:00
vbawol
7310318ea1 testing working: Linux support
(Static Linked)
2017-03-21 11:32:21 -05:00
vbawol
872d8dcb73 0.5 b700
weather tweaks and repack for PR
2017-03-18 00:24:02 -05:00
vbawol
9d69c8ada7 add legacy linux files just in case 2017-03-16 12:18:38 -05:00
vbawol
6b4f6ed0cb rebuild epoch so and attempt at x64 build for linux 2017-03-09 16:48:33 -06:00
vbawol
aff9d38c70 0.5 b699 2017-03-08 14:45:24 -06:00
vbawol
16e70faf8e 0.5 b698 2017-03-08 08:17:06 -06:00
vbawol
5857f56583 0.5 b697 2017-03-06 11:46:54 -06:00
vbawol
8b77ed0be7 add toxic sapper to spawn, give loot, etc.
also give feedback to player when Spawnpoint set
2017-03-06 11:19:20 -06:00
vbawol
6b82df4746 fix carry all backpack kicks 2017-03-06 09:20:18 -06:00
vbawol
dcd0954786 0.5 b696 2017-03-05 13:35:03 -06:00
vbawol
4f5d0baf8d 0.5 b695 2017-03-04 16:46:03 -06:00
vbawol
f5d51c4127 fixed typo in load player 2017-03-04 11:35:39 -06:00
vbawol
b695f29577 example Epoch Event: Payday
Give all connected players 100 Crypto every 30 minutes
2017-03-04 10:57:14 -06:00
vbawol
4cd7fdd5c6 0.5 b691 2017-03-04 00:53:05 -06:00
vbawol
b2629ca10f allow respawn in base 2017-03-04 00:52:45 -06:00
vbawol
4a08ccf033 fixed missing semicolons 2017-03-04 00:21:59 -06:00
vbawol
55a7a0190d 0.5 b684 2017-02-28 13:31:00 -06:00
vbawol
66452060cb Epoch Event: AirDrop 2017-02-28 12:34:45 -06:00
vbawol
51cddfa424 0.5 b683 2017-02-27 07:52:47 -06:00
vbawol
9d6b5a6ae5 0.5 b682 2017-02-26 09:19:51 -06:00
vbawol
1683d706d0 new bikey for 0.5 2017-02-26 08:37:12 -06:00
vbawol
625631f0af same 2017-02-26 08:18:54 -06:00
vbawol
246cc9670f 0.5 b681 repack 2017-02-26 08:17:12 -06:00
vbawol
8418588194 few missed pbos 2017-02-25 18:18:57 -06:00
vbawol
f31aeff613 0.5 b680 2017-02-25 16:37:07 -06:00
vbawol
2afb92e52e b678
see changelog
2017-02-24 11:31:33 -06:00
vbawol
d26d9c34e7 add experimental x64 dll for windows 2017-02-19 08:59:21 -06:00
He-Man
69a3b8b5d7 Reworked NPC Trade Script
- no longer use PubVar for Trade
- "Purchase Failed" not abort the complete trade
- Added an option, that Players with to much Bank-debit can not sell,
but can purchase. The Money for Purchasing goes directly to the Bank
then.
2017-02-10 21:28:00 +01:00
vbawol
a417dc9070 0.4 b675 2017-01-02 12:25:49 -06:00
vbawol
de95260a3e 0.4 b674 2016-12-29 13:57:50 -06:00
vbawol
1db988095e booleans in configs
- change bools in config files to string or a number.
- EPOCH_fnc_returnConfigEntry(V2) now also supports 0/1 via config when
default input is a bool.
Note: this commit may address issue with Bad conversion: bool rpt spam.

It is suggested to use the following format for storing booleans in
config:
1 = true
"true"=true
0 = false
"false"=false
2016-12-29 12:18:09 -06:00
vbawol
c7fece626f add some apex backpacks to BE filter 2016-12-18 13:22:19 -06:00
vbawol
81f3452bd9 b673 2016-12-14 14:11:36 -06:00
vbawol
fa834cebe4 revert scripts change for 1.66 hotfix 2016-12-13 07:44:51 -06:00
vbawol
dc93ccdbf4 b672 2016-12-12 13:25:00 -06:00
vbawol
31371482c8 b671 2016-12-12 11:29:46 -06:00
He-Man
77f58457cf Update epochconfig.hpp 2016-12-11 16:23:13 +01:00
He-Man
69b2bb401a Option to make BaseParts indestructible 2016-12-11 16:20:39 +01:00
vbawol
f86c49fe86 b670 2016-12-11 00:34:07 -06:00
vbawol
9856601229 0.4 b669
Workaround for playerRespawnTime always returning -1 when the player is
killed, that also prevented player time to be revived. Thanks goes to
@Ignatz-HeMan and @SPKcoding for the fix!
2016-12-03 11:22:55 -06:00
vbawol
1660e7f484 0.4 b668
fixed crash when opening crafting menu since A3 1.66.
workaround for HandleDisconnect not firing since A3 1.66.
b660
changed playableUnits to allPlayers
improved Epoch_selectInventoryItem function
improved inventory locked check with arma 1.66 features.
2016-12-02 10:24:25 -06:00
vbawol
350554b7f1 0.4 b660
fixes and improvments
2016-12-01 23:26:34 -06:00
vbawol
8e614b0b78 Arma 3 1.66 fixes part1
playableUnits changed to allPlayers
improved Epoch_selectInventoryItem function
mproved inventory locked check
2016-12-01 17:44:43 -06:00
vbawol
3d1f958839 b657 2016-11-28 00:17:28 -06:00
vbawol
fb7d733c41 b656 2016-11-26 10:26:16 -06:00
vbawol
7913ee0ea7 readd shared linux libs for now
will work on static build after I get my dev environment sorted.
2016-11-22 14:27:26 -06:00
vbawol
b4b7980aed more BE fixes for #651
removed attachto filter from scripts.txt as it has protection via
attachto.txt

add exceptions for CBA/CUP thanks to @SirDice and @Ghostrider-DbD- for
the reports
2016-11-16 08:58:22 -06:00
vbawol
4d82073c24 BE kick # 11 #651
Thanks to @baaljayjay for the report
2016-11-16 08:43:34 -06:00
vbawol
ab73f5995d BE kicks 50 and 34 #651
Thanks to @82ndab-Bravo17 for the report!
2016-11-16 08:38:29 -06:00
vbawol
57a5ec6edf rebuilt epochserver.so with shared libs 2016-11-15 08:36:42 -06:00
vbawol
f972e6a6e0 b655
repack for changes since
b07c74f80d
remove json files as they can be regenerated as needed
2016-11-13 23:49:53 -06:00
vbawol
9fa278e04a Epoch Survival 0.4 build:654
increased anti teleport distance limit to 30 and configureable via
epochah.hpp antihack_maxTravelDistance
2016-11-13 20:25:53 -06:00
vbawol
9d54517986 rebuilt epochserver.so on Debian 8.6 2016-11-13 17:35:27 -06:00
vbawol
57327acef3 Epoch Survival 0.4 b653 2016-11-11 16:50:26 -06:00
vbawol
aeab62fd0c fixed BE kick # 48 2016-11-10 10:09:05 -06:00
vbawol
9e66f8e03a 0.4 b652
- Fixed ryan zed not detected.
2016-11-09 17:23:27 -06:00
vbawol
a0b078a683 Epoch Survival 0.4 b650
- experiment with using dynamic UI (HOLD down Space Bar) for base
building: enable, disable, free mode, and snap alignment options. build
mode can still be disabled with "1" key only if already enabled.
- Replace the use of 1,2,3 keys for base building to free them up to be
used for Arma 3 weapon switching.
2016-11-09 17:04:15 -06:00
vbawol
c15ea5c42b Epoch Survival 0.4 b646
removed "wet" HUD icon for now.
reworked login fsm, thanks to some feedback on the forum.
removed most blocking of f1-12 keys and number keys via keyDown
function.
comment out some diag_log spam.
workaround for Arma 3 client crash when an admin uses F5 to delete a
vehicle.
Fixed Ryan Zombies mod detection issues.
Optimized and fixed wall state issues thanks to @Ignatz-HeMan for PR and
Xirtti for the feedback.
2016-11-09 15:21:15 -06:00
vbawol
dbf16e5c61 small correction in link 2016-11-08 11:00:46 -06:00
vbawol
1aa39383cc b640
fixed visible scrollbars on HUD UI thanks to @raymix
updated scripts.txt BE filter.
2016-11-08 09:53:09 -06:00
vbawol
af0b7bff0f BE kick #11 2016-11-03 15:10:07 -05:00
vbawol
3f3dd22f83 Epoch Survival 0.4 b639
return empty can on drinking gas,
added option to empty out gas can
2016-11-02 15:12:49 -05:00
vbawol
95cfc4be58 b638 2016-11-02 14:43:26 -05:00
vbawol
b48acf626f Epoch Survival 0.4 b637
tanoa mission file added that adds RyanZombies to the addons array
Test extended options support for double click item interaction sub
menu.
- "Drink" gas to poison your self.
- Pour our Honey "Empty" option to gain the empty jar without consuming
the honey.
2016-11-02 14:20:58 -05:00
vbawol
12740cfafd Epoch Survival 0.4 b633 2016-11-02 10:25:49 -05:00
vbawol
ae18103ddc more BE fixes and another build of epochserver.so 2016-11-01 16:23:07 -05:00
vbawol
0e3d163ab2 b632
test not suppessing SPACE key press to fix
https://github.com/EpochModTeam/Epoch/issues/539
2016-10-31 13:31:28 -05:00
vbawol
4dd055d4f3 b631
few more loot positions and updated tool with remaining list from
https://github.com/EpochModTeam/Epoch/issues/528
2016-10-31 11:23:52 -05:00
vbawol
25b6dd64e5 b630
fixed two loot positions Land_d_Windmill01_F and Land_d_Windmill01_F
2016-10-31 10:22:06 -05:00
vbawol
54269db977 Epoch Survival 0.4 b629
more BE kick fixes
removed pcre3.dll along with other uneeded files
epochserver.dll/so version 0.5.1.8 requires update to
2016-10-30 17:29:48 -05:00
vbawol
9ba075c2dc more BE fixes 2016-10-29 17:02:23 -05:00
vbawol
119bc9ac8a Epoch Survival 0.4 b628 2016-10-28 14:37:12 -05:00
vbawol
f2afc350b1 More BE scripts.txt updates 2016-10-27 18:05:42 -05:00
vbawol
90fb83790a BE fixes and changelog 2016-10-27 17:27:28 -05:00
vbawol
14058cb832 Epoch Survival 0.4 b626
increased anti-teleport range
added experimental vehicle immunity if locked inside an owned base (with
jammer)
Players now start with only 30% Hunger and Thirst instead of 100%.
2016-10-26 15:59:38 -05:00
vbawol
5fdb5f0a7b Epoch Survival 0.4 b621 2016-10-26 10:16:59 -05:00
vbawol
9ba60d5b7c Epoch Survival 0.4 b620 2016-10-24 16:23:09 -05:00
vbawol
4d5a8c150f update rest of comments
based on https://community.bistudio.com/wiki/Arma_3_Difficulty_Menu
2016-10-24 10:14:56 -05:00
vbawol
0459d18f84 correct comments for profile
https://epochmod.com/forum/topic/42773-typo-from-bi-arma-forum-propagated-to-epoch-github-repo/
2016-10-24 10:09:06 -05:00
vbawol
4aa8c8152d Epoch Survival 0.4 b619
[Changed] Dynamic sub menu for inventory item interaction and crafting
options. (Double click item in your inventory)
[Changed] Armor stat inventory feature now dynamic and no longer forced
via config.
[Changed] Group menu and requests are now on the self action menu.
2016-10-23 23:52:25 -05:00
vbawol
35cc154792 0.4 b605 gamemode
added H_105_EPOCH and halloween masks to loot table|
changed version check to check community pbo
2016-10-14 15:31:01 -05:00
vbawol
e6585ecc16 BE to allow elcan 2016-10-02 10:04:32 -05:00
vbawol
4cb51d6f4f more BE updates 2016-09-27 08:22:13 -05:00
vbawol
7028129934 BE fixes for 1.64 2016-09-26 15:06:15 -05:00
vbawol
da7e5e6d2d experiment with json config generator/parser 2016-09-25 16:33:00 -05:00
vbawol
6cdb9633d4 0.4 b602
new compiler with optional v2 format more like BI's
added expanded startup init logic
moved mirror setup to own function inside epoch core
moved server init code to main gamemode init logic.
2016-09-08 12:09:58 -05:00
vbawol
e817f1e2e5 0.4.0.0 b597 2016-09-04 23:32:38 -05:00
vbawol
d285fe4ad0 private array cleanup p1 2016-08-31 19:29:08 -05:00
He-Man
75fa5fdf1b Update epochconfig.hpp 2016-08-31 17:36:57 +02:00
vbawol
90f5674a74 0.4.0.0 b584
More work on Dynamic HUD and hudConfigs are now found in CfgEpochClient.
Animal spawn table now found in CfgEpochClient.
Two new functions added to handle get(In|Out)Man Event Handlers.
moved forced disabling of build mode when getting in vehicle to getInMan
EH function.
removed a few unused files.
2016-08-12 13:15:11 -05:00
vbawol
19d36fd802 0.4.0.0 b583
tweaks to angle and offset of HUD
2016-08-10 10:20:23 -05:00
vbawol
0c7bb5f916 Be filter update 2016-08-08 16:17:24 -05:00
vbawol
810fe5d65c bump version to 0.4
* Adds experimental test of new HUD from @raymix
* Hud elements are added and removed dynamically so that all active
icons are always right justified.
* Icons scale in size when critical levels are reached.
* added use of new A3 features to control angle and scale of hud icons.
* warning and critical levels are controlled via customVarsDefaults.

* Added larger group sizes up to 64 players and increased Krypto costs.
* reworked Finsh login in login fsm to wait for display 46 not to be
Null.
2016-08-08 14:45:39 -05:00
vbawol
9d8734acdc remove bikey for 0390 and replace with 0400 2016-08-08 14:36:19 -05:00
vbawol
e69e47185a fixed BE kick when asking trader his name 2016-08-07 15:12:58 -05:00
vbawol
45dd6f410c fixed Apex BE attachto kicks
ref to https://github.com/EpochModTeam/Epoch/issues/589
2016-08-06 12:53:56 -05:00
vbawol
6f0025f8c9 BE updates for CUP and APEX attach to kicks 2016-07-28 10:06:07 -05:00
vbawol
792e2d90bf 0.3.9 b570 2016-07-12 15:17:22 -05:00
vbawol
e865ab218e 0.3.9 b569 2016-07-12 14:41:03 -05:00
vbawol
ee7f7497c0 0.3.9 b568
change gamemode from Survival to Survive
enabled Ryan Zombies support by default.
added random delay in revenge detonation.
added min alive time setting for player revenge options. Default 15
minutes (900 seconds).
2016-07-12 14:19:56 -05:00
vbawol
443c6e90bc 0.3.9 b566
fixed incorrect index in weighted array fnc when zombies not used
added 3 additional water sources
fixed BE kick when base building since b564
removed allowdamage false on player revive, that caused player immunity
to server side AI.
trade request text feedback changed
2016-07-10 08:54:27 -05:00
vbawol
071a49aa51 0.3.9 b565
fixed typo from b563
2016-07-09 11:10:53 -05:00
vbawol
2df932cda6 fixed typo pt2 2016-07-09 10:29:23 -05:00
vbawol
88ba4b9e6b 0.3.9 b564
fixed error in load vehicles function
2016-07-09 10:26:35 -05:00
vbawol
ffad14348b repack 2016-07-09 09:13:59 -05:00
vbawol
7f23f761ca 0.3.9 b563 pt2 2016-07-09 09:05:07 -05:00
vbawol
8dcb38d655 0.3.9 b563 2016-07-09 09:04:08 -05:00
vbawol
5728c29baa 0.3.9 b562
simplify new load vehicle, (realized sleep was not needed as allowDamage
does not effect scripted damage (per the wiki)
[added] old load vehicle script and epochconfig,hpp flag. (default is
false = use new load vehicles, true use old one from 0.3.8
2016-07-08 17:34:13 -05:00
vbawol
e94971867b 0.3.9 b561 2016-07-08 10:26:27 -05:00
vbawol
1310098264 disable vehicle simulation handler
changed var name to force change, new variable is: simulationHandlerOld
2016-07-08 09:51:47 -05:00
vbawol
52e8008f16 fixed be kick # 39 2016-07-08 09:06:32 -05:00
vbawol
1a99015935 Merge branch 'release' into experimental
# Conflicts:
#	Server_Install_Pack/@epochhive/addons/epoch_server.pbo
#	Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo
#	Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo
#	Server_Install_Pack/mpmissions/epoch.Altis.pbo
#	Server_Install_Pack/mpmissions/epoch.Australia.pbo
#	Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo
#	Server_Install_Pack/mpmissions/epoch.Bornholm.pbo
#	Server_Install_Pack/mpmissions/epoch.Chernarus.pbo
#	Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo
#	Server_Install_Pack/mpmissions/epoch.Desert_E.pbo
#	Server_Install_Pack/mpmissions/epoch.Esseker.pbo
#	Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo
#	Server_Install_Pack/mpmissions/epoch.Napf.pbo
#	Server_Install_Pack/mpmissions/epoch.Porto.pbo
#	Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo
#	Server_Install_Pack/mpmissions/epoch.Sara.pbo
#	Server_Install_Pack/mpmissions/epoch.SaraLite.pbo
#	Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo
#	Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo
#	Server_Install_Pack/mpmissions/epoch.Stratis.pbo
#	Server_Install_Pack/mpmissions/epoch.Takistan.pbo
#	Server_Install_Pack/mpmissions/epoch.VR.pbo
#	Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo
#	Server_Install_Pack/mpmissions/epoch.Zargabad.pbo
#	Server_Install_Pack/mpmissions/epoch.utes.pbo
#	Sources/epoch_config/build.hpp
#	Sources/epoch_server/build.hpp

#	Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_packStorage.sqf
#	Sources/epoch_server_core/build.hpp
#	Sources/epoch_server_settings/build.hpp
#	build.txt
2016-07-07 15:55:33 -05:00
vbawol
dee3394024 0.3.9 b559 2016-07-07 15:25:03 -05:00
vbawol
de065ea3a7 0.3.9 b558
allow disable of ryan zombies support
suppressed zombies and more ai from jammers and traders
2016-07-07 14:50:35 -05:00
vbawol
76785e1694 0.3.9 b557 2016-07-07 09:50:27 -05:00
vbawol
e9958bc5d8 add god mode enabled variable flag
for #525
2016-07-06 23:56:48 -05:00
vbawol
1da15073d8 0.3.9 b556
fixed unneeded message when suppressing forced AI spawn.
fixed no message if player does not have energy for NVG.
2016-07-06 20:48:53 -05:00
vbawol
8dc77ec853 0.3.9 b555 2016-07-06 14:35:20 -05:00
vbawol
d1854aaaa3 0.3.9 b554
fixed missing var in biteplayer
2016-07-05 14:15:42 -05:00
vbawol
8f3b06f0f4 0.3.9.0 b553
Zombies: fixed issue with multiple targets
moved CfgSounds and CfgSay3Dhandler to mission file
added new mission config (CfgSwitchMovehandler) for
EPOCH_server_handle_switchMove function
minor cleanup to EPOCH_server_handle_say3D usages.
2016-07-05 13:22:14 -05:00
vbawol
eaf23d4e31 0.3.9.0 b552
zombie fixes
removed armed vtol
prices for APEX vehicles
message when NVG disabed due to lack of energy
2016-06-30 17:43:28 -05:00
vbawol
02761bb4cf 0.3.9.0 b547 2016-06-30 12:06:07 -05:00
vbawol
e04f4d2e69 Merge pull request #561 from RC-Robio/patch-2
Update sc.arma3profile
2016-06-29 15:52:28 -05:00
vbawol
6a01291440 0.3.9.0546
add server invoked looting text based feedback
2016-06-29 13:35:37 -05:00
Robio
16ab1e6132 Update sc.arma3profile 2016-06-29 13:06:53 -05:00
vbawol
b84e97a71a change config.cfg to server.cfg, install note updates
Thanks @RC-Robio for the heads up!
2016-06-29 08:22:47 -05:00
vbawol
1ec9d344be 0.3.9.0545
new function EPOCH_swapBuilding
2016-06-28 21:37:11 -05:00
vbawol
f8f776c659 0.3.9.0544
only use nearestTerrainObjects [player, ["SHIPWRECK"], 40000]; postions
for containerpos array
change gamemode to survival, (might show as unknown gamemode pre 1.62)
2016-06-27 15:56:35 -05:00
vbawol
926ad37a06 0.3.9.0543
Tanoa container positions thanks to Sparky
Tanoa Apex vehicles added
give attributes should not return anything if data is 0 even if random
is used
2016-06-27 11:51:31 -05:00
vbawol
9e548a1c04 0.3.9.0542
fixes to a few typos
2016-06-25 10:12:26 -05:00
vbawol
ed75234adb 0.3.9.0541
revert setVectorDirAndUp after setpos and use [0,0,0]
2016-06-25 08:35:36 -05:00
vbawol
05bbb9a14e 0.3.9.0539
add loot class override variable epochLootClass, to allow all zed
classes to return
BE filter updates for extra zombie classes
added loot table for zombies.
added looting of Dogs for meat with negative karma.
cooking of dog meat.
loot configs for shark
interactAttributes format changed to an array ["Hunger",100,1] //
CustomVarName, value, make value randomized.
BE updates and fixes
new function EPOCH_giveAttributes
2016-06-23 20:43:22 -05:00
vbawol
fd0ca662c7 0.3.9.0538 2016-06-23 06:44:37 -05:00
vbawol
8f5867b450 fix for shipwreck containers disappearing
http://epochmod.com/forum/topic/42270-boxes-disappearing/
2016-06-23 06:43:59 -05:00
vbawol
620e335e1d 0.3.9.0537
Tanoa building loots v1 done
2016-06-20 16:49:51 -05:00
vbawol
8b3dc768d2 merge 2016-06-20 10:58:31 -05:00
vbawol
66924ce57d Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental
# Conflicts:
#	Server_Install_Pack/sc/BattlEye/remoteexec.txt
2016-06-20 10:58:02 -05:00
vbawol
729995b0d4 BE filter for makeMarker 2016-06-20 10:53:37 -05:00