Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-12-01 06:33:38 +01:00
Code Issues Projects Releases Wiki Activity
1,228 Commits 7 Branches 130 Tags 27 MiB
f4a8f3ab03
Commit Graph

338 Commits

Author SHA1 Message Date
FrozenCow
5a5fa147d3 Removed some debug messages. 2011-07-27 16:49:48 +02:00
FrozenCow
b944b3b729 Fixed previous maptype/layer being visible in the background. 2011-07-27 16:49:48 +02:00
FrozenCow
90acf73976 Added regions-compatiblity with old configuration. 2011-07-27 16:49:48 +02:00
FrozenCow
51457464c2 Made zoom-in/out for changing tilesizes look better. 2011-07-27 16:49:48 +02:00
FrozenCow
369317ea45 Added styling to regions (thereby also changing the configuration a bit, editing HTML in configuration is not possible anymore) 2011-07-27 16:49:48 +02:00
FrozenCow
0fb56c95bb Reworked Residence to work with Leaflet (and new regions-structure). 2011-07-27 15:50:08 +02:00
FrozenCow
fd542d2b33 Fixed chatballoons for Leaflet. 2011-07-27 15:39:22 +02:00
FrozenCow
8ba8bcfc59 Added worldguard support for Leaflet. 2011-07-27 15:39:22 +02:00
FrozenCow
48683b972a Removed comment. 2011-07-27 15:39:22 +02:00
FrozenCow
eaf6ecde26 Fixed tabs. 2011-07-27 15:39:22 +02:00
FrozenCow
cce30da6be Removed old commented code. 2011-07-27 15:39:22 +02:00
FrozenCow
fc3c5be36c Removed debug. 2011-07-27 15:39:22 +02:00
FrozenCow
8b40a9761b Fixed hdmap tiling and LocationToLatLng 2011-07-27 15:39:22 +02:00
FrozenCow
674b92003c Added (proper) initial Leaflet support. 2011-07-27 15:39:22 +02:00
Mike Primm
c135a669a8 Add updated Residence support (2.3.z) 2011-07-26 23:07:20 -05:00
Mike Primm
e1160f623f Add retry count to updates request - don't show red until 3rd miss 2011-07-26 16:24:04 -05:00
Mike Primm
5a9c28ae27 Add support for 'defaultmap' setting in configuration.txt 2011-07-25 21:16:42 -05:00
Mike Primm
5ad9d7bf90 Add smallplayerfaces option for playermarkers component 2011-07-22 02:34:35 -05:00
Mike Primm
a878ce7cd1 Improve progress messages, make sure HDMaps that share render only render once 2011-07-22 01:42:10 -05:00
Mike Primm
559f251d50 Add mapzoomin attribute, to adjust zoom in levels beyond native tile resolution 2011-07-21 23:25:59 -05:00
Mike Primm
ee3f07c6cd Add support for compass rose in all 8 cardinal directions 2011-07-21 02:50:29 -05:00
Mike Primm
eb87231926 Fix scroll buttons in player list 2011-07-13 16:05:08 -05:00
Mike Primm
c5c699ae61 Fix worldtomap conversion 2011-07-10 23:12:24 -05:00
Mike Primm
874bf9da8d Fix marker/player world-to-map coordinate transform in hdmap.js 2011-07-09 18:04:42 -05:00
Mike Primm
02329673b2 Add adaptive zoomout levels for HDMaps, change zoomout processing to handle it properly 2011-07-09 17:01:40 -05:00
Mike Primm
898f4a6740 Handle bigmap versus bigworld, allows HDMap to be big-map-style independent of bigworld setting. Add bigmap setting on KzedMap and FlatMap too. 2011-07-09 15:51:32 -05:00
Mike Primm
225b348154 Get day/night workding with HDMap 2011-07-05 23:24:25 -05:00
Mike Primm
961eb17536 Fix zoom-out coordinate consistency on HDMaps 2011-07-04 10:18:05 -05:00
Mike Primm
630759c87b HD renderer prototype 2011-07-04 09:28:06 -05:00
Mike Primm
faceab68f1 Fix WorldGuard regions support to include WG5 polygon support 2011-06-29 00:43:39 -05:00
Mike Primm
edf898ae1a Fix "center" processing - broke it with URL args change :< 2011-06-27 20:38:26 -05:00
Mike Primm
752a076236 Add default icon for Biome maps 2011-06-26 22:36:17 -05:00
Mike Primm
3720c2adf7 Add support for URL-based parameter to override initial world, map, zoom, and center coordinate settings 2011-06-26 22:05:43 -05:00
Mike Primm
d63db655d8 More tuning on zoom-out, fix zoomout on bigworld on iso-maps 2011-06-24 02:46:16 -05:00
Mike Primm
f722c6fdc8 Finish zoom out on normal and 'bigworld' mode, fix marker coordinates 2011-06-23 00:53:56 -05:00
Mike Primm
8e102446fe First pass UI support for extra zoom out levels 2011-06-22 16:43:41 -05:00
Mike Primm
bec1108fa1 Settable zoom out code - incomplete prototype 2011-06-22 08:27:21 -05:00
mikeprimm
095f7b5338 Make IE happy (or, at least, suck much less) by providing a valid background color! 2011-06-15 11:45:59 -07:00
mikeprimm
8b730dc543 Merge pull request #215 from mikeprimm/master 
Prevent chat balloons being shown when speaking player is not on currently shown world
 2011-06-14 15:59:15 -07:00
