Upstream
/
dynmap
mirror of https://github.com/webbukkit/dynmap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
580 Commits 7 Branches 128 Tags 34 MiB
Commit Graph

580 Commits

Author SHA1 Message Date
Jason Booth 008052179f Fix Security Exploit 2011-06-27 18:30:45 +02:00
FrozenCow 4b3d8a7c6b Changed version to 0.18.1. 2011-06-27 18:30:45 +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