Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 1 | -4/+16 |
|\ | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| * | Merge branch 'master' of github.com:mc-server/MCServer | Tycho | 2014-06-16 | 1 | -4/+16 |
| | | |||||
* | | Portals animate and delay correctly | Tiger Wang | 2014-06-12 | 1 | -0/+1 |
|/ | |||||
* | Fixed a race condition when adding a player to a world. | madmaxoft | 2014-06-10 | 1 | -0/+24 |
| | |||||
* | Merge remote-tracking branch 'origin/pistonfixes' | Tiger Wang | 2014-06-02 | 1 | -2/+2 |
|\ | | | | | | | | | Conflicts: src/Chunk.cpp | ||||
| * | Hopefully fixed piston duplication issues | Tiger Wang | 2014-05-25 | 1 | -2/+2 |
| | | | | | | | | | | * Fixes #879 * Fixes #714 | ||||
* | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-10 | 1 | -2/+0 |
|\| | | | | | | | | | Conflicts: src/Chunk.h | ||||
| * | Merge branch 'master' into redstoneimprovements | Tiger Wang | 2014-05-04 | 1 | -1/+4 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/FallingBlock.cpp src/Mobs/AggressiveMonster.cpp src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | | Redstone simulator now directly accesses cChunk | Tiger Wang | 2014-04-27 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes | ||||
* | | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-01 | 1 | -5/+6 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fixed player spawning #953. | madmaxoft | 2014-04-27 | 1 | -1/+4 |
| |/ | |||||
| * | Removed unused assignments. | archshift | 2014-04-26 | 1 | -4/+2 |
| | | |||||
* | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-04-27 | 1 | -29/+37 |
|\| | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Chunk.h | ||||
| * | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 1 | -20/+20 |
| | | |||||
| * | Fixed chunkstays not being removed on auto-delete. | madmaxoft | 2014-04-12 | 1 | -9/+17 |
| | | | | | | | | Fixes #837. | ||||
* | | Implemented Chunk Sparsing with segments | Tycho | 2014-04-26 | 1 | -10/+6 |
|/ | |||||
* | ENUMified shrapnel level | Tiger Wang | 2014-03-20 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-18 | 1 | -55/+59 |
|\ | | | | | | | | | Conflicts: src/ChunkMap.cpp | ||||
| * | Fixed chunkmap tree block replacing. | madmaxoft | 2014-03-18 | 1 | -8/+2 |
| | | |||||
| * | Fixed double to float conversions. | madmaxoft | 2014-03-16 | 1 | -45/+46 |
| | | |||||
| * | Add new leaves to all classes. | Howaner | 2014-03-16 | 1 | -0/+7 |
| | | |||||
* | | Added levels of shrapnel | Tiger Wang | 2014-03-18 | 1 | -3/+7 |
| | | |||||
* | | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-10 | 1 | -2/+20 |
|\| | |||||
| * | Add Lua Bindings for FlowerPotEntity.h and add documentation. | Howaner | 2014-03-07 | 1 | -2/+2 |
| | | |||||
| * | Add Flower Pots | Howaner | 2014-03-07 | 1 | -0/+18 |
| | | |||||
* | | Shrapnel now configurable | Tiger Wang | 2014-03-10 | 1 | -1/+1 |
| | | |||||
* | | Added extra awesomeness to TNT | Tiger Wang | 2014-03-05 | 1 | -11/+20 |
|/ | | | | | | | + TNT now has a chance of flinging FallingBlock entities around * Improved TNT damage * Improved TNT spawning visuals * Possible fix for 'SetSwimState failure' messages in debug | ||||
* | Fixed a possible crash in cWorld::WakeUpSimulatorsInArea(). | madmaxoft | 2014-02-24 | 1 | -0/+4 |
| | | | | The Y coords weren't checked. | ||||
* | Merge pull request #697 from Howaner/Skull | Mattes D | 2014-02-19 | 1 | -0/+18 |
|\ | | | | | Add Skulls/Heads to MCServer | ||||
| * | Rename SkullEntity to MobHeadEntity | Howaner | 2014-02-19 | 1 | -2/+2 |
| | | |||||
| * | Add Heads completely | Howaner | 2014-02-18 | 1 | -0/+18 |
| | | |||||
* | | Added cWorld:SetAreaBiome() API function. | madmaxoft | 2014-02-18 | 1 | -2/+59 |
|/ | | | | Fixes #675. | ||||
* | Rewritten Lua ChunkStay API into a single function, cWorld:ChunkStay(). | madmaxoft | 2014-02-10 | 1 | -2/+11 |
| | | | | This fixes problems with indeterminate class object lifespan (Lua-GC) and forgetting to disable it or keep it until ready. | ||||
* | Merge remote-tracking branch 'origin/master' into ChunkStay | madmaxoft | 2014-02-09 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'master' into playerimprovements | Tiger Wang | 2014-02-09 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| * | | Fixed explosions bug | Tiger Wang | 2014-02-05 | 1 | -1/+1 |
| | | | | | | | | | | | | * Fixed bug where explosions would sometimes never be sent | ||||
| * | | Fixed a bunch of MSVS warnings | Tiger Wang | 2014-02-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | * Possibly also fixed some bugs with pathfinding and TNT, though unlikely | ||||
* | | | Initial ChunkStay code. | madmaxoft | 2014-02-08 | 1 | -113/+72 |
| |/ |/| | |||||
* | | Greatly improved TNT propulsion chances | Tiger Wang | 2014-02-03 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #623 from mc-server/tnt | Mattes D | 2014-02-03 | 1 | -36/+121 |
|\ | | | | | TNT improvements | ||||
| * | Inversed condition | Tiger Wang | 2014-02-03 | 1 | -25/+28 |
| | | |||||
| * | Uncommented pickup spawner code | Tiger Wang | 2014-02-02 | 1 | -3/+7 |
| | | |||||
| * | TNT improvements | Tiger Wang | 2014-02-02 | 1 | -37/+115 |
| | | | | | | | | | | | | + Added entity damage + Added entity propulsion * Fixed #67 and fixed #230 | ||||
* | | Changed pointers to references | Tycho | 2014-02-01 | 1 | -3/+3 |
| | | |||||
* | | Changed signitures of Several BLockHandler Methods | Tycho | 2014-02-01 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check | ||||
* | | Refactored cBlockHandler::OnUse and dependents | Tycho | 2014-01-26 | 1 | -2/+57 |
|/ | |||||
* | Basic command block implementation | andrew | 2014-01-18 | 1 | -0/+17 |
| | |||||
* | More MSVC warning fixes. | madmaxoft | 2014-01-07 | 1 | -1/+1 |
| | |||||
* | Fixed compiler warning. | STRWarrior | 2013-12-22 | 1 | -1/+1 |
| | |||||
* | Implented BroadcastParticleEffect | STRWarrior | 2013-12-22 | 1 | -0/+19 |
| | |||||
* | Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). | madmaxoft | 2013-12-20 | 1 | -12/+12 |
| | |||||
* | This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions. | STRWarrior | 2013-12-15 | 1 | -0/+33 |
| | |||||
* | Implemented note block playing and fixed wire | Tiger Wang | 2013-12-14 | 1 | -0/+17 |
| | | | | Game of Thrones music in Minecraft, here I come! | ||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures | Tiger Wang | 2013-12-08 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp | ||||
| * | Moved bindings-related to a Bindings subfolder. | madmaxoft | 2013-12-08 | 1 | -1/+1 |
| | | | | | | | | Ref.: #407 | ||||
* | | Renamed animation function | Tiger Wang | 2013-12-07 | 1 | -3/+3 |
| | | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know. | ||||
* | | Fixed duplication glitch with QueueSetBlock | Tiger Wang | 2013-12-06 | 1 | -2/+2 |
|/ | | | | | | | If a coordinate was queued, and then the block there was broken, it would reappear: double items! Also now just sets meta if previous and current blocktypes matched. | ||||
* | Changed cBlockHandler->OnUpdate() to use cChunk directly. | madmaxoft | 2013-11-30 | 1 | -1/+18 |
| | |||||
* | Fixed a bug with TNT waking simulators | Tiger Wang | 2013-11-28 | 1 | -2/+2 |
| | |||||
* | Improved TNT pickup randomisation | Tiger Wang | 2013-11-28 | 1 | -1/+1 |
| | |||||
* | Made TNT pickups spawning chance 25% | Tiger Wang | 2013-11-27 | 1 | -2/+2 |
| | |||||
* | Fixed VC2008 compilation, normalized include paths. | madmaxoft | 2013-11-27 | 1 | -1/+1 |
| | |||||
* | Fixed the remaining derps | Alexander Harkness | 2013-11-27 | 1 | -2/+2 |
| | |||||
* | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 1 | -2/+2 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 1 | -0/+33 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+2668 |