Commit graph

3324 commits

Author SHA1 Message Date
Mike Primm
fcc234bf3e Clean up player marker transitions to/from visible map 2011-07-31 12:41:01 -05:00
mikeprimm
6192085b5a Merge pull request #351 from mikeprimm/master
Avoid trap in regions when 'basenode' in region file cannot be found or is bad
2011-07-31 09:16:47 -07:00
Mike Primm
ed8490fdbc Fix trap when bad basenode in region component 2011-07-31 11:14:36 -05:00
mikeprimm
662db1f4c4 Merge pull request #350 from mikeprimm/master
Fix biome shading on normal worlds
2011-07-31 08:40:23 -07:00
Mike Primm
1551c97437 Merge remote branch 'origin/master' 2011-07-31 10:37:09 -05:00
Mike Primm
2fd2636583 Fix bug with not doing biome shading on normal worlds 2011-07-31 10:36:43 -05:00
mikeprimm
a9ae9cd69d Merge pull request #349 from mikeprimm/master
Make JSON unicode encoding more thorough - don't assume anything outside ASCII should not be escaped
2011-07-30 00:16:24 -07:00
Mike Primm
c446774775 Make JSON unicode encoding more thorough - don't assume anything outside ASCII should not be escaped 2011-07-30 02:13:45 -05:00
mikeprimm
2dfc03051e Merge pull request #348 from mikeprimm/master
Improve rendering of textures for redstone wire
2011-07-29 23:41:38 -07:00
Mike Primm
66496e4eb6 Improve texture rendering for redstone wire 2011-07-30 01:22:05 -05:00
mikeprimm
af56c1d365 Merge pull request #346 from mikeprimm/master
Fix autopan on chatballoons - always was on
2011-07-29 12:30:49 -07:00
Mike Primm
6c8d3e3b51 Fix autopan on chatbaloons - can be off now :) 2011-07-29 14:28:29 -05:00
mikeprimm
78d0dbeb10 Merge pull request #345 from mikeprimm/master
Fix nesting on residence subzones
2011-07-29 08:32:09 -07:00
Mike Primm
82722e4f61 Fix nesting - iterating over areas versus residences 2011-07-29 10:30:59 -05:00
FrozenCow
fd18dd0478 Fixed styling and owner/member texts of regions. 2011-07-29 17:16:27 +02:00
mikeprimm
f501b31e20 Merge pull request #344 from mikeprimm/master
Add subzones for Residence regions support
2011-07-29 07:52:14 -07:00
Mike Primm
b2a8441c67 Add support for Subzones (1 tier) 2011-07-29 09:50:50 -05:00
mikeprimm
32293f7741 Merge pull request #342 from mikeprimm/master
Fix zoom range to match selected map
2011-07-28 21:53:13 -07:00
Mike Primm
67da71b520 Update zoom range to match selected map 2011-07-28 23:51:53 -05:00
mikeprimm
d33bbc2429 Merge pull request #341 from mikeprimm/master
Fix skylands premature-end-of-render issue
2011-07-28 08:15:30 -07:00
Mike Primm
d7e3593529 Fix map edge detection to only use lack-of-chunks: fix skylands
premature end-of-render issue
2011-07-28 10:11:34 -05:00
mikeprimm
6c7fbe57b8 Merge pull request #340 from mikeprimm/master
Retire 'snowform' trigger, add 'blockformed', 'blockfaded', 'blockspread' triggers
2011-07-28 08:04:03 -07:00
Mike Primm
085ca16dbb Fix message - blockform -> blockformed 2011-07-28 10:01:54 -05:00
Mike Primm
8e003c4cc6 Retired 'snowformed' event, added 'blockformed', 'blockfaded', 'blockspread' 2011-07-28 08:08:08 -05:00
mikeprimm
98174184ea Merge pull request #337 from mikeprimm/master
Fix compass rose on new UI
2011-07-27 22:44:22 -07:00
Mike Primm
c061e1a08d Fix compass with new UI 2011-07-28 00:43:13 -05:00
mikeprimm
0501ae5073 Merge pull request #336 from mikeprimm/master
Fix Residence support with new web UI
2011-07-27 20:44:02 -07:00
Mike Primm
b1fab1f53e Fix Residence support in updated UI 2011-07-27 22:42:55 -05:00
mikeprimm
09fa40382d Merge pull request #335 from mikeprimm/master
Fix various new map issues
2011-07-27 19:30:11 -07:00
Mike Primm
ca2776160d Various map update fixes (keeping zoom, center on map change, repaint) 2011-07-27 21:27:35 -05:00
FrozenCow
d0087f890a Removed unnecessary !important from css. 2011-07-27 19:49:43 +02:00
FrozenCow
dfafae1f53 Fixed zoomin/out icons again. 2011-07-27 19:34:42 +02:00
FrozenCow
8ce73f51a6 Added logo-component. 2011-07-27 18:51:26 +02:00
FrozenCow
e6c32b7b7d Fixed flatmap. 2011-07-27 17:07:28 +02:00
FrozenCow
85a49eb934 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
f0a043b41c Fixed nightday and making use of options.mapzoomin and options.mapzoomout. 2011-07-27 16:49:49 +02:00
FrozenCow
ea4aa7de97 Removed old comments. 2011-07-27 16:49:49 +02:00
FrozenCow
bcbaae9d18 Added/upgraded jquery as a local file and moved js and css to their directories. 2011-07-27 16:49:49 +02:00
FrozenCow
a62ba04484 Upgraded leaflet to latest version. 2011-07-27 16:49:48 +02:00
FrozenCow
070f583a5d Removed some debug messages. 2011-07-27 16:49:48 +02:00
FrozenCow
219ab39e40 Fixed previous maptype/layer being visible in the background. 2011-07-27 16:49:48 +02:00
FrozenCow
7c87539f46 Added regions-compatiblity with old configuration. 2011-07-27 16:49:48 +02:00
FrozenCow
1083329b52 Made zoom-in/out for changing tilesizes look better. 2011-07-27 16:49:48 +02:00
FrozenCow
8a9dd38ada 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
846e8c45bd Reworked Residence to work with Leaflet (and new regions-structure). 2011-07-27 15:50:08 +02:00
FrozenCow
3d15985fba Fixed chatballoons for Leaflet. 2011-07-27 15:39:22 +02:00
FrozenCow
7e5ea145a0 Added worldguard support for Leaflet. 2011-07-27 15:39:22 +02:00
FrozenCow
3b6c6e2838 Removed comment. 2011-07-27 15:39:22 +02:00
FrozenCow
cc52277b7c Fixed tabs. 2011-07-27 15:39:22 +02:00
FrozenCow
9a580e5444 Removed old commented code. 2011-07-27 15:39:22 +02:00