Commit graph

72 commits

Author SHA1 Message Date
Arthur Mayer
8a19ea8ffc 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
aa62f36c11 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
af319952f8 Applied some suggestions by JSLint. 2011-02-22 15:38:49 +01:00
FrozenCow
5504761670 Player per world support @ client. 2011-02-22 14:49:03 +01:00
Arthur Mayer
82f3cc213b removed forgotten comma 2011-02-20 02:02:45 +01:00
Arthur Mayer
11296264f2 a lot of changes. chat and ui related. thanks FrozenCow & lechd 2011-02-20 01:58:53 +01:00
Jason Booth
8469b323d3 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
3f1ba85456 Made chatinput reset after send. 2011-02-19 21:16:14 +01:00
Arthur Mayer
f3078e5c3b many ui iprovements by lechd 2011-02-19 20:51:21 +01:00
FrozenCow
9d2af0f641 Merge branch 'master' of https://github.com/flames/dynmap 2011-02-19 16:31:36 +01:00
FrozenCow
a71fa73361 Added WebChat back to web. 2011-02-19 16:31:13 +01:00
Arthur Mayer
b8dd0abb0c corrected the json string in sendChat() 2011-02-18 20:15:18 +01:00
Arthur Mayer
e82f1fd7ef uups. removed debug alert, added function call 2011-02-18 11:15:05 +01:00
Arthur Mayer
71d29198bd added chatSend() function 2011-02-18 10:21:55 +01:00
Arthur Mayer
b5654208ee chat interface added, config option changed from showchatballoons:
ture/false to showchat: balloons/modal
2011-02-18 07:08:29 +01:00
Arthur Mayer
78753f99dc fixed small bug/typo where players were not removed from player list
at quit game.
2011-02-18 01:28:58 +01:00
FrozenCow
bf4ea4f08d Some desperate attempts to make IE8 work. 2011-02-18 00:07:59 +01:00
FrozenCow
cc406a157d Changed gui by lechd + map per world client-configuration. 2011-02-17 20:08:50 +01:00
FrozenCow
57d74ec3cb Made clock configurable and split clocks from map. 2011-02-15 13:50:04 +01:00
FrozenCow
d55b25831d focuschatballoons now defaults to false. 2011-02-15 13:08:33 +01:00
Daniel Chesters
1d5bf4528c if focuschatballoons is at false, disableAutoPan should be at true 2011-02-14 21:53:07 +01:00
FrozenCow
64571c9b60 Made clock and timeofday interchangable. 2011-02-14 00:01:20 +01:00
FrozenCow
2f9f956b1f Revert "Removed Clock"
This reverts commit 9ca8f8dc64e9a28da81a538a3578c2b2a8b34c88.
2011-02-13 23:27:37 +01:00
lishid
b506e6856a Removed Clock 2011-02-13 23:27:37 +01:00
lishid
34e972eefb Dynamic Time of the day Added 2011-02-13 23:27:37 +01:00
lishid
a482a388f2 Added/Modified images 2011-02-13 23:27:37 +01:00
lishid
ec2446d3bd Added compass and TimeOfDay 2011-02-13 23:27:37 +01:00
FrozenCow
503932ef41 Fixed tiles not updating. 2011-02-13 22:42:08 +01:00
FrozenCow
829a7138c4 Added multiworld update support along with client-side support. 2011-02-13 01:19:47 +01:00
FrozenCow
e216235774 Workaround for IE's retardness (not yet tested). 2011-02-06 15:09:15 +01:00
FrozenCow
6c1a69a517 Made updates in JSON format. Combined chat and tile queues into one UpdateQueue. Fixed UpdateQueue. 2011-02-06 03:00:51 +01:00
FrozenCow
e3fca58237 Oops, forgot comma. 2011-02-05 19:51:06 +01:00
FrozenCow
8da64b4601 Added 'focuschatballoons' to config influenced by Incendia's suggestion. 2011-02-05 02:59:03 +01:00
FrozenCow
ed67225a9e Added showchatballoons, showplayerfacesonmap and showplayerfacesinmenu to configuration. 2011-02-01 15:16:54 +01:00
FrozenCow
97a07a1894 Added server-to-client configuration and maptype-configuration: enables serverside configuration of maps and updaterate. 2011-02-01 14:17:08 +01:00
FrozenCow
e0f249bf6f Small fixes to chat-balloons. 2011-01-26 01:05:00 +01:00
Nathan Wolf
a5f2e6d57b 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
3a1c218487 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
FrozenCow
8263918b8d Abstracted from cave+normal to kzedmaps. Can now have any configurable type of map. 2011-01-10 23:58:39 +01:00
FrozenCow
4b5e6e6f80 Cleaned up client-side tile logic. 2011-01-10 01:28:50 +01:00
FrozenCow
c8a08b5af7 Commented debug-tile-grid. 2011-01-10 00:43:23 +01:00
FrozenCow
ce7bfdb46e Small cleanup. 2011-01-10 00:38:18 +01:00
FrozenCow
a08edc3fa9 Fixed zoomed tile/player not fitting unzoomed. 2011-01-10 00:31:44 +01:00