Commit graph

433 commits

Author SHA1 Message Date
Christian
5932bb604a Merge pull request #148 from zeeZ/master
Organize imports and output prefixing.
2011-05-17 02:45:29 -07:00
zeeZ
609a9f3724 Organize imports. 2011-05-17 11:30:06 +02:00
zeeZ
0c8e13f943 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
affbc3fa87 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
85518e72c9 Fix re-entrancy problem in FileHandler (shared buffer can cause
corrupted or exchanged tiles)
2011-05-16 21:11:28 -05:00
zeeZ
66cf80cce1 Organize imports. 2011-05-17 02:43:25 +02:00
zeeZ
07612cce2a Prefix all (intentional) output properly. 2011-05-17 02:38:49 +02:00
zeeZ
c1a692fa52 Added chunkloaded trigger to config 2011-05-17 06:58:33 +08:00
zeeZ
003ff1c149 Fix error if no render triggers are defined. 2011-05-17 06:58:32 +08:00
zeeZ
bcdbf75cea Added chunkloaded trigger to config 2011-05-17 00:53:31 +02:00
zeeZ
4b0ca4580a Fix error if no render triggers are defined. 2011-05-17 00:38:26 +02:00
zeeZ
b76e6059ae Tabs and spaces. 2011-05-16 20:55:19 +08:00
zeeZ
1ba9fe9cff Op always has permission 2011-05-16 20:55:19 +08:00
zeeZ
bcba7b1a12 Tabs and spaces. 2011-05-16 14:51:18 +02:00
zeeZ
774e7a3d4d Op always has permission 2011-05-16 14:28:18 +02:00
zeeZ
6c85bf539d Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/main/java/org/dynmap/flat/FlatMap.java
2011-05-16 14:20:56 +02:00
mikeprimm
d8458ddcc0 Merge pull request #146 from mikeprimm/master
Memory optimization for render
2011-05-15 22:46:22 -07:00
Mike Primm
38b13b6324 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
d888550a73 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
92e49fdf2a 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
37758ecc21 One more with the tabs 2011-05-15 08:05:36 -05:00
Mike Primm
e5a09b79d2 Clean up tabs 2011-05-15 08:02:45 -05:00
Mike Primm
01b337d3ff Finish HeroChat support - handle directing web messages to selected
channel (versus spamming everyone)
2011-05-15 07:56:45 -05:00
Mike Primm
e372c64a37 Re-merge the nether render support, and update race condition fixes 2011-05-14 23:25:59 -05:00
Mike Primm
ff5f791eaf HeroChat support - reflection based binding to it 2011-05-15 01:18:20 +02:00
zeeZ
c70b3df510 Added data value colored blocks to flat map 2011-05-14 21:28:21 +08:00
zeeZ
27a981ddbc Added data value colored blocks to flat map 2011-05-14 15:20:10 +02:00
zeeZ
a8c4998573 Fixed kzed map scrolling on higher zoom levels 2011-05-14 20:54:10 +08:00
zeeZ
bb8e98e941 Fixed kzed map scrolling on higher zoom levels 2011-05-14 14:32:18 +02:00
zeeZ
5d267e0521 Merge remote-tracking branch 'upstream/master' 2011-05-14 13:56:32 +02:00
zeeZ
b708db6532 (Optionally) set map center in web config, automagically pan there on map change. 2011-05-14 12:40:59 +02:00
mikeprimm
3df0c435d7 Fix zoom so that markers are placed properly 2011-05-14 12:40:26 +02:00
zeeZ
4dfd4b3ad1 (Optionally) set map center in web config, automagically pan there on map change. 2011-05-14 01:16:26 +02:00
zeeZ
064bc4301f 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
b3567ff94f 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
1940b349b3 Changed version to 0.17. 2011-05-13 12:49:43 +02:00
Mike Primm
f7baca7a83 Add zooming to flat map (why not? :) ) 2011-05-13 10:59:06 +02:00
FrozenCow
1951a57fd3 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
0b5f07054d Replaced tabs with spaces to conform the Bukkit standards. 2011-05-13 10:41:02 +02:00
Mike Primm
d09e54d116 Pull debug message 2011-05-13 10:31:50 +02:00
Mike Primm
bc155e7a05 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
71e873f5c5 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
49828683bd First iteration of weather icons 2011-05-10 12:51:52 +02:00
zeeZ
8aa96b5c73 Consistency to make Kilandor happy :-). 2011-05-10 12:51:52 +02:00
zeeZ
dfb66d9415 Added weather to json world output (hasStorm and isThundering) 2011-05-10 12:51:52 +02:00
zeeZ
1c06c03f23 Fixed NPE if using regionless config. 2011-05-10 12:51:52 +02:00
zeeZ
1618820180 Organize imports 2011-05-10 12:51:52 +02:00
zeeZ
cd08db4e31 Use Bukkit's way to strip colors. 2011-05-10 12:51:52 +02:00
FrozenCow
6678f13ee2 Partly reverted previous change to get back to zeeZ' getDisplayName. 2011-05-10 12:51:52 +02:00
FrozenCow
9b80f7d31e Removed generation of .tar.bz2. 2011-05-10 12:26:26 +02:00