Commit Graph

95 Commits

Author SHA1 Message Date
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
FrozenCow
da7da17235 Applied some suggestions by JSLint. 2011-02-22 15:38:49 +01:00
FrozenCow
ccf6f2ac49 Player per world support @ client. 2011-02-22 14:49:03 +01:00
FrozenCow
b097fb8321 Added entry for css overrides and cleaned up styles by lechd. 2011-02-20 23:55:16 +01:00
FrozenCow
cd4027495c New buttons and example override css by lechd. 2011-02-20 22:11:28 +01:00
FrozenCow
f80385e1af Added lechd's new images. 2011-02-20 18:47:18 +01:00
Arthur Mayer
02fb226350 removed forgotten comma 2011-02-20 02:02:45 +01:00
Arthur Mayer
d7fe6072a5 a lot of changes. chat and ui related. thanks FrozenCow & lechd 2011-02-20 01:58:53 +01:00
Jason Booth
6ab82174a5 Added timestamp support to Update Tiles and Chat.
New web config to handle for jsonfile method
Modified webclient to handle timestamps to prevent duplication.
Removed duplicate code in JsonTimerTask.java
2011-02-19 18:55:01 -06:00
FrozenCow
83f334445b Made chatinput reset after send. 2011-02-19 21:16:14 +01:00
FrozenCow
d5bd6ff038 Made sendmessage url relative. 2011-02-19 21:08:14 +01:00
Arthur Mayer
22cc46f4b8 many ui iprovements by lechd 2011-02-19 20:51:21 +01:00
FrozenCow
77539522f0 Merge branch 'master' of https://github.com/flames/dynmap 2011-02-19 16:31:36 +01:00
FrozenCow
2bd0052aa9 Added WebChat back to web. 2011-02-19 16:31:13 +01:00
Arthur Mayer
9d490cbcc8 removed my custom url, made it relative 2011-02-19 08:26:40 +01:00
Arthur Mayer
61c6f4a086 corrected the json string in sendChat() 2011-02-18 20:15:18 +01:00
Arthur Mayer
56f126d5f2 uups. removed debug alert, added function call 2011-02-18 11:15:05 +01:00
Arthur Mayer
10f93c02c1 added chatSend() function 2011-02-18 10:21:55 +01:00
Arthur Mayer
5ddaf940ed chat interface added, config option changed from showchatballoons:
ture/false to showchat: balloons/modal
2011-02-18 07:08:29 +01:00
Arthur Mayer
00485ddcc2 fixed small bug/typo where players were not removed from player list
at quit game.
2011-02-18 01:28:58 +01:00
FrozenCow
1388fa11e5 Some desperate attempts to make IE8 work. 2011-02-18 00:07:59 +01:00
FrozenCow
b860c7dd0e Added pinning. 2011-02-18 00:07:51 +01:00
FrozenCow
44748d7f07 Changed gui by lechd + map per world client-configuration. 2011-02-17 20:08:50 +01:00
FrozenCow
060d1092f9 Made clock configurable and split clocks from map. 2011-02-15 13:50:04 +01:00
FrozenCow
18ad2e1d79 Removed copyrights through flames' css. 2011-02-15 13:33:40 +01:00
FrozenCow
5fb098259a focuschatballoons now defaults to false. 2011-02-15 13:08:33 +01:00
Daniel Chesters
24c9dfed41 if focuschatballoons is at false, disableAutoPan should be at true 2011-02-14 21:53:07 +01:00
FrozenCow
a1c86bfabb Removed depricated time-images. 2011-02-14 00:02:52 +01:00
FrozenCow
49d45c653d Made clock and timeofday interchangable. 2011-02-14 00:01:20 +01:00
FrozenCow
42391cc4d5 Readded getMinecraftTime. 2011-02-13 23:30:19 +01:00
FrozenCow
3980ebefa1 Revert "Removed Clock"
This reverts commit 9ca8f8dc64.
2011-02-13 23:27:37 +01:00
lishid
058ab0eea7 Transparent compass now 2011-02-13 23:27:37 +01:00
lishid
6e8160e576 Removed Clock 2011-02-13 23:27:37 +01:00
lishid
51e7420bdb Dynamic Time of the day Added 2011-02-13 23:27:37 +01:00
lishid
60ea503053 Added/Modified images 2011-02-13 23:27:37 +01:00
lishid
f894c4945b Added/Modified images 2011-02-13 23:27:37 +01:00
lishid
7241b2be81 Added compass and TimeOfDay 2011-02-13 23:27:37 +01:00
unknown
b729f28df4 initial commit 2011-02-13 23:27:37 +01:00
FrozenCow
db9ced3394 Fixed tiles not updating. 2011-02-13 22:42:08 +01:00
FrozenCow
100f3e0590 Added multiworld update support along with client-side support. 2011-02-13 01:19:47 +01:00
FrozenCow
403a2acc53 Added default player-faces. 2011-02-10 01:20:50 +01:00
FrozenCow
d2b7169884 Workaround for IE's retardness (not yet tested). 2011-02-06 15:09:15 +01:00
FrozenCow
3e398e9124 Made updates in JSON format. Combined chat and tile queues into one UpdateQueue. Fixed UpdateQueue. 2011-02-06 03:00:51 +01:00
FrozenCow
711341ec47 Oops, forgot comma. 2011-02-05 19:51:06 +01:00
FrozenCow
902cc87458 Added 'focuschatballoons' to config influenced by Incendia's suggestion. 2011-02-05 02:59:03 +01:00
FrozenCow
9951baf8b5 Made tiles use nearest-neighbor filtering in Firefox and IE as suggested by lechd. 2011-02-05 02:54:06 +01:00
FrozenCow
fde56275fe Changed day/night time as suggested by lologarithm. 2011-02-02 11:58:14 +01:00
FrozenCow
455b5d3b3e Added showchatballoons, showplayerfacesonmap and showplayerfacesinmenu to configuration. 2011-02-01 15:16:54 +01:00
FrozenCow
1beb4fa466 Added server-to-client configuration and maptype-configuration: enables serverside configuration of maps and updaterate. 2011-02-01 14:17:08 +01:00
FrozenCow
e47b4dc49f Small fixes to chat-balloons. 2011-01-26 01:05:00 +01:00