Mike Primm
dc74901638 Clean up linefeed changes... 2011-06-14 17:57:51 -05:00
Mike Primm
0cf7b4be9b Add alternate directory structure to better support huge worlds 2011-06-13 21:43:02 -05:00
FrozenCow
b19d8f8745 Fixed urls for php and aspx proxies. 2011-06-13 23:37:35 +02:00
Mike Primm
f802c1d889 Prevent broken JSON when http://jsonip.appspot.com/ is over quote or 
broken.
 2011-06-12 21:33:36 -07:00
Mike Primm
397f97800c Add image for default skylands surface map 2011-06-12 17:36:06 -07:00
zeeZ
274cddd9ff Don't wrap whitespace in player names 2011-06-08 22:49:35 +08:00
Mike Primm
867c31573e Remove icon position flicker on first load/player add 2011-06-03 09:51:41 -05:00
Mike Primm
38163133cb Have per-world control of sending player position and health, prevent 
player icon flicker on addplayer (even when not on world or position
is obfuscated)
 2011-06-03 08:42:24 -05:00
Mike Primm
6a50b2ebcd Add background color support per map, add skylands template default 2011-06-03 03:24:21 -05:00
Mike Primm
2d0b2ef63d Hide player positions when on disabled worlds, add sendposition flat 
to ClientComponent to avoid leaking position data, even when markers
are off, fix problem with stale player marker positions during/right
after map changes
 2011-06-03 00:39:21 -05:00
Mike Primm
18896eeac0 Fix web to server chat on standalone - make chat.js use config.sendmessage 2011-06-02 15:41:09 -05:00
Mike Primm
7f662b2b1a Properly stringify chat input, so that we wind up with value JSON (doublequote, and others) 2011-06-02 15:15:46 -05:00
Mike Primm
d0e66d7e35 Replace "?0" with "?<currentmilliseconds" on default tile URLs to fix browser cache issues between reloads 2011-06-02 13:14:38 -05:00
Mike Primm
4b30fff8a7 Add meta tags for Apple mobile devices - full screen layout works nice 2011-05-30 11:05:21 -05:00
Mike Primm
09e1ebc972 Add 'sidebaropened' option to auto-pin sidebar 2011-05-30 09:56:10 -05:00
Mike Primm
c00bd077cb Add support in web UI for automatic day/night cycle when night-and-day 
set for a given map.
 2011-05-29 17:24:46 -05:00
