Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-12-11 03:24:01 +01:00
Code Issues Projects Releases Wiki Activity
543 Commits 7 Branches 130 Tags 27 MiB
68a78023c8
Commit Graph

291 Commits

Author SHA1 Message Date
FrozenCow
b8fe65bc99 Partly reverted previous change to get back to zeeZ' getDisplayName. 2011-05-10 12:51:52 +02:00
FrozenCow
1a5ddeeda5 Removed generation of .tar.bz2. 2011-05-10 12:26:26 +02:00
Mike Primm
5f23afe608 Don't need additional delay - using AsycnQueue for that 2011-05-10 12:26:18 +02:00
Mike Primm
0a1de1b18e Add option to run incremental renders on sync thread, using same chunk 
logic as timesliced full render, in order to handle cases where
assumption that all chunks needed for incremental render are already
resident (which can be false if player telepots, move quickly,
multiple players are active, etc).
 2011-05-10 12:26:11 +02:00
Mike Primm
88db6445f9 Added timeslicing to configuration 2011-05-10 12:26:02 +02:00
Mike Primm
6c708d1b3a Add version log message - keep track builds easier 2011-05-10 12:25:56 +02:00
Mike Primm
dcdfb3da5d Trap on bogus world names or player with bad current location 2011-05-10 12:25:48 +02:00
Mike Primm
95cc3ae869 Add "time-sliced" implementation of fullrender, which does one tile at 
a time using the Bukkit scheduler while using a tunable interval
between tiles (0.5 second default), and avoids player timeouts and
blooming the chunk and entity population.
 2011-05-10 12:25:34 +02:00
FrozenCow
106f95d8b6 Removed a println. 2011-05-08 21:15:44 +02:00
FrozenCow
be60623719 Fixed tabs. 2011-05-07 22:11:41 +02:00
FrozenCow
b66be7a47c Merge remote-tracking branch 'kilandor/master' 2011-05-07 00:04:05 +02:00
zeeZ
63b9579fa5 Strip colors off chat, use getDisplayName instead of getName 2011-05-01 23:11:29 +02:00
zeeZ
ca9aa0727f Fix for worlds with weird names and URLDecode mumbo-jumbo 2011-04-28 16:34:50 +02:00
Jason Booth
b3ccd203c8 Added some info 
Fix for spam warning for php(Thanks for bug report flames)
 2011-04-13 20:23:24 -05:00
Jason Booth
8e59f37995 Initial Support for Regions system on dynmap 
Included Worldguard support(default)
Also residence support(incomplete)
 2011-04-13 19:58:25 -05:00
zeeZ
91b60be572 Less config checks in loop, added newline at EOF 2011-04-11 23:57:10 +02:00
zeeZ
69fcc1706e Option to treat hiddenplayers.txt as a whitelist. 2011-04-11 04:10:47 +02:00
zeeZ
ab6352a17d Hidden players stored in lowercase. 2011-04-11 02:40:03 +02:00
zeeZ
631f06d091 More detailed permissions 2011-04-11 02:27:56 +02:00
zeeZ
553a956949 Flipped flat map so North is up 2011-04-08 21:40:16 +02:00
FrozenCow
d53b3bc340 Added HighlightTileRenderer (thanks in part to rockNme2349) 2011-04-07 15:46:50 +02:00
FrozenCow
eb276dd59d Another attempt to make server conform http. 2011-04-06 00:54:48 +02:00
FrozenCow
b47bbee4e8 Cleaned up join/quit messages (not being send as chat messages) 2011-04-05 22:58:46 +02:00
FrozenCow
e1e13df4b2 Removed redundant configuration values and made use of customizable join/quit messages. 2011-04-05 22:30:43 +02:00
FrozenCow
d4a2d2d32f Changed version to 0.16. 2011-04-05 01:05:51 +02:00
FrozenCow
43bc625c08 Another fix for IndexOutOfBounds (by ignoring it...) 2011-03-29 00:59:10 +02:00
FrozenCow
43a652f15a Fixed IndexOutOfBoundsException (sortof?) 2011-03-28 18:32:29 +02:00
FrozenCow
649edfdc2d Changed events for the latest Bukkit changes. 2011-03-28 18:27:11 +02:00
FrozenCow
2a9b768e3f Removed onLoad again. 2011-03-27 13:14:35 +02:00
FrozenCow
777b55f27b Changed version to 0.15. 2011-03-20 18:12:02 +01:00
FrozenCow
09568294f3 Removed getWorld. 2011-03-20 18:09:54 +01:00
FrozenCow
9206fce435 Set version to 0.14. 2011-03-17 22:26:37 +01:00
FrozenCow
37ad28dbcc Removed empty line. 2011-03-17 03:29:25 +01:00
FrozenCow
3bed604190 Another import removal. 2011-03-17 02:36:26 +01:00
FrozenCow
550a607ec9 Organized imports. 2011-03-17 02:21:04 +01:00
Jason Booth
2cef9731ed WebChat enhancement and fixes 
Added Spam Message config
Internal server now replies a spam message
Fixed getting webchat-interval to get int rather than double then cast
Fixed holding down "enter" on the empty chat line would spam chat attempts
Fixed so jsonip.appspot query is only done once
 2011-03-15 19:17:58 -05:00
