Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-25 03:35:18 +01:00
Code Issues Projects Releases Wiki Activity
1,331 Commits 7 Branches 130 Tags 27 MiB
82318346c2
Commit Graph

363 Commits

Author SHA1 Message Date
Mike Primm
9f8ab5da03 Add icons on to map display, and marker update logic 2011-09-04 14:11:48 -05:00
Mike Primm
c034a10951 Finish revert 2011-09-04 02:07:15 -05:00
Mike Primm
eee6476d6a Fix player faces in sidebar, while still preserving load cache 2011-09-04 01:35:02 -05:00
Mike Primm
8bdce005c3 Merge remote branch 'upstream/master' 2011-09-04 01:31:46 -05:00
Mike Primm
3f585c84b7 Put markers in a component, add generic component update messages 2011-09-03 16:49:18 -05:00
FrozenCow
d88763f179 Fixed playerfaces not showing in sidebar. 2011-08-30 21:46:22 +02:00
Mike Primm
d1ff472bda Add 'sidebaropened: pinned' option to allow sidebar to be pre-pinned but support unpinning 2011-08-30 10:01:07 +08:00
Mike Primm
7e37817b86 Add 'sidebaropened: pinned' option to allow sidebar to be pre-pinned but support unpinning 2011-08-29 21:00:05 -05:00
Mike Primm
f4de63e85e Add first pass of Factions support 2011-08-29 10:37:22 +08:00
Mike Primm
af1f47df23 Add first pass of Factions support 2011-08-28 21:31:04 -05:00
Mike Primm
f62d46cfbd Add hidebydefault setting to playermarkers component too 2011-08-26 14:23:32 +08:00
Mike Primm
3d385106e9 Add hidebydefault setting to playermarkers component too 2011-08-26 01:22:03 -05:00
Mike Primm
bc357dd188 Handle multiple instances of same component type (regions) 2011-08-26 13:57:05 +08:00
Mike Primm
c353d9aae6 Add hidebydefault option for regions layers 2011-08-26 13:57:05 +08:00
Mike Primm
ace7fbf838 Handle multiple instances of same component type (regions) 2011-08-26 00:55:53 -05:00
Mike Primm
aee7ea2d49 Add hidebydefault option for regions layers 2011-08-26 00:13:03 -05:00
Mike Primm
106e470898 Add playermarkers to hide/show-able layer group 2011-08-26 06:34:37 +08:00
Mike Primm
59b095628d Add control for hide/show of component layers (only regions for now) 2011-08-26 06:34:37 +08:00
Mike Primm
1a128a6d74 Add playermarkers to hide/show-able layer group 2011-08-25 17:31:34 -05:00
Mike Primm
bfb12e4f81 Add control for hide/show of component layers (only regions for now) 2011-08-25 17:07:00 -05:00
Mike Primm
04cc6aba43 Towny fixes - multiple areas on multiple worlds per town 2011-08-25 11:15:26 +08:00
Mike Primm
627cef720c Towny fixes - multiple areas on multiple worlds per town 2011-08-24 22:11:31 -05:00
Mike Primm
da32c2f0bd Add server-side generation of faces : fixes face accessory issues, IE8 2011-08-24 00:51:54 -05:00
Mike Primm
074952265f Add customstyle settings for per-region style, nation style for Towny, lots for Residence 2011-08-22 22:16:38 -05:00
Mike Primm
75d7068fbf Fix regionstyle attributes for region outlines and fill 2011-08-22 10:31:27 -05:00
Mike Primm
d349a76660 First pass of Towny region support 2011-08-22 01:17:28 -05:00
Mike Primm
82b0f2c4cd Fix naming on Residence regions, make infowindow setting control popup content again 2011-08-21 15:57:21 -05:00
Mike Primm
55dc6397e1 Fix logic on scroll buttons 2011-08-17 01:00:32 +08:00
Mike Primm
4616f6a5be Fix window resize exception - Leaflet expects 'map' at top level... 2011-08-16 08:08:59 +08:00
Mike Primm
c9494a312d Fix exception if initial update has stale logoff for player+chat 2011-08-15 21:10:44 +08:00
Mike Primm
5b7ad0f4c9 Fix IE exceptions from debug code, canvas calls 2011-08-15 10:10:08 +08:00
Mike Primm
1aa3d07e6a Fix break in namedTile during integrate of updated Leaflet 2011-08-15 04:49:42 +08:00
Mike Primm
042544f22e Reapply updated Leaflet patch 2011-08-14 14:59:53 +08:00
Mike Primm
9f4df9a76e Switch to using continuousWorld option in newer Leaflet - saves on override 2011-08-14 13:12:58 +08:00
Mike Primm
0bc760230f Update Leaflet (lots of fixes) 2011-08-14 13:12:58 +08:00
Mike Primm
d008548306 Add support for JPEG encoding option for HDMaps 2011-08-12 14:48:52 +08:00
Mike Primm
6616b3eae5 Add poly2d region support back to WorldGuard 2011-08-10 20:47:14 -05:00
Mike Primm
a5e3f36d97 Fix IE8 - missing indexOf(), if you can believe that.... fix is per 
https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/IndexOf
 2011-08-10 18:07:59 -05:00
