Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-25 03:35:18 +01:00
Code Issues Projects Releases Wiki Activity
1,477 Commits 7 Branches 130 Tags 27 MiB
c7b709fd75
Commit Graph

763 Commits

Author SHA1 Message Date
FrozenCow
1e04d10b35 Nicer invalid update-url handling (for invalid world-names or non-existing worlds). 2011-02-26 20:27:54 +01:00
FrozenCow
5778611227 Fixed JsonTimerTask. 2011-02-26 18:23:35 +01:00
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
FrozenCow
39db895b9d Fixed disable-webserver not being used (thanks for checking that Kilandor). 2011-02-24 00:58:40 +01:00
FrozenCow
00f55758c1 Changed version to 0.13. :D 2011-02-24 00:29:57 +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
b99f487567 Replaced onPlayerCommand by onCommand (server-consoles can now also be used to execute commands). 2011-02-22 14:51:40 +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
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
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
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
FrozenCow
791341f210 Fixed httpserver thereby also more optimized. 2011-02-19 00:01:42 +01:00
FrozenCow
723e7da8d3 Added stacktrace for errors. 2011-02-18 19:43:45 +01:00
FrozenCow
d3cf795ebb Fixed stupid mistake with body of http requests. 2011-02-18 19:42:32 +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
7c917b729e added join and quit messages to chat 2011-02-18 05:30:49 +01:00
Jason Booth
13099587e0 Fixed mistake with map updates only pulling interval+10 instead of interval+10000 2011-02-17 11:14:37 -06:00
Jason Booth
3916c363ae Fixed jsontimer-interval config not being used. 
Change JsonTimerTask.java to use jsontimer-interval+10 to allow a buffer for late/delayed client requests(to prevent updated tiles info to be missing)
 2011-02-17 10:05:07 -06:00
Jason Booth
77d9a88868 Fixed timer to be stopped onDisabled if it was started 2011-02-17 09:45:32 -06:00
Jason Booth
3c1bde1092 Updated JsonTimerTask.java to be Multi-World Compatible 2011-02-17 09:33:27 -06:00
Jason Booth
f7dbc89ab4 Merge branch 'master' of git://github.com/FrozenCow/dynmap 
Conflicts:
	configuration.txt
	src/main/java/org/dynmap/DynmapPlugin.java
 2011-02-17 08:54:23 -06:00
FrozenCow
909207ac26 Organized imports. 2011-02-15 21:44:08 +01:00
FrozenCow
99605ba433 Make sure request-body is skipped if not read. 2011-02-15 21:06:14 +01:00
FrozenCow
ada9637d72 Added sendmessage handler (for chatting back). 2011-02-15 21:00:36 +01:00
FrozenCow
2d693b1ebf Improved HTTP performance and POST/PUT compatbility. 2011-02-15 21:00:04 +01:00
FrozenCow
e900aca2e0 Added helper classes for HTTP. 2011-02-15 14:19:43 +01:00
FrozenCow
38df91bafe Report world for players in updates. 2011-02-15 13:38:46 +01:00
FrozenCow
1fc2cdb636 Force making directories on tile-rendering (needs cleaner fix). 2011-02-13 23:23:15 +01:00
FrozenCow
b63369675d Re-added flushing again (oops). 2011-02-13 23:22:57 +01:00
FrozenCow
a81665d38d Fixed time being reported of the correct world. 2011-02-13 22:46:45 +01:00
FrozenCow
d5d737d385 Fixed 'unknown command' being shown after fullrender. 2011-02-13 22:34:38 +01:00
FrozenCow
f3a1d53277 Added maximumheight to configuration for somewhat better nether rendering. 2011-02-13 22:33:33 +01:00
FrozenCow
9a2b9ccac0 Fixed HttpServer some more. 2011-02-13 22:30:24 +01:00
FrozenCow
835e566151 Some improvements to HttpServer. 2011-02-13 02:56:00 +01:00
FrozenCow
2380325975 Added automatically creating tiles directory. 2011-02-13 01:33:05 +01:00
FrozenCow
100f3e0590 Added multiworld update support along with client-side support. 2011-02-13 01:19:47 +01:00
FrozenCow
5b0171c459 Server-side multiworld support with several improvements overal. 2011-02-12 23:47:00 +01:00
Jason Booth
959040e5f4 Merge branch 'master' of git://github.com/FrozenCow/dynmap 2011-02-09 14:24:13 -06:00
Jason Booth
2f6930bc17 Removed System debug messages. 
Added missing JsonTimerTask.java
 2011-02-09 11:57:46 -06:00
