Commit Graph

307 Commits

Author SHA1 Message Date
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
8105a1d2a5 Revert "Bleh, Old Permissions. Bleh, hardcoded artifact location."
This reverts commit 5fa0bb1fa6.
2011-03-15 19:38: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
alron
5fa0bb1fa6 Bleh, Old Permissions. Bleh, hardcoded artifact location. 2011-03-12 01:23:19 -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
Arthur Mayer
f071e12524 added sk89q's custom colors txt 2011-03-10 20:46:56 +01:00
FrozenCow
0657d9c559 Code cleanup. 2011-03-10 15:59:19 +01:00
FrozenCow
29a3391ed8 Merge remote-tracking branch 'kilandor/master' 2011-03-10 12:03:56 +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
Jason Booth
965686d44c Cleanup Moved CSS and JS to matching folders 2011-03-09 17:43:24 -06:00
Jason Booth
d4bc0863b8 Merge branch 'master' of git://github.com/FrozenCow/dynmap 2011-03-09 16:42:49 -06:00
Arthur Mayer
363339c632 important fix for css, forgotten in my last commit, FrozenCow, please
pull
2011-03-09 17:36:15 +01: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
d98fe89c42 Fixed not being able to follow players. 2011-03-08 01:22:03 +01:00
FrozenCow
b985a55b92 Changed chat-mechanism a bit. 2011-03-07 22:07:34 +01:00
FrozenCow
072924a2a5 Renamed embedded.css to embedded_example.css. 2011-03-07 21:04:37 +01:00
Jason Booth
fe0c6556ed Merge branch 'master' of git://github.com/FrozenCow/dynmap
Conflicts:
	colorschemes/ovocean.txt
	src/main/java/org/dynmap/MapManager.java
2011-03-07 13:39:58 -06:00
Arthur Mayer
07010f36ac another fix 2011-03-07 08:14:41 +01:00
Arthur Mayer
fe93d372ab css fixes, allow to use dynmap embedded into a website or standalone. 2011-03-07 08:10:30 +01:00
Arthur Mayer
f4ba02cd23 fix, json has boolean, so checking for boolean and not string.
thanks dashkal for testing that
2011-03-07 07:48:46 +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
Arthur Mayer
689df03b78 merged latest changes, added ability to embed dynmap into a website. 2011-03-07 03:45:42 +01:00
FrozenCow
3fd0ed89b0 Removed (seemingly broken) event BLOCK_DAMAGED. 2011-03-06 14:50:15 +01:00
FrozenCow
1001028c2a Updated configuration to reflect flatmap changes. 2011-03-06 14:49:29 +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
803867fbc9 Fixed unfollowing when panning to another player. 2011-03-05 17:43:41 +01:00
FrozenCow
a4564889df Fixed map-icons. 2011-03-05 17:42:07 +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
c1603f1060 Changed skin url from minecraft.net to s3.amazonaws.com. 2011-03-01 18:21:15 +01:00
FrozenCow
d54532d899 Merge remote-tracking branch 'flames/master' 2011-03-01 02:01:51 +01:00