FrozenCow
f5f9c3bb31 Use shift, not pop, for queue. 2011-08-10 23:32:33 +02:00
FrozenCow
91b9b456b5 Added tile queueing. 2011-08-10 22:39:57 +02:00
FrozenCow
fdbce8df36 Only handle cuboid regions. 2011-08-10 15:14:48 +02:00
Mike Primm
c865ecb673 Remove default leaflet attribute 2011-08-03 21:33:53 -05:00
Mike Primm
132bfc539b Handle Leaflet freak-out on removed layers during tile load, clean up panning 2011-08-03 21:14:15 -05:00
Mike Primm
bffc56dd20 Fix blit back to original - stop fuzzy webkit browsers 2011-08-03 13:18:53 -05:00
Mike Primm
64bd846115 Fix map center consistency on map changes 2011-08-03 10:21:29 -05:00
Mike Primm
1d0b28c069 Fix defaultzoom: 0 not working 2011-08-03 08:13:59 -05:00
Mike Primm
091752aaae Drop accessory face overlay - hardly seems used and causes white faces 2011-08-03 00:40:53 -05:00
Mike Primm
ee790f86ed Fix marker position logic and zoom range calculation on Kzed and Flat 2011-08-02 21:51:00 -05:00
Mike Primm
257b1c37f1 Fix zoom on KzedMap when bigworld=false 2011-08-02 16:10:04 -05:00
Mike Primm
40e2b1eb4d Fix bigworld on kzed and flat 2011-08-02 10:48:04 -05:00
Mike Primm
e08a2d4407 Fix background color support, provide blank tile to fix refresh junk 2011-08-02 00:07:17 -05:00
Mike Primm
0bbcf6510e Make IE sane 2011-08-01 23:21:36 -05:00
Mike Primm
37c9d4b9cd Update leaflet 2011-08-01 21:03:43 -05:00
Mike Primm
17af53ee1f Band-aid playermarkers on IE8 2011-08-01 18:31:04 -05:00
Mike Primm
2fa68b2992 Force z-order for map to prevent components winding up behind it 2011-08-01 09:11:58 -05:00
FrozenCow
05f09f7bb4 Fixed image of popup close button. 2011-07-31 22:24:28 +02:00
Mike Primm
95c9520cc9 Clean up player marker transitions to/from visible map 2011-07-31 12:41:01 -05:00
Mike Primm
29e42137c9 Fix autopan on chatbaloons - can be off now :) 2011-07-29 14:28:29 -05:00
mikeprimm
181e3dccbd Merge pull request #345 from mikeprimm/master 
Fix nesting on residence subzones
 2011-07-29 08:32:09 -07:00
Mike Primm
95128df6b9 Fix nesting - iterating over areas versus residences 2011-07-29 10:30:59 -05:00
FrozenCow
5bf8010bbb Fixed styling and owner/member texts of regions. 2011-07-29 17:16:27 +02:00
Mike Primm
47194defca Add support for Subzones (1 tier) 2011-07-29 09:50:50 -05:00
Mike Primm
4824388c6b Update zoom range to match selected map 2011-07-28 23:51:53 -05:00
Mike Primm
6d66d45d43 Fix compass with new UI 2011-07-28 00:43:13 -05:00
Mike Primm
d483eb1e6f Fix Residence support in updated UI 2011-07-27 22:42:55 -05:00
Mike Primm
08192df906 Various map update fixes (keeping zoom, center on map change, repaint) 2011-07-27 21:27:35 -05:00
FrozenCow
5aa961388d Removed unnecessary !important from css. 2011-07-27 19:49:43 +02:00
FrozenCow
bea269e8df Fixed zoomin/out icons again. 2011-07-27 19:34:42 +02:00
FrozenCow
0abc944c6e Added logo-component. 2011-07-27 18:51:26 +02:00
FrozenCow
e90087390a Fixed flatmap. 2011-07-27 17:07:28 +02:00
FrozenCow
ce00242253 Made use of mapzoomout+mapzoomin on all maptypes + simplified the client code of the individual maps. 2011-07-27 16:49:49 +02:00
FrozenCow
4f75bf691a Fixed nightday and making use of options.mapzoomin and options.mapzoomout. 2011-07-27 16:49:49 +02:00
FrozenCow
9f19ccf50c Removed old comments. 2011-07-27 16:49:49 +02:00
FrozenCow
2242c0643b Added/upgraded jquery as a local file and moved js and css to their directories. 2011-07-27 16:49:49 +02:00
FrozenCow
31b849683a Upgraded leaflet to latest version. 2011-07-27 16:49:48 +02:00
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