Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 1 | -46/+47 |
|\ | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp | ||||
| * | Style: Normalized to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 1 | -43/+43 |
| | | |||||
| * | Style: Normalized spaces after if, for and while. | madmaxoft | 2014-07-21 | 1 | -2/+3 |
| | | |||||
| * | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 1 | -3/+3 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-07-21 | 1 | -3/+3 |
| | | |||||
* | | Bug and crash fixes | Tiger Wang | 2014-07-20 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | * Fixes end portals' solidity * Fixed crashes to do with multithreading and removing an entity from the wrong world * Fixed crashes due to bad merge * Fixed crashes due to an object being deleted twice * Simplified cWorld::Start() and added comments to configuration files | ||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -94/+125 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -2/+2 |
| | | | | | | | | | | This was mostly done automatically and then visually inspected for obvious errors. All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign. | ||||
| * | Fixed spaces around single-line comments. | madmaxoft | 2014-07-17 | 1 | -11/+11 |
| | | | | | | | | There should be at least two spaces in front and one space after //-style comments. | ||||
| * | Fixed basic whitespace problems. | madmaxoft | 2014-07-17 | 1 | -14/+14 |
| | | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines. | ||||
| * | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 1 | -2/+2 |
| | | |||||
| * | Merge pull request #1154 from mc-server/trappedchests | Tiger Wang | 2014-07-13 | 1 | -3/+5 |
| |\ | | | | | | | Implemented trapped chests & others | ||||
| | * | Suggestions and bug fix | Tiger Wang | 2014-07-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | * Fixed hoppers pushing/pulling to/from (trapped)chests that do not form a double-chest with the chest type directly connected to said hopper; thank you, @madmaxoft | ||||
| | * | Implemented trapped chests & others | Tiger Wang | 2014-07-07 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes | ||||
| * | | Fixed style consistency. | madmaxoft | 2014-07-10 | 1 | -59/+62 |
| | | | |||||
| * | | Implemented support for forced chunk ticking. | madmaxoft | 2014-07-10 | 1 | -2/+28 |
| |/ | | | | | | | Fixes #1160. | ||||
| * | Added generic entity-collecting. | Mattes D | 2014-06-27 | 1 | -2/+2 |
| | | | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098. | ||||
* | | Merge branch 'master' of https://github.com/mc-server/MCServer into portals | Tiger Wang | 2014-06-24 | 1 | -0/+6 |
|\| | |||||
| * | Added asserts for cChunk::GetBlockEntity() coords. | Mattes D | 2014-06-24 | 1 | -0/+6 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 1 | -2/+7 |
|\| | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| * | Nullify deleted pointers. | archshift | 2014-06-19 | 1 | -0/+4 |
| | | |||||
| * | Merge branch 'master' of github.com:mc-server/MCServer | Tycho | 2014-06-16 | 1 | -1/+3 |
| | | |||||
* | | Fixed invalid iterators | Tiger Wang | 2014-06-21 | 1 | -23/+10 |
| | | |||||
* | | Fixed order of initalisation | Tycho | 2014-06-12 | 1 | -2/+2 |
| | | |||||
* | | Removed unnessicary indirection from Entity iterator list | Tycho | 2014-06-12 | 1 | -5/+5 |
| | | |||||
* | | Portals animate and delay correctly | Tiger Wang | 2014-06-12 | 1 | -41/+33 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp | ||||
| * | Redstone fixes and improvements [SEE DESC] | Tiger Wang | 2014-06-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Haha, see desc. * Improved redstone speed through a marking dirty system. Only a select few devices are still continuously simulated * Fixed redstone crashing with recent piston changes | ||||
* | | Portal improvements and suggestions | Tiger Wang | 2014-06-10 | 1 | -1/+14 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-06-05 | 1 | -2/+5 |
| | | |||||
* | | Removed use of auto | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-04 | 1 | -163/+52 |
|\| | |||||
| * | Merge remote-tracking branch 'origin/pistonfixes' | Tiger Wang | 2014-06-02 | 1 | -14/+16 |
| |\ | | | | | | | | | | | | | Conflicts: src/Chunk.cpp | ||||
| | * | Suggestions two | Tiger Wang | 2014-06-01 | 1 | -7/+9 |
| | | | |||||
| | * | More comments! | Tiger Wang | 2014-05-29 | 1 | -5/+4 |
| | | | |||||
| | * | Hopefully fixed piston duplication issues | Tiger Wang | 2014-05-25 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | * Fixes #879 * Fixes #714 | ||||
| * | | Added comments, reformatted code. | madmaxoft | 2014-05-29 | 1 | -3/+3 |
| | | | |||||
| * | | Implemented style changes | Tycho | 2014-05-24 | 1 | -2/+2 |
| | | | |||||
| * | | Fixed stylistic issues | Tycho | 2014-05-21 | 1 | -2/+2 |
| | | | |||||
| * | | Renamed cChunkBuffer to cChunkData | Tycho | 2014-05-21 | 1 | -19/+19 |
| | | | |||||
| * | | Fixed minor style issues | Tycho | 2014-05-21 | 1 | -4/+4 |
| | | | |||||
| * | | Fixed bug in setting metas | Tycho | 2014-05-10 | 1 | -18/+0 |
| | | | |||||
| * | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-10 | 1 | -1/+19 |
| |\| | | | | | | | | | | | | | Conflicts: src/Chunk.h | ||||
| * | | Fixed bad merge | Tycho | 2014-04-27 | 1 | -13/+9 |
| | | | |||||
| * | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-04-27 | 1 | -14/+19 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Chunk.h | ||||
| * | | | Implemented Chunk Sparsing with segments | Tycho | 2014-04-26 | 1 | -153/+33 |
| | | | | |||||
* | | | | Implemented end and nether portals | Tiger Wang | 2014-05-31 | 1 | -36/+38 |
| | | | | |||||
* | | | | Cauldrons fill | Tiger Wang | 2014-05-29 | 1 | -1/+0 |
| |_|/ |/| | | |||||
* | | | Merge branch 'master' into redstoneimprovements | Tiger Wang | 2014-05-04 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/FallingBlock.cpp src/Mobs/AggressiveMonster.cpp src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | | | Fixed a buffer overflow in cChunk:SetLight(). | madmaxoft | 2014-05-02 | 1 | -2/+2 |
| | |/ | |/| | | | | | | | There are only half as many bytes for light than there are blocktypes. | ||||
* / | | Redstone simulator now directly accesses cChunk | Tiger Wang | 2014-04-27 | 1 | -1/+19 |
|/ / | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes | ||||
* | | Merge pull request #863 from mc-server/chunkysparsing | Mattes D | 2014-04-26 | 1 | -33/+97 |
|\ \ | | | | | | | Chunky sparsing | ||||
| * | | Implemented comments | Tiger Wang | 2014-04-25 | 1 | -6/+6 |
| | | | |||||
| * | | Fixed indent | Tiger Wang | 2014-04-24 | 1 | -1/+1 |
| | | | |||||
| * | | Another small speed improvement? | Tiger Wang | 2014-04-24 | 1 | -12/+2 |
| | | | |||||
| * | | Implemented suggestions | Tiger Wang | 2014-04-24 | 1 | -22/+6 |
| |/ | |||||
| * | Replaced all the .data() calls so the code compiles in VS2008 | Tycho | 2014-04-10 | 1 | -5/+5 |
| | | |||||
| * | Maybe speed improvements? | Tiger Wang | 2014-04-07 | 1 | -47/+28 |
| | | | | | | | | | | * Use a single index to determine from when to begin copying data * Use heightmap to determine first nonair block | ||||
| * | Attempt to fix errors | Tiger Wang | 2014-04-07 | 1 | -2/+2 |
| | | |||||
| * | Blocklight and skylight now compressed | Tiger Wang | 2014-04-07 | 1 | -24/+82 |
| | | |||||
| * | Nibbletypes are compressed | Tiger Wang | 2014-04-05 | 1 | -15/+34 |
| | | | | | | | | | | + Added nibble compression * Fixed an off by one | ||||
| * | Speed and memory improvements | Tiger Wang | 2014-04-04 | 1 | -61/+14 |
| | | | | | | | | * Changed array to be continuous, so no more layer splitting | ||||
| * | Merge remote-tracking branch 'origin/master' into chunkysparsing | Tiger Wang | 2014-04-03 | 1 | -1/+12 |
| |\ | |||||
| * | | Fixed some bugs | Tiger Wang | 2014-04-03 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | * Fixed undefined behaviour * Fixed compression failure | ||||
| * | | Performance improvements and chunk flipping fixed | Tiger Wang | 2014-04-02 | 1 | -30/+32 |
| | | | |||||
| * | | Sort of implementation of chunk sparsing | Tiger Wang | 2014-03-23 | 1 | -17/+92 |
| | | | | | | | | | | | | | | | | | | | | | Issues: * Chunks are flipped * Slow/inefficient/badly coded * Only blocktypes are 'compressed' | ||||
* | | | Merge pull request #909 from jfhumann/fixes | Mattes D | 2014-04-22 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | Bug fixes and optimizations. We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp | ||||
| * | | | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 1 | -2/+2 |
| | | | | |||||
* | | | | Implemented the skeleton code for the beacon. | STRWarrior | 2014-04-12 | 1 | -0/+2 |
|/ / / | | | | | | | | | | There is no handling for the GUI. It can now check how big the pyramid is under the beacon. | ||||
* | / | Fixed missing - that caused all neighbour lookups to go to the chunkmap | Tycho | 2014-04-08 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge pull request #838 from mc-server/lilypads | worktycho | 2014-03-30 | 1 | -1/+1 |
|\ \ | | | | | | | Lilypads | ||||
| * | | Fixed a potential crash | Tiger Wang | 2014-03-28 | 1 | -1/+1 |
| |/ | |||||
* / | Fixed chunk neighbor-getting for long distances. | madmaxoft | 2014-03-27 | 1 | -0/+11 |
|/ | | | | This fixes a server hang when teleporting to coords too far away. | ||||
* | Add Lua Bindings for FlowerPotEntity.h and add documentation. | Howaner | 2014-03-07 | 1 | -1/+1 |
| | |||||
* | Add Flower Pots | Howaner | 2014-03-07 | 1 | -0/+35 |
| | |||||
* | g_BlockXXX => cBlockInfo::XXX | andrew | 2014-03-01 | 1 | -5/+5 |
| | |||||
* | Removed an unused member variable from cChunk. | madmaxoft | 2014-02-24 | 1 | -7/+0 |
| | |||||
* | Merge pull request #697 from Howaner/Skull | Mattes D | 2014-02-19 | 1 | -0/+35 |
|\ | | | | | Add Skulls/Heads to MCServer | ||||
| * | Rename SkullEntity to MobHeadEntity | Howaner | 2014-02-19 | 1 | -3/+3 |
| | | |||||
| * | Add Heads completely | Howaner | 2014-02-18 | 1 | -0/+33 |
| | | |||||
| * | Add Skulls/Heads | Howaner | 2014-02-17 | 1 | -0/+2 |
| | | |||||
* | | Added cWorld:SetAreaBiome() API function. | madmaxoft | 2014-02-18 | 1 | -0/+32 |
|/ | | | | Fixes #675. | ||||
* | Initial ChunkStay code. | madmaxoft | 2014-02-08 | 1 | -1/+0 |
| | |||||
* | Changed Signiture of OnUpdate | Tycho | 2014-02-02 | 1 | -4/+10 |
| | |||||
* | Changed pointers to references | Tycho | 2014-02-01 | 1 | -1/+1 |
| | |||||
* | Changed signitures of Several BLockHandler Methods | Tycho | 2014-02-01 | 1 | -2/+4 |
| | | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check | ||||
* | Basic command block implementation | andrew | 2014-01-18 | 1 | -0/+34 |
| | |||||
* | Disabled excessive entity-related logging in Debug mode. | madmaxoft | 2014-01-16 | 1 | -2/+15 |
| | |||||
* | fixed bad merge | Tycho Bickerstaff | 2013-12-22 | 1 | -4/+0 |
| | |||||
* | merged in changes | Tycho Bickerstaff | 2013-12-22 | 1 | -0/+9 |
|\ | |||||
| * | Merge branch 'master' of github.com:mc-server/MCServer | Tycho Bickerstaff | 2013-12-22 | 1 | -0/+16 |
| |\ | |||||
| * | | Chunk is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 1 | -3/+2 |
| | | | |||||
* | | | merged in warnings changes | Tycho Bickerstaff | 2013-12-22 | 1 | -11/+4 |
| |/ |/| | |||||
* | | Implented BroadcastParticleEffect | STRWarrior | 2013-12-22 | 1 | -0/+16 |
|/ | |||||
* | Fixed the rest of constructor reorders. | madmaxoft | 2013-12-20 | 1 | -20/+21 |
| | |||||
* | Attempt at fixing cChunkDef::Height signedness. | madmaxoft | 2013-12-20 | 1 | -6/+1 |
| | |||||
* | This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions. | STRWarrior | 2013-12-15 | 1 | -0/+32 |
| | |||||
* | Implemented note block playing and fixed wire | Tiger Wang | 2013-12-14 | 1 | -0/+32 |
| | | | | Game of Thrones music in Minecraft, here I come! | ||||
* | Improved redstone loading performance | Tiger Wang | 2013-12-13 | 1 | -2/+10 |
| | |||||
* | Fixed QueueSetBlock not sending to client changes | Tiger Wang | 2013-12-13 | 1 | -2/+1 |
| | |||||
* | Redstone data is now loaded on chunk load | Tiger Wang | 2013-12-13 | 1 | -0/+6 |
| | |||||
* | Fixed warning unchecked enum value at Chunk.cpp line 841 | worktycho | 2013-12-09 | 1 | -2/+4 |
| | |||||
* | 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 | ||||
* | | Added basic ender chests | Tiger Wang | 2013-12-07 | 1 | -0/+2 |
| | | | | | | | | Note that they just mirror chests now, so no per player inventory. | ||||
* | | Renamed animation function | Tiger Wang | 2013-12-07 | 1 | -2/+2 |
| | | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know. | ||||
* | | Fixed duplication glitch with QueueSetBlock | Tiger Wang | 2013-12-06 | 1 | -5/+26 |
|/ | | | | | | | 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. | ||||
* | Fixed an error in cChunk's block ticking. | madmaxoft | 2013-12-04 | 1 | -2/+2 |
| | | | | Absolute coords were passed to a handler expecting relative coords. | ||||
* | Changed cBlockHandler->OnUpdate() to use cChunk directly. | madmaxoft | 2013-11-30 | 1 | -1/+18 |
| | |||||
* | Fixed VC2008 compilation, normalized include paths. | madmaxoft | 2013-11-27 | 1 | -1/+1 |
| | |||||
* | Fixed some of tiger's derpyness. | Alexander Harkness | 2013-11-27 | 1 | -1/+1 |
| | |||||
* | Fixed loads more of them. | Alexander Harkness | 2013-11-26 | 1 | -1/+1 |
| | |||||
* | 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 | -7/+51 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+2732 |