summaryrefslogtreecommitdiffstats
path: root/src/Globals.h (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Thread safe cMap managerandrew2014-02-201-3/+3
|
* Manual merge (Fixed conflicts)andrew2014-02-201-0/+10
|
* Merge branch 'master' into GeneratingBenchmark2Tycho2014-01-261-0/+3
|\ | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h
| * PolarSSL is fully used for 1.3.2 protocol encryption.madmaxoft2014-01-231-0/+3
| |
* | Added support for overide in c++11 supporting varients of gcc/clangTycho2014-01-261-2/+4
|/
* Move biome definition to separate filesBill Derouin2014-01-091-0/+1
|
* Disabled an unneeded MSVC warning.madmaxoft2014-01-071-4/+7
| | | | Also sorted the enabled warnings by their numerical code for easier searching..
* Disabled the type conversion MSVC warning.madmaxoft2014-01-061-1/+3
| | | | It was hitting way too many false positives.
* Changed the release version of ASSERT.Diusrex2014-01-051-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.Diusrex2014-01-051-1/+13
|
* Removed offending tr1/memory header inclusion.madmaxoft2013-12-181-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.STRWarrior2013-12-141-0/+1
|
* Fixed a load of issues, clang autodetection works now.Alexander Harkness2013-11-271-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 srcAlexander Harkness2013-11-241-0/+227