Commit Graph
92 Commits
Author SHA1 Message Date
Tycho 53fe82eaf8 Added travis support for multiple build types 2014-03-07 11:26:36 -08:00
Tycho 72697cfb4f Added support to overide CMake build type with env vars 2014-03-07 11:23:28 -08:00
Tycho df193c8f6f BlockEntities is warnings free 2014-02-24 11:29:59 -08:00
Tycho e3f38b04fd Undid changing core 2014-02-23 12:25:48 -08:00
Tycho 462e0bcf46 fixed globals.h warnings 2014-02-23 12:23:35 -08:00
Tycho 6da2d2bb21 Added -Wextra 2014-02-16 07:04:44 -08:00
Tycho 761857bd01 Fixed comment 2014-02-16 05:55:37 -08:00
Tycho 2b0b2b7425 Build cmake built tools in travis 2014-02-16 04:49:50 -08:00
Tycho e3dd931be2 Fogot 2014-02-16 04:39:41 -08:00
Tycho f42ad4e9f7 can Now build ProtoProxy alongside MCServer 2014-02-16 04:30:45 -08:00
Tycho 994904f6c5 Now uses setflags for flags 2014-02-16 04:15:12 -08:00
Tycho 83f0438e21 COnverted ProtoProxy to use library CMakeLists 2014-02-16 04:09:00 -08:00
Tycho 2acf218700 Allow building MCADefrag at the same time as MCServer 2014-02-16 03:37:31 -08:00
Tycho 42e9b21fb2 CHange MCADefrag CMakelist to use zlib CMakeList 2014-02-15 15:27:10 -08:00
Tycho 9ba0b6ecf2 rewrote MCADefrag CMakelist to use Setflags 2014-02-15 15:24:34 -08:00
Tycho faa6456344 Added a seperate module for Setting flags 2014-02-15 15:17:58 -08:00
Tycho 9f542ee0f8 Merge branch 'master' into boatsFix
Conflicts:
	src/Items/ItemBoat.h
2014-02-10 10:01:50 -08:00
Tycho 9015e56c60 Merge branch 'master' into runMCServer 2014-02-05 11:08:10 -08:00
Tycho aeb877f76a Modified automatic test for boundingBox 2014-02-05 11:06:57 -08:00
Tycho 670213b48d Simplified shutdown 2014-02-05 10:39:33 -08:00
Tycho de7e84b45b Revert "Added Self Test Plugin"
This reverts commit 62c18868b2.
2014-02-05 10:38:24 -08:00
Tycho f25597540d Added support to start up MCServer and then immediatly sut it down in travis 2014-02-05 10:10:45 -08:00
Tycho 62c18868b2 Added Self Test Plugin
At the moment It just shuts the server down again
2014-02-05 09:57:53 -08:00
Tycho 8ba6f73169 Fixed most of the reordering warnings 2014-02-05 09:43:49 -08:00
Tycho 1f26c9f5ab Fix gcc not having operator ++ on enums 2014-02-04 11:26:39 -08:00
Tycho bee7de25f1 Ensure -Wall is enabled 2014-02-04 11:15:41 -08:00
Tycho 8464f689ea Improved Type safety of eBlockFace
May Fix #640
2014-02-04 10:59:05 -08:00
Tycho 4b19247305 Fogot to save Biogen 2014-02-03 13:07:38 -08:00
Tycho d9fb83300c Fixed Compile errors
c++11 introduces scoped enums, so the code didn't fail in clang
2014-02-03 13:01:12 -08:00
Tycho f8881622a4 Removed unused lookups 2014-02-03 12:31:18 -08:00
Tycho 80807eec2c Increased Type safety of Biomes
Changed a number of funcictions from using integers to store biomes to using EMCSBiome
Note that switching from an int to an Enum is a non-breaking chang to the lua bindings
2014-02-03 12:26:17 -08:00
Tycho 1e4e6c4619 Merge branch 'master' into registerfix 2014-02-02 09:11:53 -08:00
Tycho 42497847ac Added missing files 2014-02-02 06:59:36 -08:00
Tycho 0b0aa5554f Merge branch 'master' into GeneratingBenchmark2
Conflicts:
	src/Blocks/BlockTorch.h
