Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-12-19 15:17:58 +01:00
Code Issues Projects Releases Wiki Activity
2,858 Commits 7 Branches 130 Tags 27 MiB
ec6fd59999
Commit Graph

2858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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