Merge remote branch 'upstream/master'

This commit is contained in:
Mike Primm 2012-03-20 08:02:58 -05:00
commit 67e0bd2f2c

View File

@ -28,6 +28,9 @@ components:
require-player-login-ip: false require-player-login-ip: false
# (optional) block player login IDs that are banned from chatting # (optional) block player login IDs that are banned from chatting
block-banned-player-chat: true block-banned-player-chat: true
# Require login for web-to-server chat (requires login-enabled: true)
webchat-requires-login: false
# # Optional - make players hidden when they are inside/underground/in shadows (#=light level: 0=full shadow,15=sky) # # Optional - make players hidden when they are inside/underground/in shadows (#=light level: 0=full shadow,15=sky)
# hideifshadow: 4 # hideifshadow: 4
# # Optional - make player hidden when they are under cover (#=sky light level,0=underground,15=open to sky) # # Optional - make player hidden when they are under cover (#=sky light level,0=underground,15=open to sky)
@ -48,6 +51,8 @@ components:
# hideifshadow: 0 # hideifshadow: 0
# hideifundercover: 0 # hideifundercover: 0
# hideifsneaking: false # hideifsneaking: false
# # Require login for web-to-server chat (requires login-enabled: true)
# webchat-requires-login: false
- class: org.dynmap.SimpleWebChatComponent - class: org.dynmap.SimpleWebChatComponent
allowchat: true allowchat: true
@ -264,6 +269,11 @@ disable-webserver: false
# Enable/disable having the web server allow symbolic links (true=compatible with existing code, false=more secure (default)) # Enable/disable having the web server allow symbolic links (true=compatible with existing code, false=more secure (default))
allow-symlinks: true allow-symlinks: true
# Enable login support
login-enabled: false
# Require login to access website (requires login-enabled: true)
login-required: false
# Period between tile renders for fullrender, in seconds (non-zero to pace fullrenders, lessen CPU load) # Period between tile renders for fullrender, in seconds (non-zero to pace fullrenders, lessen CPU load)
timesliceinterval: 0.0 timesliceinterval: 0.0
@ -327,6 +337,7 @@ persist-ids-by-ip: true
msg: msg:
maptypes: "Map Types" maptypes: "Map Types"
players: "Players" players: "Players"
chatrequireslogin: "Chat Requires Login"
# Set to true to enable verbose startup messages - can help with debugging map configuration problems # Set to true to enable verbose startup messages - can help with debugging map configuration problems
# Set to false for a much quieter startup log # Set to false for a much quieter startup log