2014-02-02 06:56:07 -08:00
Tycho b82fc394dd Changed Signiture of OnUpdate 2014-02-02 06:49:37 -08:00
Tycho 6e39ed3868 Changed Signiture of OnDigging 2014-02-01 08:35:48 -08:00
Tycho cf3b4ec226 Changed Signiture of OnDestroyedByPlayer 2014-02-01 06:01:13 -08:00
Tycho 4b5bd4dedf Removed register keyword from Messinne Twister
Removed register as it is meaningless in c++ and causes a depreciated warning in clang 3.4 in c++ mode for va_copy
2014-02-01 05:14:31 -08:00
Tycho c6304b2b4f Changed pointers to references 2014-02-01 05:06:32 -08:00
Tycho fec17409d2 Merge branch 'master' into GeneratingBenchmark2
Conflicts:
	src/World.h
2014-01-31 15:31:05 -08:00
Tycho 25ec7750aa Changed signitures of Several BLockHandler Methods
Changed the signitures of the following to use interfaces:
GetPlacementBlockTypeMeta
OnPlaced
OnPlacedByPlayer
OnDestroyed
OnNeighbourChanged
NeighbourChanged
OnUse
CanBeAt
Check
2014-01-31 15:17:41 -08:00
Tycho 6952b24e88 Changed it so std was actually set to c++11 in clang not gcc on OS X 2014-01-26 07:20:24 -08:00
Tycho 6e6409b1a0 Removed cWorld Include 2014-01-26 07:10:29 -08:00
Tycho a13d009a30 Refactored GetPlacementBlockTypeMeta 2014-01-26 07:06:25 -08:00
Tycho bed2ee22e8 Merge branch 'master' into GeneratingBenchmark2
Conflicts:
	src/Blocks/BlockRail.h
	src/World.h
2014-01-26 06:28:51 -08:00
Tycho 14e48ccb4b Refactored cBlockHandler::OnUse and dependents 2014-01-26 06:20:39 -08:00
Tycho a2d3eea80b Added support for overide in c++11 supporting varients of gcc/clang 2014-01-25 15:02:31 -08:00
Tycho 15b92af166 First attempt at Implementing Interfaces 2014-01-25 11:14:14 -08:00
Tycho 03b08456b6 dded dependecy on Blocks to Generator 2014-01-25 10:23:18 -08:00
Tycho 2a18feb015 Stupid Mistake fixed 2014-01-25 10:13:54 -08:00
Tycho 2806b48afa Fixed exports 2014-01-25 06:06:30 -08:00
Tycho 977e277094 Switched cEvent to GetOSErrorString 2014-01-25 06:02:20 -08:00
Tycho 59b8205f02 Extracted cSocket::GetErrorString into GetOSErrorString 2014-01-25 05:51:03 -08:00
Tycho cb7c5a6181 Simplified .gitignore 2014-01-25 05:37:19 -08:00
Tycho 45bc1ff033 Added dependecy output to Bindings/BindingsDependencies.txt 2014-01-25 05:35:04 -08:00
Tycho b2fd91ee6b Reformatted Bindings Dependecies 2014-01-25 05:25:43 -08:00
Tycho b95e005d91 Make clean now effects Bindings 2014-01-23 11:06:42 -08:00
Tycho ce2fb844aa Removed Bindings folder subcmake on *nix 2014-01-23 11:03:49 -08:00
Tycho 27d1d5d491 Bugfixes 2014-01-23 11:00:36 -08:00
Tycho e0956be0a7 added dependecies for bindings regen 2014-01-23 10:41:08 -08:00
Tycho 7419579140 Switched cEvent to use strerror_r for error messages 2014-01-23 10:25:56 -08:00
Tycho 5ef0a00a6c Fixed spelling error 2014-01-22 10:39:09 -08:00
Tycho 571200019d Added manual bindings for moved functions 2014-01-22 10:35:36 -08:00
Tycho 1c320fa18c formatting changes 2014-01-22 10:13:41 -08:00
Tycho c832fbeb8e Merge branch 'master' into GeneratingBenchmark
Conflicts:
	src/World.h
