mikeprimm
1cb79e41cb
Merge pull request #375 from mikeprimm/master
...
Add maximumheight and minimumheight attributes for IsoHDPerspective
2011-08-03 22:27:50 -07:00
Mike Primm
d95189a7c1
Add maximumheight and minimumheight options to IsoHDPerspective
2011-08-04 00:26:08 -05:00
mikeprimm
42c95012ef
Merge pull request #374 from mikeprimm/master
...
Fix detection of new blockspread, blockform, blockfaded triggers
2011-08-03 21:43:45 -07:00
Mike Primm
571c66a189
Fix detection of blockformed, blockfaded, blockspread
2011-08-03 23:40:25 -05:00
mikeprimm
2f7e7ad87b
Merge pull request #373 from mikeprimm/master
...
Fix armor calculation - round vs truncate
2011-08-03 20:46:09 -07:00
Mike Primm
ba9e27f451
Fix armor calculation - round vs truncate
2011-08-03 22:45:18 -05:00
mikeprimm
8d5233befd
Merge pull request #372 from mikeprimm/master
...
Remove default Leaflet attribution
2011-08-03 19:34:52 -07:00
Mike Primm
c865ecb673
Remove default leaflet attribute
2011-08-03 21:33:53 -05:00
mikeprimm
bb2f21b44c
Merge pull request #371 from mikeprimm/master
...
Handle Leaflet freak-out on removed layers during tile load, clean up panning
2011-08-03 19:20:34 -07: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
mikeprimm
852df86ad1
Merge pull request #370 from mikeprimm/master
...
Make Kzed setting for mapzoomout match existing behavior (2 levels below native, not 3)
2011-08-03 13:10:50 -07:00
Mike Primm
612cdf0c98
Make mapzoomin for Kzed consistent with previous versions (2 below
...
native)
2011-08-03 15:09:28 -05:00
mikeprimm
d6388aab31
Merge pull request #368 from mikeprimm/master
...
Go back to pixel by pixel blit - makes webkit browsers less fuzzy
2011-08-03 11:19:53 -07:00
Mike Primm
bffc56dd20
Fix blit back to original - stop fuzzy webkit browsers
2011-08-03 13:18:53 -05:00
mikeprimm
bb279d7e2f
Merge pull request #367 from mikeprimm/master
...
Fix map center consistency between map changes, add fromLatLngToLocation to Projection
2011-08-03 08:26:57 -07:00
Mike Primm
64bd846115
Fix map center consistency on map changes
2011-08-03 10:21:29 -05:00
mikeprimm
db0fadc5de
Merge pull request #366 from mikeprimm/master
...
Fix defaultzoom: 0 not working
2011-08-03 06:14:53 -07:00
Mike Primm
1d0b28c069
Fix defaultzoom: 0 not working
2011-08-03 08:13:59 -05:00
mikeprimm
e6e07bf421
Merge pull request #365 from mikeprimm/master
...
Don't include face accessory overlay on faces for now - causes 'white face'
2011-08-02 22:49:12 -07:00
Mike Primm
091752aaae
Drop accessory face overlay - hardly seems used and causes white faces
2011-08-03 00:40:53 -05:00
mikeprimm
6d75c9ea44
Merge pull request #364 from mikeprimm/master
...
Fix zoom range and marker position calculation on Kzed and Flat
2011-08-02 19:54:06 -07:00
Mike Primm
ee790f86ed
Fix marker position logic and zoom range calculation on Kzed and Flat
2011-08-02 21:51:00 -05:00
mikeprimm
4bf9f9a978
Merge pull request #363 from mikeprimm/master
...
And another KzedMap Zoom fix - for non-bigworld this time
2011-08-02 14:11:12 -07:00
Mike Primm
257b1c37f1
Fix zoom on KzedMap when bigworld=false
2011-08-02 16:10:04 -05:00
mikeprimm
8cef3fb478
Merge pull request #361 from mikeprimm/master
...
Fix flat and kzed 'bigworld' support
2011-08-02 08:48:45 -07:00
Mike Primm
40e2b1eb4d
Fix bigworld on kzed and flat
2011-08-02 10:48:04 -05:00
mikeprimm
49978e3ac5
Merge pull request #358 from mikeprimm/master
...
Fix background color support, fix junk on map switches
2011-08-01 22:08:23 -07:00
Mike Primm
e08a2d4407
Fix background color support, provide blank tile to fix refresh junk
2011-08-02 00:07:17 -05:00
mikeprimm
b0a7a6b748
Merge pull request #357 from mikeprimm/master
...
Update leaflet, lots of little fixes to make IE sane
2011-08-01 21:25:26 -07: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
mikeprimm
9cc51e4cc0
Merge pull request #356 from mikeprimm/master
...
Band-aid for playermarkers on IE8 - avoid lack of canvas support
2011-08-01 16:32:17 -07:00
Mike Primm
17af53ee1f
Band-aid playermarkers on IE8
2011-08-01 18:31:04 -05:00
mikeprimm
f592f5a3bf
Merge pull request #355 from mikeprimm/master
...
Force 'z-order' in 'map' style to zero to make sure components don't wind up behind it
2011-08-01 07:13:05 -07:00
Mike Primm
2fa68b2992
Force z-order for map to prevent components winding up behind it
2011-08-01 09:11:58 -05:00
mikeprimm
fdbd4ab2d1
Merge pull request #354 from mikeprimm/master
...
Fix zoomout processing problem on kzedmaps due to inconsistent use of name vs prefix
2011-07-31 20:46:47 -07:00
Mike Primm
d845ed207d
Get name and prefix use consistent
2011-07-31 22:40:18 -05:00
Mike Primm
4d285b475a
Fix zoom out processing for kzed maps - used name not prefix
2011-07-31 22:30:02 -05:00
FrozenCow
05f09f7bb4
Fixed image of popup close button.
2011-07-31 22:24:28 +02:00
mikeprimm
fea152a914
Merge pull request #353 from mikeprimm/master
...
Clean up player icon transitions to/from visible map
2011-07-31 10:44:24 -07:00
Mike Primm
95c9520cc9
Clean up player marker transitions to/from visible map
2011-07-31 12:41:01 -05:00
mikeprimm
e792bcc7a1
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
58df3a8441
Fix trap when bad basenode in region component
2011-07-31 11:14:36 -05:00
mikeprimm
98dee3b404
Merge pull request #350 from mikeprimm/master
...
Fix biome shading on normal worlds
2011-07-31 08:40:23 -07:00
Mike Primm
2ee49fd82e
Merge remote branch 'origin/master'
2011-07-31 10:37:09 -05:00
Mike Primm
c2fe0f772c
Fix bug with not doing biome shading on normal worlds
2011-07-31 10:36:43 -05:00
mikeprimm
65f20df60c
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
b4ce28fd9a
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
5a39ba5d5a
Merge pull request #348 from mikeprimm/master
...
Improve rendering of textures for redstone wire
2011-07-29 23:41:38 -07:00
Mike Primm
6c42b399f4
Improve texture rendering for redstone wire
2011-07-30 01:22:05 -05:00
mikeprimm
f9958fbff8
Merge pull request #346 from mikeprimm/master
...
Fix autopan on chatballoons - always was on
2011-07-29 12:30:49 -07: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
mikeprimm
6259da4e0f
Merge pull request #344 from mikeprimm/master
...
Add subzones for Residence regions support
2011-07-29 07:52:14 -07:00
Mike Primm
47194defca
Add support for Subzones (1 tier)
2011-07-29 09:50:50 -05:00
mikeprimm
f8f1e77153
Merge pull request #342 from mikeprimm/master
...
Fix zoom range to match selected map
2011-07-28 21:53:13 -07:00
Mike Primm
4824388c6b
Update zoom range to match selected map
2011-07-28 23:51:53 -05:00
mikeprimm
ee0ad7c3d5
Merge pull request #341 from mikeprimm/master
...
Fix skylands premature-end-of-render issue
2011-07-28 08:15:30 -07:00
Mike Primm
4622b42aed
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
bec6b0aec5
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
8957ab7c31
Fix message - blockform -> blockformed
2011-07-28 10:01:54 -05:00
Mike Primm
b1272d18f8
Retired 'snowformed' event, added 'blockformed', 'blockfaded', 'blockspread'
2011-07-28 08:08:08 -05:00
mikeprimm
832a79eb1f
Merge pull request #337 from mikeprimm/master
...
Fix compass rose on new UI
2011-07-27 22:44:22 -07:00
Mike Primm
6d66d45d43
Fix compass with new UI
2011-07-28 00:43:13 -05:00
mikeprimm
1a24217a98
Merge pull request #336 from mikeprimm/master
...
Fix Residence support with new web UI
2011-07-27 20:44:02 -07:00
Mike Primm
d483eb1e6f
Fix Residence support in updated UI
2011-07-27 22:42:55 -05:00
mikeprimm
f13b0b6c46
Merge pull request #335 from mikeprimm/master
...
Fix various new map issues
2011-07-27 19:30:11 -07: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
mikeprimm
b9225b3ed3
Merge pull request #332 from mikeprimm/master
...
Add help text for new commands
2011-07-27 06:20:58 -07:00
Mike Primm
d862d1aa70
Add new commands to help text
2011-07-27 08:18:12 -05:00
mikeprimm
9005b68fdb
Merge pull request #331 from mikeprimm/master
...
Tighten up cleanup during /reload or shutdown
2011-07-27 06:07:40 -07:00
Mike Primm
df9d3494c3
Tighten up shutdown of zoom file processing during reload
2011-07-27 08:04:53 -05:00
mikeprimm
8bac8b0d23
Merge pull request #329 from mikeprimm/master
...
Add updated regions support for current Residence (2.3.x)
2011-07-26 21:08:52 -07:00
Mike Primm
c135a669a8
Add updated Residence support (2.3.z)
2011-07-26 23:07:20 -05:00
mikeprimm
1465795f97
Merge pull request #327 from mikeprimm/master
...
Make "server update failed" red banner happen after 3rd consecutive read fail,not first
2011-07-26 14:27:47 -07: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
mikeprimm
7e0124e849
Merge pull request #325 from mikeprimm/master
...
Add cancelrender command
2011-07-26 13:16:59 -07:00
Mike Primm
096d2fe72e
Add cancelrender command
2011-07-26 10:29:50 -05:00
mikeprimm
ef59612dad
Merge pull request #324 from mikeprimm/master
...
Flesh out comments on selecting template sets, and which files are used for each
2011-07-25 20:05:52 -07:00
Mike Primm
f9393d70ea
Flesh out comments on selecting template sets, and which files are used for each
2011-07-25 22:04:53 -05:00
mikeprimm
5762340238
Merge pull request #323 from mikeprimm/master
...
Add support for 'defaultmap' setting in configuration.txt
2011-07-25 19:29:12 -07:00
Mike Primm
beb3165bbe
Make default consistent with existing behaviors
2011-07-25 21:26:01 -05:00
mikeprimm
1e9cfe3bc7
Merge pull request #322 from mikeprimm/master
...
Add max-sessions setting to configuration.txt - limits concurrent threads and sessions on internal web server
2011-07-25 19:22:34 -07:00
Mike Primm
5a9c28ae27
Add support for 'defaultmap' setting in configuration.txt
2011-07-25 21:16:42 -05:00
Mike Primm
aa29ddf141
Add max-sessions setting to configuration.txt - limits concurrent threads and sessions on internal web server
2011-07-25 20:34:37 -05:00
mikeprimm
641ce05767
Merge pull request #320 from mikeprimm/master
...
Render and shader performance tuning
2011-07-25 00:41:53 -07:00
Mike Primm
42132328cd
Shader fine tuning
2011-07-25 02:38:30 -05:00
Mike Primm
9e7e333cc5
Tune render performance
2011-07-25 02:16:00 -05:00
mikeprimm
23db0c62fc
Merge pull request #319 from mikeprimm/master
...
Use memory buffer for ImageIO encoding - avoid re-encoding when lock retry needed
2011-07-24 22:14:27 -07:00
Mike Primm
cf08f243d0
Modify ImageIO use to avoid re-encoding on retry, do better buffering
2011-07-25 00:12:07 -05:00
mikeprimm
31623a0676
Merge pull request #318 from mikeprimm/master
...
Tighten up cleanup during /reload or shutdown
2011-07-24 21:27:09 -07:00
Mike Primm
737bcb98d9
Improve handling of /reload, clean up dead code
2011-07-24 23:23:24 -05:00
mikeprimm
e0ddbcd27d
Merge pull request #317 from mikeprimm/master
...
Make HDMap fall back to default perspective, shader or lighting as needed if unable to find configured preset
2011-07-24 18:37:58 -07:00
Mike Primm
3ddce85f89
Make HDMap fall back to default perspective, shader or lighting as needed if unable to find configured preset.
2011-07-24 20:34:39 -05:00
mikeprimm
4cacc3f92c
Merge pull request #316 from mikeprimm/master
...
Add escape sequence '&color;' support for webprefix/websuffix - avoid frequent editor code page problems
2011-07-24 18:32:45 -07:00
Mike Primm
abd7c25d80
Add escape sequence '&color;' support for webprefix/websuffix - avoid frequent editor code page problems.
2011-07-24 20:31:12 -05:00
mikeprimm
39a6bee3ca
Merge pull request #315 from mikeprimm/master
...
Add shader option to disable biome shading, disable biome shading on non-normal worlds
2011-07-24 15:17:03 -07:00
Mike Primm
78f571a68b
Add shader option to disable biome shading, disable biome shading on non-normal worlds
2011-07-24 17:14:45 -05:00
mikeprimm
a65fd601ac
Merge pull request #313 from mikeprimm/master
...
Add 'dynmap radiusrender <radius>' command to allow player-initiated render in radius from position
2011-07-23 22:04:26 -07:00
Mike Primm
62b42aa302
Add 'radiusrender' command to allow limited render by player in radius
2011-07-24 00:00:32 -05:00
mikeprimm
c7e176b56d
Merge pull request #312 from mikeprimm/master
...
Fix for bedrock texture (thanks to Graloth)
2011-07-23 20:54:37 -07:00
Mike Primm
a07c03081d
Fix bedrock texture (thanks, Graloth!)
2011-07-23 22:53:12 -05:00
mikeprimm
60f7773e76
Merge pull request #310 from mikeprimm/master
...
Sweep default files into JAR, extract as defaults when needed - prevent unneeded stomping of user customized configuration
2011-07-23 13:37:53 -07:00
Mike Primm
ddeded3e9c
Package more of default data/config in JAR, lay down when needed, to avoid stomping customized configuration when unneeded
2011-07-23 15:29:47 -05:00
mikeprimm
e601a2c661
Merge pull request #309 from mikeprimm/master
...
Put model and texture data into own subdirectory (renderdata)
2011-07-23 07:34:26 -07:00
Mike Primm
357e46280c
Merge remote branch 'origin/master'
2011-07-23 09:30:57 -05:00
Mike Primm
9992aa7628
Shift models and texture data into 'renderdata' directory
2011-07-23 09:30:22 -05:00
mikeprimm
869d6a701f
Merge pull request #308 from mikeprimm/master
...
Add single/double chest type support, single chest orientation detection
2011-07-22 22:51:02 -07:00
Mike Primm
4be9ccb1b2
Add single chest orientation calculation
2011-07-23 00:49:09 -05:00
Mike Primm
1c6ececd62
Detect chest type (double, single) and base orientation
2011-07-22 23:20:58 -05:00
mikeprimm
d746102963
Merge pull request #307 from mikeprimm/hdrender
...
Split templates.txt into multiple files in templates directory, support loading templates from directory
2011-07-22 19:52:59 -07:00
Mike Primm
6e1768f544
Drop mapzoomin on flat maps
2011-07-22 21:36:17 -05:00
Mike Primm
9bb9012f9c
Make the hires surface maps from 30 degrees - might as well go pretty!
2011-07-22 21:31:14 -05:00
Mike Primm
0fba601063
Switch flat maps in hires template set to lowres - seems excessive
2011-07-22 21:28:39 -05:00
Mike Primm
ec13742c85
Restructure templates into template directory, multiple files
2011-07-22 21:18:02 -05:00
mikeprimm
2c1d078272
Merge pull request #306 from mikeprimm/hdrender
...
Add support for enforcing banned-ips.txt on internal web server
2011-07-22 15:01:27 -07:00
Mike Primm
e613fb14d7
Add support for enforcing banned-ips.txt on internal web server
2011-07-22 16:56:08 -05:00
mikeprimm
0e6dfc1adf
Merge pull request #305 from mikeprimm/hdrender
...
Make subblock rendering of scaled down models more accurate (esp for torches, small stuff)
2011-07-22 12:49:39 -07:00
Mike Primm
436fac707f
Improve handling of scaled down models in subblock renderer
2011-07-22 13:11:03 -05:00
Mike Primm
0ee5c3db04
Avoid overflows during model scale down
2011-07-22 08:49:50 -05:00
mikeprimm
9c1a744431
Merge pull request #304 from mikeprimm/hdrender
...
Add smallplayerfaces option for playermarkers component
2011-07-22 00:35:21 -07:00
Mike Primm
5ad9d7bf90
Add smallplayerfaces option for playermarkers component
2011-07-22 02:34:35 -05:00
mikeprimm
ce76cfd695
Merge pull request #303 from mikeprimm/hdrender
...
Improve progress messages, make sure HDMaps that share render only render
2011-07-21 23:47:17 -07:00
Mike Primm
a878ce7cd1
Improve progress messages, make sure HDMaps that share render only render once
2011-07-22 01:42:10 -05:00
mikeprimm
9197290910
Merge pull request #302 from mikeprimm/hdrender
...
Add mapzoomin attribute, to adjust zoom in levels beyond native tile reso
2011-07-21 21:28:48 -07:00
Mike Primm
559f251d50
Add mapzoomin attribute, to adjust zoom in levels beyond native tile resolution
2011-07-21 23:25:59 -05:00
mikeprimm
43dba33db9
Merge pull request #301 from mikeprimm/hdrender
...
Make incremental update zoom processing more disk I/O efficient
2011-07-21 16:38:14 -07:00
Mike Primm
8c134edce3
Make incremental update zoom processing more disk I/O efficient
2011-07-21 18:33:04 -05:00
mikeprimm
2e96cf88e2
Merge pull request #300 from mikeprimm/hdrender
...
Stop using Bukkit scheduler - isn't working reliably
2011-07-21 13:36:27 -07:00
Mike Primm
da566cdecc
Stop using Bukkit scheduler - isn't working reliably
2011-07-21 15:33:38 -05:00
mikeprimm
1115963ab7
Merge pull request #299 from mikeprimm/hdrender
...
Add support for compass rose in all 8 cardinal directions
2011-07-21 00:51:27 -07:00
Mike Primm
ee3f07c6cd
Add support for compass rose in all 8 cardinal directions
2011-07-21 02:50:29 -05:00
mikeprimm
edc97fe399
Merge pull request #298 from mikeprimm/hdrender
...
Start restructure of configuration.txt, but without breaking folks - and stop stomping user configuration
2011-07-20 22:10:56 -07:00
Mike Primm
b9882955af
start move to break up configuration.txt, stop stomping user configurations on upgrade
2011-07-20 23:55:05 -05:00
Mike Primm
bf4f8a84f0
Add support for custom-perspectives.txt, custom-shaders.txt, custom-lightings.txt
2011-07-20 21:52:43 -05:00
mikeprimm
2935080bdf
Merge pull request #296 from mikeprimm/hdrender
...
Add proper Connection response to keep-alive handling
2011-07-19 23:54:17 -07:00
Mike Primm
4987ac3fe1
Add proper Connection response to keep-alive handling
2011-07-20 01:37:31 -05:00
mikeprimm
a1536d03cd
Merge pull request #295 from mikeprimm/hdrender
...
Add block transparency attributes to improve lighting accuracy
2011-07-19 21:35:26 -07:00
Mike Primm
644c8d0213
Add block transparency attributes to improve lighting accuracy
2011-07-19 23:34:01 -05:00
mikeprimm
b277663705
Merge pull request #294 from mikeprimm/hdrender
...
Handle snow lighting special case
2011-07-19 15:45:59 -07:00
Mike Primm
913a92a010
Handle snow lighting special case
2011-07-19 17:45:05 -05:00
mikeprimm
976f8cd334
Merge pull request #293 from mikeprimm/hdrender
...
Undo bad fix - broke some models
2011-07-19 14:43:34 -07:00
Mike Primm
3ef3f6cb61
Undo bad fix - broke some models
2011-07-19 16:39:09 -05:00
mikeprimm
b212908a13
Merge pull request #292 from mikeprimm/hdrender
...
Add nether support to HDMap
2011-07-19 14:20:05 -07:00
Mike Primm
537c6d3f25
Add nether support to HDMap
2011-07-19 15:11:44 -05:00
mikeprimm
06b7a5dd57
Merge pull request #289 from mikeprimm/hdrender
...
Fix wool coloring in texture support
2011-07-18 23:48:36 -07:00
Mike Primm
f58092167f
Fix wool coloring in texture support
2011-07-19 01:47:46 -05:00
mikeprimm
71a8195fc2
Merge pull request #288 from mikeprimm/hdrender
...
Performance tuning
2011-07-18 23:03:34 -07:00
Mike Primm
73825b4558
Merge remote branch 'upstream/master' into HEAD
2011-07-19 00:53:02 -05:00
Mike Primm
2c16c800e9
Performance tuning, improve workaround for bukkit scheduler bugs
2011-07-19 00:52:05 -05:00
FrozenCow
929a34656b
Added webchat-interval for JsonFileClientUpdateComponent (which should fix sendmessage.php)
2011-07-18 13:13:02 +02:00
mikeprimm
910b963fcd
Merge pull request #286 from mikeprimm/hdrender
...
Add handling for custom_still_water, custom_still_lava, etc
2011-07-17 19:24:27 -07:00
Mike Primm
b51bb22b9e
Add handling for custom_still_water, custom_still_lava, etc
2011-07-17 20:51:51 -05:00
mikeprimm
1adbe45c27
Merge pull request #285 from mikeprimm/hdrender
...
Fix texture pack scaling support, remove assumption that watercolor.png is present
2011-07-17 16:14:47 -07:00
Mike Primm
ff07b6f343
Fix texture pack scaling support
2011-07-17 18:13:03 -05:00
Mike Primm
c74dd49f67
Make workaround for adaptive - be faster when bukkit isn't tripping up
2011-07-17 16:32:34 -05:00
Mike Primm
1862dc918c
Different Bukkit schedule spin workaround, that isn't so slow
...
Generalize texture image loading
2011-07-17 16:19:24 -05:00
mikeprimm
d4ecd05af9
Merge pull request #283 from mikeprimm/hdrender
...
Add texture pack shader support
2011-07-17 09:38:37 -07:00
Mike Primm
4e810fc9d8
Woraround bukkit schedule spin, add custom-models.txt, custom-texture.txt
2011-07-17 11:02:22 -05:00
Mike Primm
4bc3030637
Correct wood grain orientation from top
2011-07-17 02:42:35 -05:00
Mike Primm
9133d03489
Finish first pass of texture mapping
2011-07-17 02:20:13 -05:00
Mike Primm
d21d640eae
First pass functional texture pack shader :)
2011-07-16 16:51:46 -05:00
Mike Primm
edac2e5cd9
Start on texture pack shader
2011-07-15 23:19:05 -05:00
Mike Primm
0323c98938
More texture pack work
2011-07-15 17:37:54 -05:00
Mike Primm
a91060dc95
Fix non-power-of-two scaling on models and textures
2011-07-15 09:29:27 -05:00
Mike Primm
c958da0ae0
Start on texture pack loader/scaler
2011-07-15 08:28:09 -05:00
mikeprimm
862c219d7d
Merge pull request #281 from mikeprimm/hdrender
...
Add weakref based chunk snapshot cache
2011-07-13 23:10:20 -07:00
Mike Primm
66ca5199e3
Add weak reference based cache for chunk snapshots
2011-07-14 01:08:28 -05:00
Mike Primm
eb87231926
Fix scroll buttons in player list
2011-07-13 16:05:08 -05:00
mikeprimm
b4d7568e61
Merge pull request #278 from mikeprimm/hdrender
...
More models (doors, levers)
2011-07-12 23:06:14 -07:00
Mike Primm
e4edb91f3d
More models (doors, levers)
2011-07-13 01:05:20 -05:00
mikeprimm
281005f1f8
Merge pull request #277 from mikeprimm/hdrender
...
More models (beds, etc), proper fence support, lighting fixes for steps and slabs
2011-07-12 21:44:42 -07:00
Mike Primm
c81c8cbaa6
More models (beds, etc), proper fence support, lighting fixes for steps and slabs
2011-07-12 23:32:18 -05:00
mikeprimm
d764598bde
Merge pull request #276 from mikeprimm/hdrender
...
More models, fixes to make HD shader defaults more consistent with Kzed shader
2011-07-12 16:23:28 -07:00
Mike Primm
9c1479b922
Add models for flowers, mushrooms, fire
2011-07-12 18:22:12 -05:00
Mike Primm
bd69a69aff
Make default shader more consistent with Kzed shader
2011-07-12 18:02:01 -05:00
mikeprimm
8df180313e
Merge pull request #273 from mikeprimm/hdrender
...
Add models.txt, and code to load models from it, and lots of models
2011-07-12 00:21:32 -07:00
Mike Primm
de2cdf5411
Add models.txt, and code to load models from it, and lots of models
2011-07-12 02:08:48 -05:00
mikeprimm
2db0d76950
Merge pull request #270 from mikeprimm/hdrender
...
Fix biome rendering
2011-07-11 07:39:29 -07:00
Mike Primm
57ea6aefd6
Fix biome rendering
2011-07-11 09:37:03 -05:00
mikeprimm
2cb8d9e3a1
Merge pull request #269 from mikeprimm/hdrender
...
Add support for non-cube block models, subblock tracing for them
2011-07-11 00:19:13 -07:00
Mike Primm
b72cc2063a
Add support for non-cube block models, subblock tracing for them
2011-07-11 02:14:55 -05:00
mikeprimm
d8052d4196
Merge pull request #268 from mikeprimm/hdrender
...
Fix worldtomap conversion (y coordinate off by 1 tile)
2011-07-10 21:14:20 -07:00
Mike Primm
c5c699ae61
Fix worldtomap conversion
2011-07-10 23:12:24 -05:00
mikeprimm
86e5b0c4f8
Merge pull request #267 from mikeprimm/hdrender
...
Fix orientation of sample flat maps to be north-top (view from south)
2011-07-10 19:13:57 -07:00
Mike Primm
9faad7397b
Fix orientation of sample flat maps to be north-top (view from south)
2011-07-10 21:12:11 -05:00
mikeprimm
20028096c7
Merge pull request #266 from mikeprimm/hdrender
...
Add configuration.txt.sample-hd as sample of HD render with existing defa
2011-07-10 12:44:26 -07:00
Mike Primm
0f0fb22074
Add configuration.txt.sample-hd as sample of HD render with existing default map structure
2011-07-10 14:42:36 -05:00
mikeprimm
b85e8f9151
Merge pull request #265 from mikeprimm/hdrender
...
Add cancelable custom event for reporting of messages received from web
2011-07-09 19:42:39 -07:00
Mike Primm
f4e9b8ffce
Add cancelable custom event for reporting of messages received from web
2011-07-09 21:39:49 -05:00
mikeprimm
88fde1fcd6
Merge pull request #264 from mikeprimm/hdrender
...
First drop of HD Renderer
2011-07-09 16:43:43 -07:00
Mike Primm
e9c72e1cd9
Merge remote branch 'upstream/master' into HEAD
2011-07-09 18:18:26 -05:00
mikeprimm
dcca317b2f
Merge pull request #263 from mikeprimm/master
...
Cleanup event synchronize, so that web config request is more parallel
2011-07-09 16:17:08 -07: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
02fa9384ac
Add HD cave shader
2011-07-09 02:19:56 -05:00
Mike Primm
a3c00a1026
Split lighting and shading - add lightings.txt
2011-07-09 01:26:47 -05:00
Mike Primm
69baafe597
Refactor HDMap configuration - add shaders, perspectives
2011-07-08 22:40:40 -05:00
Mike Primm
7e5865a899
Merge remote branch 'origin/hdrender' into HEAD
2011-07-08 01:36:19 -05:00
Mike Primm
52f23f5e2d
Start structuring for shaders and perspectives
2011-07-08 01:34:22 -05:00
Mike Primm
ae190b3c57
Merge branch 'master' into HEAD
2011-07-08 00:41:39 -05:00
Mike Primm
137b6af6d5
Fix tile render timmes, split out utility class
2011-07-08 00:40:52 -05:00
Mike Primm
56e5f6fbb3
Split perspective state out, to let shaders better interact with it
2011-07-07 08:41:31 -05:00
Mike Primm
4f73d2cbd6
Clean up HDMap dither, fix tile update events
2011-07-07 00:35:59 -05:00
Mike Primm
ee8718d083
Merge remote branch 'upstream/master' into HEAD
2011-07-06 09:44:13 -05:00
Mike Primm
225b348154
Get day/night workding with HDMap
2011-07-05 23:24:25 -05:00
Mike Primm
1f2722b249
Get full existing shader function working on HDMap
2011-07-05 22:17:22 -05:00
FrozenCow
9afe25b449
Changed version to 0.20.
2011-07-05 09:59:17 +02:00
Mike Primm
f3f871df3c
Finish correction of zoom file coordinate correction for HDMap
2011-07-04 22:34:30 -05:00
Mike Primm
961eb17536
Fix zoom-out coordinate consistency on HDMaps
2011-07-04 10:18:05 -05:00
Mike Primm
e2244ddda5
Merge remote branch 'upstream/master' into HEAD
2011-07-04 09:30:04 -05:00
Mike Primm
4086291ce2
Merge remote branch 'origin/master' into HEAD
2011-07-04 09:29:02 -05:00
Mike Primm
630759c87b
HD renderer prototype
2011-07-04 09:28:06 -05:00
mikeprimm
bf1f8a8f65
Merge pull request #258 from mikeprimm/master
...
Setting to 0.19.2 for support release for 1.7 related issues
2011-07-03 16:07:24 -07:00
Mike Primm
4152337568
Set to 0.19.2 for bug-fix release for 1.7 items
2011-07-03 18:03:04 -05:00
mikeprimm
9942327531
Merge pull request #257 from mikeprimm/master
...
Workaround for CB953 furnace freak-out
2011-07-03 10:06:42 -07:00
Mike Primm
c393eec159
Workaround for CB 953 furnace freakout (fixed in CB955)
2011-07-03 12:03:06 -05:00
mikeprimm
9b9320f9c0
Merge pull request #256 from mikeprimm/master
...
More 1.7 stuff: add sticky piston to colorschemes, fix spurrious read lock timeouts on web
2011-07-03 09:36:53 -07:00
Mike Primm
e724a7bccb
Fix premature timeouts on tile read waits, causing missed tile loads
2011-07-03 11:30:48 -05:00
Mike Primm
97ff6a2c2d
Add sticky piston block, too
2011-07-03 11:28:09 -05:00
mikeprimm
e8aab6e257
Merge pull request #255 from mikeprimm/master
...
Add color definitions to schemas for pistons and piston-heads
2011-06-30 13:30:33 -07:00
Mike Primm
33206e089f
Add piston and piston-head block color definitions
2011-06-30 15:29:47 -05:00
FrozenCow
cb4f6aaf82
Changed version to 0.20.
2011-06-30 12:38:02 +02:00
mikeprimm
c978d87fef
Merge pull request #254 from mikeprimm/master
...
Set head branch back to 0.19.1 - need bug fix build
2011-06-29 19:11:58 -07:00
Mike Primm
1c32aebff9
Set to 0.19.1 - need bug fix release
2011-06-29 21:10:43 -05:00
Mike Primm
00a660d019
Don't throw exception on bogus absolute path ( http://xxx//blah )
2011-06-30 03:19:04 +08:00
Mike Primm
1102c08b3e
Don't throw exception on bogus absolute path ( http://xxx//blah )
2011-06-29 14:16:12 -05:00
mikeprimm
3875486fbf
Merge pull request #253 from mikeprimm/master
...
Add better URI path normalization, option to allow symlinks in web path
2011-06-29 11:44:58 -07:00
Mike Primm
e6a8e54172
Add better URI path normalization, option to allow symlinks in web
...
path
2011-06-29 13:40:02 -05:00
mikeprimm
e0f9a2f1e2
Merge pull request #251 from mikeprimm/master
...
Add some cleanup to help avoid exceptions on /reload and shutdown/disable
2011-06-28 23:38:04 -07:00
Mike Primm
e2b55c3b54
Add some cleanup to help avoid exceptions on /reload and shutdown/disable
2011-06-29 01:37:09 -05:00
mikeprimm
be983825ab
Merge pull request #250 from mikeprimm/master
...
Fix WorldGuard regions code to handle polygon regions (WG5)
2011-06-28 22:45:15 -07:00
Mike Primm
faceab68f1
Fix WorldGuard regions support to include WG5 polygon support
2011-06-29 00:43:39 -05:00
mikeprimm
aa796deeff
Merge pull request #249 from mikeprimm/master
...
Tighten up logic for assuring unlock of locked files during exceptions, fix version number display
2011-06-28 20:39:00 -07:00
Mike Primm
2863dd0acc
Put timeout on read lock used by web server - make sure it can't be indefinite
2011-06-28 22:33:11 -05:00
Mike Primm
48fea32500
Tighten up lock release logic on I/O and other exceptions
...
Make version in plugin.yml string so that 0.20 isn't 0.2
2011-06-28 22:13:42 -05:00
mikeprimm
b4b11329c2
Merge pull request #248 from mikeprimm/master
...
Fix 'visibleregions' option on JSON implementation of WorldGuard regions
2011-06-28 09:07:28 -07:00
Mike Primm
f118ada39e
Fix 'visibleregions' option on JSON (gotta kill those parallel code
...
paths at some point....)
2011-06-28 11:00:05 -05:00
mikeprimm
1a23f24b81
Merge pull request #247 from mikeprimm/master
...
Fix break in processing center: coordinates due to mistake in url-parameter code
2011-06-27 18:49:40 -07:00
Mike Primm
edf898ae1a
Fix "center" processing - broke it with URL args change :<
2011-06-27 20:38:26 -05:00
FrozenCow
bf29c09522
Changed version to 0.20.
2011-06-27 21:44:12 +02:00
Jason Booth
d3b621f90b
Fix Security Exploit
2011-06-27 21:27:23 +02:00
FrozenCow
47620fe79e
Revert "Disallow .. in file path. Also logging, imports"
...
This reverts commit 1bc275ea46 .
2011-06-27 21:26:52 +02:00
zeeZ
1bc275ea46
Disallow .. in file path. Also logging, imports
2011-06-27 22:48:39 +08:00
mikeprimm
d4f0161e14
Merge pull request #245 from mikeprimm/master
...
Add icon for Biome maps, and color mapping for SKY biome
2011-06-26 22:08:35 -07:00
Mike Primm
d59c8f1506
Add SKY biome mappings
2011-06-27 00:07:00 -05:00
Mike Primm
752a076236
Add default icon for Biome maps
2011-06-26 22:36:17 -05:00
mikeprimm
8089e75ab2
Merge pull request #244 from mikeprimm/master
...
Add support for URL-based parameter overrides for selecting world, map, zoom, and center coordinates
2011-06-26 20:12:49 -07: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
mikeprimm
dbbff3d04f
Merge pull request #243 from mikeprimm/master
...
Add verbose: false option to make dynmap much less chatty during startup
2011-06-26 12:33:55 -07:00
Mike Primm
b937c4bf38
Add option to have Dynmap STFU during start (verbose: false)
...
Add softdep, authors, stats commands to plugin.yml
2011-06-26 14:31:40 -05:00
mikeprimm
54f5de4c2c
Merge pull request #241 from mikeprimm/master
...
Change autogenerate-to-visbilitylimits to have 3 options: none, map-only, permanent
2011-06-25 14:07:57 -07:00
Mike Primm
39281188bc
Change autogenerate-to-visibilitylimits to have options for map-only (temporary generated chunks) versus permanent (world growing)
...
Fix exception catching code in thread pool
2011-06-25 16:01:06 -05:00
mikeprimm
4678c53a48
Merge pull request #240 from mikeprimm/master
...
Add option to use visibilitylimits to define area to automatically prime chunk generation
2011-06-24 23:23:06 -07:00
Mike Primm
6dac7f0689
Add autogenerate-to-visibilitylimits option to allow automatic priming/generating of chunks within defined visibility area
...
Avoid rendering tiles with nothing but empty chunks
Limit size of hash-file cache, and move hash files to world-specific tile directories
2011-06-25 01:13:40 -05:00
mikeprimm
3310e07c9b
Merge pull request #239 from mikeprimm/master
...
Add support for 'chunkgenerated' render trigger, now that CB has functional chunk generate events
2011-06-24 17:14:16 -07:00
Mike Primm
3674ba3786
Add support for now-functional chunk generate detection
...
(chunkgenerated render trigger)
2011-06-24 19:10:10 -05:00
mikeprimm
f81dc8cdac
Merge pull request #238 from mikeprimm/master
...
Fix bigworld+iso-maps+zoom-out issue with directory name logic inconsistency
2011-06-24 12:20:23 -07:00
Mike Primm
f3ac3d9be4
Another bigworld+isomaps+zoom-out fix - directory name inconsistency
2011-06-24 14:18:21 -05:00
mikeprimm
fcb865ea28
Merge pull request #237 from mikeprimm/master
...
Fix occasional broken zoom-out tiles due to hash code calculation error
2011-06-24 10:06:27 -07:00
Mike Primm
5bb3249dfe
Fix hash code problem with zoomed-out tiles - caused incomplete
...
updates
2011-06-24 11:44:21 -05:00
mikeprimm
eb12834ee3
Merge pull request #236 from mikeprimm/master
...
Add invalidate events to zoom out processing - avoids problems with linux file time resolution
2011-06-24 06:32:20 -07:00
Mike Primm
214fec208d
Add queued update triggers for zoom-out updates - deals with file time
...
resolution issues on Linux (1 second is too long to be reliable)
2011-06-24 08:25:26 -05:00
mikeprimm
ec948f980e
Merge pull request #235 from mikeprimm/master
...
Add file hashing to reduce zoom-out tile recalc, fix bigworld support
2011-06-24 00:50:05 -07:00
Mike Primm
d63db655d8
More tuning on zoom-out, fix zoomout on bigworld on iso-maps
2011-06-24 02:46:16 -05:00
mikeprimm
2ab7339381
Merge pull request #234 from mikeprimm/master
...
Per request, add 'trustclientname' option to sendMessage on InternalClientUpdaeComponent
2011-06-23 14:40:26 -07:00
Mike Primm
c2ee0ebd42
Add requestion option to trust client-provided name in sendMessage for
...
internal web server
2011-06-23 16:35:17 -05:00
mikeprimm
654769af1e
Merge pull request #233 from mikeprimm/master
...
Fix reported trap in Armor calculation when player has incomplete set of armor
2011-06-23 06:13:32 -07:00
Mike Primm
244419d686
Fix reported traps in Armor calculation when armor is incomplete - not
...
sure how this didn't happen more - possibly bukkit behavior change?
2011-06-23 08:08:33 -05:00
mikeprimm
6d6a5f4db0
Merge pull request #232 from mikeprimm/master
...
Add support for configurable extra zoom out levels on each world - generates more tiers of zoomed images
2011-06-22 23:10:35 -07: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
9db23444db
Fix problem with coordinate offsets due to negative coordinate walk on
...
kzedmaps
2011-06-22 17:24:12 -05:00
Mike Primm
8e102446fe
First pass UI support for extra zoom out levels
2011-06-22 16:43:41 -05:00
Mike Primm
e7e4406e77
Finish rest of zoom out core logic - still need to finish web UI
2011-06-22 13:56:21 -05:00
Mike Primm
bec1108fa1
Settable zoom out code - incomplete prototype
2011-06-22 08:27:21 -05:00
mikeprimm
42f4d4e4a6
Merge pull request #230 from mikeprimm/master
...
Add support for optional 'visibleregions' list attribute for regions component, to limit visible region population
2011-06-20 16:50:48 -07:00
Mike Primm
a7c6a20dcc
Add support for visibleregions list for regions component - limit
...
which regions are shown
2011-06-20 18:48:23 -05:00
mikeprimm
90bff11417
Merge pull request #229 from mikeprimm/master
...
Fix reading of webpath by regions component - load from top-level setting, instead of component local config
2011-06-20 15:36:18 -07:00
Mike Primm
2c3e8fbdc0
Fix reading of 'webpath' by Regions component - was reading its own
...
config instead of top-level one
2011-06-20 17:33:01 -05:00
mikeprimm
690be9d80a
Merge pull request #228 from mikeprimm/master
...
Add delay-retry on image file writes, to recover from locked file exceptions from external web servers
2011-06-20 15:01:08 -07:00
Mike Primm
e584e3202b
Add delay-retry loop for handling temporarily locked image file writes
2011-06-20 16:58:07 -05:00
mikeprimm
427249b5a9
Merge pull request #226 from mikeprimm/master
...
Add support for biome-data-based shading on surface map renderer
2011-06-20 14:11:42 -07:00
Mike Primm
6efbf3a3df
Update biomecolored to support biome-type-based,
...
biome-temperature-based and biome-rainfail-based shading
2011-06-20 16:00:28 -05:00
Mike Primm
edf7d4f5c8
Add biome-based coloring option for surface map
2011-06-20 00:09:22 -05:00
mikeprimm
287d3cbe63
Merge pull request #225 from mikeprimm/master
...
Add support for throttling chunk load rate, splitting tile loads across multiple server ticks if needed
2011-06-18 17:50:26 -07:00
Mike Primm
2bc9b410a6
Add support for throttling chunk load rate, spreading over ticks
2011-06-18 19:43:47 -05:00
mikeprimm
6ecb271576
Merge pull request #224 from mikeprimm/master
...
Alter 'textured' setting on flat map to have 'none'/'smooth'/'dither' choices
2011-06-18 14:11:00 -07:00
Mike Primm
8b35f4d3b7
Alter 'textured' setting for flat map to have none/smooth/dither opts
2011-06-18 16:05:47 -05:00
mikeprimm
4a9eb76944
Merge pull request #220 from mikeprimm/master
...
Add 'textured' option to Flat render - when set, causes color dither to match surface map (looks more consistent)
2011-06-16 22:14:43 -07:00
Mike Primm
e18ab1a880
Add 'textured' option for Flat - matches color scheme tone better
2011-06-17 00:08:13 -05:00
mikeprimm
fa34aafabe
Merge pull request #219 from mikeprimm/master
...
Support defining visibility limits on each world, and selectiong methods for how to present hidden areas
2011-06-16 21:45:22 -07:00
Mike Primm
ffc08173b4
Add support for limiting visible areas on each world, selective fill
...
of hidden areas (air, stone, ocean)
2011-06-16 23:37:28 -05:00
mikeprimm
4fdcc0bf92
Merge pull request #218 from mikeprimm/master
...
Report output from fullrender to command sender, not log
2011-06-16 00:01:10 -07:00
Mike Primm
81dbb8483f
Merge remote branch 'upstream/master'
2011-06-16 01:58:38 -05:00
Mike Primm
fa33977469
Log fullrender messages to commandsender, versus just log
2011-06-16 01:58:12 -05:00
mikeprimm
5bd7c64c97
Merge pull request #217 from mikeprimm/master
...
MAKE IE SUCK LESS!
2011-06-15 11:50:07 -07: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
0b735eba40
Merge pull request #216 from mikeprimm/master
...
Support new Bukkit ChunkSnapshot API, maintain legacy chunksnapshot support
2011-06-14 23:42:57 -07:00
Mike Primm
0b7bd72231
Merge remote branch 'upstream/master'
2011-06-15 01:40:42 -05:00
Mike Primm
b1d1075dfe
Add support for ChunkSnapshot API (CB860), maintain legacy support too
2011-06-15 01:27:59 -05: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
mikeprimm
5115c587ff
Merge pull request #214 from mikeprimm/master
...
Add support for new render triggers - snowform, blockburn, leavesdecay
2011-06-13 21:22:42 -07:00
Mike Primm
9286cfff66
Add blockburn, snowform, leavesdecay render events
2011-06-13 23:19:02 -05:00
mikeprimm
2c66044550
Merge pull request #213 from mikeprimm/master
...
Clean up random compile warnings
2011-06-13 20:08:20 -07:00
Mike Primm
2f22560f3d
Clean up warnings
2011-06-13 22:05:14 -05:00
mikeprimm
1eb9789780
Merge pull request #212 from mikeprimm/master
...
Add support for alternate tile directory structure, to better support huge worlds
2011-06-13 19:50:53 -07: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
FrozenCow
864d815bc4
Changed version to 0.19.
2011-06-13 21:12:35 +02:00
mikeprimm
5eacf530bd
Merge pull request #209 from mikeprimm/master
...
Prevent bad JSON when http://jsonip.appspot.com/ is broken or overquota
2011-06-12 21:34:54 -07: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
mikeprimm
a827843365
Merge pull request #202 from MiLk/encoding
...
Use unicode hexadecimal for specials characters
2011-06-12 19:56:24 -07:00
mikeprimm
d1f94fbf8e
Merge pull request #208 from mikeprimm/master
...
Add better HTTP proxy support for webchat, add hidewebchatip option to alias web chat IP addresses
2011-06-12 19:40:54 -07:00
Mike Primm
e8a6bf46cf
Add support for hidewebchatip option, to replace webchat IP with alias
2011-06-12 19:35:53 -07:00
Mike Primm
40ee132277
Add support for using X-Forwarded-From for better proxy IP handling on
...
webchat
2011-06-12 18:50:41 -07:00
mikeprimm
790d0380c2
Merge pull request #207 from mikeprimm/master
...
Add default icon for skylands surface map
2011-06-12 17:40:17 -07:00
Mike Primm
397f97800c
Add image for default skylands surface map
2011-06-12 17:36:06 -07:00
MiLk
7cea521e97
Use unicode hexadecimal for specials characters
...
Signed-off-by: MiLk <hello@emilienkenler.com >
2011-06-09 00:30:50 +02:00
zeeZ
274cddd9ff
Don't wrap whitespace in player names
2011-06-08 22:49:35 +08:00
mikeprimm
65f93393e6
Merge pull request #198 from mikeprimm/master
...
Eliminate initial player position flicker
2011-06-03 07:56:14 -07:00
Mike Primm
d54d26db69
Fix typo in example
2011-06-03 09:52:26 -05: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
mikeprimm
c323ba5b11
Merge pull request #197 from mikeprimm/master
...
Add optional background color control per map, including day/night
2011-06-03 01:32:10 -07:00
Mike Primm
6a50b2ebcd
Add background color support per map, add skylands template default
2011-06-03 03:24:21 -05:00
mikeprimm
684376889e
Merge pull request #196 from mikeprimm/master
...
Fix player position security problems
2011-06-02 22:46:29 -07: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
mikeprimm
83b971ed2b
Merge pull request #194 from mikeprimm/master
...
Fix chat.js to work for web->server chat on standalone
2011-06-02 13:44:25 -07: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
mikeprimm
b2df79eb9c
Merge pull request #193 from mikeprimm/master
...
Properly stringify chat inputs - prevents bad JSON input, potential security exposures
2011-06-02 13:21:26 -07: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
mikeprimm
07f16d1cfb
Merge pull request #192 from mikeprimm/master
...
Replace "?0" in default image URLs with "?<currenttimemillis>" to prevent browser cache issues
2011-06-02 11:20:51 -07: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
mikeprimm
9a7c1f5751
Merge pull request #190 from mikeprimm/master
...
Make sure JSON/Web text communications are either escaped or UTF-8 encoded (non-Latin character set support)
2011-06-01 22:36:48 -07:00
Mike Primm
0fdeee5177
Make sure all JSON/web text interactions are escaped and/or UTF-8
2011-06-02 00:20:25 -05:00
mikeprimm
60d1a59d45
Merge pull request #189 from mikeprimm/master
...
Fix hash index calculation - kzed tile coords inconsistent with map
2011-06-01 17:33:04 -07:00
Mike Primm
3c793b5302
Merge remote branch 'origin/master'
2011-06-01 19:09:46 -05:00
Mike Primm
cf71b38259
Fix tile coord calculation for tile hash on kzed render - too sparse
...
because not divided by tile dimensions (inconsistent with flat :<)
2011-06-01 19:08:53 -05:00
Mike Primm
364272fafe
Incorporate ovocean's updates, plus fix for bad bookshelf ID
2011-06-02 03:36:50 +08:00
Mike Primm
28ccb2ae71
Incorporate ovocean's updates, plus fix for bad bookshelf ID
2011-06-01 14:18:24 -05:00
mikeprimm
e6566f6cff
Merge pull request #186 from mikeprimm/master
...
Update colorschemes with 1.6 block IDs, scrub obsolete alpha block IDs
2011-05-31 23:53:02 -07:00
Mike Primm
68a78023c8
Add new block IDs, remove obsolete ones from colorschemes
2011-06-01 01:50:57 -05:00
Mike Primm
e46de59da5
Improve transparency processing on flat map
2011-06-01 13:14:47 +08:00
Mike Primm
4af247593d
Improve transparency processing on flat map
2011-06-01 00:12:27 -05:00
mikeprimm
0f0af92c4b
Merge pull request #185 from mikeprimm/master
...
Add transparency control option to Flat and Surface renderers, file lock fixes
2011-05-31 21:53:25 -07:00
Mike Primm
19984946ac
Add transparency samples to configuration.txt
2011-05-31 23:49:04 -05:00
Mike Primm
c4646dc299
Add transparency option on Flat and Surface map, fix file locks
2011-05-31 23:44:17 -05:00
mikeprimm
c97b373fa5
Merge pull request #184 from mikeprimm/master
...
Add file access read/write locking to avoid conflicting tile updates, dirty reads by internal web server
2011-05-31 19:27:15 -07:00
Mike Primm
c48d06eec1
Add file access synchronization to prevent conflicting tile updates
2011-05-31 21:20:23 -05:00
Arthur Mayer
5dbb69f2fe
Merge pull request #183 from flames/master
...
fixed encoding (sorry)
2011-05-31 15:12:50 -07:00
Arthur Mayer
44cc1da227
fixed encoding (sorry)
2011-06-01 00:11:41 +02:00
Arthur Mayer
773ce4e3f0
Merge pull request #182 from flames/master
...
added configurable suffix for webchat
2011-05-31 14:54:32 -07:00
Arthur Mayer
af51d8b7e0
added configurable suffix for webchat
2011-05-31 23:30:02 +02:00
Arthur Mayer
cd02926fb0
made webchat prefix to configurable
2011-05-31 23:10:16 +02:00
Mike Primm
aa7d80407f
Fix chatfile - shouldn't have changed this with last fix
2011-06-01 03:33:01 +08:00
mikeprimm
852c185b0b
Merge pull request #180 from mikeprimm/master
...
Make JSON file updates more transactional, to prevent reading of partially written files
2011-05-31 12:05:24 -07:00
Mike Primm
cbbea34859
Make JSON file updates more transactional - fix problem with read
...
during updates (seen on flames server)
2011-05-31 14:01:12 -05:00
mikeprimm
f6390581f4
Merge pull request #179 from mikeprimm/master
...
Add render statistics, support for tile hashcodes to reduce unneeded tile updates
2011-05-30 22:47:06 -07:00
Mike Primm
d393ccf6e9
Add render statistics, support for tile hashcodes to stop non-updates
2011-05-31 00:33:54 -05:00
mikeprimm
4eec50a112
Merge pull request #178 from mikeprimm/master
...
Add meta tags for Apple mobile devices - puts page in full screen mode
2011-05-30 09:10:40 -07:00
Mike Primm
4b30fff8a7
Add meta tags for Apple mobile devices - full screen layout works nice
2011-05-30 11:05:21 -05:00
mikeprimm
74fb60718d
Merge pull request #177 from mikeprimm/master
...
Avoid exception in JSON handling for web chat messages without timestanp
2011-05-30 08:52:06 -07:00
Mike Primm
d0bee6f030
Handle trap in Json handling if timestamp not specified
2011-05-30 10:45:58 -05:00
mikeprimm
3e9e695087
Merge pull request #176 from mikeprimm/master
...
FIx snow rendering in flat map
2011-05-30 08:20:26 -07:00
Mike Primm
840854aef0
Fix snow rendering on flat map
2011-05-30 10:16:56 -05:00
mikeprimm
d40bdf4638
Merge pull request #175 from mikeprimm/master
...
Add 'sidebaropened' option flat, to allow menu sidebar to be always opened
2011-05-30 07:58:35 -07:00
Mike Primm
09e1ebc972
Add 'sidebaropened' option to auto-pin sidebar
2011-05-30 09:56:10 -05:00
mikeprimm
bdccd5daf0
Merge pull request #174 from mikeprimm/master
...
Add night-and-day option support in web interface - automatically synced to world time
2011-05-29 15:33:36 -07: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
Mike Primm
995f4c242a
More memory tuning on BufferedImage handling, workaround bukkit leak
2011-05-29 22:54:32 +08:00
Mike Primm
544283a650
More memory tuning on BufferedImage handling, workaround bukkit leak
2011-05-29 09:33:51 -05:00
mikeprimm
cf6a2f8f90
Merge pull request #172 from mikeprimm/master
...
Rework BufferedImage handling to improve CPU performance
2011-05-28 23:56:36 -07:00
Mike Primm
a25fcc0001
Create BufferedImage using our own buffer - allows faster pixel
...
writing
2011-05-29 01:52:57 -05:00
mikeprimm
6596742bbe
Merge pull request #171 from mikeprimm/master
...
Fix debugger loading, and handle height field boundary condition at zero
2011-05-28 01:27:03 -07:00
Mike Primm
fc88dfad41
Fix boundary condition on height field - raw can be zero, function
...
return value must not be. Also, fix debugger loading function.
2011-05-28 03:22:50 -05:00
mikeprimm
340da29e18
Merge pull request #170 from mikeprimm/master
...
Use height map from Chunk - better performance on flat map
2011-05-28 00:04:57 -07:00
Mike Primm
15fb1ec743
Fetch height map from Chunk - more performance
2011-05-28 01:59:02 -05:00
Mike Primm
b0b1ab5926
Add night-and-day support for FlatMap
2011-05-28 01:16:54 -05:00
mikeprimm
611a12312a
Merge pull request #169 from mikeprimm/master
...
Shift all rendering off server thread to async thread pool, minimize server thread load
2011-05-27 22:23:25 -07:00
Mike Primm
e1a17ca79c
Add night-and-day setting to drive night/day tile set generation
2011-05-28 00:11:26 -05:00
Mike Primm
9b12ebc025
Shift all rendering over to async thread pool, minimize server thread
...
load
2011-05-28 00:08:29 -05:00
mikeprimm
b6c36f016f
Merge pull request #168 from mikeprimm/master
...
Add support for emitted light, including support for "night view" in both Surface and Flat rendere
2011-05-26 22:59:49 -07:00
Mike Primm
d2c947653d
Add night view via ambientlight setting on Flat and Surface maps, add
...
night-and-day setting to generate both night (default) and day
(prefix+'_day') versions of tiles, and add transparency to generated
PNG files
2011-05-27 00:56:56 -05:00
FrozenCow
993b26beb4
Changed version to 0.18.
2011-05-26 23:57:42 +02:00
Mike Primm
f9f615db2d
Fix exception in world ordering code when world not in worlds list
2011-05-26 15:32:56 -05:00
FrozenCow
bc6176f3e1
Fixed order of worlds in sidebar.
2011-05-26 19:05:16 +02:00
FrozenCow
0db2296e97
Reverted map-structure for worlds, so that worlds have an order again.
...
This reverts commit f0cdd5614b , fd0c430695 and cee491f610 .
2011-05-26 18:06:17 +02: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
FrozenCow
f0cdd5614b
Fix when leaving out the world: section.
2011-05-26 03:03:45 +02:00
FrozenCow
fd0c430695
Fixed nether configuration.
2011-05-26 02:43:18 +02:00
FrozenCow
cee491f610
Made configuration structure of worlds like templates (looks nicer :D).
2011-05-26 02:33:26 +02:00
Mike Primm
38dd39d75f
Fix spacing on player markers to correct health/armor layout
2011-05-25 12:29:21 +08:00
FrozenCow
108e9d24c4
Changed the way templates and world-configuration are handled.
2011-05-24 02:13:43 +02:00
mikeprimm
de0ad58344
Fix missing spaces on sample name-title only world definition
2011-05-23 16:43:37 -07:00
mikeprimm
cf660f0c9a
Merge pull request #162 from mikeprimm/master
...
FIx broken checkin
2011-05-23 08:17:45 -07:00
mikeprimm
015f898255
Screwed up merge
2011-05-23 08:16:35 -07:00
mikeprimm
d75a0ea325
Merge pull request #161 from mikeprimm/master
...
Add hiddenworlds list to suppress templates on listed worlds
2011-05-23 08:10:18 -07:00
mikeprimm
d0ab3b6fe5
Add sample hiddenworlds settings with harmless defaults
2011-05-23 08:08:06 -07:00
mikeprimm
7cf75873b8
Add hiddenworlds attribute to suppress templates on selected worlds
2011-05-23 08:06:08 -07:00
Mike Primm
b89af6cca3
Fix handling of existing maps tag under world definitions
2011-05-23 08:23:28 +08:00
Mike Primm
23f5ec5a27
Fix handling of existing maps tag under world definitions
2011-05-22 19:21:27 -05:00
mikeprimm
3b7e81a729
Merge pull request #160 from mikeprimm/master
...
Add support for world-type-specific templates in configuration.txt - automatically configure worlds
2011-05-22 15:41:32 -07:00
Mike Primm
19fca36bac
Add support world-type-specific templates, to allow automatic
...
initializing of worlds (make configuration.txt work unmodified for
most folks, while still supporting per-world customizations)
2011-05-22 17:28:12 -05: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
FrozenCow
2866eaa905
Added ability to reload (also using 'dynmap reload').
2011-05-22 19:42:47 +02:00
FrozenCow
ca9be50422
Another fix for chat.
2011-05-22 18:51:11 +02:00
FrozenCow
f00e05f25e
Fixed web-to-mc chat for JsonFile?
2011-05-22 18:24:09 +02:00
FrozenCow
d6cce5ed48
Fixed client-updates for JsonFile.
2011-05-22 18:11:16 +02:00
FrozenCow
04d93d35fd
Removed global chat related configuration-values from configuration.txt.
2011-05-22 17:49:26 +02:00
FrozenCow
15489833df
Fixed allowwebchat for JsonFile.
2011-05-22 17:46:11 +02:00
FrozenCow
d5c19703f6
Added map-icon to configuration.
2011-05-22 17:45:30 +02:00
FrozenCow
fea84a45b2
Corrected JsonFile use of webpath.
2011-05-22 17:09:42 +02:00
FrozenCow
1622bb4408
Added center to configuration with default 0,64,0 like before.
2011-05-22 16:48:43 +02:00
zeeZ
3fd511a8d1
Added armor (merged from zeeZ).
2011-05-22 16:28:26 +02:00
FrozenCow
3b16a36b99
Made use of log.log instead of .info.
2011-05-22 16:28:19 +02:00
zeeZ
5ae837f911
Added log prefix to info logger.
2011-05-22 16:28:14 +02:00
FrozenCow
5f8c44ee6b
Transfered chat/webchat functionality to their components.
2011-05-22 16:28:10 +02:00
FrozenCow
e2f0307eeb
Cleaned up depricated configuration.
2011-05-22 16:28:06 +02:00
FrozenCow
d5b4f6c8c4
Transfered client-updates to two components (jsonfile and internal).
2011-05-22 16:28:01 +02:00
FrozenCow
9fa46597d1
Made use of org.json.simple for updates.
2011-05-22 16:27:57 +02:00
FrozenCow
987e6bcb54
Moved HeroChat code to HeroWebChatModule.
2011-05-22 16:27:53 +02:00
FrozenCow
b2cb15b75c
Moved regions-code to regions-component.
2011-05-22 16:27:49 +02:00
FrozenCow
e57301b14e
Added events for components and implemented 'buildclientconfiguration'-event in ClientConfigurationComponent.
2011-05-22 16:27:43 +02:00
FrozenCow
38c8254707
Added simple start for server-side components.
2011-05-22 16:27:37 +02:00
mikeprimm
5b5b217be2
Merge pull request #159 from mikeprimm/master
...
Fix player faces when nicknames used, partial fix for HeroChat
2011-05-22 00:05:09 -07:00
Mike Primm
de73cd4028
Better fix for HeroChat - still need herochatwebchannel's channel to
...
be set to join-messages: true to allow web messages before first
player message in channel.
2011-05-22 01:53:48 -05: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
b108cad2d3
Merge remote branch 'upstream/master'
2011-05-21 01:30:07 -05:00
mikeprimm
cb010802db
Merge pull request #156 from mikeprimm/master
...
Implement chunk snapshotting approach to drop memory use and CPU use significantly, add shadows option (via shadowstrength) on defaulttilerender, add fix for nicknamed players' skins
2011-05-20 23:03:35 -07: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
Mike Primm
325f069b46
Add BufferedImage cache
2011-05-21 00:30:42 -05:00
Mike Primm
024e7dc96c
Tune shadow render, add to accept wait queue on web server
2011-05-20 23:26:46 -05:00
Mike Primm
b56332eae8
Fix line feeds...
2011-05-20 20:59:39 -05:00
Mike Primm
992a905b0a
Add shadowstrength attribute for surface renderer - enables shadows
...
based on top-down chunk sky light data
2011-05-20 20:52:34 -05:00
mikeprimm
920dea04ee
Make sure boundary condition is respected - getHighestBlockY must return 1 or higher
2011-05-20 08:47:35 -07:00
mikeprimm
2ccf70d3fe
Make sure boundary condition is right on getMaximumY - must be 1 or higher
2011-05-20 08:46:12 -07:00
Mike Primm
3365a96565
Prototype of chunk snapshot support - pre-Bukkit API (reflection
...
based, with fallback to existing APIs)
2011-05-20 01:38:49 -05:00
FrozenCow
c3f0062862
Fixed ConfigurationNode.
2011-05-19 11:15:15 +02:00
mikeprimm
9dc81aa65a
Merge pull request #154 from mikeprimm/master
...
Add support for WorldGuard on built-in server
2011-05-18 21:40:27 -07:00
Mike Primm
26f4f7d994
Add support for WorldGuard on built-in server, fix getNodes() on new
...
ConfigurationNode class
2011-05-18 23:29:33 -05:00
FrozenCow
a7ba34065b
Fixed arguments for createInstance.
2011-05-19 03:18:20 +02:00
zeeZ
ecf415d9e4
Optional option is optional.
2011-05-19 01:53:22 +02:00
zeeZ
6bea667659
Optionally add player health bars to map markers.
2011-05-19 01:53:08 +02:00
zeeZ
728cd8304a
Option to output player health in json for later web usage.
2011-05-19 01:52:38 +02:00
FrozenCow
7937a64f06
Cleaned up logging.
2011-05-19 01:36:14 +02:00
FrozenCow
e28ee185b6
Cleaned up configuration handling and added new logging class.
2011-05-19 01:36:05 +02:00
zeeZ
e5556d9138
herochatchannels like the rest of the config syntax, additional example channels
2011-05-19 01:35:10 +02:00
Mike Primm
084cf3f0f9
Missed one LOG_PREFIX
2011-05-19 01:35:10 +02:00
Mike Primm
28e98a617d
Add basic progress messages on fullrender (end of each map, every 100
...
renders), and add dispose on Graphics2D to accelerate non-heap memory
recovery
2011-05-19 01:35:10 +02:00
zeeZ
c2d596e433
Recenter map only on projection change.
2011-05-19 01:35:09 +02:00
Christian
32da02ffaa
Merge pull request #149 from zeeZ/0caa6550
...
Default zoom to 0, option in config.
2011-05-17 04:37:49 -07:00
zeeZ
0caa655095
Default zoom in config or 0.
2011-05-17 13:34:54 +02:00
Christian
771b708959
Merge pull request #148 from zeeZ/master
...
Organize imports and output prefixing.
2011-05-17 02:45:29 -07:00
zeeZ
d840b07960
Organize imports.
2011-05-17 11:30:06 +02:00
zeeZ
b36821f3b4
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
src/main/java/org/dynmap/MapManager.java
src/main/java/org/dynmap/debug/LogDebugger.java
src/main/java/org/dynmap/web/handlers/FileHandler.java
src/main/java/org/dynmap/web/handlers/SendMessageHandler.java
2011-05-17 11:24:13 +02:00
mikeprimm
57f4f0030e
Merge pull request #147 from mikeprimm/master
...
Fix problem with common buffer in re-entrant FileHandler
2011-05-16 20:05:49 -07:00
Mike Primm
deef732129
Fix re-entrancy problem in FileHandler (shared buffer can cause
...
corrupted or exchanged tiles)
2011-05-16 21:11:28 -05:00
zeeZ
17ba0d4d00
Organize imports.
2011-05-17 02:43:25 +02:00
zeeZ
ccbd6bf45e
Prefix all (intentional) output properly.
2011-05-17 02:38:49 +02:00
zeeZ
9cdbf45062
Added chunkloaded trigger to config
2011-05-17 06:58:33 +08:00
zeeZ
d915f7b14a
Fix error if no render triggers are defined.
2011-05-17 06:58:32 +08:00
zeeZ
70dead3fb9
Added chunkloaded trigger to config
2011-05-17 00:53:31 +02:00
zeeZ
b804aa72f8
Fix error if no render triggers are defined.
2011-05-17 00:38:26 +02:00
zeeZ
17f5f43772
Tabs and spaces.
2011-05-16 20:55:19 +08:00
zeeZ
5e107cccb9
Op always has permission
2011-05-16 20:55:19 +08:00
zeeZ
05f3ced64f
Tabs and spaces.
2011-05-16 14:51:18 +02:00
zeeZ
b01e0c8cdc
Op always has permission
2011-05-16 14:28:18 +02:00
zeeZ
69b562a5bf
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
src/main/java/org/dynmap/flat/FlatMap.java
2011-05-16 14:20:56 +02:00
mikeprimm
4a17f87691
Merge pull request #146 from mikeprimm/master
...
Memory optimization for render
2011-05-15 22:46:22 -07:00
Mike Primm
04056572f8
Optimize the getRequiredChunks() to load only chunks that are needed -
...
reduces chunks needed by 42% versus current implementation.
2011-05-15 23:50:50 -05:00
Mike Primm
271990b87c
Reduce heap memory allocation on render path (less heap junk) by
...
replacing java.awt.Color with work-alike, lightweight updatable
alternative.
2011-05-15 22:25:45 -05:00
mikeprimm
cbfa26a5b3
Merge pull request #143 from mikeprimm/master
...
Remerged - nether render updates, and rest of HeroChat
2011-05-15 19:20:52 -07:00
Mike Primm
355d54842f
One more with the tabs
2011-05-15 08:05:36 -05:00
Mike Primm
e26ac97787
Clean up tabs
2011-05-15 08:02:45 -05:00
Mike Primm
03376dab52
Finish HeroChat support - handle directing web messages to selected
...
channel (versus spamming everyone)
2011-05-15 07:56:45 -05:00
Mike Primm
0ffc825b05
Re-merge the nether render support, and update race condition fixes
2011-05-14 23:25:59 -05:00
Mike Primm
600dd00bcd
HeroChat support - reflection based binding to it
2011-05-15 01:18:20 +02:00
zeeZ
fe93f64273
Added data value colored blocks to flat map
2011-05-14 21:28:21 +08:00
zeeZ
d41422fc2c
Added data value colored blocks to flat map
2011-05-14 15:20:10 +02:00
zeeZ
491e88f745
Fixed kzed map scrolling on higher zoom levels
2011-05-14 20:54:10 +08:00
zeeZ
ecf6ae69a3
Fixed kzed map scrolling on higher zoom levels
2011-05-14 14:32:18 +02:00
zeeZ
4985c763cc
Merge remote-tracking branch 'upstream/master'
2011-05-14 13:56:32 +02: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
zeeZ
2b01db451d
(Optionally) set map center in web config, automagically pan there on map change.
2011-05-14 01:16:26 +02:00
zeeZ
c82a54fe7f
Added data value colors for Stone Slabs and Double Stone Slabs to colorschemes, added Sandstone color as a copy of Sand color to sk89q.txt
2011-05-13 22:26:00 +08:00
zeeZ
a1ccc876a3
Added data value colors for Stone Slabs and Double Stone Slabs to colorschemes, added Sandstone color as a copy of Sand color to sk89q.txt
2011-05-13 15:17:55 +02:00
FrozenCow
e752ae3bd5
Changed version to 0.17.
2011-05-13 12:49:43 +02:00
Mike Primm
1e3ceed5d7
Add zooming to flat map (why not? :) )
2011-05-13 10:59:06 +02:00
FrozenCow
88ff70ac48
Added formatting profile which is used for Dynmap. This should look a lot like the profile used in Bukkit.
2011-05-13 10:48:37 +02:00
FrozenCow
84d01c530a
Replaced tabs with spaces to conform the Bukkit standards.
2011-05-13 10:41:02 +02:00
Mike Primm
daa2d0f186
Pull debug message
2011-05-13 10:31:50 +02:00
Mike Primm
17644a5778
Add tile data coloring (aka colored wool support), combine rendering
...
of default tiles and their zoomed counterparts (saves reloading the
default tile, and keeps the scale levels of the map consistent during
a fullrender and otherwise)
2011-05-13 10:31:38 +02:00
Mike Primm
0a8f2a182a
Shift all imageIO and file I/O to async thread
...
Minus the version change in plugin.yml.
2011-05-13 10:29:38 +02:00
zeeZ
619485212d
First iteration of weather icons
2011-05-10 12:51:52 +02:00
zeeZ
7f5d3ab23d
Consistency to make Kilandor happy :-).
2011-05-10 12:51:52 +02:00
zeeZ
bb45cc10cb
Added weather to json world output (hasStorm and isThundering)
2011-05-10 12:51:52 +02:00
zeeZ
c0479bff05
Fixed NPE if using regionless config.
2011-05-10 12:51:52 +02:00
zeeZ
cf1d6c414d
Organize imports
2011-05-10 12:51:52 +02:00
zeeZ
9eab216525
Use Bukkit's way to strip colors.
2011-05-10 12:51:52 +02:00
FrozenCow
b8fe65bc99
Partly reverted previous change to get back to zeeZ' getDisplayName.
2011-05-10 12:51:52 +02:00
FrozenCow
1a5ddeeda5
Removed generation of .tar.bz2.
2011-05-10 12:26:26 +02:00
Mike Primm
5f23afe608
Don't need additional delay - using AsycnQueue for that
2011-05-10 12:26:18 +02:00
Mike Primm
0a1de1b18e
Add option to run incremental renders on sync thread, using same chunk
...
logic as timesliced full render, in order to handle cases where
assumption that all chunks needed for incremental render are already
resident (which can be false if player telepots, move quickly,
multiple players are active, etc).
2011-05-10 12:26:11 +02:00
Mike Primm
88db6445f9
Added timeslicing to configuration
2011-05-10 12:26:02 +02:00
Mike Primm
6c708d1b3a
Add version log message - keep track builds easier
2011-05-10 12:25:56 +02:00
Mike Primm
dcdfb3da5d
Trap on bogus world names or player with bad current location
2011-05-10 12:25:48 +02:00
Mike Primm
95cc3ae869
Add "time-sliced" implementation of fullrender, which does one tile at
...
a time using the Bukkit scheduler while using a tunable interval
between tiles (0.5 second default), and avoids player timeouts and
blooming the chunk and entity population.
2011-05-10 12:25:34 +02:00
FrozenCow
106f95d8b6
Removed a println.
2011-05-08 21:15:44 +02:00
FrozenCow
be60623719
Fixed tabs.
2011-05-07 22:11:41 +02:00
FrozenCow
ff026e91b6
Disabled regions component by default.
2011-05-07 00:20:34 +02:00
FrozenCow
b66be7a47c
Merge remote-tracking branch 'kilandor/master'
2011-05-07 00:04:05 +02:00
FrozenCow
92e3ec5f08
Merge remote-tracking branch 'zeez/master'
2011-05-06 23:19:37 +02:00
FrozenCow
c4e1362274
Added another way to specify configuration file.
2011-05-06 23:18:46 +02:00
zeeZ
63b9579fa5
Strip colors off chat, use getDisplayName instead of getName
2011-05-01 23:11:29 +02:00
zeeZ
5f32f8fb99
Added Google Maps API version selection to fix map changes
2011-04-28 16:58:30 +02:00
zeeZ
ca9aa0727f
Fix for worlds with weird names and URLDecode mumbo-jumbo
2011-04-28 16:34:50 +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
91b60be572
Less config checks in loop, added newline at EOF
2011-04-11 23:57:10 +02:00
zeeZ
69fcc1706e
Option to treat hiddenplayers.txt as a whitelist.
2011-04-11 04:10:47 +02:00
zeeZ
ab6352a17d
Hidden players stored in lowercase.
2011-04-11 02:40:03 +02:00
zeeZ
631f06d091
More detailed permissions
2011-04-11 02:27:56 +02: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
eb276dd59d
Another attempt to make server conform http.
2011-04-06 00:54:48 +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
d4a2d2d32f
Changed version to 0.16.
2011-04-05 01:05:51 +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
alron
fb825daa04
Force maven to treat everything as UTF-8. Removed a warning at compile time.
2011-03-29 12:22:54 -07:00
FrozenCow
0b421209a2
Small fix for invalid http response of updates.
2011-03-29 01:16:52 +02:00
FrozenCow
43bc625c08
Another fix for IndexOutOfBounds (by ignoring it...)
2011-03-29 00:59:10 +02:00
FrozenCow
43a652f15a
Fixed IndexOutOfBoundsException (sortof?)
2011-03-28 18:32:29 +02:00
FrozenCow
649edfdc2d
Changed events for the latest Bukkit changes.
2011-03-28 18:27:11 +02:00
FrozenCow
2a9b768e3f
Removed onLoad again.
2011-03-27 13:14:35 +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
777b55f27b
Changed version to 0.15.
2011-03-20 18:12:02 +01:00
FrozenCow
09568294f3
Removed getWorld.
2011-03-20 18:09:54 +01:00
FrozenCow
394dfff8f4
Removed chunkgenerated and chunkloaded from configuration.
2011-03-17 22:30:14 +01:00
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
FrozenCow
02e0f0aa24
Fixed being able to render other worlds from command.
2011-03-08 02:39:16 +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
Jason Booth
fe0c6556ed
Merge branch 'master' of git://github.com/FrozenCow/dynmap
...
Conflicts:
colorschemes/ovocean.txt
src/main/java/org/dynmap/MapManager.java
2011-03-07 13:39:58 -06: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
bc7ddaf9d2
some fix to allowchat
2011-03-07 07:13:32 +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
3fd0ed89b0
Removed (seemingly broken) event BLOCK_DAMAGED.
2011-03-06 14:50:15 +01:00
FrozenCow
1001028c2a
Updated configuration to reflect flatmap changes.
2011-03-06 14:49:29 +01:00
FrozenCow
f3c90f0aae
Added prefix to flatmap.
2011-03-06 14:45:26 +01:00
FrozenCow
090f417f32
Added ability to specify colorschemes per map/renderer.
2011-03-05 18:38:17 +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
8d70839d3b
Some changes after running Findbugs.
2011-03-05 16:09:26 +01:00
FrozenCow
b0c84234cc
Added configurable render-triggers.
2011-03-05 15:39:21 +01:00
FrozenCow
41bf56fccb
Optimized stringifyJson a bit.
2011-03-04 22:17:50 +01:00
FrozenCow
d1f280eb0f
Cleaned Http handling a bit.
2011-03-04 21:31:16 +01:00
FrozenCow
9ce160f1b9
Enabled '-' and '.' to be valid world-characters.
2011-03-04 20:15:52 +01:00
FrozenCow
e771d94f24
Added configuration caching.
2011-03-01 18:52:15 +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
FrozenCow
1755411545
Added default equals method to MapTile.
2011-03-01 01:58: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
ff36e4f87a
Fixed incorrect offset when using maximumheight.
2011-02-28 19:24:32 +01:00
FrozenCow
686331d1a5
Better error status message.
2011-02-28 19:23:25 +01:00
FrozenCow
0372329d06
Fixed incorrect offset with maximumHeight.
2011-02-26 23:02:11 +01:00
FrozenCow
a04215be8f
Alertbox does not open when opening page anymore.
2011-02-26 21:33:02 +01:00
FrozenCow
84b86f25a3
Removed BukkitPlayerDebugger: incompatible with Bukkit.
2011-02-26 20:31:26 +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
5778611227
Fixed JsonTimerTask.
2011-02-26 18:23:35 +01:00
FrozenCow
119abb33eb
Merge remote-tracking branch 'alron/master'
2011-02-24 16:10:29 +01:00
alron
001a865c2a
Renamed assembly.xml to more accurately reflect what it is doing. As assembly can me many many things with maven.
2011-02-23 19:18:09 -08:00
alron
550d6e401f
Moved assembly file into more maven consistent location.
2011-02-23 19:14:46 -08:00
alron
256436f68d
Someone forgot to rev-bump when they released. :)
...
also, you are not org.bukkit.dynmap. you are org.dynmap.dynmap
2011-02-23 19:07:43 -08:00
FrozenCow
39db895b9d
Fixed disable-webserver not being used (thanks for checking that Kilandor).
2011-02-24 00:58:40 +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
00f55758c1
Changed version to 0.13. :D
2011-02-24 00:29:57 +01:00
FrozenCow
ea64a55c04
Some dumb description changes in configuration.
2011-02-24 00:21:35 +01:00
FrozenCow
fcbd76c591
Removed clock configuration.
2011-02-24 00:16:30 +01:00
FrozenCow
9a32485ca9
Small cleanup.
2011-02-24 00:16:10 +01:00
Jason Booth
a1d7805116
Fix for NPE JsonTimerTask.java using wrong playerList
...
Removed unused PlayerList variable in MapManager.java
2011-02-23 17:07:04 -06:00
FrozenCow
20e954b905
Change for the inner nerd in me.
2011-02-24 00:06:36 +01:00
FrozenCow
da4c456254
Merge remote-tracking branch 'flames/master'
2011-02-24 00:03:52 +01:00
Jason Booth
bd51387c10
Merge branch 'master' of git://github.com/FrozenCow/dynmap
2011-02-23 17:03:10 -06:00
FrozenCow
95bf263f11
Merge remote-tracking branch 'kilandor/master'
2011-02-24 00:02:15 +01:00
Jason Booth
774e013558
Fix jsonfile-interval should be 1 not 1000
2011-02-23 16:31:57 -06: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
b99f487567
Replaced onPlayerCommand by onCommand (server-consoles can now also be used to execute commands).
2011-02-22 14:51:40 +01:00
FrozenCow
ccf6f2ac49
Player per world support @ client.
2011-02-22 14:49:03 +01:00
FrozenCow
ca76b29fb9
Made Dynmap package not include subdirectory.
2011-02-22 14:09:14 +01:00
FrozenCow
40c7c9fa66
It's official, ima retard.
2011-02-22 09:17:38 +01:00
FrozenCow
fae5014b4e
Added commands to plugin.yml, removed disabledcommands and added fullrender <worldname>.
2011-02-22 00:42:37 +01:00
FrozenCow
0fbd0c0a44
Added commands to plugin.yml.
2011-02-21 22:39:21 +01:00
FrozenCow
8d0f509bfe
Made MapTypes per World (instead of having MapTypes for all worlds).
2011-02-21 22:17:38 +01:00
FrozenCow
65f3ea4fe3
Used new Bukkit constructor format.
2011-02-21 16:22:16 +01:00
FrozenCow
b097fb8321
Added entry for css overrides and cleaned up styles by lechd.
2011-02-20 23:55:16 +01:00
FrozenCow
feb6d65d82
Merge remote-tracking branch 'flames/master'
2011-02-20 22:13:41 +01:00
FrozenCow
cd4027495c
New buttons and example override css by lechd.
2011-02-20 22:11:28 +01:00
Arthur Mayer
298c0f3391
corrected (hopefully) the chat response for show/hide commands
2011-02-20 20:06:07 +01:00
Arthur Mayer
e15514291b
only OPs can use fullrender. added response to chat for
...
hide/show/fillrender commands.
2011-02-20 19:49:05 +01:00
FrozenCow
f80385e1af
Added lechd's new images.
2011-02-20 18:47:18 +01:00
FrozenCow
618d1b05c9
Merge branch 'master' of https://github.com/flames/dynmap
2011-02-20 17:46:27 +01:00
alron
aaa06bfc38
Automagic packages built. Love me for this. :)
2011-02-19 21:49:24 -08:00
Arthur Mayer
ad07d68d7e
added configuration option messagettl, TimeToLive for chatmessages, in
...
Milliseconds! 15seconds: messagettl: 15000
2011-02-20 02:11:44 +01:00
Arthur Mayer
02fb226350
removed forgotten comma
2011-02-20 02:02:45 +01:00
Arthur Mayer
d7fe6072a5
a lot of changes. chat and ui related. thanks FrozenCow & lechd
2011-02-20 01:58:53 +01:00
Jason Booth
6ab82174a5
Added timestamp support to Update Tiles and Chat.
...
New web config to handle for jsonfile method
Modified webclient to handle timestamps to prevent duplication.
Removed duplicate code in JsonTimerTask.java
2011-02-19 18:55:01 -06:00
FrozenCow
83f334445b
Made chatinput reset after send.
2011-02-19 21:16:14 +01:00
FrozenCow
d5bd6ff038
Made sendmessage url relative.
2011-02-19 21:08:14 +01:00
Arthur Mayer
22cc46f4b8
many ui iprovements by lechd
2011-02-19 20:51:21 +01:00
FrozenCow
77539522f0
Merge branch 'master' of https://github.com/flames/dynmap
2011-02-19 16:31:36 +01:00
FrozenCow
2bd0052aa9
Added WebChat back to web.
2011-02-19 16:31:13 +01:00
FrozenCow
c53e6058be
Added debugging to configuration. Disabled by default.
2011-02-19 15:25:31 +01:00
Arthur Mayer
9b604d4e75
Merge remote branch 'choose_remote_name/master' into HEAD
2011-02-19 08:28:03 +01:00
Arthur Mayer
9d490cbcc8
removed my custom url, made it relative
2011-02-19 08:26:40 +01:00
FrozenCow
791341f210
Fixed httpserver thereby also more optimized.
2011-02-19 00:01:42 +01:00
FrozenCow
42d07d6ca2
Added quotes to login/out messages for yaml.
2011-02-19 00:01:21 +01:00
Arthur Mayer
61c6f4a086
corrected the json string in sendChat()
2011-02-18 20:15:18 +01:00
FrozenCow
723e7da8d3
Added stacktrace for errors.
2011-02-18 19:43:45 +01:00
FrozenCow
d3cf795ebb
Fixed stupid mistake with body of http requests.
2011-02-18 19:42:32 +01:00
Arthur Mayer
67baf5100c
forgotten config change for chat
2011-02-18 18:46:48 +01:00
Arthur Mayer
56f126d5f2
uups. removed debug alert, added function call
2011-02-18 11:15:05 +01:00
Arthur Mayer
10f93c02c1
added chatSend() function
2011-02-18 10:21:55 +01:00
Arthur Mayer
5ddaf940ed
chat interface added, config option changed from showchatballoons:
...
ture/false to showchat: balloons/modal
2011-02-18 07:08:29 +01:00
Arthur Mayer
7c917b729e
added join and quit messages to chat
2011-02-18 05:30:49 +01:00
Arthur Mayer
00485ddcc2
fixed small bug/typo where players were not removed from player list
...
at quit game.
2011-02-18 01:28:58 +01:00
Arthur Mayer
55aeb3c583
added custom configuration to nether rendering, changed pom.xml, so
...
maven compiles dynmap.jar instead of dynamic-map.jar
2011-02-18 01:23:14 +01:00
FrozenCow
1388fa11e5
Some desperate attempts to make IE8 work.
2011-02-18 00:07:59 +01:00
FrozenCow
b860c7dd0e
Added pinning.
2011-02-18 00:07:51 +01:00
FrozenCow
c67b2e5cc2
Added example to configuration.
2011-02-17 21:17:54 +01:00
FrozenCow
44748d7f07
Changed gui by lechd + map per world client-configuration.
2011-02-17 20:08:50 +01:00
Jason Booth
13099587e0
Fixed mistake with map updates only pulling interval+10 instead of interval+10000
2011-02-17 11:14:37 -06:00
Jason Booth
3916c363ae
Fixed jsontimer-interval config not being used.
...
Change JsonTimerTask.java to use jsontimer-interval+10 to allow a buffer for late/delayed client requests(to prevent updated tiles info to be missing)
2011-02-17 10:05:07 -06:00
Jason Booth
77d9a88868
Fixed timer to be stopped onDisabled if it was started
2011-02-17 09:45:32 -06:00
Jason Booth
e1f2ca26d6
Changed disable-webserver and jsonfile to default false
2011-02-17 09:38:08 -06:00
Jason Booth
3c1bde1092
Updated JsonTimerTask.java to be Multi-World Compatible
2011-02-17 09:33:27 -06:00
Jason Booth
f7dbc89ab4
Merge branch 'master' of git://github.com/FrozenCow/dynmap
...
Conflicts:
configuration.txt
src/main/java/org/dynmap/DynmapPlugin.java
2011-02-17 08:54:23 -06:00
FrozenCow
909207ac26
Organized imports.
2011-02-15 21:44:08 +01:00
FrozenCow
99605ba433
Make sure request-body is skipped if not read.
2011-02-15 21:06:14 +01:00
FrozenCow
ada9637d72
Added sendmessage handler (for chatting back).
2011-02-15 21:00:36 +01:00
FrozenCow
2d693b1ebf
Improved HTTP performance and POST/PUT compatbility.
2011-02-15 21:00:04 +01:00
FrozenCow
e900aca2e0
Added helper classes for HTTP.
2011-02-15 14:19:43 +01:00
FrozenCow
060d1092f9
Made clock configurable and split clocks from map.
2011-02-15 13:50:04 +01:00
FrozenCow
38df91bafe
Report world for players in updates.
2011-02-15 13:38:46 +01:00
FrozenCow
18ad2e1d79
Removed copyrights through flames' css.
2011-02-15 13:33:40 +01:00
FrozenCow
5fb098259a
focuschatballoons now defaults to false.
2011-02-15 13:08:33 +01:00
Daniel Chesters
24c9dfed41
if focuschatballoons is at false, disableAutoPan should be at true
2011-02-14 21:53:07 +01:00
FrozenCow
a1c86bfabb
Removed depricated time-images.
2011-02-14 00:02:52 +01:00
FrozenCow
49d45c653d
Made clock and timeofday interchangable.
2011-02-14 00:01:20 +01:00
FrozenCow
42391cc4d5
Readded getMinecraftTime.
2011-02-13 23:30:19 +01:00
FrozenCow
3980ebefa1
Revert "Removed Clock"
...
This reverts commit 9ca8f8dc64e9a28da81a538a3578c2b2a8b34c88.
2011-02-13 23:27:37 +01:00
lishid
058ab0eea7
Transparent compass now
2011-02-13 23:27:37 +01:00
lishid
6e8160e576
Removed Clock
2011-02-13 23:27:37 +01:00
lishid
51e7420bdb
Dynamic Time of the day Added
2011-02-13 23:27:37 +01:00
lishid
60ea503053
Added/Modified images
2011-02-13 23:27:37 +01:00
lishid
f894c4945b
Added/Modified images
2011-02-13 23:27:37 +01:00
lishid
7241b2be81
Added compass and TimeOfDay
2011-02-13 23:27:37 +01:00
unknown
b729f28df4
initial commit
2011-02-13 23:27:37 +01:00
FrozenCow
1fc2cdb636
Force making directories on tile-rendering (needs cleaner fix).
2011-02-13 23:23:15 +01:00
FrozenCow
b63369675d
Re-added flushing again (oops).
2011-02-13 23:22:57 +01:00
FrozenCow
a81665d38d
Fixed time being reported of the correct world.
2011-02-13 22:46:45 +01:00
FrozenCow
db9ced3394
Fixed tiles not updating.
2011-02-13 22:42:08 +01:00
FrozenCow
d5d737d385
Fixed 'unknown command' being shown after fullrender.
2011-02-13 22:34:38 +01:00
FrozenCow
f3a1d53277
Added maximumheight to configuration for somewhat better nether rendering.
2011-02-13 22:33:33 +01:00
FrozenCow
9a2b9ccac0
Fixed HttpServer some more.
2011-02-13 22:30:24 +01:00
FrozenCow
835e566151
Some improvements to HttpServer.
2011-02-13 02:56:00 +01:00
FrozenCow
2380325975
Added automatically creating tiles directory.
2011-02-13 01:33:05 +01:00
FrozenCow
100f3e0590
Added multiworld update support along with client-side support.
2011-02-13 01:19:47 +01:00
FrozenCow
5b0171c459
Server-side multiworld support with several improvements overal.
2011-02-12 23:47:00 +01:00
FrozenCow
2fd91ef94b
Changed tilepath to tilespath in configuration.
2011-02-11 06:28:17 -08:00
FrozenCow
403a2acc53
Added default player-faces.
2011-02-10 01:20:50 +01:00
Jason Booth
959040e5f4
Merge branch 'master' of git://github.com/FrozenCow/dynmap
2011-02-09 14:24:13 -06:00
Jason Booth
2f6930bc17
Removed System debug messages.
...
Added missing JsonTimerTask.java
2011-02-09 11:57:46 -06:00
Jason Booth
fb01f6ecf7
New config to Disable Webserver
...
New feature and config to output JSON to file
2011-02-09 11:35:09 -06:00
FrozenCow
29517e9a24
Fixed handling invalid http requests.
2011-02-09 17:22:16 +01:00
FrozenCow
d566fccb1e
Fixed rendering zoomedout tiles.
2011-02-09 13:25:06 +01:00
FrozenCow
b2f6ae5132
Disabled fullrender by default.
2011-02-09 01:03:31 +01:00
FrozenCow
5c209c2a5e
Renamed y to z in DynmapChunk.
2011-02-09 00:42:16 +01:00
FrozenCow
fb1b5df3d0
Made zoomed-rendering make use of existing tile-files instead of keeping those tiles in memory.
2011-02-08 23:38:57 +01:00
FrozenCow
38ee8657e8
Better exception handling.
2011-02-08 20:59:51 +01:00
FrozenCow
89c8d564a4
Made use of newly introduced unloadChunk in BukkitAPI + removal of unstable features.
2011-02-08 20:27:37 +01:00
FrozenCow
b31bb14452
disabledcommands can now be empty.
2011-02-07 22:26:55 +01:00
FrozenCow
553eb7952d
Added ability to disable commands in configuration.
2011-02-07 17:25:16 +01:00
FrozenCow
421b91058a
Merge https://github.com/kosiini/dynmap
2011-02-07 17:01:39 +01:00
Janne Sinisalo
100a03274c
Compile fix for multiworld
...
Updated getWorlds()[0] to getWorlds().get(0)
2011-02-07 17:42:11 +02:00
FrozenCow
d2b7169884
Workaround for IE's retardness (not yet tested).
2011-02-06 15:09:15 +01:00
FrozenCow
3e398e9124
Made updates in JSON format. Combined chat and tile queues into one UpdateQueue. Fixed UpdateQueue.
2011-02-06 03:00:51 +01:00
FrozenCow
7c257af454
Fixed Json stringify.
2011-02-06 02:00:27 +01:00
FrozenCow
a937d13086
Added reflection-support for stringifyJson.
2011-02-05 21:09:49 +01:00
FrozenCow
d651d58d63
Moved stringifyJson to Json class.
2011-02-05 21:02:39 +01:00
FrozenCow
9a655676ab
Moved FileHandler to handlers package.
2011-02-05 20:54:28 +01:00
FrozenCow
debf5bcc57
Renamed WebServer to HttpServer and WebServerRequest to HttpServerConnection.
2011-02-05 20:53:42 +01:00
FrozenCow
2a79aea7bb
Moved handlers to their own (independent) classes.
2011-02-05 20:51:20 +01:00
FrozenCow
883eba6890
Removed debugging + small fix.
2011-02-05 19:57:32 +01:00
FrozenCow
226cc5f86c
More work on HttpServer.
2011-02-05 19:51:48 +01:00
FrozenCow
bf0edea7e2
Initial http-server work.
2011-02-05 19:51:48 +01:00
FrozenCow
711341ec47
Oops, forgot comma.
2011-02-05 19:51:06 +01:00
FrozenCow
14a3d32205
Used colors.txt from lechd.
2011-02-05 17:49:11 +01:00
FrozenCow
9f555bd4bb
Added 'loadChunks' to configuration.
2011-02-05 03:03:52 +01:00
FrozenCow
902cc87458
Added 'focuschatballoons' to config influenced by Incendia's suggestion.
2011-02-05 02:59:03 +01:00
FrozenCow
9951baf8b5
Made tiles use nearest-neighbor filtering in Firefox and IE as suggested by lechd.
2011-02-05 02:54:06 +01:00
FrozenCow
335109d8c7
Added pumpkin colors as suggested by lechd.
2011-02-05 02:53:22 +01:00
FrozenCow
3940b91d0e
Applied Eclipse formatting.
2011-02-05 02:25:18 +01:00
FrozenCow
4f138a56da
Removed comments.
2011-02-05 02:11:49 +01:00
FrozenCow
c8cf39a440
Added unstable fullmap rendering. Also... messed up formatting by pressing ctrl+shift+f in eclipse, sigh
2011-02-05 02:01:04 +01:00
FrozenCow
138aed8c33
Added chunk loading to rendering.
2011-02-04 23:12:55 +01:00
FrozenCow
fde56275fe
Changed day/night time as suggested by lologarithm.
2011-02-02 11:58:14 +01:00
FrozenCow
13e829cda0
Updated Server.getTime to World.getTime (to reflect Bukkit's changes)
2011-02-02 11:40:49 +01:00
FrozenCow
455b5d3b3e
Added showchatballoons, showplayerfacesonmap and showplayerfacesinmenu to configuration.
2011-02-01 15:16:54 +01:00
FrozenCow
8abf596ba6
Organized imports.
2011-02-01 14:23:13 +01:00
FrozenCow
1beb4fa466
Added server-to-client configuration and maptype-configuration: enables serverside configuration of maps and updaterate.
2011-02-01 14:17:08 +01:00
FrozenCow
e47b4dc49f
Small fixes to chat-balloons.
2011-01-26 01:05:00 +01:00
FrozenCow
3ff0b85ef7
Merge branch 'master' of https://github.com/NathanWolf/dynmap
2011-01-26 00:39:48 +01:00
FrozenCow
99ae8a8f3b
Moved Web* to webpackage and added server-to-client configuration (server-side).
2011-01-26 00:38:36 +01:00
Nathan Wolf
18b36f96fe
Finish the client-side chat bubble interface:
...
- Bubbles disappear automatically after some time
- Each bubble shows the last 5 messages for each player
- Some formatting to the bubble done, could be better (add high-res
player pic?)
2011-01-25 15:10:42 -08:00
FrozenCow
36d1a7676e
Merge branch 'master' of https://github.com/NathanWolf/dynmap
2011-01-25 23:06:48 +01:00
Nathan Wolf
f14e097c54
Adding chat message pop-ups!
2011-01-25 14:03:27 -08:00
FrozenCow
4de18ac700
Changed startup message (shows webserver-info, hides debug)
2011-01-25 22:59:22 +01:00
FrozenCow
98f03c588e
Added ignores.
2011-01-25 22:56:35 +01:00
FrozenCow
5ee5fee232
Added getters/setters.
2011-01-25 18:43:11 +01:00
FrozenCow
c2047fe7c4
Fixed webpath and tilepath accepting absolute paths.
2011-01-23 19:56:59 +01:00
FrozenCow
34093874bc
Changed /map to /dynmap.
2011-01-23 12:07:23 +01:00
FrozenCow
676f6c5a3e
Made it possible to change background color in style.css
2011-01-23 12:00:15 +01:00
FrozenCow
9ea9e347ea
Changed proxy-url to /up/ as ktr suggested.
2011-01-22 14:55:50 -08:00
FrozenCow
75efba1425
Fixed comment in config.js.
2011-01-20 23:29:38 +01:00