Jason Booth
fb01f6ecf7 New config to Disable Webserver 
New feature and config to output JSON to file
 2011-02-09 11:35:09 -06:00
FrozenCow
29517e9a24 Fixed handling invalid http requests. 2011-02-09 17:22:16 +01:00
FrozenCow
d566fccb1e Fixed rendering zoomedout tiles. 2011-02-09 13:25:06 +01:00
FrozenCow
5c209c2a5e Renamed y to z in DynmapChunk. 2011-02-09 00:42:16 +01:00
FrozenCow
fb1b5df3d0 Made zoomed-rendering make use of existing tile-files instead of keeping those tiles in memory. 2011-02-08 23:38:57 +01:00
FrozenCow
38ee8657e8 Better exception handling. 2011-02-08 20:59:51 +01:00
FrozenCow
89c8d564a4 Made use of newly introduced unloadChunk in BukkitAPI + removal of unstable features. 2011-02-08 20:27:37 +01:00
FrozenCow
b31bb14452 disabledcommands can now be empty. 2011-02-07 22:26:55 +01:00
FrozenCow
553eb7952d Added ability to disable commands in configuration. 2011-02-07 17:25:16 +01:00
Janne Sinisalo
100a03274c Compile fix for multiworld 
Updated getWorlds()[0] to getWorlds().get(0)
 2011-02-07 17:42:11 +02: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
