Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-19 00:35:37 +01:00
Code Issues Projects Releases Wiki Activity
896 Commits 7 Branches 130 Tags 27 MiB
64bd846115
Commit Graph

896 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FrozenCow
119abb33eb Merge remote-tracking branch 'alron/master' 2011-02-24 16:10:29 +01:00
alron
001a865c2a Renamed assembly.xml to more accurately reflect what it is doing. As assembly can me many many things with maven. 2011-02-23 19:18:09 -08:00
alron
550d6e401f Moved assembly file into more maven consistent location. 2011-02-23 19:14:46 -08:00
alron
256436f68d Someone forgot to rev-bump when they released. :) 
also, you are not org.bukkit.dynmap. you are org.dynmap.dynmap
 2011-02-23 19:07:43 -08:00
FrozenCow
39db895b9d Fixed disable-webserver not being used (thanks for checking that Kilandor). 2011-02-24 00:58:40 +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
00f55758c1 Changed version to 0.13. :D 2011-02-24 00:29:57 +01:00
FrozenCow
ea64a55c04 Some dumb description changes in configuration. 2011-02-24 00:21:35 +01:00
FrozenCow
fcbd76c591 Removed clock configuration. 2011-02-24 00:16:30 +01:00
FrozenCow
9a32485ca9 Small cleanup. 2011-02-24 00:16:10 +01:00
Jason Booth
a1d7805116 Fix for NPE JsonTimerTask.java using wrong playerList 
Removed unused PlayerList variable in MapManager.java
 2011-02-23 17:07:04 -06:00
FrozenCow
20e954b905 Change for the inner nerd in me. 2011-02-24 00:06:36 +01:00
FrozenCow
da4c456254 Merge remote-tracking branch 'flames/master' 2011-02-24 00:03:52 +01:00
Jason Booth
bd51387c10 Merge branch 'master' of git://github.com/FrozenCow/dynmap 2011-02-23 17:03:10 -06:00
FrozenCow
95bf263f11 Merge remote-tracking branch 'kilandor/master' 2011-02-24 00:02:15 +01:00
Jason Booth
774e013558 Fix jsonfile-interval should be 1 not 1000 2011-02-23 16:31:57 -06:00
Arthur Mayer
b6ec0a2955 lechd updated override example 2011-02-23 23:28:28 +01:00
Arthur Mayer
cdd30d95c5 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
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
1d2cce6caa Simplified tile-mechanism again (a bit like hMod's version). 2011-02-23 14:06:13 +01:00
FrozenCow
b7f6a5a39d Applied style-change of lechd. 2011-02-23 12:40:05 +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
b99f487567 Replaced onPlayerCommand by onCommand (server-consoles can now also be used to execute commands). 2011-02-22 14:51:40 +01:00
FrozenCow
ccf6f2ac49 Player per world support @ client. 2011-02-22 14:49:03 +01:00
FrozenCow
ca76b29fb9 Made Dynmap package not include subdirectory. 2011-02-22 14:09:14 +01:00
FrozenCow
40c7c9fa66 It's official, ima retard. 2011-02-22 09:17:38 +01:00
FrozenCow
fae5014b4e Added commands to plugin.yml, removed disabledcommands and added fullrender <worldname>. 2011-02-22 00:42:37 +01:00
FrozenCow
0fbd0c0a44 Added commands to plugin.yml. 2011-02-21 22:39:21 +01:00
FrozenCow
8d0f509bfe Made MapTypes per World (instead of having MapTypes for all worlds). 2011-02-21 22:17:38 +01:00
FrozenCow
65f3ea4fe3 Used new Bukkit constructor format. 2011-02-21 16:22:16 +01:00
FrozenCow
b097fb8321 Added entry for css overrides and cleaned up styles by lechd. 2011-02-20 23:55:16 +01:00
FrozenCow
feb6d65d82 Merge remote-tracking branch 'flames/master' 2011-02-20 22:13:41 +01:00
FrozenCow
cd4027495c New buttons and example override css by lechd. 2011-02-20 22:11:28 +01:00
Arthur Mayer
298c0f3391 corrected (hopefully) the chat response for show/hide commands 2011-02-20 20:06:07 +01:00
Arthur Mayer
e15514291b only OPs can use fullrender. added response to chat for 
hide/show/fillrender commands.
 2011-02-20 19:49:05 +01:00
FrozenCow
f80385e1af Added lechd's new images. 2011-02-20 18:47:18 +01:00
FrozenCow
618d1b05c9 Merge branch 'master' of https://github.com/flames/dynmap 2011-02-20 17:46:27 +01:00
alron
aaa06bfc38 Automagic packages built. Love me for this. :) 2011-02-19 21:49:24 -08:00
Arthur Mayer
ad07d68d7e added configuration option messagettl, TimeToLive for chatmessages, in 
Milliseconds! 15seconds: messagettl: 15000
 2011-02-20 02:11:44 +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
FrozenCow
c53e6058be Added debugging to configuration. Disabled by default. 2011-02-19 15:25:31 +01:00
Arthur Mayer
9b604d4e75 Merge remote branch 'choose_remote_name/master' into HEAD 2011-02-19 08:28:03 +01:00