Tycho
8d6919f3b6
Fixed polarssl programs included
2014-05-01 12:05:11 -07:00
Tycho
47cc1a84e1
Tests off by default take 2
2014-05-01 11:57:07 -07:00
Tycho
1929b46aff
Disable polarssl tests by default
2014-05-01 11:52:08 -07:00
Tycho
8780b324ff
Merge branch 'master' into chunksparsing/structs
2014-05-01 11:50:40 -07:00
Mattes D
a2cffb0363
Fixed MSVC2013 compilation.
2014-05-01 20:22:23 +02:00
worktycho
2576effc19
Merge pull request #971 from worktycho/polarssl-local
...
Keep a cloned copy of polarssl
2014-05-01 19:19:47 +01:00
Tycho
9928698d6d
Merged change to enable testing to be disabled
...
This is confirmed upstream but is unlikely to get into the repository for
several weeks
2014-05-01 09:53:43 -07:00
Tycho
ed071538d5
Changed polarssl repo to point to cloned copy of polarssl
2014-05-01 09:47:22 -07:00
madmaxoft
772b57ca04
Anvil saver pads data to 4K boundaries.
...
Fixes #524 .
2014-05-01 18:00:10 +02:00
madmaxoft
ab2dfb44fa
If webadmin.ini doesn't exist, example one is written immediately.
2014-04-30 17:37:25 +02:00
madmaxoft
f2b5790776
Fixed a warning when an empty item is being created.
2014-04-30 17:36:51 +02:00
madmaxoft
ae2d18daee
Ladders set as transparent.
2014-04-30 17:13:56 +02:00
madmaxoft
58929a9948
Removed the unused cBlockingTCPLink class.
2014-04-30 17:06:46 +02:00
Mattes D
014fab58e6
Merge pull request #965 from mc-server/SslWrappers
...
Ssl wrappers
2014-04-30 17:05:13 +02:00
madmaxoft
1dbdb8ed91
Delayed sending the KeepAlive packet for 3 seconds after login.
...
This should alleviate #889 .
2014-04-29 23:10:50 +02:00
madmaxoft
c045bb3f4c
Removed unneeded #includes.
2014-04-29 17:45:20 +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
7e972f6a5d
Merge branch 'master' into SslWrappers
2014-04-29 15:41:24 +02:00
madmaxoft
015bf244b5
Added BiomeToString() API function.
2014-04-29 15:36:29 +02:00
madmaxoft
5d33ce226f
Added BiomeToString() API function.
2014-04-29 15:36:05 +02:00
madmaxoft
e39f2a21d5
Fixed ProtoProxy.
2014-04-29 11:48:57 +02:00
madmaxoft
79ec770d77
Added missing initialization.
2014-04-29 11:17:47 +02:00
madmaxoft
ec33bbe294
Moved cRsaPrivateKey to PolarSSL++, rewritten using existing objects.
2014-04-29 11:04:54 +02:00
madmaxoft
709ae320e0
Disabled MSVC warnings about constant bool expressions.
2014-04-28 22:30:07 +02:00
madmaxoft
55a7f392cc
Hopefully fixed repeated clang warnings.
2014-04-28 22:22:07 +02:00
madmaxoft
dffd38e53b
Fixed a MSVC warning.
2014-04-28 22:21:49 +02:00
madmaxoft
0b16e6821f
Merged branch 'master' into SslWrappers.
2014-04-28 22:05:02 +02:00
madmaxoft
bab3a3cd31
Added the G1 root cert.
...
Now the authenticator finally works.
2014-04-28 21:16:52 +02:00
madmaxoft
16b3eae862
Added a debug cert printing function.
2014-04-28 21:16:32 +02:00
Mattes D
709015369d
Merge pull request #940 from Howaner/GlobalFixes
...
Add entity invulnerable
2014-04-28 20:58:15 +02:00
madmaxoft
8ab8fb344f
Fixed braces.
2014-04-28 20:37:22 +02:00
madmaxoft
f04957321d
Fixed missing return value warning in MSVC.
2014-04-28 20:37:12 +02:00
madmaxoft
8ae472df86
Merge remote-tracking branch 'worktycho/master'
2014-04-28 20:16:37 +02:00
Tycho
ad5cdf9f2d
Removed static from combinators.
...
THis allows us to use the functions in template params at the cost of polluting the global namespace.
2014-04-28 11:07:06 -07:00
Tycho
6d520e398b
Fixed unbraced ifs
2014-04-28 11:00:43 -07:00
Tycho
05fe6d6c58
Removed inlines from combinators
...
gcc requires external linkage for functions provided to template parameters
2014-04-28 10:52:48 -07:00
Tycho
a42480cf82
Template Magic
...
Removed need to allocate a fake meta block by using templates to provide a version
of the code that does not use metas. Also changed the function to a template
argument to make sure that the compilier is able to inline it.
2014-04-28 10:31:07 -07:00
Howaner
acd2804f31
Revert "Withers now use the new invulnerable."
...
This reverts commit 619592b5a0
2014-04-28 13:51:40 +02:00
Howaner
26e935cb20
Revert "Changed the old invulnerable methods from the wither to the new."
...
This reverts commit d50f8f6f11
2014-04-28 13:51:22 +02:00
Mattes D
c063051645
Merge pull request #954 from mc-server/projectiles-split
...
Totally refactored ProjectileEntity.h, splitting up into several files.
2014-04-28 12:32:02 +02:00
archshift
9b0cb3fd97
Fixed projectile source filenames, indentations
2014-04-27 17:05:18 -07:00
madmaxoft
ef57133f9b
Reordered constructors.
2014-04-27 23:35:17 +02:00
madmaxoft
bb73af6843
Fixed a late-night typo.
2014-04-27 23:31:26 +02:00
madmaxoft
9dc9713a9c
Fixed warnings.
2014-04-27 23:12:52 +02:00
madmaxoft
4c165f8a6d
Fixed player spawning #953 .
2014-04-27 23:11:36 +02:00
Tycho
744e00c904
Worked around const pointer
2014-04-27 13:43:59 -07:00
Mattes D
051bb8cfbd
Merge pull request #958 from worktycho/bugfix
...
Bugfix
2014-04-27 22:42:22 +02:00
madmaxoft
dd52719c2d
Rewritten cAuthenticator to use the new PolarSSL++ wrapper classes.
2014-04-27 22:28:14 +02:00
madmaxoft
0bdc49221b
PolarSSL wrappers for the SSL context.
2014-04-27 22:27:53 +02:00
