Commit Graph

447 Commits

Author SHA1 Message Date
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