summaryrefslogtreecommitdiffstats
path: root/src/ChunkMap.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into portalsTiger Wang2014-07-181-31/+69
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp
| * Fixed spaces before commas.madmaxoft2014-07-181-2/+2
| |
| * Merge branch 'master' of https://github.com/mc-server/MCServermadmaxoft2014-07-171-1/+3
| |\
| | * Fixed crash with entities in unloaded chunksTiger Wang2014-07-171-1/+3
| | | | | | | | | | | | * Fixes #1190
| * | Fixed spaces around single-line comments.madmaxoft2014-07-171-11/+12
| | | | | | | | | | | | There should be at least two spaces in front and one space after //-style comments.
| * | Fixed basic whitespace problems.madmaxoft2014-07-171-3/+3
| |/ | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
| * Merge pull request #1183 from Howaner/SoundsTiger Wang2014-07-171-2/+2
| |\ | | | | | | Reset meta to zero when the blocks explode
| | * Derp.Howaner2014-07-151-2/+2
| | |
| | * Reset meta to zero when the block explode.Howaner2014-07-141-4/+4
| | |
| * | Merge pull request #1172 from mc-server/coverity_fixesMattes D2014-07-131-1/+1
| |\ \ | | | | | | | | Coverity fixes
| | * | Added parenthasiesworktycho2014-07-131-1/+1
| | | |
| | * | Add Null check to SendBlockToworktycho2014-06-261-1/+1
| | | | | | | | | | | | Fixes CID 43611
| * | | Fixed MSVC warnings in SoundEffect functions.madmaxoft2014-07-131-1/+1
| | |/ | |/|
| * | Merge branch 'master' into SoundsHowaner2014-07-131-2/+2
| |\ \
| | * | Fixed wrong types. (BLOCKTYPE -> NIBBLETYPE)Howaner2014-07-131-2/+2
| | | |
| * | | Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-131-3/+3
| |/ /
| * | Merge pull request #1154 from mc-server/trappedchestsTiger Wang2014-07-131-1/+20
| |\ \ | | | | | | | | Implemented trapped chests & others
| | * | Implemented trapped chests & othersTiger Wang2014-07-071-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes
| * | | Implemented support for forced chunk ticking.madmaxoft2014-07-101-2/+18
| |/ / | | | | | | | | | Fixes #1160.
| * / Added generic entity-collecting.Mattes D2014-06-271-3/+3
| |/ | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098.
* | Merge branch 'master' into portalsTiger Wang2014-06-211-4/+16
|\| | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * Merge branch 'master' of github.com:mc-server/MCServerTycho2014-06-161-4/+16
| |
* | Portals animate and delay correctlyTiger Wang2014-06-121-0/+1
|/
* Fixed a race condition when adding a player to a world.madmaxoft2014-06-101-0/+24
|
* Merge remote-tracking branch 'origin/pistonfixes'Tiger Wang2014-06-021-2/+2
|\ | | | | | | | | Conflicts: src/Chunk.cpp
| * Hopefully fixed piston duplication issuesTiger Wang2014-05-251-2/+2
| | | | | | | | | | * Fixes #879 * Fixes #714
* | Merge branch 'master' into chunksparsing/structsTycho2014-05-101-2/+0
|\| | | | | | | | | Conflicts: src/Chunk.h
| * Merge branch 'master' into redstoneimprovementsTiger Wang2014-05-041-1/+4
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/FallingBlock.cpp src/Mobs/AggressiveMonster.cpp src/Simulator/IncrementalRedstoneSimulator.cpp
| * | Redstone simulator now directly accesses cChunkTiger Wang2014-04-271-2/+0
| | | | | | | | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes
* | | Merge branch 'master' into chunksparsing/structsTycho2014-05-011-5/+6
|\ \ \ | | |/ | |/|
| * | Fixed player spawning #953.madmaxoft2014-04-271-1/+4
| |/
| * Removed unused assignments.archshift2014-04-261-4/+2
| |
* | Merge branch 'master' into chunksparsing/structsTycho2014-04-271-29/+37
|\| | | | | | | | | | | Conflicts: src/Chunk.cpp src/Chunk.h
| * Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-181-20/+20
| |
| * Fixed chunkstays not being removed on auto-delete.madmaxoft2014-04-121-9/+17
| | | | | | | | Fixes #837.
* | Implemented Chunk Sparsing with segmentsTycho2014-04-261-10/+6
|/
* ENUMified shrapnel levelTiger Wang2014-03-201-2/+2
|
* Merge branch 'master' into awesometntTiger Wang2014-03-181-55/+59
|\ | | | | | | | | Conflicts: src/ChunkMap.cpp
| * Fixed chunkmap tree block replacing.madmaxoft2014-03-181-8/+2
| |
| * Fixed double to float conversions.madmaxoft2014-03-161-45/+46
| |
| * Add new leaves to all classes.Howaner2014-03-161-0/+7
| |
* | Added levels of shrapnelTiger Wang2014-03-181-3/+7
| |
* | Merge branch 'master' into awesometntTiger Wang2014-03-101-2/+20
|\|
| * Add Lua Bindings for FlowerPotEntity.h and add documentation.Howaner2014-03-071-2/+2
| |
| * Add Flower PotsHowaner2014-03-071-0/+18
| |
* | Shrapnel now configurableTiger Wang2014-03-101-1/+1
| |
* | Added extra awesomeness to TNTTiger Wang2014-03-051-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().madmaxoft2014-02-241-0/+4
| | | | The Y coords weren't checked.
* Merge pull request #697 from Howaner/SkullMattes D2014-02-191-0/+18
|\ | | | | Add Skulls/Heads to MCServer
| * Rename SkullEntity to MobHeadEntityHowaner2014-02-191-2/+2
| |
| * Add Heads completelyHowaner2014-02-181-0/+18
| |
* | Added cWorld:SetAreaBiome() API function.madmaxoft2014-02-181-2/+59
|/ | | | Fixes #675.
* Rewritten Lua ChunkStay API into a single function, cWorld:ChunkStay().madmaxoft2014-02-101-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 ChunkStaymadmaxoft2014-02-091-1/+1
|\
| * Merge branch 'master' into playerimprovementsTiger Wang2014-02-091-1/+1
| |\ | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua
| * | Fixed explosions bugTiger Wang2014-02-051-1/+1
| | | | | | | | | | | | * Fixed bug where explosions would sometimes never be sent
| * | Fixed a bunch of MSVS warningsTiger Wang2014-02-051-1/+1
| | | | | | | | | | | | | | | * Possibly also fixed some bugs with pathfinding and TNT, though unlikely
* | | Initial ChunkStay code.madmaxoft2014-02-081-113/+72
| |/ |/|
* | Greatly improved TNT propulsion chancesTiger Wang2014-02-031-1/+1
|/
* Merge pull request #623 from mc-server/tntMattes D2014-02-031-36/+121
|\ | | | | TNT improvements
| * Inversed conditionTiger Wang2014-02-031-25/+28
| |
| * Uncommented pickup spawner codeTiger Wang2014-02-021-3/+7
| |
| * TNT improvementsTiger Wang2014-02-021-37/+115
| | | | | | | | | | | | + Added entity damage + Added entity propulsion * Fixed #67 and fixed #230
* | Changed pointers to referencesTycho2014-02-011-3/+3
| |
* | Changed signitures of Several BLockHandler MethodsTycho2014-02-011-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check
* | Refactored cBlockHandler::OnUse and dependentsTycho2014-01-261-2/+57
|/
* Basic command block implementationandrew2014-01-181-0/+17
|
* More MSVC warning fixes.madmaxoft2014-01-071-1/+1
|
* Fixed compiler warning.STRWarrior2013-12-221-1/+1
|
* Implented BroadcastParticleEffectSTRWarrior2013-12-221-0/+19
|
* Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).madmaxoft2013-12-201-12/+12
|
* This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions.STRWarrior2013-12-151-0/+33
|
* Implemented note block playing and fixed wireTiger Wang2013-12-141-0/+17
| | | | Game of Thrones music in Minecraft, here I come!
* Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeaturesTiger Wang2013-12-081-1/+1
|\ | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp
| * Moved bindings-related to a Bindings subfolder.madmaxoft2013-12-081-1/+1
| | | | | | | | Ref.: #407
* | Renamed animation functionTiger Wang2013-12-071-3/+3
| | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know.
* | Fixed duplication glitch with QueueSetBlockTiger Wang2013-12-061-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.madmaxoft2013-11-301-1/+18
|
* Fixed a bug with TNT waking simulatorsTiger Wang2013-11-281-2/+2
|
* Improved TNT pickup randomisationTiger Wang2013-11-281-1/+1
|
* Made TNT pickups spawning chance 25%Tiger Wang2013-11-271-2/+2
|
* Fixed VC2008 compilation, normalized include paths.madmaxoft2013-11-271-1/+1
|
* Fixed the remaining derpsAlexander Harkness2013-11-271-2/+2
|
* Attempt to fix compilationTiger Wang2013-11-241-2/+2
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-0/+33
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-241-0/+2668
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 04:47:21 +0100