FrozenCow
58060137b4 Made webchat-interval in seconds. 2011-03-15 22:47:12 +01:00
FrozenCow
38e997cf37 Added webchat-interval for anti-spam webmessaging. 2011-03-15 22:43:48 +01:00
FrozenCow
6c6d29a402 Removed some warnings, redisabled BufferedOutputStream closing. 2011-03-15 21:04:53 +01:00
FrozenCow
437e82387b Merge remote-tracking branch 'alron/master' 2011-03-15 16:53:12 +01:00
FrozenCow
5eb070cd94 Made dynmap compatible with chat-plugins who cancel chat-events. 2011-03-15 14:03:04 +01:00
FrozenCow
5a878cbd0d Added empty onLoad method 2011-03-15 13:22:05 +01:00
FrozenCow
d5ab98deaf New coloring system for flatmap. 2011-03-15 00:01:08 +01:00
alron
19a7dba613 Doesn't change anywhere? Probably should be final. 2011-03-12 01:38:34 -08:00
alron
57c952a1cd oops, didn't need that ^^ 2011-03-12 01:36:43 -08:00
alron
77cc1a70c4 Close potential filedescriptor leak. 2011-03-12 01:35:07 -08:00
alron
0007acd05b Close potential filedescriptor leak. 2011-03-12 01:33:30 -08:00
FrozenCow
10e03c4219 Abstracted permissions. Cleaned up DynmapPlugin. 2011-03-11 16:05:54 +01:00
FrozenCow
47e1f20a15 Fixed shutting down http server(?) 2011-03-11 15:22:14 +01:00
FrozenCow
612966734a Fixed very long shutdown(?) 2011-03-11 15:18:48 +01:00
FrozenCow
70429dc5a4 Merge branch 'master' of https://github.com/flames/dynmap 2011-03-11 15:18:41 +01:00
FrozenCow
cbe562d33d Render command now responds with a nice message. 2011-03-10 22:59:03 +01:00
FrozenCow
0657d9c559 Code cleanup. 2011-03-10 15:59:19 +01:00
Jason Booth
d296724755 Fix client side timestamp problem 
Added Support for standalone webchat by reading a json file
Fix for jsonfile-interval in code
Added working php script with spam prevention, for webchat
 2011-03-10 00:11:43 -06:00
FrozenCow
ead24cc304 Added heightmap like combination for flatmap. 2011-03-08 16:42:21 +01:00
FrozenCow
02e0f0aa24 Fixed being able to render other worlds from command. 2011-03-08 02:39:16 +01:00
FrozenCow
b985a55b92 Changed chat-mechanism a bit. 2011-03-07 22:07:34 +01:00
Arthur Mayer
bc7ddaf9d2 some fix to allowchat 2011-03-07 07:13:32 +01:00
Arthur Mayer
32fdf9da86 added option to disable webchat input 2011-03-07 07:07:48 +01:00
FrozenCow
3fd0ed89b0 Removed (seemingly broken) event BLOCK_DAMAGED. 2011-03-06 14:50:15 +01:00
FrozenCow
f3c90f0aae Added prefix to flatmap. 2011-03-06 14:45:26 +01:00
FrozenCow
090f417f32 Added ability to specify colorschemes per map/renderer. 2011-03-05 18:38:17 +01:00
FrozenCow
8d70839d3b Some changes after running Findbugs. 2011-03-05 16:09:26 +01:00
FrozenCow
b0c84234cc Added configurable render-triggers. 2011-03-05 15:39:21 +01:00
FrozenCow
41bf56fccb Optimized stringifyJson a bit. 2011-03-04 22:17:50 +01:00
FrozenCow
d1f280eb0f Cleaned Http handling a bit. 2011-03-04 21:31:16 +01:00
FrozenCow
9ce160f1b9 Enabled '-' and '.' to be valid world-characters. 2011-03-04 20:15:52 +01:00
FrozenCow
e771d94f24 Added configuration caching. 2011-03-01 18:52:15 +01:00
FrozenCow
f4f4a33b8b Implemented FlatMap fullrender + required clientlib. 2011-03-01 01:59:33 +01:00
FrozenCow
1755411545 Added default equals method to MapTile. 2011-03-01 01:58:33 +01:00
FrozenCow
9fea1eafdb Added shitty-looking top-down flat map. 2011-02-28 19:26:05 +01:00
FrozenCow
ff36e4f87a Fixed incorrect offset when using maximumheight. 2011-02-28 19:24:32 +01:00
FrozenCow
0372329d06 Fixed incorrect offset with maximumHeight. 2011-02-26 23:02:11 +01:00
FrozenCow
84b86f25a3 Removed BukkitPlayerDebugger: incompatible with Bukkit. 2011-02-26 20:31:26 +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
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