Commit Graph

77 Commits

Author SHA1 Message Date
FrozenCow
686331d1a5 Better error status message. 2011-02-28 19:23:25 +01:00
FrozenCow
a04215be8f Alertbox does not open when opening page anymore. 2011-02-26 21:33:02 +01:00
FrozenCow
1e04d10b35 Nicer invalid update-url handling (for invalid world-names or non-existing worlds). 2011-02-26 20:27:54 +01:00
FrozenCow
e6d2c4932a Reverted back to "== '13'" like flames suggested before. This seemed to raise incompatiblities for Firefox and Safari on Mac, not on Linux. 2011-02-24 00:38:46 +01:00
FrozenCow
20e954b905 Change for the inner nerd in me. 2011-02-24 00:06:36 +01:00
Arthur Mayer
cc0bb3b509 fixed chat sending messages from web.
event.keyCode === '13', where the strict equal operator seem to break
safari, firefox and chrome (different value types? keydown event seem
not to provide either a string nor an integer)
2011-02-23 21:26:51 +01:00
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
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
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
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
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
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
49d45c653d Made clock and timeofday interchangable. 2011-02-14 00:01:20 +01:00
FrozenCow
3980ebefa1 Revert "Removed Clock"
This reverts commit 9ca8f8dc64.
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
7241b2be81 Added compass and TimeOfDay 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
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
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
Nathan Wolf
18b36f96fe Finish the client-side chat bubble interface:
- Bubbles disappear automatically after some time
 - Each bubble shows the last 5 messages for each player
 - Some formatting to the bubble done, could be better (add high-res
player pic?)
2011-01-25 15:10:42 -08:00
Nathan Wolf
f14e097c54 Adding chat message pop-ups! 2011-01-25 14:03:27 -08:00
FrozenCow
676f6c5a3e Made it possible to change background color in style.css 2011-01-23 12:00:15 +01:00
FrozenCow
b22a48d5cb Fixed small browser incompatibilities 2011-01-15 02:11:31 +01:00
FrozenCow
d594df93ee Fixed little bug. 2011-01-15 00:01:44 +01:00
FrozenCow
dfe33efdc3 Made dynmap's javascript self-contained, which allows for multiple maps on a single page. 2011-01-14 20:08:23 +01:00
FrozenCow
c4cce7182a More cleanup. 2011-01-12 02:03:31 +01:00
FrozenCow
d634aede92 Minor cleaups. 2011-01-12 01:45:56 +01:00
FrozenCow
27fb8a20f1 Abstracted clock and tile-updating a bit. 2011-01-12 01:28:45 +01:00