Commit Graph
100 Commits
Author SHA1 Message Date
Tycho bfe1960191 Converted Monster to std::chrono 2015-01-16 14:38:21 +00:00
Tycho 05c40db060 Converted cPickupEntity to std::chrono 2015-01-16 13:56:18 +00:00
Tycho 8dc9cf0c76 Converted MinecartEntity to std::chrono 2015-01-16 13:42:44 +00:00
Tycho 7562a381c0 Converted cExpOrbEntity to std::chrono 2015-01-16 13:27:10 +00:00
Tycho d6f042da4a Converted ArrowEntityTiers to std::chrono 2015-01-16 13:13:23 +00:00
Tycho acc2dcbbc3 Fix trailing whitespace 2015-01-11 21:53:20 +00:00
Tycho 2a9664d6ca Initial convertion of a_Dt to std::chrono
also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
2015-01-11 21:12:26 +00:00
Tycho 4f75b94c99 Created new type cTickTime and rewrote cWorld::TickThread to use it 2015-01-11 01:54:18 +00:00
Tycho 7542255d5c Clang needs the libstdc++ that comes with gcc-4.8 2014-12-13 22:12:53 +00:00
Tycho aef36a5c19 final syntax errors 2014-12-13 21:33:16 +00:00
Tycho 946adeac3b Double equals 2014-12-13 21:26:38 +00:00
Tycho 0e1ef05ea8 Fix forgoten thens 2014-12-13 21:22:15 +00:00
Tycho 3d9c88affa "Don't set compiler to gcc on clang builds" 2014-12-13 20:58:28 +00:00
Tycho f6979642e6 Use factory method to construct redstone simulator data 2014-09-28 15:36:00 +01:00
Tycho 0e141923bb Merge branch 'master' of https://github.com/mc-server/MCServer 2014-09-26 18:14:22 +01:00
Tycho a3f940f47c Removed more unessicary includes 2014-09-26 18:13:19 +01:00
Tycho 6ffb7835e7 Removed a few unnessicary includes 2014-09-26 16:26:03 +01:00
Tycho b2f5ab9678 Merge branch 'master' into redstoneTests
Conflicts:
	src/Simulator/IncrementalRedstoneSimulator.cpp
2014-09-25 17:58:12 +01:00
Tycho 799c96661d Fixed style 2014-09-25 15:45:39 +01:00
Tycho 9c459cbe50 Merge branch 'master' into redstoneTests
Conflicts:
	src/Mobs/Monster.h
2014-09-25 15:22:08 +01:00
Tycho 73dfe1fe81 Fix accedental c++11 2014-09-17 18:59:45 +01:00
Tycho 045d54e0e2 Merge branch 'master' into redstoneTests
Conflicts:
	src/Blocks/ChunkInterface.h