7c257af454 Fixed Json stringify. 2011-02-06 02:00:27 +01:00
FrozenCow
a937d13086 Added reflection-support for stringifyJson. 2011-02-05 21:09:49 +01:00
FrozenCow
d651d58d63 Moved stringifyJson to Json class. 2011-02-05 21:02:39 +01:00
FrozenCow
9a655676ab Moved FileHandler to handlers package. 2011-02-05 20:54:28 +01:00
FrozenCow
debf5bcc57 Renamed WebServer to HttpServer and WebServerRequest to HttpServerConnection. 2011-02-05 20:53:42 +01:00
FrozenCow
2a79aea7bb Moved handlers to their own (independent) classes. 2011-02-05 20:51:20 +01:00
FrozenCow
883eba6890 Removed debugging + small fix. 2011-02-05 19:57:32 +01:00
FrozenCow
226cc5f86c More work on HttpServer. 2011-02-05 19:51:48 +01:00
FrozenCow
bf0edea7e2 Initial http-server work. 2011-02-05 19:51:48 +01:00
FrozenCow
14a3d32205 Used colors.txt from lechd. 2011-02-05 17:49:11 +01:00
FrozenCow
335109d8c7 Added pumpkin colors as suggested by lechd. 2011-02-05 02:53:22 +01:00
FrozenCow
3940b91d0e Applied Eclipse formatting. 2011-02-05 02:25:18 +01:00
FrozenCow
4f138a56da Removed comments. 2011-02-05 02:11:49 +01:00
FrozenCow
c8cf39a440 Added unstable fullmap rendering. Also... messed up formatting by pressing ctrl+shift+f in eclipse, sigh 2011-02-05 02:01:04 +01:00
FrozenCow
138aed8c33 Added chunk loading to rendering. 2011-02-04 23:12:55 +01:00
FrozenCow
13e829cda0 Updated Server.getTime to World.getTime (to reflect Bukkit's changes) 2011-02-02 11:40:49 +01:00
FrozenCow
455b5d3b3e Added showchatballoons, showplayerfacesonmap and showplayerfacesinmenu to configuration. 2011-02-01 15:16:54 +01:00
FrozenCow
8abf596ba6 Organized imports. 2011-02-01 14:23:13 +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
99ae8a8f3b Moved Web* to webpackage and added server-to-client configuration (server-side). 2011-01-26 00:38:36 +01:00
FrozenCow
36d1a7676e Merge branch 'master' of https://github.com/NathanWolf/dynmap 2011-01-25 23:06:48 +01:00
Nathan Wolf
f14e097c54 Adding chat message pop-ups! 2011-01-25 14:03:27 -08:00
FrozenCow
4de18ac700 Changed startup message (shows webserver-info, hides debug) 2011-01-25 22:59:22 +01:00
FrozenCow
5ee5fee232 Added getters/setters. 2011-01-25 18:43:11 +01:00
FrozenCow
c2047fe7c4 Fixed webpath and tilepath accepting absolute paths. 2011-01-23 19:56:59 +01:00
FrozenCow
34093874bc Changed /map to /dynmap. 2011-01-23 12:07:23 +01:00
FrozenCow
6419469be3 Added ability to hide players (/map hide, /map hide playername(s) and /map show). 2011-01-20 22:56:39 +01:00
FrozenCow
68412ae27d Changed '/map_render' to '/map render'. 2011-01-20 20:50:18 +01:00
FrozenCow
78b243371d Fixed red and yellow colors for flowers. 2011-01-19 19:29:37 +01:00
FrozenCow
867f069822 Added new minecraft-blocks to colors. 2011-01-18 20:54:47 +01:00
FrozenCow
b27fcdbd4b Changed configuration to key/value instead of full YAML. 2011-01-18 20:08:05 +01:00
FrozenCow
9b8a90bf9f Added some of the configuration options. (not all yet) 2011-01-16 21:44:03 +01:00
FrozenCow
3aa48f2215 Added configuration and renamed Map to MapType. 2011-01-16 18:09:58 +01:00
FrozenCow
ce60452a35 Fix to be compatible with latest Bukkit. 2011-01-16 11:51:56 +01:00
FrozenCow
18a1f484d8 Fixed to be compatible with latest Dynmap. 2011-01-15 23:18:16 +01:00
FrozenCow
53e7ab73a0 Fix to reflect Bukkit's changes. Also fixes the threading-problems. 2011-01-15 21:44:27 +01:00
FrozenCow
32567b8569 Removed hardcoded path, sigh. 2011-01-15 03:33:30 +01:00
FrozenCow
b501f1d8cb More exception handling and messages. 2011-01-15 02:57:11 +01:00
FrozenCow
686b09bc9d Tiles will now also generate when destroying blocks. 2011-01-14 23:41:13 +01:00
FrozenCow
77b0bc1664 More debug messages. 2011-01-14 20:05:12 +01:00
FrozenCow
2e1a9d0a0e Changed Color to ChatColor to reflect Bukkits changes. 2011-01-14 14:51:29 +01:00
FrozenCow
ff5f96aa78 Small fix for loadColorSet. 2011-01-13 15:33:30 +01:00
FrozenCow
342a72f39f Made colors load from jar when not found in filesystem. 2011-01-13 11:18:54 +01:00
FrozenCow
4f0e89b1d8 Set tilePath to 'tiles/'. 2011-01-13 01:57:19 +01:00
FrozenCow
a08edc3fa9 Fixed zoomed tile/player not fitting unzoomed. 2011-01-10 00:31:44 +01:00
FrozenCow
2b2891bd0a Readded zoom-tiles. Still needs some work. 2011-01-09 01:12:35 +01:00
FrozenCow
e1a3ac60e2 Cleanup/Refactoring. 2011-01-08 18:56:08 +01:00
FrozenCow
8860eb8c04 Splitted up MapManager. 2011-01-08 03:20:51 +01:00
FrozenCow
90afd9ef82 Restructured MapManager. 2011-01-07 15:36:50 +01:00
FrozenCow
6a7559f3ad Expanded internal webserver to also handle web and tiles, where web-files can be retrieved from filesystem or jar. Also some debugging changes. 2011-01-07 04:50:43 +01:00
flames
b4fca31cd5 added configvariable bindaddress (thanks FrozenCow) 2011-01-07 02:52:59 +01:00
FrozenCow
8162817041 Reenabled time again by using Bukkit's getTime. 2011-01-06 16:37:54 +01:00
FrozenCow
c5d5a85a17 Separated rendering from MapTile, removed separate cave logic (integrated in rendering) and temporarily removed/disabled zoom-rendering. 2011-01-06 03:30:50 +01:00
FrozenCow
4261f30dcd Made code better fit for Bukkit. 2011-01-05 21:19:11 +01:00
FrozenCow
f0ec375834 Put classes in package to be more compatible with Bukkit. 2011-01-05 19:41:21 +01:00