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
Tycho
2aa28ad6f4
First attempt at Compiling Generator seperatly
2014-01-19 12:50:07 -08:00
Tiger Wang
71b01234a2
ProtoProxy: UpdateBlockEntity NBT is written
2014-01-19 00:55:08 +00:00
madmaxoft
1aeecdbe43
ProtoProxy: Compiles under Linux.
2014-01-17 13:15:54 +01:00
madmaxoft
b99fe7d812
ProtoProxy: Fixed inversed typedef.
...
I must be going crazy...
2014-01-17 12:39:19 +01:00
madmaxoft
c4f4eda347
ProtoProxy: Fixed compilation in Windows and in Linux.
2014-01-17 12:38:25 +01:00
madmaxoft
c7b67d9c3c
ProtoProxy: Fixed #include filename case.
2014-01-17 12:28:09 +01:00
Mattes D
4974bf2832
Merge pull request #545 from mc-server/VarArgs
...
Var args
2014-01-15 13:41:45 -08:00
madmaxoft
3b8b558979
ProtoProxy: use CMake to generate the MSVC project files.
2014-01-15 22:41:12 +01:00
madmaxoft
f436f87464
Fixed ProtoProxy compilation.
2014-01-15 19:10:03 +01:00
madmaxoft
9af16c3f28
ProtoProxy: Fixed login kick packet direction.
2014-01-13 20:31:08 +01:00
Matyas Dolak
8104f611f1
BiomeVisualiser: Added zooming using the 1 - 8 keys.
2014-01-10 11:55:43 +01:00
madmaxoft
17363716a1
ProtoProxy: Fixed favicon relaying.
...
The buffer was too small for the favicon; now it's dynamic.
2014-01-08 17:17:37 +01:00
madmaxoft
c19f2d7383
ProtoProxy: Fixed description-changing to work with 1.7.4.
2013-12-15 20:41:35 +01:00
madmaxoft
1373539bce
ProtoProxy: Fixed metadata parsing.
2013-12-05 12:20:37 +01:00
madmaxoft
41175b5549
BiomeVisualiser: Using the common BiomeGen creation code.
2013-11-28 20:19:10 +01:00
madmaxoft
bdd86d7934
BiomeVisualiser: Added the TwoLevel biome generator.
2013-11-28 20:00:30 +01:00
madmaxoft
8acf0129e1
BiomeVisualiser: The biome settings are read from a file.
2013-11-28 20:00:29 +01:00
madmaxoft
c90f021ed4
Fixed RCONClient after foldermove.
2013-11-28 13:55:28 +01:00
madmaxoft
cfd9a29046
Fixed MemDumpAnalysis after foldermove.
2013-11-28 13:53:38 +01:00
madmaxoft
bb37271f30
Fixed BlockZapper after folder move.
2013-11-28 13:48:52 +01:00
madmaxoft
afd94a0b11
Fixed BiomeVisualiser after folder move.
2013-11-28 10:09:45 +01:00
madmaxoft
54c82c746e
Fixed AnvilStats after folder move.
2013-11-28 10:05:39 +01:00
madmaxoft
19895dc428
ProtoProxy: Fixed after folder move.
2013-11-28 09:52:28 +01:00
madmaxoft
2d68969a45
AnvilStats: Fixed compilation.
2013-11-24 22:10:27 +01:00
madmaxoft
274bdc40ff
BiomeVisualiser: Added 1.7 biomes, recolored using AMIDST colors.
2013-11-24 17:49:04 +01:00
madmaxoft
dbb76ef9fe
RCONClient: Initial implementation.
...
Fix #79 .
2013-11-24 14:35:35 +01:00
madmaxoft
f0aab7c580
ProtoProxy: Added dblquotes.
2013-11-10 22:58:39 +01:00
madmaxoft
e7ba63b43c
ProtoProxy: Fixed SpawnMob packet.
2013-11-07 17:13:25 +01:00
madmaxoft
cd52eeb223
ProtoProxy: Fixed the SpawnObjectVehicle packet.
2013-11-03 11:59:06 +01:00
madmaxoft
81aa5f3419
ProtoProxy: Removed unused enums.
2013-11-03 11:59:06 +01:00
madmaxoft
0652e7a4c8
ProtoProxy: Fixed handling of incomplete packets.
2013-11-03 11:59:06 +01:00
madmaxoft
e4906b3027
ProtoProxy: Working 1.7 protocol.
...
Players can login, move around, dig blocks.
2013-10-29 22:55:16 +01:00
madmaxoft
db62f8bcea
ProtoProxy: Updated the server-side packets to 1.7.
...
Forgotten a file in the previous commit.
2013-10-29 22:14:30 +01:00
madmaxoft
111fb24d3a
ProtoProxy: Updated the server-side packets to 1.7.
2013-10-29 19:05:51 +01:00
madmaxoft
21192e5ead
ProtoProxy: The login part of the protocol is implemented.
2013-10-29 15:47:22 +01:00
madmaxoft
fe82ada084
ProtoProxy: Implemented 1.7.2 status request / response / ping.
2013-10-28 23:05:53 +01:00
madmaxoft
fd85ac23c1
ProtoProxy: Fixed compilation after the previous cByteBuffer changes.
2013-10-28 21:12:49 +01:00
madmaxoft
4fdb1c1aaf
BiomeVisualiser: fixed crash at shutdown caused by bad logging
2013-10-12 11:27:06 +02:00
madmaxoft
b88a70963c
Updated BiomeVisualiser to compile again.
2013-10-11 12:53:05 +02:00
madmaxoft
19bfab9eca
ProtoProxy: Added handling for the Explosion packet.
...
This will help #129 .
2013-09-19 21:51:59 +02:00
madmaxoft
d9494ccf1e
ProtoProxy: Removed the per-packet sleep from the DEBUG version.
...
It is now enabled by defining a macro, by default off.
2013-09-19 21:35:33 +02:00
madmaxoft
36a6df8a34
ProtoProxy: Logs are saved to a Logs subfolder.
2013-09-08 11:27:49 +02:00
madmaxoft
273a53a758
ProtoProxy: The MOTD is modified to indicate ProtoProxy presence.
2013-09-08 11:12:34 +02:00
madmaxoft
d31142811d
Merged branch 'Projectiles'.
2013-09-07 22:06:30 +02:00
madmaxoft
bd9956b35f
ProtoProxy: Improved logging for fixed-point numbers.
...
"Absolute integers" and velocity are reported including their fractional part.
2013-09-04 20:42:37 +02:00
madmaxoft
2a5b2e826a
AnvilStats: ignoring the world subfolder
2013-09-01 11:32:17 +02:00
madmaxoft
79b79e5b77
AnvilStats: Added combined HeightBiome map
2013-08-30 23:32:27 +02:00
madmaxoft
105251a986
Merge branch 'Projectiles'
2013-08-30 20:49:33 +02:00
madmaxoft
7f4c880147
AnvilStats: Implemented a cImageComposingCallback class.
...
This will ease the creation of callbacks that produce per-region images of stuff.
2013-08-30 20:46:16 +02:00
madmaxoft
b1f8b6e4c4
AnvilStats: Callbacks can now use CALLBACK_CONTINUE and CALLBACK_ABORT instead of bool return values.
...
This makes the code slightly easier to understand.
2013-08-30 20:45:29 +02:00
madmaxoft
32bc969339
AnvilStats: Added the callback for region begin and end.
2013-08-30 19:38:21 +02:00
madmaxoft
1c5b571633
AnvilStats: Ignoring the build folders
2013-08-30 19:37:28 +02:00
madmaxoft
333c3cbc7e
ProtoProxy: Log individual chunks in MapChunkBulk packet.
2013-08-30 16:38:37 +02:00
madmaxoft
d61c9bfb61
ProtoProxy: Next packet type is logged for client as well.
2013-08-30 10:15:54 +02:00
madmaxoft
3c0e08ee71
ProtoProxy: Uses cTimer for the timing information.
...
Previously used clock() is not suitable for the task, unfortunately it worked in MSVC.
2013-08-30 10:10:56 +02:00
madmaxoft
ebc076e8b2
Fixed ProtoProxy compilation, added client Kick handling.
2013-08-25 21:57:12 +02:00
Tiger Wang
7f87d6c3d6
Feature and bugfixes [SEE DESC]
...
Added TNT and Hopper minecarts
Fixed piston code failing without an extension set
Repeaters are now broken
Fixed not being able to place a minecart on an activator rail
Added much needed comments on piston code
Fixed minor formatting issue
2013-08-16 11:23:24 +01:00
madmaxoft
15e98cc7f5
ProtoProxy: Tab completion logging lists the last item, too
2013-07-31 14:35:48 +02:00
madmaxoft
0b166ee784
ProtoProxy: Added the tab completion packet parsing
2013-07-31 14:32:05 +02:00