2014-09-17 18:47:33 +01:00
Tycho 6e7c0e33b5 Added first test to show the object can be created 2014-09-17 18:40:10 +01:00
Tycho 26a4845a99 IncrementalRedstoneSimulator now has no dependencies on cChunk 2014-09-16 20:29:31 +01:00
Tycho b87585977f Don't include IncrementalRedsonteSimulator.inc when in SELF_TEST mode 2014-09-11 17:57:34 +01:00
Tycho 0b044e1c83 Possibly decoupled IncrementalRedstoneSimulator from the rest of the server
THis wil hopefully allow for unit testing
2014-09-11 17:48:21 +01:00
Tycho c8b41e9b2b Merge branch 'master' of https://github.com/mc-server/MCServer 2014-09-10 19:50:31 +01:00
Tycho cf69ddcce1 Cleaned up flags 2014-09-10 19:49:52 +01:00
Tycho 4f67ca4c0a Added MCServer_ prfix to env vars for versions 2014-09-10 18:08:50 +01:00
Tycho c043f68024 Added example for how to use version info to travis 2014-09-10 16:31:23 +01:00
Tycho 27be179939 Added abilty to set build info
build info is displayed at startup
Fixes #1410
2014-09-10 16:07:00 +01:00
Tycho fb20c2eb85 FIxed a couple more warnings 2014-09-08 19:15:29 +01:00
Tycho 2c945c8818 TimeOfDay does not need to be an Int64 2014-09-08 19:07:45 +01:00
Tycho 4bdf9256f2 Fixed a few compile warnings 2014-09-08 18:56:27 +01:00
Tycho 562b2d1d1d Added workaround for clang version 2014-09-06 16:30:04 +01:00
Tycho 5fa206a420 bumped cmake version min and fixed clang support 2014-09-06 15:30:13 +01:00
Tycho f4d268636a Fixed comments 2014-08-13 13:37:07 +01:00
Tycho fecd607d74 Added missing header 2014-08-13 13:15:29 +01:00
Tycho 781e1e6264 Fixed Integer pasing warnings in CraftingRecipies.cpp 2014-08-13 13:03:56 +01:00
Tycho c3c3d3a72d Fixed type issues in CraftingRecipe.cpp 2014-08-13 12:14:55 +01:00
Tycho 8f7b9acb48 Fixed forgotten error checking 2014-08-13 12:10:21 +01:00
Tycho 2321d2af41 Fixed shadowing variable 2014-08-13 12:01:13 +01:00
Tycho 60ea4bb937 Removed unused method 2014-08-13 11:56:47 +01:00
Tycho 01c50eb53a Fix messing rename 2014-08-12 17:32:08 +01:00
Tycho 9844368267 Renamed Loggers 2014-08-12 16:05:04 +01:00
Tycho df96f437a3 Fixed circular dependecy luaState_Call.inc 2014-08-10 22:15:52 +01:00
Tycho 5623a045f5 Fixed potential null dereference
Fixes CID 70466
2014-08-10 22:06:56 +01:00
Tycho 07103ed9d7 Spaces 2014-08-10 21:26:28 +01:00
Tycho 63a07b7ffc Fixed potential crash in Player.cpp
Fixes CID 71780
If ShouldBroadcastDeathMessages is false the pointer would fall through to a check agaist it being a player
2014-08-10 20:47:16 +01:00
Tycho be780b380e Fixed Tools to work with new logging framework 2014-08-10 20:10:47 +01:00
Tycho bf0050e066 Added forgoten files 2014-08-10 19:44:49 +01:00
Tycho 806d0936dc First Implementatation of new Loggin framework 2014-08-10 19:34:11 +01:00
Tycho 6acddd0cad Fixed style issues 2014-08-06 13:19:22 +01:00
Tycho a0ba7426c6 Fixed multiple inhertance being output by tolua 2014-08-06 13:17:05 +01:00
Tycho 9272bd627c Removed dependecy of redstone simulator on NoteBlock 2014-08-05 22:54:36 +01:00
Tycho 06942871dd Refactored Redstone simulator not to depend on TNTEntity or DropSpenserENtity Directly 2014-08-05 21:48:23 +01:00
Tycho 57f4e871bb Fixed FindClosestPlayer 2014-07-15 12:52:02 +01:00
Tycho 01a31a1872 Added super typedef 2014-07-15 12:27:36 +01:00
Tycho 0e5fa2662a COnverted Lilypad back to mixin 2014-07-15 00:01:16 +01:00
Tycho 8fd636aa72 Revert "Converted some blockhandlers to use cClearMetaOnDrop"
This reverts commit 333f4f982c.
2014-07-14 23:59:24 +01:00
Tycho 2cd3443fbb Added documentation 2014-07-14 21:21:17 +01:00
Tycho 333f4f982c Converted some blockhandlers to use cClearMetaOnDrop 2014-07-14 20:50:56 +01:00
Tycho 093b5c6456 Simplified ClearMetaOnDrop 2014-07-14 20:33:30 +01:00
Tycho 515c3cbc67 Added cClearOnDrop Mixin to cPumpkin 2014-07-14 20:28:16 +01:00
Tycho 1929d16724 Added first implementation of cClearMetaOnDrop 2014-07-14 20:26:36 +01:00
Tycho 6892b448db Merge branch 'master' into ChestFix 2014-07-13 16:03:29 +01:00
Tycho 2a0c041ad8 Adjusted calls to CreateProjectile that passed Items 2014-07-13 15:25:52 +01:00
Tycho 74cd730589 FIxed second weird enum 2014-06-16 18:06:09 +01:00
Tycho 6fa99a211e Refactored reversing logic into seperate function 2014-06-16 17:55:58 +01:00
Tycho 3a7c0c8ce9 Fixed tigers weird enums 2014-06-16 15:29:49 +01:00
Tycho d5c84b5fe6 Merge branch 'master' into redstonerefactor
Conflicts:
	src/Simulator/IncrementalRedstoneSimulator.cpp