2014-01-22 09:13:12 -08:00
Tycho ca3389231e Actually implemented interfaces 2014-01-20 10:15:19 -08:00
Tycho 4f09e8df6e Moved Schematic file methods to seperate class 2014-01-20 09:59:12 -08:00
Tycho 613f238ab6 Merge branch 'ForEachChunkProvider' into GeneratingBenchmark
Conflicts:
	src/World.h
2014-01-20 09:37:31 -08:00
Tycho 16375f6aad Merge branch 'master' into GeneratingBenchmark
this merge is necessary,
2014-01-20 09:21:47 -08:00
Tycho 9bb61e6e2e Seperated BlockArea From World
If anyone can come up with a better name for the interface I'll change it, It contians to methods which do compleatly unrelated things
2014-01-20 09:17:24 -08:00
Tycho bd4278aca1 Added Inifile and OSSupport Linking 2014-01-19 12:51:23 -08:00
Tycho 2aa28ad6f4 First attempt at Compiling Generator seperatly 2014-01-19 12:50:07 -08:00
Tycho f13a14d2cf Switched EnchantmentSerilizer to namespace 2014-01-19 08:52:45 -08:00
Tycho e14ddff1c0 Spilt Writing of Enchantments to seperate class
Created a new class cEnchantmentSerializer to serilize Enchantments to NBT.
This breaks a dependecy chain between cChunkGenerator and cWorld.
cEnchantmentSerializer is seperate from NBTWriter as it needs to access private members of cEnchantments
so having it seperate reduces the spread of the frein modifier
2014-01-19 07:38:59 -08:00
Tycho d93a4362b4 Fixed iterators bug 2014-01-18 10:57:25 -08:00
Tycho 160a27cced switched to using m_WorldAge rather than m_TickID 2014-01-18 06:15:33 -08:00
Tycho a54cbba0fd Added user setting compression factor 2014-01-17 11:01:14 -08:00
Tycho 287144839e Increased tick count to long 2014-01-17 10:23:40 -08:00
Tycho 80f2f21f4c Changed std to c++11 in clang to fix va_copy issues 2014-01-17 10:10:31 -08:00
Tycho ce030bc7c9 Implemented xsofts suggestion for a saturating counter in the scheduler 2014-01-17 10:07:33 -08:00
Tycho daf94e5f48 Documented the SchedualeTask function 2014-01-16 09:53:46 -08:00
Tycho 9a8975420e documented CROSSCOMPILING flag 2014-01-16 09:51:01 -08:00
Tycho 292ccdc09e added cWorld::ScheduleTask Function
ScheduleTask schedules a SceduledTask object to be run x ticks in the future.
In is exported to lua, fixes #150
2014-01-14 12:17:03 -08:00
Tycho 9c669e9217 Added -march=native to linux targets 2014-01-13 10:13:09 -08:00
Tycho 623146996a Fixed FreeBSD compilition 2014-01-07 05:08:58 -08:00
Tycho 0b79ad0d5d Merge branch 'master' of github.com:mc-server/MCServer 2014-01-07 04:57:34 -08:00
Tycho f0b3593028 Merge branch 'master' of github.com:mc-server/MCServer
Conflicts:
	lib/tolua++/Makefile
2014-01-04 04:03:41 -08:00
Tycho d26c0e3815 Fixed Documentation 2014-01-03 09:42:35 -08:00
Tycho 13bbb3d99d derp 2014-01-03 08:56:20 -08:00
Tycho 14ec68d8d3 actual fix 2014-01-03 08:49:14 -08:00
Tycho 0e8bb3bf41 fixed failure to return a value from Remove 2014-01-03 08:34:41 -08:00
Tycho 83c7ba2bae removed tolua++ makefile which is overwritten by cmake 2014-01-03 08:10:57 -08:00