Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-19 00:35:37 +01:00
Code Issues Projects Releases Wiki Activity
2,732 Commits 7 Branches 130 Tags 27 MiB
83cfe0b1ea
Commit Graph

2732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FrozenCow
9206fce435 Set version to 0.14. 2011-03-17 22:26:37 +01:00
FrozenCow
64733202c0 Merged from flames/master 2011-03-17 22:10:59 +01:00
FrozenCow
082b3577fb Removed jQuery.js (using jQuery from Google now.) 2011-03-17 21:54:32 +01:00
FrozenCow
e4fa4fe015 Merge branch 'master' of https://github.com/flames/dynmap 2011-03-17 21:43:02 +01:00
Arthur Mayer
2bfbaa241b added forgotten jquery.mousewheel.js 2011-03-17 21:41:24 +01:00
FrozenCow
c13517949b Hides scrollbuttons when they are not needed. 2011-03-17 21:10:35 +01:00
FrozenCow
79c2989b37 Merge branch 'master' of https://github.com/flames/dynmap 2011-03-17 15:55:24 +01:00
Arthur Mayer
89b66613f0 scrollbutton images 2011-03-17 15:53:14 +01:00
FrozenCow
cc7b33ef47 Merge branch 'master' of https://github.com/flames/dynmap 2011-03-17 15:46:14 +01:00
Arthur Mayer
954ab689e9 scrollbuttons added and small change for css (because i want it so!) 2011-03-17 15:43:28 +01:00
FrozenCow
5e325d00ea Corrected image references from css. 2011-03-17 15:30:30 +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
FrozenCow
2c0717f3d9 Merge branch 'master' of https://github.com/flames/dynmap 2011-03-17 00:03:05 +01:00
Arthur Mayer
105e2d1829 css for playerlist scrolling. thanks lechd for help. js part comming 
soon :P
 2011-03-16 23:56:04 +01:00
FrozenCow
e281b55c3f Added flatmap-icon. 2011-03-16 14:12:54 +01:00
FrozenCow
05aaa1c39d Fixed website and other not very interesting stuff in pom.xml. 2011-03-16 02:28:49 +01:00
FrozenCow
4d5d8d63bf Made pom.xml refer to TheYeti's permissions' groupId and it use the latest version. 2011-03-16 01:31:05 +01:00
FrozenCow
e5520934f6 Merge branch 'master' of https://github.com/Kilandor/dynmap 2011-03-16 01:21:53 +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
831fb04bae Revert "Revert "Bleh, Old Permissions. Bleh, hardcoded artifact location."" 
This reverts commit 8105a1d2a5.
 2011-03-16 01:02:33 +01:00
Arthur Mayer
07cb3ad1b3 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
4a2f82a7d6 messagettl for chat also in seconds :) 2011-03-15 23:56:22 +01: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
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