2014-06-16 15:22:02 +01:00
Tycho 6ee562caf3 Merge branch 'master' of github.com:mc-server/MCServer 2014-06-16 15:13:10 +01:00
Tycho ee50790398 Merge branch 'master' of github.com:mc-server/MCServer 2014-06-16 15:12:50 +01:00
Tycho aa3537112d Moved repeater handling to seperate pass 2014-06-16 15:07:41 +01:00
Tycho 84c83e0deb Fix a few warnings 2014-06-16 15:03:07 +01:00
Tycho 1e57161ecc Added override 2014-06-16 14:12:10 +01:00
Tycho 8a2aa6cb16 Changed names of callbacks 2014-06-14 20:24:52 +01:00
Tycho 6ddcf42409 Removed spaces 2014-06-14 20:10:49 +01:00
Tycho 41e5a64ff8 Documented starvation callbacks 2014-06-14 20:07:17 +01:00
Tycho 2643a46c69 Documented cAllocationPool 2014-06-14 20:04:35 +01:00
Tycho f97116141f Reformated ChunkMap.h 2014-06-14 19:56:01 +01:00
Tycho 3efbdb1c9b Moved m_Sections 2014-06-14 19:54:09 +01:00
Tycho 94c48febd2 Added generic Allocation Pool Interface 2014-06-14 19:46:34 +01:00
Tycho a1520c7a40 reverted accedental android changes 2014-06-14 19:08:14 +01:00
Tycho 6b99e55646 fixed spaces 2014-06-14 19:05:02 +01:00
Tycho 0310a50192 fixed spaces 2014-06-14 18:43:36 +01:00
Tycho a2df68b80b fixed compile 2014-06-14 18:19:34 +01:00
Tycho f6af584efa fixed const issue 2014-06-14 18:11:43 +01:00
Tycho bff76f201f Fill with buffer on startup 2014-06-14 17:59:47 +01:00
Tycho 8bf37f3dd7 Fixed comments 2014-06-14 17:57:21 +01:00
Tycho 061102c778 Added logging 2014-06-14 17:23:57 +01:00
Tycho 039c1a75f3 merge master 2014-06-14 17:19:28 +01:00
Tycho c82f4f6309 Fixed order of initalisation 2014-06-12 18:56:48 +01:00
Tycho 93d4a8aa92 Removed unnessicary indirection from Entity iterator list 2014-06-12 18:51:33 +01:00
Tycho cbb9e15257 Fix bugs in test 2014-05-30 17:13:36 +01:00
Tycho f26ddac619 removed NULL assignment to const value 2014-05-30 14:50:30 +01:00
Tycho d854d3af1c removed unneded addressof 2014-05-30 14:43:33 +01:00
Tycho 19df18c461 Fixed test globals to work with precompiled headers 2014-05-27 12:46:22 +01:00
Tycho 2a7d199df6 Fixed bad merge 2014-05-25 18:26:10 +01:00
Tycho 8133efd7f9 Merge branch 'chunksparsing/structs' into AllocationPool
Conflicts:
	src/ChunkData.cpp
	src/ChunkData.h
	tests/ChunkData/Coordinates.cpp
2014-05-25 18:02:33 +01:00