FrozenCow 1cc43637ee Merge remote-tracking branch 'kilandor/master' into nowebserver ...

Conflicts:
	configuration.txt
	src/main/java/org/dynmap/DynmapPlayerListener.java
	src/main/java/org/dynmap/DynmapPlugin.java
	web/map.js

2011-02-22 17:58:39 +01:00

..

block_cave.png

Changed gui by lechd + map per world client-configuration.

2011-02-17 20:08:50 +01:00

block_nether.png

Changed gui by lechd + map per world client-configuration.

2011-02-17 20:08:50 +01:00

block_other.png

Changed gui by lechd + map per world client-configuration.

2011-02-17 20:08:50 +01:00

block_surface.png

Changed gui by lechd + map per world client-configuration.

2011-02-17 20:08:50 +01:00

book.png

Merged revisions 37-48 from trunk.

2010-12-17 02:19:56 +00:00

cave_off.png

Merged revisions 37-48 from trunk.

2010-12-17 02:19:56 +00:00

cave_on.png

Merged revisions 37-48 from trunk.

2010-12-17 02:19:56 +00:00

chat_bubble.png

Changed gui by lechd + map per world client-configuration.

2011-02-17 20:08:50 +01:00

chat_cursor.png

Added lechd's new images.

2011-02-20 18:47:18 +01:00

chat_style.css

a lot of changes. chat and ui related. thanks FrozenCow & lechd

2011-02-20 01:58:53 +01:00

chat.js

Made sendmessage url relative.

2011-02-19 21:08:14 +01:00

clock_day.png

Changed gui by lechd + map per world client-configuration.

2011-02-17 20:08:50 +01:00

clock_night.png

Changed gui by lechd + map per world client-configuration.

2011-02-17 20:08:50 +01:00

clock.digital.js

Made clock configurable and split clocks from map.

2011-02-15 13:50:04 +01:00

clock.timeofday.js

a lot of changes. chat and ui related. thanks FrozenCow & lechd

2011-02-20 01:58:53 +01:00

compass_alt.png

Added lechd's new images.

2011-02-20 18:47:18 +01:00

compass.png

many ui iprovements by lechd

2011-02-19 20:51:21 +01:00

config.js

Added server-to-client configuration and maptype-configuration: enables serverside configuration of maps and updaterate.

2011-02-01 14:17:08 +01:00

custommarker.js

Player per world support @ client.

2011-02-22 14:49:03 +01:00

dynmap_style.css

Player per world support @ client.

2011-02-22 14:49:03 +01:00

dynmap.ico

Added lechd's new images.

2011-02-20 18:47:18 +01:00

follow_off.png

added fescen9 branch

2010-12-04 13:24:32 +00:00

follow_on.png

added fescen9 branch

2010-12-04 13:24:32 +00:00

home.png

- Renamed markers.csv to markers.txt

2010-12-10 06:48:09 +00:00

index.html

Added entry for css overrides and cleaned up styles by lechd.

2011-02-20 23:55:16 +01:00

jquery-1.4.4.min.js

Fixed browser compatiblity for Firefox with several cleanups, added jQuery and readded follow-boxes.

2010-12-31 13:33:51 +01:00

jquery.json.js

Added server-to-client configuration and maptype-configuration: enables serverside configuration of maps and updaterate.

2011-02-01 14:17:08 +01:00

kzedmaps.js

Changed gui by lechd + map per world client-configuration.

2011-02-17 20:08:50 +01:00

list_off.png

added fescen9 branch

2010-12-04 13:24:32 +00:00

list_on.png

added fescen9 branch

2010-12-04 13:24:32 +00:00

map.js

Merge remote-tracking branch 'kilandor/master' into nowebserver

2011-02-22 17:58:39 +01:00

minecraft.js

Readded getMinecraftTime.

2011-02-13 23:30:19 +01:00

moon.png

many ui iprovements by lechd

2011-02-19 20:51:21 +01:00

override_example.css

New buttons and example override css by lechd.

2011-02-20 22:11:28 +01:00

player_death.png

Added lechd's new images.

2011-02-20 18:47:18 +01:00

player_face.png

Added lechd's new images.

2011-02-20 18:47:18 +01:00

player_follow_off.png

Changed gui by lechd + map per world client-configuration.

2011-02-17 20:08:50 +01:00

player_follow_on.gif

Added lechd's new images.

2011-02-20 18:47:18 +01:00

player_follow_on.png

Changed gui by lechd + map per world client-configuration.

2011-02-17 20:08:50 +01:00

player_travel.png

Added lechd's new images.

2011-02-20 18:47:18 +01:00

player.png

Added lechd's new images.

2011-02-20 18:47:18 +01:00

server.png

Added lechd's new images.

2011-02-20 18:47:18 +01:00

sidebar_hint.png

Changed gui by lechd + map per world client-configuration.

2011-02-17 20:08:50 +01:00

sign_home.png

Changed gui by lechd + map per world client-configuration.

2011-02-17 20:08:50 +01:00

sign_sign_alt.png

Added lechd's new images.

2011-02-20 18:47:18 +01:00

sign_sign.png

Added lechd's new images.

2011-02-20 18:47:18 +01:00

sign_warp.png

Changed gui by lechd + map per world client-configuration.

2011-02-17 20:08:50 +01:00

sign.png

- Markers are now known as "Signs"

2010-12-11 04:56:06 +00:00

spawn.png

- Renamed markers.csv to markers.txt

2010-12-10 06:48:09 +00:00

sun.png

many ui iprovements by lechd

2011-02-19 20:51:21 +01:00

up.aspx

Changed proxy-url to /up/ as ktr suggested.

2011-01-22 14:55:50 -08:00

warp.png

- Renamed markers.csv to markers.txt

2010-12-10 06:48:09 +00:00

window_close_hover.png

New buttons and example override css by lechd.

2011-02-20 22:11:28 +01:00

window_close.png

Changed gui by lechd + map per world client-configuration.

2011-02-17 20:08:50 +01:00

window_open.png

Changed gui by lechd + map per world client-configuration.

2011-02-17 20:08:50 +01:00

window_pinned_hover.png

New buttons and example override css by lechd.

2011-02-20 22:11:28 +01:00

window_pinned.png

New buttons and example override css by lechd.

2011-02-20 22:11:28 +01:00

window_unpinned.png

Added pinning.

2011-02-18 00:07:51 +01:00

zoom_in.png

Changed gui by lechd + map per world client-configuration.

2011-02-17 20:08:50 +01:00

zoom_out.png

Changed gui by lechd + map per world client-configuration.

2011-02-17 20:08:50 +01:00