FrozenCow
8e72f588aa
Merge branch 'master' of https://github.com/flames/dynmap
2011-03-17 15:46:14 +01:00
Arthur Mayer
c94fbd621d
scrollbuttons added and small change for css (because i want it so!)
2011-03-17 15:43:28 +01:00
FrozenCow
80f0125f7e
Corrected image references from css.
2011-03-17 15:30:30 +01:00
FrozenCow
5a5ebdffd9
Removed empty line.
2011-03-17 03:29:25 +01:00
FrozenCow
08e85fe23d
Another import removal.
2011-03-17 02:36:26 +01:00
FrozenCow
a07829eab4
Organized imports.
2011-03-17 02:21:04 +01:00
FrozenCow
779eb803f7
Merge branch 'master' of https://github.com/flames/dynmap
2011-03-17 00:03:05 +01:00
Arthur Mayer
80fb26cfa6
css for playerlist scrolling. thanks lechd for help. js part comming
...
soon :P
2011-03-16 23:56:04 +01:00
FrozenCow
64d7c4e6d8
Added flatmap-icon.
2011-03-16 14:12:54 +01:00
FrozenCow
603e2d530a
Fixed website and other not very interesting stuff in pom.xml.
2011-03-16 02:28:49 +01:00
FrozenCow
a1cc977880
Made pom.xml refer to TheYeti's permissions' groupId and it use the latest version.
2011-03-16 01:31:05 +01:00
FrozenCow
6c29201652
Merge branch 'master' of https://github.com/Kilandor/dynmap
2011-03-16 01:21:53 +01:00
Jason Booth
9c799c71a2
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
c41da6e4c8
Revert "Revert "Bleh, Old Permissions. Bleh, hardcoded artifact location.""
...
This reverts commit 4961c27cf0
2011-03-16 01:02:33 +01:00
Arthur Mayer
62023f1d31
readded modified sk89q colorssheme, its contains now beta 1.3 blocks
...
and snow is not that bright.
2011-03-15 23:59:16 +01:00
Arthur Mayer
a3fa849b5a
messagettl for chat also in seconds :)
2011-03-15 23:56:22 +01:00
FrozenCow
0cfd7997b9
Made webchat-interval in seconds.
2011-03-15 22:47:12 +01:00
FrozenCow
53533ec599
Added webchat-interval for anti-spam webmessaging.
2011-03-15 22:43:48 +01:00
FrozenCow
411e1adbfc
Removed some warnings, redisabled BufferedOutputStream closing.
2011-03-15 21:04:53 +01:00
FrozenCow
4961c27cf0
Revert "Bleh, Old Permissions. Bleh, hardcoded artifact location."
...
This reverts commit 2f0d5c2e56
2011-03-15 19:38:53 +01:00
FrozenCow
15abae9f94
Merge remote-tracking branch 'alron/master'
2011-03-15 16:53:12 +01:00
FrozenCow
9a3d7ee356
Made dynmap compatible with chat-plugins who cancel chat-events.
2011-03-15 14:03:04 +01:00
FrozenCow
d398eb0bb0
Added empty onLoad method
2011-03-15 13:22:05 +01:00
FrozenCow
492847d576
New coloring system for flatmap.
2011-03-15 00:01:08 +01:00
alron
95f5092499
Doesn't change anywhere? Probably should be final.
2011-03-12 01:38:34 -08:00
alron
fb55dcd0e3
oops, didn't need that ^^
2011-03-12 01:36:43 -08:00
alron
d0e2096104
Close potential filedescriptor leak.
2011-03-12 01:35:07 -08:00
alron
bc9a0d54d0
Close potential filedescriptor leak.
2011-03-12 01:33:30 -08:00
alron
2f0d5c2e56
Bleh, Old Permissions. Bleh, hardcoded artifact location.
2011-03-12 01:23:19 -08:00
FrozenCow
c2d00b740e
Abstracted permissions. Cleaned up DynmapPlugin.
2011-03-11 16:05:54 +01:00
FrozenCow
767810ca4c
Fixed shutting down http server(?)
2011-03-11 15:22:14 +01:00
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
