Commit graph

3385 commits

Author SHA1 Message Date
FrozenCow
857c57b8ae Change for the inner nerd in me. 2011-02-24 00:06:36 +01:00
FrozenCow
064a79ff2c Merge remote-tracking branch 'flames/master' 2011-02-24 00:03:52 +01:00
Jason Booth
6c2c08e3f6 Merge branch 'master' of git://github.com/FrozenCow/dynmap 2011-02-23 17:03:10 -06:00
FrozenCow
4e1914e173 Merge remote-tracking branch 'kilandor/master' 2011-02-24 00:02:15 +01:00
Jason Booth
f94a0ff904 Fix jsonfile-interval should be 1 not 1000 2011-02-23 16:31:57 -06:00
Arthur Mayer
835ce85c0c lechd updated override example 2011-02-23 23:28:28 +01:00
Arthur Mayer
acf9698102 lechd's new override style to let the sidebar always open and hides
also the icon
2011-02-23 23:03:26 +01:00
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
32277d9433 Simplified tile-mechanism again (a bit like hMod's version). 2011-02-23 14:06:13 +01:00
FrozenCow
aa36ae6f69 Applied style-change of lechd. 2011-02-23 12:40:05 +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
d10393546b Replaced onPlayerCommand by onCommand (server-consoles can now also be used to execute commands). 2011-02-22 14:51:40 +01:00
FrozenCow
5504761670 Player per world support @ client. 2011-02-22 14:49:03 +01:00
FrozenCow
5408db1044 Made Dynmap package not include subdirectory. 2011-02-22 14:09:14 +01:00
FrozenCow
4f4c1caeea It's official, ima retard. 2011-02-22 09:17:38 +01:00
FrozenCow
90fe02be59 Added commands to plugin.yml, removed disabledcommands and added fullrender <worldname>. 2011-02-22 00:42:37 +01:00
FrozenCow
592057c671 Added commands to plugin.yml. 2011-02-21 22:39:21 +01:00
FrozenCow
1df916dde0 Made MapTypes per World (instead of having MapTypes for all worlds). 2011-02-21 22:17:38 +01:00
FrozenCow
b5adcd03ef Used new Bukkit constructor format. 2011-02-21 16:22:16 +01:00
FrozenCow
8a24ae87f0 Added entry for css overrides and cleaned up styles by lechd. 2011-02-20 23:55:16 +01:00
FrozenCow
f0e2b522aa Merge remote-tracking branch 'flames/master' 2011-02-20 22:13:41 +01:00
FrozenCow
4ffa2a0026 New buttons and example override css by lechd. 2011-02-20 22:11:28 +01:00
Arthur Mayer
be4ec1e0e3 corrected (hopefully) the chat response for show/hide commands 2011-02-20 20:06:07 +01:00
Arthur Mayer
95fe4eca4d only OPs can use fullrender. added response to chat for
hide/show/fillrender commands.
2011-02-20 19:49:05 +01:00
FrozenCow
a7316ef893 Added lechd's new images. 2011-02-20 18:47:18 +01:00
FrozenCow
fd49f3f843 Merge branch 'master' of https://github.com/flames/dynmap 2011-02-20 17:46:27 +01:00
alron
a211179f12 Automagic packages built. Love me for this. :) 2011-02-19 21:49:24 -08:00
Arthur Mayer
e3375a7b7b added configuration option messagettl, TimeToLive for chatmessages, in
Milliseconds! 15seconds: messagettl: 15000
2011-02-20 02:11:44 +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
FrozenCow
85720cce0a Made sendmessage url relative. 2011-02-19 21:08: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
FrozenCow
9995bd8895 Added debugging to configuration. Disabled by default. 2011-02-19 15:25:31 +01:00
Arthur Mayer
efa228e78d Merge remote branch 'choose_remote_name/master' into HEAD 2011-02-19 08:28:03 +01:00
Arthur Mayer
512ed19429 removed my custom url, made it relative 2011-02-19 08:26:40 +01:00
FrozenCow
5c685af299 Fixed httpserver thereby also more optimized. 2011-02-19 00:01:42 +01:00
FrozenCow
b92c91eb57 Added quotes to login/out messages for yaml. 2011-02-19 00:01:21 +01:00
Arthur Mayer
b8dd0abb0c corrected the json string in sendChat() 2011-02-18 20:15:18 +01:00
FrozenCow
af93366b0f Added stacktrace for errors. 2011-02-18 19:43:45 +01:00
FrozenCow
d11b0819a6 Fixed stupid mistake with body of http requests. 2011-02-18 19:42:32 +01:00
Arthur Mayer
4b36ae9a62 forgotten config change for chat 2011-02-18 18:46:48 +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
dc2c95eb2c added join and quit messages to chat 2011-02-18 05:30:49 +01:00