FrozenCow
e4e0d68537 Formatted config.js. 2011-05-26 14:16:34 +02:00
FrozenCow
d1a8c40248 Added ability to set each url individually. 2011-05-26 13:54:08 +02:00
Mike Primm
38dd39d75f Fix spacing on player markers to correct health/armor layout 2011-05-25 12:29:21 +08:00
FrozenCow
d44c3620cc Fixed errorous css with Opera (thanks Lycano!) 2011-05-22 22:04:43 +02:00
Mike Primm
fe25cb6a0f Fix player faces when aliases being used, and strip color from player 
display names sent to web UI
 2011-05-23 03:23:11 +08:00
zeeZ
3fd511a8d1 Added armor (merged from zeeZ). 2011-05-22 16:28:26 +02:00
Mike Primm
06785be5f3 Fixes for alias/nicknames in web UI (esp handling player icons), 
HeroChat fixes
 2011-05-21 23:58:48 -05:00
Mike Primm
4fb1ddf49a Fix for skins on players with nicknames - send up account name as well 
as display name.
 2011-05-21 00:59:08 -05:00
zeeZ
6bea667659 Optionally add player health bars to map markers. 2011-05-19 01:53:08 +02:00
zeeZ
c2d596e433 Recenter map only on projection change. 2011-05-19 01:35:09 +02:00
zeeZ
0caa655095 Default zoom in config or 0. 2011-05-17 13:34:54 +02:00
Mike Primm
0ffc825b05 Re-merge the nether render support, and update race condition fixes 2011-05-14 23:25:59 -05:00
zeeZ
491e88f745 Fixed kzed map scrolling on higher zoom levels 2011-05-14 20:54:10 +08:00
zeeZ
7ff33f04a0 (Optionally) set map center in web config, automagically pan there on map change. 2011-05-14 12:40:59 +02:00
mikeprimm
31584804aa Fix zoom so that markers are placed properly 2011-05-14 12:40:26 +02:00
Mike Primm
1e3ceed5d7 Add zooming to flat map (why not? :) ) 2011-05-13 10:59:06 +02:00
zeeZ
619485212d First iteration of weather icons 2011-05-10 12:51:52 +02:00
FrozenCow
b66be7a47c Merge remote-tracking branch 'kilandor/master' 2011-05-07 00:04:05 +02:00
FrozenCow
c4e1362274 Added another way to specify configuration file. 2011-05-06 23:18:46 +02:00
zeeZ
5f32f8fb99 Added Google Maps API version selection to fix map changes 2011-04-28 16:58:30 +02:00
Jason Booth
b3ccd203c8 Added some info 
Fix for spam warning for php(Thanks for bug report flames)
 2011-04-13 20:23:24 -05:00
Jason Booth
8e59f37995 Initial Support for Regions system on dynmap 
Included Worldguard support(default)
Also residence support(incomplete)
 2011-04-13 19:58:25 -05:00
