Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-09-25 04:13:00 +02:00
Code Issues Projects Releases Wiki Activity
3,083 Commits 7 Branches 130 Tags 27 MiB
v3.5-beta-2
Commit Graph

3083 Commits

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