Tycho
bed2ee22e8
Merge branch 'master' into GeneratingBenchmark2
...
Conflicts:
src/Blocks/BlockRail.h
src/World.h
2014-01-26 06:28:51 -08:00
Tycho
a2d3eea80b
Added support for overide in c++11 supporting varients of gcc/clang
2014-01-25 15:02:31 -08:00
madmaxoft
5f34c78091
PolarSSL is fully used for 1.3.2 protocol encryption.
2014-01-23 23:35:23 +01:00
Bill Derouin
cee76f1ace
Move biome definition to separate files
2014-01-09 15:21:46 -06:00
madmaxoft
a33b157dc9
Disabled an unneeded MSVC warning.
...
Also sorted the enabled warnings by their numerical code for easier searching..
2014-01-07 17:15:08 +01:00
madmaxoft
778c329ad2
Disabled the type conversion MSVC warning.
...
It was hitting way too many false positives.
2014-01-06 22:23:03 +01:00
Diusrex
1acbf07445
Changed the release version of ASSERT.
...
This was so a variable only used in ASSERT statements will not give a warning about not being used.
2014-01-05 15:07:46 -07:00
Diusrex
0d5b581fcd
Making all of the useful level 4 warnings be active.
2014-01-05 14:42:22 -07:00
madmaxoft
4402725c61
Removed offending tr1/memory header inclusion.
...
We already use <memory> at line 160, this was a double include, additionally causing problems (#424 ).
2013-12-18 12:04:31 +01:00
STRWarrior
8c04afe18a
Exported E_EFFECTS_<Effect> to lua. Forgot to commit Globals.h.
2013-12-14 22:34:49 +01:00
Alexander Harkness
596963743e
Fixed a load of issues, clang autodetection works now.
...
This fixes issue #210 .
This also removes the disableasm option, so it would be wise to remove
it from any scripts that use it.
I also removed a random line in the middle of globals.h, why was it
there?
2013-11-27 17:18:40 +00:00
Alexander Harkness
675b4aa878
Moved source to src
2013-11-24 14:19:41 +00:00
