Commit graph

293 commits

Author SHA1 Message Date
FrozenCow
db6534ee43 Fixed very long shutdown(?) 2011-03-11 15:18:48 +01:00
FrozenCow
803c4104d9 Merge branch 'master' of https://github.com/flames/dynmap 2011-03-11 15:18:41 +01:00
FrozenCow
02514b8625 Render command now responds with a nice message. 2011-03-10 22:59:03 +01:00
Arthur Mayer
93ac01c56d added sk89q's custom colors txt 2011-03-10 20:46:56 +01:00
FrozenCow
a080825060 Code cleanup. 2011-03-10 15:59:19 +01:00
FrozenCow
4ae5707505 Merge remote-tracking branch 'kilandor/master' 2011-03-10 12:03:56 +01:00
Jason Booth
15e7417807 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
912dd0694b Cleanup Moved CSS and JS to matching folders 2011-03-09 17:43:24 -06:00
Jason Booth
8e6a5cc207 Merge branch 'master' of git://github.com/FrozenCow/dynmap 2011-03-09 16:42:49 -06:00
Arthur Mayer
6e5ee07aab important fix for css, forgotten in my last commit, FrozenCow, please
pull
2011-03-09 17:36:15 +01:00
FrozenCow
b612de9a0d Added heightmap like combination for flatmap. 2011-03-08 16:42:21 +01:00
FrozenCow
e1fbb52109 Fixed being able to render other worlds from command. 2011-03-08 02:39:16 +01:00
FrozenCow
78041a4168 Fixed not being able to follow players. 2011-03-08 01:22:03 +01:00
FrozenCow
d06a0ecb4b Changed chat-mechanism a bit. 2011-03-07 22:07:34 +01:00
FrozenCow
b5f9d68127 Renamed embedded.css to embedded_example.css. 2011-03-07 21:04:37 +01:00
Jason Booth
edd4d86109 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
8e0ba28efa another fix 2011-03-07 08:14:41 +01:00
Arthur Mayer
1b0b513e1f css fixes, allow to use dynmap embedded into a website or standalone. 2011-03-07 08:10:30 +01:00
Arthur Mayer
8d2066d280 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
a92e17f6d4 some fix to allowchat 2011-03-07 07:13:32 +01:00
Arthur Mayer
aba85ac512 added option to disable webchat input 2011-03-07 07:07:48 +01:00
Arthur Mayer
4c552eb6ba merged latest changes, added ability to embed dynmap into a website. 2011-03-07 03:45:42 +01:00
FrozenCow
96305ee761 Removed (seemingly broken) event BLOCK_DAMAGED. 2011-03-06 14:50:15 +01:00
FrozenCow
43d6612626 Updated configuration to reflect flatmap changes. 2011-03-06 14:49:29 +01:00
FrozenCow
e613a59aa3 Added prefix to flatmap. 2011-03-06 14:45:26 +01:00
FrozenCow
36685c5950 Added ability to specify colorschemes per map/renderer. 2011-03-05 18:38:17 +01:00
FrozenCow
a29c29ae2b Fixed unfollowing when panning to another player. 2011-03-05 17:43:41 +01:00
FrozenCow
fe0ece8235 Fixed map-icons. 2011-03-05 17:42:07 +01:00
FrozenCow
d9bbef12f8 Some changes after running Findbugs. 2011-03-05 16:09:26 +01:00
FrozenCow
dd38b4b972 Added configurable render-triggers. 2011-03-05 15:39:21 +01:00
FrozenCow
1f05bc99e2 Optimized stringifyJson a bit. 2011-03-04 22:17:50 +01:00
FrozenCow
630fcf7c93 Cleaned Http handling a bit. 2011-03-04 21:31:16 +01:00
FrozenCow
f7c731f855 Enabled '-' and '.' to be valid world-characters. 2011-03-04 20:15:52 +01:00
FrozenCow
e4cf55c7d6 Added configuration caching. 2011-03-01 18:52:15 +01:00
FrozenCow
429e6a4880 Changed skin url from minecraft.net to s3.amazonaws.com. 2011-03-01 18:21:15 +01:00
FrozenCow
2209934068 Merge remote-tracking branch 'flames/master' 2011-03-01 02:01:51 +01:00
FrozenCow
9eb2d1a6a0 Implemented FlatMap fullrender + required clientlib. 2011-03-01 01:59:33 +01:00
FrozenCow
e4fb902420 Added default equals method to MapTile. 2011-03-01 01:58:33 +01:00
Arthur Mayer
4458d5e399 moved all images to separate folder 2011-03-01 00:01:35 +01:00
FrozenCow
7bff552a62 Added shitty-looking top-down flat map. 2011-02-28 19:26:05 +01:00
FrozenCow
5c8d9f3ea3 Fixed incorrect offset when using maximumheight. 2011-02-28 19:24:32 +01:00
FrozenCow
0210635822 Better error status message. 2011-02-28 19:23:25 +01:00
FrozenCow
dce5de053c Fixed incorrect offset with maximumHeight. 2011-02-26 23:02:11 +01:00
FrozenCow
fba2345811 Alertbox does not open when opening page anymore. 2011-02-26 21:33:02 +01:00
FrozenCow
49dca85dda Removed BukkitPlayerDebugger: incompatible with Bukkit. 2011-02-26 20:31:26 +01:00
FrozenCow
f4dcfe77a9 Nicer invalid update-url handling (for invalid world-names or non-existing worlds). 2011-02-26 20:27:54 +01:00
FrozenCow
a21c945097 Fixed JsonTimerTask. 2011-02-26 18:23:35 +01:00
FrozenCow
15393d8800 Merge remote-tracking branch 'alron/master' 2011-02-24 16:10:29 +01:00
alron
cffb8c6749 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
af749ae722 Moved assembly file into more maven consistent location. 2011-02-23 19:14:46 -08:00