141 Commits

Author SHA1 Message Date
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 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
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
Arthur Mayer 4a2f82a7d6 messagettl for chat also in seconds :) 2011-03-15 23:56:22 +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
Arthur Mayer 363339c632 important fix for css, forgotten in my last commit, FrozenCow, please
pull
2011-03-09 17:36:15 +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
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