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
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
Tycho
744e00c904
Worked around const pointer
2014-04-27 13:43:59 -07:00
Tycho
077179277c
Fixes to uninitallsed array access in Noise.cpp
...
CID 43634, 43634
2014-04-27 13:20:00 -07:00
Tycho
71c51783f3
Initalize counter in fastrandom
...
Fixes CID 43622
2014-04-27 13:15:19 -07:00
Tycho
a2b1fa6520
Initialised MetaArrays in BlockArea
...
Fixes CID 43621
2014-04-27 13:12:36 -07:00
Tycho
25d933883a
Removed unneeded assert
...
Fixed CID 43610
2014-04-27 13:07:21 -07:00
Tycho
35dc88e4ff
Removed Old Asserts
...
Removed asserts about non-negative numbers on what are now unsigned types
Fixes CID 43608
2014-04-27 12:42:29 -07:00
Tycho
d15743df1c
Removed old unused code
2014-04-27 12:41:22 -07:00
Tycho
ee354a405b
Fixed OnPluginMessage hook not exiting early.
...
OnPluginMessage hook would call all plugins even after one returned true.
Fixes CID 43512
2014-04-27 12:37:08 -07:00
Tycho
01546020fc
Replaced all the .data() calls so the code compiles in VS2008
2014-04-10 12:12:36 -07:00
Tycho
18793ca568
Fixed missing - that caused all neighbour lookups to go to the chunkmap
2014-04-08 08:59:50 -07:00
Tycho
10e72a122c
Removed check for enqueuing a chunk that is already enqueued to be loaded
...
This remaval is safe as cWorldStorage checks for duplicate chunks when dequeuing
and removes an expensive iteration whilst holding the queue lock
2014-04-08 08:43:28 -07:00
Tycho
f5cb81eb1b
Added support for redstone latching
...
fixes #856
2014-04-06 11:09:33 -07:00
Tycho
c89f7902df
Added forgoten lua file
2014-04-06 05:56:43 -07:00
Tycho
23395a5ce1
Merge branch 'master' into override
...
Conflicts:
lib/tolua++/CMakeLists.txt
2014-04-05 14:12:17 -07:00
Tycho
0075b2f72e
Merge branch 'master' into HTTPSizeT
...
Conflicts:
src/HTTPServer/EnvelopeParser.h
src/HTTPServer/HTTPFormParser.h
src/HTTPServer/MultipartParser.h
2014-04-02 07:51:48 -07:00
Tycho
b449ad8613
Merge branch 'MacFixes'
...
Conflicts:
src/DeadlockDetect.cpp
src/World.cpp
2014-04-02 06:54:57 -07:00
Tycho
741a64c250
Merge branch 'master' into HTTPSizeT
2014-04-02 06:37:24 -07:00
Tycho
1f5a4a39f2
Fixed All signedness warnings in HTTPServer.cpp
2014-04-02 06:36:25 -07:00
Tycho
dcaea749ae
Merge branch 'master' into globals
2014-04-02 06:05:55 -07:00
Tycho
298c0b409a
Fixed tolua++ override support
2014-04-02 06:04:17 -07:00
Tycho
7ece0cc836
Fixed format string in HTTPConnection
2014-04-02 05:10:08 -07:00
Tycho
93bb5369a8
Fixed Comparison to -1 in HTTPMessage.h
2014-04-02 05:06:38 -07:00
Tycho
5653997bcc
Added override specifier to functions declared in cWorld
2014-03-22 08:43:54 -07:00
Tycho
0cfb12f0d1
Added Additonal check for xxd existance
2014-03-22 08:30:49 -07:00
Tycho
830a9c3bb4
FIrst attempt at adding override support to tolua
2014-03-22 08:16:07 -07:00
Tycho
2266c2150d
Merge branch 'master' into size_t_lua
...
Conflicts:
lib/tolua++/src/bin/basic_lua.h
2014-03-22 07:48:16 -07:00
Tycho
a69a1ef032
Fixed enum checking functions not being called in generated code
2014-03-20 13:23:15 -07:00
Tycho
6a3fe7adcc
Fixed bugs in patched tolua output
2014-03-19 12:38:00 -07:00
Tycho
1635c696de
Merge branch 'master' into unreachable
2014-03-19 12:13:05 -07:00
Tycho
363c92ed53
Added unreachable lines backit prtected by preprocessor guards
2014-03-19 12:06:12 -07:00
Tycho
04adca3410
Fixed tolua emitting isnumber insteand of is<Enum>
2014-03-19 12:02:26 -07:00
Tycho
e8f7c18ba7
Fixed type error in lua bindings
2014-03-19 11:34:33 -07:00
Tycho
0a505576e5
Fixed =~ bug
2014-03-17 10:28:04 -07:00
Tycho
90ab055eab
Merge branch 'master' into unreachable
2014-03-17 09:44:34 -07:00
Tycho
3e0dfbc7a1
Made buffers static const
2014-03-16 07:59:58 -07:00
Tycho
7f84c8d60b
Patched tolua to understand size_t
2014-03-15 10:42:35 -07:00
Tycho
a427f004b8
Fix indentation
2014-03-15 07:15:02 -07:00
Tycho
04f1d58561
Fixed unessicary return
2014-03-15 07:08:09 -07:00
Tycho
683e2f4840
Merge branch 'master' into globals
...
Conflicts:
SetFlags.cmake
2014-03-15 06:53:07 -07:00
Tycho
fbd4d53dac
Merge branch 'master' into unreachable
...
Conflicts:
SetFlags.cmake
2014-03-15 06:47:56 -07:00
Tycho
2e9fe777e4
Patched tolua to emit range checks for enums
2014-03-15 06:45:26 -07:00
Tycho
e3646fc877
Fixed a couple of unneeded returns in ProtoProxy
2014-03-14 08:05:35 -07:00
Tycho
693e59c6a4
Merge branch 'master' into noreturn
...
Conflicts:
SetFlags.cmake
2014-03-14 08:04:48 -07:00
Tycho
8e11c270fc
Added Noreturn attribtes to a couple of functions and made a missing noreturn an error
2014-03-14 07:59:25 -07:00
Tycho
c51a9b5fc2
Merge branch 'master' into unreachable
...
Conflicts:
SetFlags.cmake
2014-03-14 07:46:33 -07:00
Tycho
0ad835d1cf
Merge branch 'master' into globals
...
Conflicts:
SetFlags.cmake
2014-03-14 07:45:24 -07:00
Tycho
2f81c1d7fb
Added NORETURN macro
2014-03-14 07:33:47 -07:00
Tycho
cd7ef264be
Disable global constructors and exit-time destructors warnings
2014-03-14 07:16:55 -07:00
Tycho
fed461bf2a
Made unreachable code an error
2014-03-14 07:12:18 -07:00
Tycho
b829c9b14e
Fixed a few unneeded breaks
2014-03-14 07:12:00 -07:00
Tycho
58fa8b40bf
Removed missiterperatable malfunctioning error handling code
2014-03-14 07:02:57 -07:00
Tycho
e61810e1bf
Removed invalid block face handling code
...
The code for handling invalid block faces is removed by gcc and clang as it is undefined behavior for a enum
to contain a value that is not part of the enum. Since the only way that the line can be executed is through
undefined behavior clang and gcc remove it so the function fits in the caches better.
2014-03-14 06:52:49 -07:00
Tycho
8b83c1a653
Merge branch 'master' into warnings
2014-03-14 06:46:20 -07:00
Tycho
22cdbe99b4
Fixed a couple of missing defs
2014-03-14 06:44:04 -07:00
Tycho
cd6ab5617c
Fixed xofts issues
2014-03-14 06:11:49 -07:00
Tycho
692cf5bb70
Merge branch 'master' into warnings
2014-03-14 06:01:45 -07:00
Tycho
9a28d1bbe1
Fixed comma
2014-03-12 11:56:24 -07:00
Tycho
862e219443
Added additional macros to support the MSVC size_t format and changed all formats to use the macros
2014-03-12 10:34:50 -07:00
Tycho
d904e89712
Merge branch 'Werror' into warnings
...
Conflicts:
src/Globals.h
2014-03-12 10:12:13 -07:00
Tycho
a584b7b3bc
Fixed printf format compatabilty
2014-03-12 10:09:08 -07:00
Tycho
3caa4a38b9
Merge branch 'master' into Werror
...
Conflicts:
src/Generating/PieceGenerator.cpp
2014-03-12 09:59:10 -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
9c6ca5a3ed
made format-nonliteral an error
2014-03-11 14:43:56 -07:00
Tycho
7e6ee7ef81
Fixed more Format issues
2014-03-11 14:43:14 -07:00
Tycho
16b27c4b7a
Fixed a load of format string errors
2014-03-11 14:16:08 -07:00
Tycho
a19f5fc484
Move Format issues
2014-03-11 13:51:56 -07:00
Tycho
f64f879027
Fixed format errors in protocol
2014-03-11 13:46:32 -07:00
Tycho
53faac10c5
Added macros to follow format string checking through wrappers
2014-03-11 13:41:15 -07:00
Tycho
bb4b35e438
Rollback submodule change
2014-03-11 12:54:46 -07:00
Tycho
80cc824c0c
Fixed Chunkdef warnings
2014-03-11 12:41:18 -07:00
Tycho
0fc4a1ee06
Move comment
2014-03-11 12:36:51 -07:00
Tycho
728870ed9d
Fixed Warnings in PieceGenerator
2014-03-11 12:35:44 -07:00
Tycho
80d7c88e00
Merge branch 'master' into Werror
...
Conflicts:
src/ChunkDef.h
2014-03-11 12:33:26 -07:00
Tycho
f5f7c6b38b
Merge branch 'master' into Werror
2014-03-10 13:56:16 -07:00
Tycho
e4c7aac1cc
Prepended Travis to env vars
2014-03-10 13:52:13 -07:00
Tycho
ce5b02c312
Merge branch 'master' into Werror
...
Conflicts:
src/ChunkDef.h
2014-03-10 13:31:21 -07:00
Tycho
98e15a34a4
Fixed xofts issues
2014-03-10 13:18:53 -07:00
Tycho
e9e2852ce1
Fixed test asserts
2014-03-10 13:12:43 -07:00
Tycho
bb28f0d1e3
Fixed assert
2014-03-10 12:36:01 -07:00
Tycho
bc556e7f00
Fixed Issues in ProtoProxy
2014-03-10 12:21:18 -07:00
Tycho
d6050275fb
Merge branch 'master' into Werror
2014-03-10 11:58:32 -07:00
Tycho
693734bd83
Enable error on cast-align and unused macros
2014-03-10 11:57:04 -07:00
Tycho
b78c729880
Fixed Alignment issue in ByteBuffer
2014-03-10 11:56:23 -07:00
Tycho
2eca30aebc
Removed Some unnessicary macros
2014-03-10 11:34:20 -07:00
Tycho
8947f80294
Use string.reserve to avoid the need to do inplace byteswap
2014-03-10 11:24:12 -07:00
Tycho
cff6631513
Removed unused macro from WSSCompact
2014-03-10 11:14:34 -07:00
Tycho
8864e7d8ca
Fixed alignment issues in Fireworks Serializer
2014-03-10 11:13:07 -07:00
Tycho
7c974b27b1
Removed unused macro
2014-03-10 10:49:03 -07:00
Tycho
e2e7f2184f
Fixed cast to type with different alignment in BlockingTCPLink
2014-03-10 10:48:50 -07:00
Tycho
8665233522
Fixed cast between types of different alignment in cSocket
2014-03-10 10:32:51 -07:00
Tycho
30353cd228
Fixed MTRand warnings
2014-03-10 10:24:44 -07:00
Tycho
0a509ab85e
Merge branch 'master' into Werror
2014-03-10 10:17:28 -07:00
Tycho
1bf99b5fd2
Be more parinoid about int sizes
2014-03-09 11:47:22 -07:00