Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Thread safe cMap manager | andrew | 2014-02-20 | 1 | -3/+3 |
| | |||||
* | Manual merge (Fixed conflicts) | andrew | 2014-02-20 | 1 | -0/+10 |
| | |||||
* | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-01-26 | 1 | -0/+3 |
|\ | | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h | ||||
| * | PolarSSL is fully used for 1.3.2 protocol encryption. | madmaxoft | 2014-01-23 | 1 | -0/+3 |
| | | |||||
* | | Added support for overide in c++11 supporting varients of gcc/clang | Tycho | 2014-01-26 | 1 | -2/+4 |
|/ | |||||
* | Move biome definition to separate files | Bill Derouin | 2014-01-09 | 1 | -0/+1 |
| | |||||
* | Disabled an unneeded MSVC warning. | madmaxoft | 2014-01-07 | 1 | -4/+7 |
| | | | | Also sorted the enabled warnings by their numerical code for easier searching.. | ||||
* | Disabled the type conversion MSVC warning. | madmaxoft | 2014-01-06 | 1 | -1/+3 |
| | | | | It was hitting way too many false positives. | ||||
* | Changed the release version of ASSERT. | Diusrex | 2014-01-05 | 1 | -1/+1 |
| | | | | This was so a variable only used in ASSERT statements will not give a warning about not being used. | ||||
* | Making all of the useful level 4 warnings be active. | Diusrex | 2014-01-05 | 1 | -1/+13 |
| | |||||
* | Removed offending tr1/memory header inclusion. | madmaxoft | 2013-12-18 | 1 | -3/+0 |
| | | | | We already use <memory> at line 160, this was a double include, additionally causing problems (#424). | ||||
* | Exported E_EFFECTS_<Effect> to lua. Forgot to commit Globals.h. | STRWarrior | 2013-12-14 | 1 | -0/+1 |
| | |||||
* | Fixed a load of issues, clang autodetection works now. | Alexander Harkness | 2013-11-27 | 1 | -1/+0 |
| | | | | | | | | 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? | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+227 |