zeeZ
8d5f081cdf Compass style based on map type. Hacky because widgets have classes, not IDs 2011-04-09 08:24:52 +02:00
zeeZ
553a956949 Flipped flat map so North is up 2011-04-08 21:40:16 +02:00
FrozenCow
d53b3bc340 Added HighlightTileRenderer (thanks in part to rockNme2349) 2011-04-07 15:46:50 +02:00
FrozenCow
ad33ef79d9 Fixed up.php. 2011-04-05 23:25:11 +02:00
FrozenCow
b47bbee4e8 Cleaned up join/quit messages (not being send as chat messages) 2011-04-05 22:58:46 +02:00
FrozenCow
e1e13df4b2 Removed redundant configuration values and made use of customizable join/quit messages. 2011-04-05 22:30:43 +02:00
FrozenCow
445f37475a Added php proxy. 2011-04-03 17:15:19 +02:00
FrozenCow
0dca8d9cfe Fixed a incompatiblity with FF3 (and others). 2011-04-02 00:52:24 +02:00
FrozenCow
060f4641d4 Added option for digital clock to timeofday. 2011-03-31 16:00:47 +02:00
FrozenCow
f93eb8dcbc Changed clocks to be components. 2011-03-31 15:53:42 +02:00
FrozenCow
1cda538eef Dynamically load javascript files of components. 2011-03-31 13:06:34 +02:00
FrozenCow
6622db1b2c Simplified component-creation, dropping IE8 compatibility. 2011-03-31 12:54:32 +02:00
FrozenCow
6eface57ae Separated playermarkers to a component. 2011-03-31 12:44:42 +02:00
FrozenCow
7464e5b809 Separated chatbox to a separate component (into different files). 2011-03-31 12:32:27 +02:00
FrozenCow
9a09cace54 Separated chat-balloon-code to a component. 2011-03-29 23:42:56 +02:00
FrozenCow
0b421209a2 Small fix for invalid http response of updates. 2011-03-29 01:16:52 +02:00
John Du Hart
064f911f5a Mised the maps API URL 2011-03-26 00:15:54 +01:00
John Du Hart
3c094ec87d Implemented protocol-relative URLs (this is tested) 2011-03-24 18:32:43 +01:00
FrozenCow
2be0cd3671 Added initial work for 'componentizing' client-side. 2011-03-21 20:46:53 +01:00
FrozenCow
15a8e03e9e Added client-side events to map. 2011-03-21 19:07:30 +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
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
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
f3c90f0aae Added prefix to flatmap. 2011-03-06 14:45:26 +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
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
FrozenCow
f4f4a33b8b Implemented FlatMap fullrender + required clientlib. 2011-03-01 01:59:33 +01:00
Arthur Mayer
d200b0b8c5 moved all images to separate folder 2011-03-01 00:01:35 +01:00
FrozenCow
9fea1eafdb Added shitty-looking top-down flat map. 2011-02-28 19:26:05 +01:00
FrozenCow
686331d1a5 Better error status message. 2011-02-28 19:23:25 +01:00
FrozenCow
a04215be8f Alertbox does not open when opening page anymore. 2011-02-26 21:33:02 +01:00
FrozenCow
1e04d10b35 Nicer invalid update-url handling (for invalid world-names or non-existing worlds). 2011-02-26 20:27:54 +01:00
FrozenCow
e6d2c4932a Reverted back to "== '13'" like flames suggested before. This seemed to raise incompatiblities for Firefox and Safari on Mac, not on Linux. 2011-02-24 00:38:46 +01:00
FrozenCow
9a32485ca9 Small cleanup. 2011-02-24 00:16:10 +01:00
FrozenCow
20e954b905 Change for the inner nerd in me. 2011-02-24 00:06:36 +01:00
Arthur Mayer
b6ec0a2955 lechd updated override example 2011-02-23 23:28:28 +01:00
Arthur Mayer
cdd30d95c5 lechd's new override style to let the sidebar always open and hides 
also the icon
 2011-02-23 23:03:26 +01:00
Arthur Mayer
cc0bb3b509 fixed chat sending messages from web. 
event.keyCode === '13', where the strict equal operator seem to break
safari, firefox and chrome (different value types? keydown event seem
not to provide either a string nor an integer)
 2011-02-23 21:26:51 +01:00
FrozenCow
1d2cce6caa Simplified tile-mechanism again (a bit like hMod's version). 2011-02-23 14:06:13 +01:00
FrozenCow
b7f6a5a39d Applied style-change of lechd. 2011-02-23 12:40:05 +01:00
FrozenCow
1cc43637ee Merge remote-tracking branch 'kilandor/master' into nowebserver 
Conflicts:
	configuration.txt
	src/main/java/org/dynmap/DynmapPlayerListener.java
	src/main/java/org/dynmap/DynmapPlugin.java
	web/map.js
 2011-02-22 17:58:39 +01:00
FrozenCow
da7da17235 Applied some suggestions by JSLint. 2011-02-22 15:38:49 +01:00
FrozenCow
ccf6f2ac49 Player per world support @ client. 2011-02-22 14:49:03 +01:00
FrozenCow
b097fb8321 Added entry for css overrides and cleaned up styles by lechd. 2011-02-20 23:55:16 +01:00
FrozenCow
cd4027495c New buttons and example override css by lechd. 2011-02-20 22:11:28 +01:00
FrozenCow
f80385e1af Added lechd's new images. 2011-02-20 18:47:18 +01:00
Arthur Mayer
02fb226350 removed forgotten comma 2011-02-20 02:02:45 +01:00