Mattes D
ed99216ba4
Tools: Removed unused Timer.* file from CMakeLists.txt.
2014-12-04 22:51:40 +01:00
Mattes D
c014f5624c
Merged branch 'origin/master' into c++11.
2014-12-04 22:04:16 +01:00
Mattes D
dec89478a7
Fixed MCADefrag compilation.
2014-11-29 23:58:26 +01:00
Mattes D
abbe18c0ab
Fixed QtBiomeVisualiser compilation.
2014-11-29 23:55:06 +01:00
Mattes D
8e6f98eb40
Fixed missing files in ProtoProxy.
2014-11-29 23:30:27 +01:00
Tiger Wang
79e5b82354
Merge remote-tracking branch 'origin/master' into c++11
...
Conflicts:
src/Noise/Noise.h
src/World.h
2014-11-23 17:12:34 +00:00
Tiger Wang
6382989ba0
Compilation fixes
2014-11-23 14:22:05 +00:00
Mattes D
c6e8da893e
QtBiomeVisualiser: Fixed default zoom selection.
2014-10-31 12:26:12 +01:00
Mattes D
f25e268ca0
QtBiomeVisualiser: Set start zoom to 25%, just like AMIDST.
2014-10-30 16:54:23 +01:00
Mattes D
8c04abf9aa
QtBiomeVisualiser: Added a prototyping int generator flavor.
...
This generator is easier to manipulate, since it doesn't require rewriting the sizes in the template parameters. On the other hand, it doesn't optimize so well, so it's a bit slower.
2014-10-30 16:24:35 +01:00
Mattes D
93f33b7d4e
Merge remote-tracking branch 'origin/master' into GrownBiomes
2014-10-30 12:50:55 +01:00
Mattes D
4e0cef0ff6
QtBiomeVisualiser: Generator uses all machine threads.
...
The previous limit of 1 thread was lifted, now the generator source runs on all CPU threads available.
2014-10-29 23:04:59 +01:00
Mattes D
791f891212
Merged branch 'master' into GrownBiomes.
2014-10-28 22:29:46 +01:00
Mattes D
48ac3acc84
QtBiomeVisualiser: Added quick shutdown to region loaders.
...
Now the app shuts down immediately even if regions are queued for loading.
2014-10-28 22:19:24 +01:00
Mattes D
3168a95404
QtBiomeVisualiser: Fixed mouse zoom vs menu zoom.
2014-10-28 22:15:42 +01:00
Mattes D
bea2edb2a9
QtBiomeVisualiser: Reduced memory usage.
2014-10-28 20:52:04 +01:00
Mattes D
3f3a2a6755
QtBiomeVisualiser: Fixed random regions not rendered.
2014-10-28 20:49:29 +01:00
Mattes D
6a1a76e73d
Merged remote-tracking branch 'origin/master'.
2014-10-28 19:42:35 +01:00
Mattes D
d6c663cbc5
QtBiomeVisualiser: Fixed compilation on Linux.
2014-10-28 15:44:58 +01:00
Mattes D
53ff5c527c
QtBiomeVisualiser: Attempt at fixing Linux compilation.
2014-10-28 11:23:54 +01:00
Mattes D
c53b7e5d38
QtBiomeVisualiser: Switched caching to entire regions.
...
This speeds up the rendering preparation for small zooms.
2014-10-27 23:58:09 +01:00
Mattes D
7e1d603080
Added new biomegen: Grown
2014-10-26 19:58:16 +01:00
Mattes D
765bf006ad
Merged branch 'master' into c++11.
2014-10-24 10:19:13 +02:00
Mattes D
298be25413
QtBiomeVisualiser: Moved the IniFile lib.
2014-10-23 15:29:02 +02:00
Tiger Wang
6a9f8a7615
Compile fix?
2014-10-21 14:40:00 +01:00
Mattes D
e0cfbc4d85
Generator: Rewritten to use SharedPtrs.
2014-10-19 14:01:59 +02:00
Mattes D
0aa1b5667e
QtBiomeVisualiser: Added mouse hover info.
2014-10-03 19:41:42 +02:00
madmaxoft
f625b33d56
QtBiomeVisualiser: Zoom is now limited and aligned to steps.
2014-10-03 12:33:03 +02:00
madmaxoft
f424a0ec60
QtBiomeVisualiser: Seed is read properly.
2014-09-29 21:32:02 +02:00
Mattes D
8d55cd409e
Merge pull request #1466 from mc-server/endofsupport
...
Removed protocols 1.2 to 1.6
2014-09-28 22:04:30 +02:00
Tiger Wang
ae36ba5d33
Compilation fix
2014-09-28 13:08:00 +01:00
madmaxoft
576d088f38
QtBiomeVisualiser: fixed compilation.
2014-09-27 22:26:56 +02:00
madmaxoft
34b83656b3
QtBiomeVisualiser: Fixed MSVC path-crossing.
...
MSVC would occasionally compile the wrong CPP file - the same name, but wrong path.
2014-09-24 11:21:59 +02:00
madmaxoft
de163f0134
QtBiomeVisualiser: Fixed confusion about Globals.h.
2014-09-23 12:51:02 +02:00
madmaxoft
83588fb0aa
QtBiomeVisualiser: Implemented live-update for the generator setup.
2014-09-22 21:52:38 +02:00
madmaxoft
583532e1b9
QtBiomeVisualiser: generator source is read from generator setup ini.
2014-09-22 21:52:37 +02:00
madmaxoft
10c5d50566
QtBiomeVisualiser: Moved the generator setup into a side-pane.
2014-09-22 21:52:37 +02:00
madmaxoft
dda66ea6ef
QtBiomeVisualiser: Added the base for INI editting.
2014-09-21 22:58:27 +02:00
madmaxoft
14123c6d16
QtBiomeVisualiser: Added list of vanilla worlds.
2014-09-20 23:03:13 +02:00
madmaxoft
66ef05c765
QtBiomeVisualiser: Added support for loading Anvil worlds.
2014-09-20 18:41:21 +02:00
madmaxoft
09c67bddf7
QtBiomeVisualiser: More gcc fixes.
2014-09-18 10:26:28 +02:00
madmaxoft
98f4588ed3
QtBiomeVisualiser: Fixed linux compilation.
2014-09-18 10:24:52 +02:00
madmaxoft
18743540bc
QtBiomeVisualiser: Fixed colors and read failures.
2014-09-15 21:45:35 +02:00
Mattes D
21b70f17c2
QtBiomeVisualiser: Added reloading.
2014-09-15 17:29:34 +02:00
Mattes D
84947a22ad
QtBiomeVisualiser: removed multithreading.
...
It was slowing things down, the granularity is too fine.
2014-09-15 17:20:54 +02:00
Mattes D
d772bc032f
QtBiomeVisualiser: Added multithreading.
...
For some reason this makes the UI less responsive.
2014-09-15 16:50:40 +02:00
Mattes D
ddf130f849
QtBiomeVisualiser: Extended zoom down below 100%.
2014-09-14 22:20:16 +02:00
Mattes D
69b46aeb27
QtBiomeVisualiser: Added mouse and keyboard view control.
...
Mouse dragging or WASD pans view, mouse wheel or QE zooms.
2014-09-14 22:05:10 +02:00
Mattes D
2a020e47f1
QtBiomeVisualiser: Removed build-specific variables.
...
These should be set in the project configuration instead, passed directly to qmake.
2014-09-14 20:09:33 +02:00
Mattes D
e3a2dc5a13
Added new Qt-based biome visualiser.
...
Compile with Qt 5.1+
2014-09-14 01:33:05 +02:00
Mattes D
cde195c156
AnvilStats: Fixed thread start race condition.
...
The whole program would sometimes fail to process anything because the threads were waited-for before they were started.
2014-08-27 12:29:57 +03:00
Mattes D
af47b5ece2
AnvilStats: Added per-height spawner stats.
2014-08-27 12:24:56 +03:00
Mattes D
751d345c59
AnvilStats: Ignoring output XLS files.
2014-08-27 11:54:22 +03:00
Mattes D
b361e994ef
AnvilStats: Added cmake directive for larger executable stack.
...
This fixes runtime "stack overflow" errors caused by large stack-allocated arrays used for decompression.
2014-08-27 11:53:46 +03:00
Mattes D
ccaa51f913
AnvilStats: Fixed Win64 compilation.
2014-08-27 11:52:54 +03:00
madmaxoft
d783753cb5
AnvilStats: initial per-height blocktype implementation (WIP).
2014-08-27 09:46:59 +02:00
madmaxoft
24a092d9cb
AnvilStats: Rewritten to use CMake.
2014-08-27 09:05:43 +02:00
Tycho
9844368267
Renamed Loggers
2014-08-12 16:05:04 +01:00
Tycho
be780b380e
Fixed Tools to work with new logging framework
2014-08-10 20:10:47 +01:00
archshift
431d898a81
Made redundant semi not an error, fixed one more.
2014-07-24 11:24:22 -07:00
madmaxoft
6e78a2f7d9
Fixed the BiomeVisualiser project.
...
Compiles under MSVC2008 again, was missing some shared files.
2014-06-20 21:22:20 +02:00
Mattes D
c11488ccd7
Merge pull request #1011 from SphinxC0re/SomeWarningFixes
...
Fixed some warnings
2014-06-04 18:02:45 +02:00
Julian Laubstein
1499426472
Update Globals.h
2014-06-03 21:32:46 +02:00
Mattes D
cdddb1aeac
AnvilStats: Added new biome colors.
2014-06-01 22:35:29 +02:00
Mattes D
869cd7a208
Hot-fixed AnvilStats compilation for MSVC2013.
2014-06-01 15:19:01 +02:00
madmaxoft
4aec5c9450
Fixed MCADefrag compilation.
2014-05-20 09:37:21 +02:00
Julian Laubstein
cfbb256360
Fixed some warnings
2014-05-19 10:37:43 +02:00
Mattes D
28815252e6
Merge branch 'master' into SslWebAdmin
2014-05-10 21:27:57 +02:00
madmaxoft
e88811e589
Fixed ProtoProxy compilation in MSVC2013.
...
Fixes #983 .
2014-05-04 14:39:21 +02:00
madmaxoft
3e854bc596
ProtoProxy: Renamed PublicKey to CryptoKey.
2014-05-01 20:20:12 +02:00
madmaxoft
6cb2d2461f
Moved the rest of the Crypto objects into their own respective files.
2014-04-29 17:37:15 +02:00
madmaxoft
d9f7ae6a4d
Moved cPublicKey to its separate file in PolarSSL++.
2014-04-29 17:13:08 +02:00
madmaxoft
e39f2a21d5
Fixed ProtoProxy.
2014-04-29 11:48:57 +02:00
madmaxoft
21e5690811
ProtoProxy: Fixed weird gcc compilation errors.
2014-04-14 18:50:44 +02:00
madmaxoft
449afa850e
ProtoProxy: Added 1.7.9 compatibility.
2014-04-14 18:24:44 +02:00
madmaxoft
446a651502
ProtoProxy: Fixed a few Clang and MSVC warnings.
2014-04-04 08:55:48 +02:00
madmaxoft
62f84d968a
Merge branch 'unreachable'
2014-03-20 22:36:24 +01:00
madmaxoft
93d4cbb989
ProtoProxy: Fixed MSVC compilation.
2014-03-20 15:21:28 +01:00
Tycho
e3646fc877
Fixed a couple of unneeded returns in ProtoProxy
2014-03-14 08:05:35 -07:00
Tycho
d904e89712
Merge branch 'Werror' into warnings
...
Conflicts:
src/Globals.h
2014-03-12 10:12:13 -07:00
Tycho
ef58b0eb54
Fixed comments an assert
2014-03-12 09:49:37 -07:00
Tycho
3d15319e3c
Added macros support to tools
2014-03-11 15:55:37 -07:00
Tycho
98e15a34a4
Fixed xofts issues
2014-03-10 13:18:53 -07:00
Tycho
bc556e7f00
Fixed Issues in ProtoProxy
2014-03-10 12:21:18 -07:00
madmaxoft
29269a6ef8
ProtoProxy: ignoring PolarSSL build files.
2014-02-18 13:51:45 +01:00
Tycho
994904f6c5
Now uses setflags for flags
2014-02-16 04:15:12 -08:00
Tycho
83f0438e21
COnverted ProtoProxy to use library CMakeLists
2014-02-16 04:09:00 -08:00
Tycho
2acf218700
Allow building MCADefrag at the same time as MCServer
2014-02-16 03:37:31 -08:00
Tycho
42e9b21fb2
CHange MCADefrag CMakelist to use zlib CMakeList
2014-02-15 15:27:10 -08:00
Tycho
9ba0b6ecf2
rewrote MCADefrag CMakelist to use Setflags
2014-02-15 15:24:34 -08:00
madmaxoft
41ab8260f7
MCADefrag: Implemented recompression.
...
This finalizes #639 .
2014-02-13 16:54:39 +01:00
madmaxoft
cd658e02e8
MCADefrag: Fixed bugs, now produces valid MCA files.
2014-02-13 16:54:39 +01:00
madmaxoft
05590fb91d
MCADefrag: Initial implementation.
...
Partially implements #639 .
This only defragments the chunks, without recompressing them.
2014-02-13 16:54:39 +01:00
Tycho
d9fb83300c
Fixed Compile errors
...
c++11 introduces scoped enums, so the code didn't fail in clang
2014-02-03 13:01:12 -08:00
Tycho
80807eec2c
Increased Type safety of Biomes
...
Changed a number of funcictions from using integers to store biomes to using EMCSBiome
Note that switching from an int to an Enum is a non-breaking chang to the lua bindings
2014-02-03 12:26:17 -08:00
madmaxoft
ae897804a0
ProtoProxy: Added encryption support.
2014-01-28 23:53:54 +01:00
Mattes D
f78a62a5e3
Merge pull request #575 from worktycho/GeneratingBenchmark
...
More Interfaces to decouple Generator from the rest of the code
2014-01-25 13:55:33 -08:00
madmaxoft
8f1890e877
ProtoProxy: Modified to use PolarSSL.
2014-01-25 19:19:37 +01:00
madmaxoft
d8014d1ed8
ProtoProxy: Fixed connection on *nix.
2014-01-24 18:51:15 +01:00
Tycho
16375f6aad
Merge branch 'master' into GeneratingBenchmark
...
this merge is necessary,
2014-01-20 09:21:47 -08:00
