Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Clean up GenerateChunk/TouchChunk | Tiger Wang | 2020-08-28 | 1 | -10/+0 |
| | | | | | | - Remove TouchChunk - Remove unused bool return value in GenerateChunk - Remove ShouldGenerateIfLoadFailed | ||||
* | Remove unneeded MarkDirty, SendToClients parameters of SetMeta | Tiger Wang | 2020-08-28 | 1 | -2/+2 |
| | | | | | | | | Partially reverts #3129, whose addition of these parameters was superseded by #3149 that fixed generated leaves' metas. References: https://github.com/cuberite/cuberite/pull/4417#discussion_r334950513 e0bcd754009f16480437b2c1fa5e7fbedab31496 | ||||
* | Changed tree-growing functions in cWorld to use Vector3i coords. | Mattes D | 2020-08-27 | 1 | -30/+32 |
| | |||||
* | large conifers sapplings grow | mBornand | 2020-08-05 | 1 | -1/+6 |
| | |||||
* | Corrected wakeup sequences | Tiger Wang | 2020-08-04 | 1 | -4/+3 |
| | | | | | | | * Pistons/Ice no longer need to FastSetBlock first (#4600), and the former don't drop items when broken in creative - Begin migration away from stationary fluids * Tick the chunk after applying a client's changed * Broadcast pending blocks at the end of a tick | ||||
* | OnBroken/OnPlaced are for entity actions | Tiger Wang | 2020-08-04 | 1 | -17/+12 |
| | | | | | | * Call OnPlaced/OnBroken in PlaceBlock/DigBlock - Remove unused Placing/Breaking handlers * Have the blockhandler's Check handle neighbour updating, instead of QueueTickBlockNeighbors | ||||
* | Add WakeUp/AddBlock distinction | Tiger Wang | 2020-08-02 | 1 | -1/+1 |
| | | | | | | * WakeUp is for singular changes (block breaking for example). The simulator should check blocks around the position and discover other affected blocks as it sees fit * AddBlock is for when you know a whole area is to be updated; chunk loading, or area wakeups for example + Prepares for correct handling of destroyed blocks after removal of SolidBlockHandler in the redstone simulator | ||||
* | Replaced cpp14::make_unique<> with std::make_unique<>. | Mattes D | 2020-08-01 | 1 | -18/+18 |
| | |||||
* | cWorld * -> cWorld (#4771) | Tiger Wang | 2020-07-14 | 1 | -16/+15 |
| | | | * cWorld * -> cWorld | ||||
* | Enable some more clang-tidy linter checks (#4738) | peterbell10 | 2020-05-15 | 1 | -7/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Avoid inefficient AString -> c_str() -> AString round trip * Avoid redundant string init expressions * Avoid unnecessary return, continue, etc. * Add .clang-format to help with clang-tidy fix-its * Avoid unnecessary passing by value * Avoid unnecessary local copying * Avoid copying in range-for loops * Avoid over-complicated boolean expressions * Some violations missed by my local clang-tidy * Allow unnecessary continue statements * Add brackets * Another expression missed locally * Move BindingsProcessor call into clang-tidy.sh and add space * Fix pushd not found error * Different grouping of CheckBlockInteractionRate | ||||
* | Remove old Android leftovers (#4722) | Mat | 2020-05-07 | 1 | -1/+1 |
| | |||||
* | Assert if world is incorrect | Mat | 2020-05-03 | 1 | -0/+1 |
| | |||||
* | Set entity world early | mathiascode | 2020-05-03 | 1 | -1/+0 |
| | |||||
* | Vector3 in Handlers (#4680) | Mattes D | 2020-04-21 | 1 | -1/+1 |
| | | | Refactored all cBlockHandler and cItemHandler descendants to use Vector3. | ||||
* | More Vector3 in cBlockHandler (#4644) | Mattes D | 2020-04-17 | 1 | -3/+3 |
| | | | | | * cBlockHandler.OnUpdate uses Vector3 params. Also slightly changed how block ticking works. | ||||
* | Using Super. | Mattes D | 2020-04-16 | 1 | -2/+2 |
| | |||||
* | Acquire chunk map CS when accessing player entities | Peter Bell | 2020-04-13 | 1 | -27/+23 |
| | |||||
* | Don't set entity world twice (#4606) | Mat | 2020-04-09 | 1 | -1/+1 |
| | | | | | * Don't set entity world twice * Call HookSpawnedEntity when the entity actually spawned | ||||
* | Falling blocks can now be spawned at any position. (#4620) | Mattes D | 2020-04-09 | 1 | -1/+1 |
| | | | | | | | * Falling blocks can now be spawned at any position. * Added a /cake command to Debuggers that throws a cake in a nice slow arc. * Fixed regular falling blocks. | ||||
* | Initial resource pack support (#4622) | Mat | 2020-04-07 | 1 | -0/+7 |
| | |||||
* | Implement wither skeletons (#4563) | Mat | 2020-04-04 | 1 | -1/+1 |
| | |||||
* | Pulled the BlockID and BlockInfo headers from Globals.h. (#4591) | Mattes D | 2020-04-03 | 1 | -0/+1 |
| | | | | | | | | | The BlockID.h file was removed from Globals.h and renamed to BlockType.h (main change) The BlockInfo.h file was removed from Globals.h (main change) The ENUM_BLOCK_ID and ENUM_ITEM_ID enum names were replaced with ENUM_BLOCK_TYPE and ENUM_ITEM_TYPE (cosmetics) The various enums, such as eDimension, eDamageType and eExplosionSource were moved from BlockType.h to Defines.h, together with the helper functions for converting between them and strings (StringToDimension et al.) (minor) Many inline functions were moved from headers to their respective cpp files, so that BlockType.h could be included only into the cpp file, rather than the header. That broke our tests a bit, since they pick bits and pieces out of the main code and provide stubs for the rest; they had to be re-stubbed and re-verified. eMonsterType values are no longer tied to E_ITEM_SPAWN_EGG_META_* values | ||||
* | Fix explosion knockback issues and tweak knockback strength (#4590) | peterbell10 | 2020-04-02 | 1 | -3/+6 |
| | |||||
* | Fix client disconnect assert (#4579) | peterbell10 | 2020-03-29 | 1 | -2/+6 |
| | |||||
* | Lock hopper when powered by redstone (#4347) | Bond-009 | 2020-03-27 | 1 | -0/+9 |
| | | | | | | | | | * Lock hopper when powered by redstone * Add to manual bindings * Add hopper API documentation Co-authored-by: Mat <mail@mathias.is> | ||||
* | Disable bonemealable settings for now (#4551) | Mat | 2020-03-26 | 1 | -0/+4 |
| | |||||
* | Fix nether mob spawning (#4546) | Mat | 2020-03-25 | 1 | -1/+1 |
| | | | | | * Fix nether mob spawning * Remove zombie from nether mobs | ||||
* | Pickup spawn improvements (#4525) | Mat | 2020-03-23 | 1 | -4/+4 |
| | | | Pickups are now thrown around when spawned, like in vanilla. Pickups also bail out of the collision detection checks while being created, to prevent them from blasting too far off in e.g. cobblestone generators. | ||||
* | TNT position fixes (#4519) | Mat | 2020-03-22 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | * TNT position fixes * Don't add offset to explosion spawn coords * Don't make other entities push TNT * Correct initial TNT speed * Fix typo * Improvements * Revert unwanted change * Style fixes * Update format | ||||
* | Improve explosion visuals (#4511) | Mat | 2020-03-21 | 1 | -1/+17 |
| | |||||
* | Stabilise MoveToWorld (#4004) | Mat | 2020-03-05 | 1 | -11/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Stabilise MoveToWorld * Fix comments and deprecate ScheduleMoveToWorld * Enhanced thread safety for m_WorldChangeInfo * Return unique_ptr from cAtomicUniquePtr::exchange * cWorld now calls entity cEntity::OnAddToWorld and cEntity::OnRemoveFromWorld. Allows broadcasting entities added to the world from the world's tick thread. This also factors out some common code from cEntity::DoMoveToWorld and cEntity::Initialize. As a consequence, cEntity::Destroy(false) (i.e. Destroying the entity without broadcasting) is impossible. This isn't used anywhere in Cuberite so it's now deprecated. * Update entity position after removing it from the world. Fixes broadcasts being sent to the wrong chunk. * Fix style * cEntity: Update LastSentPosition when sending spawn packet * Add Wno-deprecated-declarations to the lua bindings * Kill uses of ScheduleMoveToWorld | ||||
* | Improved large jungle and acacia tree generation (#4413) | NiLSPACE | 2019-12-22 | 1 | -7/+7 |
| | |||||
* | Moved growing from cWorld / cChunk to cBlockHandler descendants. | Mattes D | 2019-10-28 | 1 | -338/+35 |
| | |||||
* | Refactored block-to-pickup conversion. (#4417) | Mattes D | 2019-10-16 | 1 | -13/+57 |
| | |||||
* | Refactored more of Entities and BlockEntities to use Vector3. (#4403) | Mattes D | 2019-09-29 | 1 | -37/+40 |
| | |||||
* | Fixed MSVC warnings (#4400) | Mattes D | 2019-09-27 | 1 | -1/+1 |
| | |||||
* | NBTChunkSerializer: Cleaned up interface. | Mattes D | 2019-09-24 | 1 | -2/+2 |
| | | | | | | Removed dependency on cChunkDataCallback. Moved all the serializing code into a worker class. Changed the serialization into a single-call action. | ||||
* | Moved the generator defaults to ComposableGenerator. | Mattes D | 2019-09-06 | 1 | -50/+5 |
| | |||||
* | Separated chunk generator from world / plugin interfaces. | Mattes D | 2019-09-06 | 1 | -10/+96 |
| | | | | The generator now only takes care of servicing synchronous "GetChunk(X, Y)" and "GetBiomes(X, Y)" requests. | ||||
* | Add a formatting function for Vector3 (#4282) | peterbell10 | 2018-09-24 | 1 | -4/+4 |
| | | | | | | | | | | * Vector3: Add custom fmt compatible formatter. * cLuaState: Add fmt version of ApiParamError * Use vector formatting in manual bindings * Always log vectors with FLOG | ||||
* | Experience orb (#4259) | changyong guo | 2018-08-02 | 1 | -3/+60 |
| | | | | | | | * Replace cWorld::FindClosesPlayer with cWorld::DoWithClosestPlayer * Implement experience reward splitting into the orb sizes used in vanilla * Modified speed calculation in cExpOrb::Tick to make the orbs fly towards the player Fixes #4216 | ||||
* | cWorld: Manually bind deprecated broadcast functions (#4265) | peterbell10 | 2018-07-27 | 1 | -15/+16 |
| | | | Ref: https://github.com/cuberite/cuberite/pull/4264#discussion_r204769193 | ||||
* | CheckBasicStyle: Check number of empty lines between functions (#4267) | peterbell10 | 2018-07-26 | 1 | -13/+3 |
| | | | | Add check for number of empty lines between functions and fix the corresponding failures | ||||
* | Broadcast refactor (#4264) | peterbell10 | 2018-07-24 | 1 | -487/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | * Move Broadcast functions from cChunkMap to cBroadcaster - Remove cBroadcastInterface in favour of cBroadcaster. - cChunk: Remove broadcast functions. * resurect broadcast interface * Absorb cBroadcaster into cWorld. Removes the need for forwarding the function calls. * Improve const-correctness * Use Int8 instead of char + Comment `ForClients` functions * Improve comments * Broadcaster: Rename ForClients functions | ||||
* | Rewrite explosion knock back (#4251) | changyong guo | 2018-07-23 | 1 | -14/+1 |
| | | | | | | | 1. Base knockback on an entity's bounding box intersection with the explosion 2. Armor blast protection reduces knockback 3. Don't apply knockback to players flying in creative mode Fixes #4139 | ||||
* | Removed duplicate code (#4198) | Bond-009 | 2018-04-11 | 1 | -1/+1 |
| | | | Should also fix dogs not despawning | ||||
* | Deal with covered switches consistently (#4161) | peterbell10 | 2018-02-05 | 1 | -12/+6 |
| | | | | | | | * Fixes a number of "<function>: not all control paths return a value" warnings on MSVC. * Introduces the UNREACHABLE global macro and uses it instead of conditionally compiled switch defaults. * Move cNBTParseErrorCategory from FastNBT.h into FastNBT.cpp to prevent bad calls to message() | ||||
* | Add world name in logs from cWorld (#4148) | Bond-009 | 2018-01-16 | 1 | -3/+3 |
| | |||||
* | improve rain simulation (#4017) | Alexander Harkness | 2017-12-26 | 1 | -0/+28 |
| | | | | | | | | | | | * Uses vanilla logic to decide which blocks rain falls through. * Rain falls infinitely above the world, and stops at y=0. * Entities will now be extinguished if they are under rain-blocking blocks, and fire will now be extinguished by rain similarly. * Create IsWeatherWetAtXYZ to identify wetness at a particular location. * Use new code for enderman rain detection. * Fixes issue #916 * Disable warnings for global constructors in the fire simulator. | ||||
* | cWorld Threads: Seperate initialization and thread start. | peterbell10 | 2017-10-21 | 1 | -2/+4 |
| | | | | Prevents nullptr dereferences before Start has been called. | ||||
* | cWorld: Move Initialization from Start to the constructor. | peterbell10 | 2017-10-21 | 1 | -218/+224 |
| | | | | Start now does nothing more than launch the world's threads. | ||||
* | BroadcastBlockBreakAnimation and BroadcastBlockEntity use vectors (#4038) | Bond-009 | 2017-09-25 | 1 | -4/+4 |
| | |||||
* | Changed BroadcastSoundEffect, SendSoundEffect, and CastThunderbolt parameters to vectors (#3959) | Lane Kolbly | 2017-09-19 | 1 | -9/+39 |
| | | | | | | | | | | | | | | | | | | * Made BroadcastSoundEffect take vector parameters. * Added docs for new vectored methods * Removed old code * Fixed lua warnings * Made old BroadcastSoundEffect not an override. * m_Block to m_BlockPos, used Vector3d constructor where prettier. * a_Block to a_BlockPos * Changed thunderbolt a_Block to a_BlockPos | ||||
* | Removed UTF-8 BOM (#4033) | Lukas Pioch | 2017-09-19 | 1 | -1/+1 |
| | |||||
* | Replace ItemCallbacks with lambdas (#3993) | peterbell10 | 2017-09-11 | 1 | -131/+61 |
| | |||||
* | Made world data paths adjustable, and added API to temporarily disable saving chunks to disk. (#3912) | Lane Kolbly | 2017-09-07 | 1 | -11/+21 |
| | |||||
* | Changed some int parameters to vector parameters (#3937) | Bond-009 | 2017-09-07 | 1 | -4/+4 |
| | |||||
* | Add cWorld::RemoveEntity and use in cEntity (#4003) | peterbell10 | 2017-09-05 | 1 | -0/+30 |
| | | | | | | * Add cWorld::RemoveEntity and use in cEntity * cEntity: Remove uneeded asserts from Destroy and DoMoveToWorld | ||||
* | Revert "Replace ItemCallbacks with lambdas (#3948)" | LogicParrot | 2017-09-02 | 1 | -63/+133 |
| | | | | This reverts commit 496c337cdfa593654018c171f6a74c28272265b5. | ||||
* | Replace ItemCallbacks with lambdas (#3948) | peterbell10 | 2017-09-01 | 1 | -133/+63 |
| | |||||
* | cWorld: Add entities without holding of m_CSEntitiesToAdd | peterbell10 | 2017-08-29 | 1 | -9/+12 |
| | | | | * Fixes deadlock when cWorld::AddEntity is called while holding chunk map CS. | ||||
* | Add cUUID class (#3871) | peterbell10 | 2017-08-25 | 1 | -2/+3 |
| | |||||
* | Fully implemented leashes (#3798) | Pablo Beltrán | 2017-08-21 | 1 | -0/+18 |
| | |||||
* | Merge pull request #3489 from cuberite/EntityOwnership | Tiger Wang | 2017-08-18 | 1 | -106/+148 |
|\ | | | | | * Changed entity ownership model to use smart pointers | ||||
| * | Changed entity ownership model to use smart pointers | Tiger Wang | 2017-08-07 | 1 | -106/+148 |
| | | |||||
* | | Changed int parameters to vector parameters in cCuboid and simulators (#3874) | Lane Kolbly | 2017-08-17 | 1 | -4/+14 |
|/ | |||||
* | Remove double includes part 2 (#3890) | peterbell10 | 2017-08-03 | 1 | -1/+0 |
| | |||||
* | Removed double includes (#3885) | Lukas Pioch | 2017-08-02 | 1 | -5/+0 |
| | |||||
* | cWorld::SendBlockTo take player by ref | peterbell10 | 2017-08-01 | 1 | -1/+1 |
| | |||||
* | Remove smart pointer macros | peterbell10 | 2017-07-21 | 1 | -3/+3 |
| | |||||
* | Simulators: Added area-based wakeup. | Mattes D | 2017-07-16 | 1 | -1/+1 |
| | |||||
* | Changing pickup lifetime and combining semantics, making these adjustable in the lua api. (#3843) | Lane Kolbly | 2017-07-12 | 1 | -0/+16 |
| | |||||
* | Added bed entity (#3823) | Lukas Pioch | 2017-07-07 | 1 | -0/+9 |
| | | | | | | | | | | * Added bed entity * Export cBedEntity to lua * Set color of bed through item damage value * Added bed entity to APIDoc * NBT: Added loading and saving * Crafting recipes for the colored beds | ||||
* | Let water vaporise in the Nether by default | Bond-009 | 2017-06-20 | 1 | -5/+6 |
| | |||||
* | Remove sign conversion | peterbell10 | 2017-06-16 | 1 | -5/+5 |
| | |||||
* | FastRandom rewrite (#3754) | peterbell10 | 2017-06-13 | 1 | -28/+36 |
| | |||||
* | Exported boat | Lukas Pioch | 2017-05-24 | 1 | -2/+2 |
| | | | | | | | - NBT: Added saving / loading of material - Added the material in the item handler of the boat - Drop the correct boat if destroyed - APIDoc: Added desc and functions | ||||
* | Don't destroy monster when last target type is a player (#3721) | Pablo Beltrán | 2017-05-21 | 1 | -2/+2 |
| | | | In current Cuberite version if you are pursued by monsters you just have to disconnect and connect again to get rid of them. If no other player is in your chunk monsters will get destroyed. | ||||
* | Tracer replacement (#3704) | Mattes D | 2017-05-11 | 1 | -22/+16 |
| | | | | | | * Replaced cTracer usage with cLineBlockTracer. * Exported new cLineBlockTracer utility functions to Lua API. | ||||
* | Added missing checks for Initialize function and updated APIDoc | Lukas Pioch | 2017-05-08 | 1 | -7/+40 |
| | |||||
* | Changed world_end to world_the_end #3531 (#3538) | Bond-009 | 2017-02-24 | 1 | -2/+7 |
| | |||||
* | Updated sounds and effect IDs (#3422) | mathiascode | 2017-02-15 | 1 | -3/+3 |
| | |||||
* | Added some blocks and items (#3503) | mathiascode | 2017-02-14 | 1 | -0/+22 |
| | |||||
* | Made survival the default gamemode (#3563) | Lawton Mizell | 2017-02-07 | 1 | -1/+1 |
| | |||||
* | World: Remember the age persistently. (#3556) | Mattes D | 2017-01-19 | 1 | -0/+3 |
| | |||||
* | World: Removed LineBlockTracer test code. (#3555) | Mattes D | 2017-01-19 | 1 | -53/+0 |
| | | | The test for LineBlockTracer is already in the Debuggers plugin (/spidey and testtracer commands). | ||||
* | Removed asserts about chunk queued. | Mattes D | 2017-01-19 | 1 | -2/+0 |
| | | | | The assumption is not needed and was invalid under a stress-test. | ||||
* | DeadlockDetect now lists some tracked CS's stats. | Mattes D | 2017-01-18 | 1 | -2/+14 |
| | |||||
* | World: Add check for unknown RedstoneSimulator (#3496) | Fabian Stein | 2016-12-29 | 1 | -0/+5 |
| | |||||
* | Initial support for the 1.11 protocol. | Mattes D | 2016-12-16 | 1 | -2/+2 |
| | |||||
* | Use CMake's Android generators to crosscompile | Tiger Wang | 2016-12-12 | 1 | -3/+3 |
| | |||||
* | Removed ClientHandle.h dependencies from common headers. | Mattes D | 2016-11-18 | 1 | -0/+9 |
| | |||||
* | Spectators added (#2852) | bibo38 | 2016-10-12 | 1 | -2/+20 |
| | |||||
* | Configurable dirty unused chunk cap to avoid RAM overuse (#3359) | LogicParrot | 2016-09-03 | 1 | -10/+32 |
| | | | Configurable dirty unused chunk cap to avoid RAM overuse | ||||
* | Delay EntityChangedWorld players' callback until Entity fully linked to world (#3330) | ElNounch | 2016-08-22 | 1 | -10/+25 |
| | | | | Otherwise, some API calls just don't seem to happen .gitignore tweak for test executables | ||||
* | Added cWorld:SetSpawn() API and Lua binding (#3316) | ElNounch | 2016-08-15 | 1 | -12/+29 |
| | |||||
* | Fix tab list sometimes not updating after a player leaves. (#3280) | Alexander Harkness | 2016-07-31 | 1 | -1/+1 |
| | | | | | | When a player leaves the game, their client handle has its state changed to csDestroyed. This should fix issue #3138 | ||||
* | Updated API documentation. | Mattes D | 2016-07-18 | 1 | -2/+2 |
| | |||||
* | Makes tall grass and large flowers bonemealable | QUSpilPrgm | 2016-06-03 | 1 | -12/+75 |
| | | | | Adds the bonemeal particle effect to some more places | ||||
* | Update Dispensers and let them act more like in Vanilla | QUSpilPrgm | 2016-06-03 | 1 | -61/+70 |
| | | | | | | | | - Added code to make bonemeal, potions, minecarts, XP bottles and boats work inside dispensers - Dispensers are now able to place TNT if the block is transparent but not air - Added return value that indicates the success of pumpkin, melon, sugarcane and cactus growing functions - Changed return value of "GrowRipePlant" so that it actually indicates if the block was able to grow - Fixed "GrowSugarcane" and "GrowCactus" in "GrowRipePlant" so that it only grows them a single block | ||||
* | 1.9 / 1.9.2 / 1.9.3 / 1.9.4 protocol support (#3135) | Pokechu22 | 2016-05-14 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Semistable update to 15w31a I'm going through snapshots in a sequential order since it should make things easier, and since protocol version history is written. * Update to 15w34b protocol Also, fix an issue with the Entity Equipment packet from the past version. Clients are able to connect and do stuff! * Partially update to 15w35e Chunk data doesn't work, but the client joins. I'm waiting to do chunk data because chunk data has an incomplete format until 15w36d. * Add '/blk' debug command This command lets one see what block they are looking at, and makes figuring out what's supposed to be where in a highly broken chunk possible. * Fix CRLF normalization in CheckBasicStyle.lua Normally, this doesn't cause an issue, but when running from cygwin, it detects the CR as whitespace and creates thousands of violations for every single line. Lua, when run on windows, will normalize automatically, but when run via cygwin, it won't. The bug was simply that gsub was returning a replaced version, but not changing the parameter, so the replaced version was ignored. * Update to 15w40b This includes chunk serialization. Fully functional chunk serialization for 1.9. I'm not completely happy with the chunk serialization as-is (correct use of palettes would be great), but cuberite also doesn't skip sending empty chunks so this performance optimization should probably come later. The creation of a full buffer is suboptimal, but it's the easiest way to implement this code. * Write long-by-long rather than creating a buffer This is a bit faster and should be equivalent. However, the code still doesn't look too good. * Update to 15w41a protocol This includes the new set passengers packet, which works off of the ridden entity, not the rider. That means, among other things, that information about the previously ridden vehicle is needed when detaching. So a new method with that info was added. * Update to 15w45a * 15w51b protocol * Update to 1.9.0 protocol Closes #3067. There are still a few things that need to be worked out (picking up items, effects, particles, and most importantly inventory), but in general this should work. I'll make a few more changes tomorrow to get the rest of the protocol set up, along with 1.9.1/1.9.2 (which did make a few changes). Chunks, however, _are_ working, along with most other parts of the game (placing/breaking blocks). * Fix item pickup packet not working That was a silly mistake, but at least it was an easy one. * 1.9.2 protocol support * Fix version info found in server list ping Thus, the client reports that it can connect rather than saying that the server is out of date. This required creating separate classes for 1.9.1 and 1.9.2, unfortunately. * Fix build errors generated by clang These didn't happen in MSVC. * Add protocol19x.cpp and protocol19x.h to CMakeLists * Ignore warnings in protocol19x that are ignored in protocol18x * Document BLOCK_FACE and DIG_STATUS constants * Fix BLOCK_FACE links and add separate section for DIG_STATUS * Fix bat animation and object spawning The causes of both of these are explained in #3135, but the gist is that both were typos. * Implement Use Item packet This means that buckets, bows, fishing rods, and several other similar items now work when not looking at a block. * Handle DIG_STATUS_SWAP_ITEM_IN_HAND * Add support for spawn eggs and potions The items are transformed from the 1.9 version to the 1.8 version when reading and transformed back when sending. * Remove spammy potion debug logging * Fix wolf collar color metadata The wrong type was being used, causing several clientside issues (including the screen going black). * Fix 1.9 chunk sending in the nether The nether and the end don't send skylight. * Fix clang build errors * Fix water bottles becoming mundane potions This happened because the can become splash potion bit got set incorrectly. Water bottles and mundane potions are only differentiated by the fact that water bottles have a metadata of 0, so setting that bit made it a mundane potion. Also add missing break statements to the read item NBT switch, which would otherwise break items with custom names and also cause incorrect "Unimplemented NBT data when parsing!" logging. * Copy Protocol18x as Protocol19x Aditionally, method and class names have been swapped to clean up other diffs. This commit is only added to make the following diffs more readable; it doesn't make any other changes (beyond class names). * Make thrown potions use the correct appearence This was caused by potions now using metadata. * Add missing api doc for cSplashPotionEntity::GetItem * Fix compile error in SplashPotionEntity.cpp * Fix fix of cSplashPotionEntity API doc * Temporarilly disable fall damage particles These were causing issues in 1.9 due to the changed effect ID. * Properly send a kick packet when connecting with an invalid version This means that the client no longer waits on the server screen with no indication whatsoever. However, right now the server list ping isn't implemented for unknown versions, so it'll only load "Old" on the ping. I also added a GetVarIntSize method to cByteBuffer. This helps clean up part of the code here (and I think it could clean up other parts), but it may make sense for it to be moved elsewhere (or declared in a different way). * Handle server list pings from unrecognized versions This isn't the cleanest way of writing it (it feels odd to use ProtocolRecognizer to send packets, and the addition of m_InPingForUnrecognizedVersion feels like the wrong technique), but it works and I can't think of a better way (apart from creating a full separate protocol class to handle only the ping... which would be worse). * Use cPacketizer for the disconnect packet This also should fix clang build errors. * Add 1.9.3 / 1.9.4 support * Fix incorrect indentation in APIDesc | ||||
* | Fix Crash on stopping the server (#3176) | LogicParrot | 2016-05-01 | 1 | -2/+0 |
| | |||||
* | Disable Enderman Spawn (Issue #3108) (#3170) | benf516 | 2016-04-30 | 1 | -2/+2 |
| | | | Temporarily disabled enderman spawning until the glitches can be fixed | ||||
* | Reduced unnecessary block updates | LogicParrot | 2016-04-22 | 1 | -11/+2 |
| | |||||
* | Auto clean bad world linkages | LogicParrot | 2016-04-19 | 1 | -16/+14 |
| | |||||
* | Updated cChunk::SetMeta, fixed grass growth, reduced markDirty/setMeta usage | LogicParrot | 2016-04-16 | 1 | -2/+4 |
| | |||||
* | Revert "Move mob tick code to cChunk" | LogicParrot | 2016-04-06 | 1 | -0/+46 |
| | |||||
* | Move mob tick code to cChunk | LogicParrot | 2016-04-06 | 1 | -46/+0 |
| | |||||
* | Fix adding players to world | LogicParrot | 2016-03-31 | 1 | -1/+1 |
| | |||||
* | Entities are never lost | LogicParrot | 2016-03-30 | 1 | -19/+13 |
| | |||||
* | Rewrite mob tick code | LogicParrot | 2016-03-23 | 1 | -18/+41 |
| | |||||
* | Add check if entity is in chunk before changing tick status | Marvin Kopf | 2016-02-21 | 1 | -2/+8 |
| | |||||
* | Proper entity destruction in non-ticking chunks | LogicParrot | 2016-02-19 | 1 | -10/+21 |
| | |||||
* | Add forum link to linkage error message | LogicParrot | 2016-02-09 | 1 | -1/+1 |
| | |||||
* | Improve world linkage error message | LogicParrot | 2016-02-08 | 1 | -2/+2 |
| | |||||
* | Merge pull request #2961 from LogicParrot/enforce | LogicParrot | 2016-02-08 | 1 | -0/+34 |
|\ | | | | | [PhantomWorlds - 4] Prevent server from starting if there's bad world linkage | ||||
| * | Prevent server from starting if there's bad world linkage | LogicParrot | 2016-02-05 | 1 | -0/+34 |
| | | |||||
* | | Proper world linkages and dimension types for newly created world.ini's | LogicParrot | 2016-02-06 | 1 | -2/+12 |
| | | |||||
* | | Tab completion for player names now case insensitive. | Marvin Kopf | 2016-02-05 | 1 | -1/+1 |
|/ | |||||
* | cMonster::m_Target safety across worlds | LogicParrot | 2016-02-03 | 1 | -0/+20 |
| | |||||
* | Fixed non-natural spawning near player (egg, breeding, etc.) | LogicParrot | 2016-01-16 | 1 | -9/+0 |
| | |||||
* | Do not spawn mobs too close to player | LogicParrot | 2016-01-12 | 1 | -54/+63 |
| | |||||
* | Fixed default Nether generator params. | Mattes D | 2015-12-30 | 1 | -1/+1 |
| | | | | The prefab file is "NetherFort" | ||||
* | Fixed spawn point. Wrong number for divisions and wrong highest spawn point. | Lukas Pioch | 2015-12-20 | 1 | -3/+4 |
| | |||||
* | Reorganised the redstone simulator | Tiger Wang | 2015-12-18 | 1 | -4/+2 |
| | | | | | | -> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan! * Uses classes and inheritance now * Speed should be improved | ||||
* | Changed Nether defaults to use PieceStructures. | Mattes D | 2015-12-01 | 1 | -1/+1 |
| | |||||
* | Add enum for Sound and Particle Effects | Dave Tucker | 2015-11-24 | 1 | -10/+10 |
| | | | | | | Fixes #2603 Signed-off-by: Dave Tucker <dave@dtucker.co.uk> | ||||
* | Improved spawn location calculations. | samoatesgames | 2015-11-13 | 1 | -69/+168 |
| | | | | | | | | | | - Supports Overworld and Nether spawns. - Supports spawning under objects, but still above ground (e.g. under the leaves of a tree). - Protects against spawning in oceans. - Protects against spawning in water. - Uses a radial search about the origin, rather than a linear. - Correctly calculates Nether spawn on spawn world generation (fixes: cuberite#2548) - Fixes a bug in CheckPlayerSpawnPoint() where the X offset was used in both the X and Z coords (BLOCKTYPE BlockType = GetBlock(a_PosX + Coords[i].x, a_PosY, a_PosZ + Coords[i].x);) | ||||
* | Implemented brewing | Lukas Pioch | 2015-11-03 | 1 | -0/+18 |
| | |||||
* | The bottom layer cannot hold a valid spawn point | worktycho | 2015-10-01 | 1 | -0/+6 |
| | | | | Fixes #2510 | ||||
* | Added weather intervals to world.ini settings. | Mattes D | 2015-09-28 | 1 | -4/+46 |
| | |||||
* | Prepared ScheduleTask for threading refactor | Tiger Wang | 2015-09-25 | 1 | -131/+35 |
| | | | | | * Llama-ified and condensed Schedule/QueueTask - Removed hackery done with piston animations | ||||
* | Add new "ForEach" function: ForEachLoadedChunk. | tycho | 2015-09-24 | 1 | -0/+9 |
| | |||||
* | Increase robustness of the logging subsystem | tycho | 2015-09-15 | 1 | -6/+0 |
| | |||||
* | Unified the doxy-comment format. | Mattes D | 2015-07-31 | 1 | -1/+0 |
| | |||||
* | Silenced and fixed many warning messages across multiple files. | Samuel Barney | 2015-07-29 | 1 | -26/+28 |
| | |||||
* | Spawn baby mobs | hallucino | 2015-07-16 | 1 | -1/+6 |
| | |||||
* | Improved maps | Tiger Wang | 2015-07-14 | 1 | -1/+2 |
| | |||||
* | Sapling Growth Update | Samuel Barney | 2015-07-13 | 1 | -2/+16 |
| | | | | | | | | | * Growth has been slowed down * Saplings do not grow if they do not have enough space to grow * Saplings do not grow unless the light level is 9 or above * Dark Oak doesn't grow unless it is in a 2x2 Jungle Trees now will grow into a large tree when 2x2 saplings are used. | ||||
* | Squashed Bonemeal Plant Growth Update | Samuel Barney | 2015-07-06 | 1 | -13/+85 |
| | | | | | | * Fixed Crops growing to maturity with only 1 bonemeal * Trees now go through growth stages with bonemeal, as they do in Vanilla Minecraft | ||||
* | Merge pull request #2224 from cuberite/ChunkQueueCollapsing | worktycho | 2015-07-04 | 1 | -14/+43 |
|\ | | | | | Chunk queue collapsing: MK II | ||||
| * | Fixed minor errors in Tycho's code | Tiger Wang | 2015-06-22 | 1 | -1/+1 |
| | | | | | | | | Everything should work now :) | ||||
| * | Reinstate "Chunk queue collapsing" | Tiger Wang | 2015-06-10 | 1 | -14/+43 |
| | | | | | | | | | | This reinstates commit f36acb683594daff5af3971dcbe3c3a171628b78 and reverts commit adfbc42c021e1bcfcb355933c0fd784306ce0e18. | ||||
* | | Added a size check for portals. | STRWarrior | 2015-06-28 | 1 | -0/+4 |
| | | | | | | | | | | | | Made the portal size configurable Alpha-sorted SetXYZNetherPortalXYZ functions | ||||
* | | Buttons no longer click on when already on. Buttons now play sound when clicking off. | Hax52 | 2015-06-24 | 1 | -3/+9 |
|/ | |||||
* | Redstone wire and trapdoor fixes | Tiger Wang | 2015-06-06 | 1 | -1/+1 |
| | | | | | | * Fixes #1887 * Fixes #1763 * Fixes #1083 | ||||
* | Made cLightingThread own its callbacks | tycho | 2015-05-30 | 1 | -4/+4 |
| | |||||
* | Clean up Spawn Prepare | tycho | 2015-05-30 | 1 | -136/+2 |
| | | | | | Made cSpawnPrepare execute on the same thread since it is a syncronous operation, and most of the code happens on the lighting thread. Also moved cSpawnPrepare into its own file | ||||
* | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-23 | 1 | -1/+1 |
|\ | |||||
| * | Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher. | Lukas Pioch | 2015-05-23 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-23 | 1 | -0/+1 |
|\| | |||||
| * | Merge pull request #2030 from beeduck/master | worktycho | 2015-05-21 | 1 | -0/+1 |
| |\ | | | | | | | Issue #1868 and Issue #1984 | ||||
| | * | Added thunder sound effect to CastThunderbolt() | b33duck | 2015-05-21 | 1 | -0/+1 |
| | | | |||||
* | | | Fixed compile and a few more warnings | tycho | 2015-05-19 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #2019 from mc-server/OverrideArgs | Alexander Harkness | 2015-05-19 | 1 | -5/+5 |
|\ \ | | | | | | | Initial Implementation of command line arguments | ||||
| * | | Move make_unique into a namespace to avoid ADL issues | tycho | 2015-05-16 | 1 | -5/+5 |
| |/ | | | | | | | this prevents VS finding std::make_unique for constructors that take types from std | ||||
* / | Updated the defaults for the overworld world generator | STRWarrior | 2015-05-17 | 1 | -1/+1 |
|/ | |||||
* | Update World.cpp | Martin Fahy | 2015-05-14 | 1 | -2/+2 |
| | | | Fixed minor typos in comments, simply trying to understand the code base to fix issue regarding no sound when lighting is produced, no change to actual code. | ||||
* | CheckBasicStyle: checks spaces around * and &. | Mattes D | 2015-05-09 | 1 | -1/+1 |
| | |||||
* | More style checking. | Mattes D | 2015-05-09 | 1 | -2/+2 |
| | | | | Spaces around some operators are checked. | ||||
* | Added support for additional data in the ParticleEffect Packet | tycho | 2015-05-07 | 1 | -9/+15 |
| | | | | Also started refactoring how broadcasts are handled | ||||
* | Added Guardian and Rabbit to DefaultMonsters in Overworld | Mathias | 2015-04-29 | 1 | -1/+1 |
| | |||||
* | cSetChunkData constructor explicitly requires std::move() instead of | Woazboat | 2015-04-27 | 1 | -1/+1 |
| | | | | unsafely stealing data | ||||
* | Added GlowStone finisher | STRWarrior | 2015-04-19 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1826 from mc-server/UnifyPacketizer | Mattes D | 2015-03-24 | 1 | -23/+22 |
|\ | | | | | Unify packetizer | ||||
| * | Changed cEntity::m_UniqueID to UInt32. | Mattes D | 2015-03-21 | 1 | -23/+22 |
| | | |||||
* | | Changed linked world name variables and setters / getters. | Mattes D | 2015-03-21 | 1 | -10/+10 |
| | | | | | | | | | | Ref.: #1792 Ref.: https://github.com/mc-server/MCServer/pull/1792#discussion_r25946707 | ||||
* | | Added cPluginLua::cResettable interface, used for scheduled tasks. | Mattes D | 2015-03-20 | 1 | -5/+5 |
|/ | | | | | This allows plugins to register objects that can "survive" the plugin unloading - they will simply bail out if the plugin is already unloaded, instead of referencing bad plugin data. Fixes #1556. | ||||
* | Fixed a clang warning, improved comments. | Mattes D | 2015-03-19 | 1 | -7/+4 |
| | |||||
* | World:DoWithEntityByID() checks the entities-to-add as well. | Mattes D | 2015-03-18 | 1 | -0/+14 |
| | | | | This allows plugins to create entities and immediately act on them using that call. This will most likely need to be added to most of the DoWith<> and ForEach<> calls. | ||||
* | Merge pull request #1734 from mc-server/pistons | Mattes D | 2015-03-14 | 1 | -1/+1 |
|\ | | | | | Handle client 'leave bed' request | ||||
| * | Reverted non-functional changes | Tiger Wang | 2015-03-05 | 1 | -25/+0 |
| | | |||||
| * | Handle client 'leave bed' request | Tiger Wang | 2015-02-08 | 1 | -1/+26 |
| | | | | | | | | * Fixes #1728 | ||||
* | | Fixed a small bug | tumultenrx | 2015-03-14 | 1 | -1/+1 |
| | | |||||
* | | Monsters will now attack. Additional checks have been added when generating spawn. | tumultenrx | 2015-03-13 | 1 | -4/+64 |
|/ | | | | Monsters will now attack. Additional checks have been added when generating spawn. | ||||
* | Converted cServer to use the cNetwork API. | Mattes D | 2015-01-27 | 1 | -14/+17 |
| | |||||
* | Fixed defect #71781 in Coverity list. | Kirill Kirilenko | 2015-01-23 | 1 | -0/+5 |
| | |||||
* | Fixed type conversion warnings. | Mattes D | 2015-01-18 | 1 | -3/+3 |
| | |||||
* | correct comment to say milliseconds | worktycho | 2015-01-17 | 1 | -1/+1 |
| | |||||
* | Initial convertion of a_Dt to std::chrono | Tycho | 2015-01-11 | 1 | -42/+37 |
| | | | | also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay | ||||
* | Created new type cTickTime and rewrote cWorld::TickThread to use it | Tycho | 2015-01-11 | 1 | -6/+5 |
| | |||||
* | Refactored all player block placing to go through hooks. | Mattes D | 2014-12-24 | 1 | -2/+11 |
| | | | | Fixes #1618. | ||||
* | Fix compile error on OS X introduced by commit ecf778bbec2794562bf5e5b8645e2171f7cd081c | Jonathan Fabian | 2014-12-22 | 1 | -1/+1 |
| | | | | The following error occurs on OS X with the order reversed: `MCServer/src/World.cpp:282:2: error: field 'm_LastSave' will be initialized after field 'm_LastUnload' [-Werror,-Wreorder] m_LastSave(0),`. Reversing the order of initialization fixes this. | ||||
* | cWorld: Moved initialization into constructor. | Mattes D | 2014-12-21 | 1 | -3/+2 |
| | | | | Fixes CID 71781. | ||||
* | Merge pull request #1581 from mc-server/redstone | Mattes D | 2014-12-17 | 1 | -3/+3 |
|\ | | | | | Resplit redstone .inc file and provided improvements | ||||
| * | Merge branch 'master' into redstone | Tiger Wang | 2014-12-13 | 1 | -160/+182 |
| |\ | |||||
| * | | Cleaned up simulators | Tiger Wang | 2014-10-25 | 1 | -3/+3 |
| | | | |||||
* | | | Fixed mob invisibility | Howaner | 2014-12-14 | 1 | -1/+0 |
| | | | |||||
* | | | "& 0x0f" isn't needed | Howaner | 2014-12-14 | 1 | -1/+1 |
| | | | |||||
* | | | Fixes | Howaner | 2014-12-13 | 1 | -1/+15 |
| |/ |/| | |||||
* | | Merge pull request #1657 from mc-server/PrepareChunk | Mattes D | 2014-12-11 | 1 | -2/+11 |
|\ \ | | | | | | | Prepare chunk | ||||
| * | | Added a cWorld:PrepareChunk function. | Mattes D | 2014-12-10 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | It prepares the chunk - loads or generates it and lights it. The spawn prepare process uses this function. | ||||
* | | | Merge pull request #1655 from tonibm19/patch-2 | Mattes D | 2014-12-10 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Added NetherOreNests to default nether generator. | ||||
| * | | | Moved NetherOreNests | tonibm19 | 2014-12-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Added NetherOreNests to nether default generator. | tonibm19 | 2014-12-08 | 1 | -1/+1 |
| | | | | | | | | | | | | Now there's quartz in the nether | ||||
* | | | | Merge pull request #1623 from p-mcgowan/issue_1253 | Mattes D | 2014-12-10 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Prevent multiple logins with same username, unless allowed in settings | ||||
| * | | | | removed GetUsernames() from World | Vincent | 2014-11-30 | 1 | -15/+0 |
| | | | | | |||||
| * | | | | fixed naming of strings and changed from i to I | Vincent | 2014-11-29 | 1 | -3/+7 |
| | | | | | |||||
| * | | | | issue 1253 - prevent multiple logins with same username | Vincent | 2014-11-29 | 1 | -0/+12 |
| | | | | | |||||
* | | | | | Moved NaturalPatches in front of PreSimulator and Animals. | Mattes D | 2014-12-08 | 1 | -1/+1 |
| |/ / / |/| | | | |||||
* | | | | Added NaturalPatches to finishers | tonibm19 | 2014-12-08 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Fixed crash on server stop. | Mattes D | 2014-12-07 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | The entity destructors called through chunkmap destructor and chunk destructor were accessing the world which was in an already invalid state (half-destroyed). Fixed by destroying chunkmap explicitly and providing a nullptr check in the HasEntity() function. | ||||
* | | | Fixed c++11 branch issues. | Mattes D | 2014-12-07 | 1 | -1/+3 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into c++11 | Tiger Wang | 2014-12-06 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: src/OSSupport/Thread.cpp | ||||
| * \ \ | Merge branch 'master' of github.com:p-mcgowan/MCServer into animalTerrainFinisher | p-mcgowan | 2014-12-05 | 1 | -3/+3 |
| |\ \ \ | | | | | | | | | | | | | | | | update | ||||
| | * | | | Fixed reported parentheses around comparisons. | Mattes D | 2014-12-05 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | forgot generation defaul init | p-mcgowan | 2014-12-03 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merged branch 'origin/master' into c++11. | Mattes D | 2014-12-04 | 1 | -3/+5 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Allow Spectator Gamemode as a world default. | Jonathan Fabian | 2014-12-03 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Added better soulsand rims | STRWarrior | 2014-12-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | As a finisher called SoulsandRims | ||||
| * | | | Fixed a crash in cSpawnPrepare. | Mattes D | 2014-11-30 | 1 | -0/+2 |
| | | | | |||||
| * | | | Improved comments for cWorld::DoWithPlayer(). | Mattes D | 2014-11-30 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #1604 from mc-server/GeneratorShapeRefactor | Mattes D | 2014-11-24 | 1 | -13/+17 |
| |\ \ | | | | | | | | | Generator shape refactor | ||||
| | * | | cWorld: Changed generator defaults. | Mattes D | 2014-11-20 | 1 | -13/+17 |
| | | | | |||||
| * | | | Changed back capitalization. | Mattes D | 2014-11-24 | 1 | -3/+3 |
| | | | | |||||
| * | | | cWorld: Rewritten spawn preparation. | Mattes D | 2014-11-22 | 1 | -120/+111 |
| |/ / | | | | | | | | | | | | | It now supports pregeneration distance of any size and runs in two threads in parallel (generator / lighting). Fixes #1597. | ||||
* | | | Merge remote-tracking branch 'origin-master' into c++11 | Tiger Wang | 2014-11-26 | 1 | -132/+123 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into c++11 | Tiger Wang | 2014-11-23 | 1 | -9/+23 |
|\| | | | | | | | | | | | | | | | | | Conflicts: src/Noise/Noise.h src/World.h | ||||
| * | | Merge pull request #1598 from mc-server/SignEditor | Mattes D | 2014-11-18 | 1 | -9/+3 |
| |\ \ | | | | | | | | | Fixed a security problem with signs. | ||||
| | * | | Fixed a security problem with signs. | Howaner | 2014-11-15 | 1 | -9/+3 |
| | | | | |||||
| * | | | Merge branch 'master' into ViewDistance | Howaner | 2014-11-14 | 1 | -0/+17 |
| |\| | | |||||
| | * | | Merge branch 'master' of https://github.com/mc-server/MCServer | Mattes D | 2014-11-06 | 1 | -1/+1 |
| | |\| | |||||
| | * | | renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDump | Lukas Pioch | 2014-11-05 | 1 | -2/+3 |
| | | | | |||||
| | * | | Simplified FindAndDoWithUUID, formatted line | Lukas Pioch | 2014-11-02 | 1 | -7/+1 |
| | | | | |||||
| | * | | Added FindAndDoWithUUID | Lukas Pioch | 2014-11-02 | 1 | -0/+22 |
| | |/ | |||||
| * / | Added a MaxViewDistance option. | Howaner | 2014-10-30 | 1 | -0/+3 |
| |/ | |||||
* | | Merged branch 'master' into c++11. | Mattes D | 2014-10-24 | 1 | -6/+5 |
|\| | |||||
| * | Merge pull request #1565 from mc-server/MergedIniFile | Mattes D | 2014-10-24 | 1 | -1/+1 |
| |\ | | | | | | | Merged ini file | ||||
| | * | Merged IniFile into main MCS sources. | Mattes D | 2014-10-23 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-23 | 1 | -35/+35 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkSender.cpp src/ClientHandle.cpp src/World.h | ||||
| | * | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 1 | -35/+35 |
| | | | |||||
| * | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-21 | 1 | -33/+40 |
| |\| | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | | Stream 4 chunks per tick. Added priority. | Howaner | 2014-10-06 | 1 | -4/+4 |
| | | | |||||
| * | | Optimized chunk loader | Howaner | 2014-10-02 | 1 | -1/+0 |
| | | | |||||
* | | | Missing space fix. | Alexander Harkness | 2014-10-21 | 1 | -1/+1 |
| | | | |||||
* | | | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-20 | 1 | -35/+35 |
| | | | |||||
* | | | Migrated cSleep and cTimer to std::chrono | Tiger Wang | 2014-10-20 | 1 | -16/+11 |
| | | | |||||
* | | | Migrated random generators to std::random | Tiger Wang | 2014-10-19 | 1 | -1/+0 |
| |/ |/| | |||||
* | | Functions in cPluginManager get references instead of pointers. | Mattes D | 2014-10-15 | 1 | -5/+5 |
| | | |||||
* | | cWorld: Fixed scheduler. | Mattes D | 2014-10-13 | 1 | -9/+18 |
| | | | | | | | | | | Fixes #1534. Added a test case into the Debuggers plugin. | ||||
* | | Fixed style. | Mattes D | 2014-10-13 | 1 | -2/+4 |
| | | |||||
* | | Fix style | worktycho | 2014-10-12 | 1 | -2/+2 |
| | | |||||
* | | Update World.cpp | worktycho | 2014-10-12 | 1 | -1/+1 |
| | | |||||
* | | Fix lambda capture | worktycho | 2014-10-11 | 1 | -1/+2 |
| | | |||||
* | | Moved a few objects to unique_ptr | tycho | 2014-10-10 | 1 | -29/+24 |
|/ | |||||
* | Fixed iron trapdoors | Howaner | 2014-09-30 | 1 | -2/+2 |
| | |||||
* | World: Fixed chunk generation by plugins. | madmaxoft | 2014-09-29 | 1 | -1/+1 |
| | | | | ChunkWorx was broken, it was trying to generate chunks that were not properly marked as InQueue. | ||||
* | Merge branch 'master' into Fixes | Howaner | 2014-09-26 | 1 | -6/+6 |
|\ | |||||
| * | Merge pull request #1419 from mc-server/redstoneTests | worktycho | 2014-09-26 | 1 | -6/+6 |
| |\ | | | | | | | Added test mocking to IncrementalRedstoneSimulator | ||||
| | * | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 1 | -7/+83 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h | ||||
| | * \ | Merge branch 'master' into redstoneTests | Tycho | 2014-09-17 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/ChunkInterface.h | ||||
| | * | | | Added first test to show the object can be created | Tycho | 2014-09-17 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | IncrementalRedstoneSimulator now has no dependencies on cChunk | Tycho | 2014-09-16 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Possibly decoupled IncrementalRedstoneSimulator from the rest of the server | Tycho | 2014-09-11 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | THis wil hopefully allow for unit testing | ||||
* | | | | | Fixed players custom name in 1.8 | Howaner | 2014-09-26 | 1 | -2/+2 |
|/ / / / | |||||
* | | / | Improved searching for spawn. | madmaxoft | 2014-09-26 | 1 | -3/+14 |
| |_|/ |/| | | | | | | | | Won't spawn on a small island inside ocean anymore. | ||||
* | | | Merge branch 'master' into EntityCustomName | Howaner | 2014-09-23 | 1 | -45/+139 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/ClientHandle.h src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/World.cpp src/World.h | ||||
| * | | | Exported player list states to extra functions. | Howaner | 2014-09-18 | 1 | -3/+75 |
| | | | | |||||
| * | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-13 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: src/Items/ItemHoe.h | ||||
| | * | | Fixed farmland issues. | Howaner | 2014-09-12 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-12 | 1 | -12/+24 |
| |\| | |||||
| | * | Actually set default | worktycho | 2014-09-09 | 1 | -0/+1 |
| | | | |||||
| | * | use the correct ASSERT | worktycho | 2014-09-08 | 1 | -2/+2 |
| | | | |||||
| | * | FIxed a couple more warnings | Tycho | 2014-09-08 | 1 | -2/+8 |
| | | | |||||
| | * | TimeOfDay does not need to be an Int64 | Tycho | 2014-09-08 | 1 | -1/+1 |
| | | | |||||
| | * | Fixed a few compile warnings | Tycho | 2014-09-08 | 1 | -9/+14 |
| | | | |||||
| * | | 1.8: Added ParticleEffect packet. | Howaner | 2014-09-11 | 1 | -2/+2 |
| | | | |||||
| * | | Added the player list to the 1.8 protocol. | Howaner | 2014-09-09 | 1 | -3/+3 |
| |/ | |||||
| * | Rewritten chunk status to specify whether the chunk is in queue. | Mattes D | 2014-09-05 | 1 | -18/+20 |
| | | | | | | | | This fixes #1370. | ||||
| * | Merge remote-tracking branch 'origin/master' into EntitiesInBox | madmaxoft | 2014-09-04 | 1 | -11/+10 |
| |\ | |||||
| | * | Merge pull request #1351 from LO1ZB/remove-a_RelY | Mattes D | 2014-09-03 | 1 | -11/+10 |
| | |\ | | | | | | | | | remove y-coord from chunks | ||||
| | | * | hopefully the last commit for removing y-coord from chunks. :) | LO1ZB | 2014-09-03 | 1 | -11/+2 |
| | | | | |||||
| | | * | me being stupid | LO1ZB | 2014-08-29 | 1 | -1/+1 |
| | | | | |||||
| | | * | add comments | LO1ZB | 2014-08-29 | 1 | -1/+2 |
| | | | | |||||
| | | * | fix chunk regenerating | LO1ZB | 2014-08-29 | 1 | -0/+8 |
| | | | | |||||
| | | * | remove y-coord from chunks | LO1ZB | 2014-08-28 | 1 | -11/+10 |
| | | | | |||||
| * | | | Added cWorld::ForEachEntityInBox() | madmaxoft | 2014-09-03 | 1 | -0/+9 |
| |/ / | |||||
* / / | Added SetCustomName() to players. | Howaner | 2014-09-02 | 1 | -5/+9 |
|/ / | |||||
* | | Merge branch 'master' into fixes | madmaxoft | 2014-08-30 | 1 | -2/+4 |
|\ \ | |||||
| * | | Rewritten block entity loading. | Mattes D | 2014-08-29 | 1 | -2/+4 |
| |/ | | | | | | | | | | | Block entities are now loaded based on the blocktype at the coords they specify; before loading, their type ("id" NBT tag) is checked. The chunk now expects that all block entities given to it via cChunk::SetAllData() have their valid blocktype; asserts if they don't. Fixes #1354. | ||||
* | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-08-29 | 1 | -19/+57 |
|\| | | | | | | | | | Conflicts: src/Server.cpp | ||||
| * | World: Report chunk count for the spawn area. | Mattes D | 2014-08-22 | 1 | -1/+1 |
| | | |||||
| * | Added cWorld initializers. | Mattes D | 2014-08-21 | 1 | -0/+30 |
| | | |||||
| * | Code formatting fixes. | Howaner | 2014-08-19 | 1 | -0/+1 |
| | | |||||
| * | CheckBasicStyle checks the src folder as well. | madmaxoft | 2014-08-14 | 1 | -1/+1 |
| | | |||||
| * | Exported daylight cycle flag to the protocol. | Howaner | 2014-08-11 | 1 | -8/+1 |
| | | |||||
| * | Added a comment and simplified code. | Howaner | 2014-08-10 | 1 | -5/+2 |
| | | |||||
| * | Added IsDaylightCycleEnabled saving. | Howaner | 2014-08-10 | 1 | -0/+2 |
| | | |||||
| * | Renamed functions. | Howaner | 2014-08-10 | 1 | -3/+3 |
| | | |||||
| * | Renamed m_DoDaylightCycle to m_CycleDaylight. | Howaner | 2014-08-08 | 1 | -3/+3 |
| | | |||||
| * | Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld. | Howaner | 2014-08-07 | 1 | -17/+32 |
| | | | | | | I need this for a GameRule plugin. | ||||
* | | Improved explosion damage | Tiger Wang | 2014-08-29 | 1 | -3/+6 |
|/ | |||||
* | Fixed issues with autocomplete and time loading | Tiger Wang | 2014-08-01 | 1 | -7/+33 |
| | | | | * Fixes #1274 | ||||
* | Merge pull request #1269 from Howaner/BlockEntitys | Mattes D | 2014-08-01 | 1 | -0/+10 |
|\ | | | | | Added beacon. | ||||
| * | Exported the beacon. | Howaner | 2014-07-30 | 1 | -0/+10 |
| | | |||||
* | | Capitalised "incremental" | Howaner | 2014-07-31 | 1 | -4/+4 |
| | | |||||
* | | Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator. | Howaner | 2014-07-31 | 1 | -2/+2 |
|/ | |||||
* | Merged branch 'howaner/Options'. | madmaxoft | 2014-07-30 | 1 | -0/+3 |
|\ | |||||
| * | Add "Broadcasting" settings to world.ini | Howaner | 2014-07-27 | 1 | -0/+3 |
| | | |||||
* | | Slight cleanup after portals | Tiger Wang | 2014-07-29 | 1 | -2/+4 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-29 | 1 | -32/+63 |
|\| | | | | | | | | | Conflicts: src/World.h | ||||
| * | Added a queue for setting chunk data. | madmaxoft | 2014-07-24 | 1 | -32/+53 |
| | | | | | | | | Fixes #1196. | ||||
| * | Made the cWorld::SpawnMobFinalize function more readable. | STRWarrior | 2014-07-24 | 1 | -0/+10 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-07-23 | 1 | -6/+3 |
| | | |||||
* | | Speed improvements, crash fixes, & self-suggestions | Tiger Wang | 2014-07-22 | 1 | -11/+6 |
| | | |||||
* | | Suggestion and failed merge fix | Tiger Wang | 2014-07-22 | 1 | -0/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 1 | -9/+4 |
|\| | | | | | | | | | | | | | | | 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 | -1/+1 |
| | | |||||
| * | Style: Normalized spaces after if, for and while. | madmaxoft | 2014-07-21 | 1 | -3/+3 |
| | | |||||
| * | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 1 | -1/+1 |
| | | |||||
| * | World.cpp: fixed not all enum fields being used in m_Dimension switch | archshift | 2014-07-19 | 1 | -1/+2 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-07-21 | 1 | -56/+79 |
| | | |||||
* | | Bug and crash fixes | Tiger Wang | 2014-07-20 | 1 | -8/+16 |
| | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | Fix failed merge and other issues | Tiger Wang | 2014-07-18 | 1 | -10/+6 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -48/+65 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -10/+10 |
| | | | | | | | | | | 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 | -17/+15 |
| | | | | | | | | There should be at least two spaces in front and one space after //-style comments. | ||||
| * | Fixed basic whitespace problems. | madmaxoft | 2014-07-17 | 1 | -5/+5 |
| | | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines. | ||||
| * | Merge pull request #1192 from mc-server/skinuuid | Mattes D | 2014-07-16 | 1 | -1/+1 |
| |\ | | | | | | | Skins | ||||
| | * | Player properties are now retrieved | Tiger Wang | 2014-07-14 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed FindClosestPlayer | Tycho | 2014-07-15 | 1 | -3/+6 |
| | | | |||||
| * | | Made CreateProjectile a pointer | worktycho | 2014-07-13 | 1 | -1/+1 |
| | | | |||||
| * | | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 1 | -3/+3 |
| |/ | |||||
| * | Merge pull request #1154 from mc-server/trappedchests | Tiger Wang | 2014-07-13 | 1 | -4/+13 |
| |\ | | | | | | | Implemented trapped chests & others | ||||
| | * | Implemented trapped chests & others | Tiger Wang | 2014-07-07 | 1 | -4/+13 |
| | | | | | | | | | | | | | | | | | | | | | + 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. | madmaxoft | 2014-07-10 | 1 | -0/+9 |
| | | | | | | | | | | | | Fixes #1160. | ||||
| * | | Fixed arrow collection animation | Tiger Wang | 2014-07-09 | 1 | -9/+0 |
| |/ | | | | | | | * Fixed piston extension non-solidness | ||||
| * | Removed world-saving log messages. | madmaxoft | 2014-07-04 | 1 | -2/+0 |
| | | | | | | | | Ref.: http://forum.mc-server.org/showthread.php?tid=1518 | ||||
| * | Added generic entity-collecting. | Mattes D | 2014-06-27 | 1 | -1/+10 |
| | | | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098. | ||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 1 | -6/+9 |
|\| | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| * | Nullify deleted pointers. | archshift | 2014-06-19 | 1 | -6/+9 |
| | | |||||
* | | Fixed invalid iterators | Tiger Wang | 2014-06-21 | 1 | -10/+4 |
| | | |||||
* | | Fixed order of initalisation | Tycho | 2014-06-12 | 1 | -3/+4 |
| | | |||||
* | | Portals animate and delay correctly | Tiger Wang | 2014-06-12 | 1 | -3/+6 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 1 | -30/+106 |
|\| | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp | ||||
| * | Fixed a race condition when adding a player to a world. | madmaxoft | 2014-06-10 | 1 | -4/+1 |
| | | |||||
| * | Fixed deadlock when moving players to other worlds. | Mattes D | 2014-06-08 | 1 | -29/+82 |
| | | | | | | | | Fixes #1039, fixes #851 | ||||
| * | Added queue for adding entities to cWorld. | Mattes D | 2014-06-08 | 1 | -1/+27 |
| | | | | | | | | This alone doesn't work properly yet, further changes to cPlayer are needed. | ||||
* | | Portal improvements and suggestions | Tiger Wang | 2014-06-10 | 1 | -5/+13 |
| | | |||||
* | | Fixed Time of day | worktycho | 2014-06-07 | 1 | -1/+1 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-06-05 | 1 | -9/+2 |
| | | |||||
* | | Time and weather is saved, part of #1058 | Tiger Wang | 2014-06-04 | 1 | -0/+12 |
| | | | | | | | | Also fixed unreliability in Health and LootPickup loading. | ||||
* | | Configurable portals | Tiger Wang | 2014-06-04 | 1 | -0/+26 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-04 | 1 | -2/+45 |
|\| | |||||
| * | Changed block send queue to use vectors | Tiger Wang | 2014-05-29 | 1 | -11/+10 |
| | | | | | | | | As suggested by @worktycho. | ||||
| * | Hopefully fixed piston duplication issues | Tiger Wang | 2014-05-25 | 1 | -2/+46 |
| | | | | | | | | | | * Fixes #879 * Fixes #714 | ||||
* | | Implemented end and nether portals | Tiger Wang | 2014-05-31 | 1 | -0/+31 |
|/ | |||||
* | World pre-generation distance is settable in world.ini. | Mattes D | 2014-05-09 | 1 | -2/+6 |
| | |||||
* | Fixed MSVC 64-bit build warnings. | Mattes D | 2014-05-09 | 1 | -4/+3 |
| | |||||
* | Moved the weather picker out of TickWeather(), squashing a warning and improving readability. | archshift | 2014-04-26 | 1 | -24/+26 |
| | |||||
* | Removed impossible default case. | archshift | 2014-04-26 | 1 | -6/+0 |
| | | | | Squashed a warning. | ||||
* | Removed extraneous switch{} in Start() | archshift | 2014-04-26 | 1 | -15/+0 |
| | | | | Squashed a warning. | ||||
* | Small changes; warning fixing. | archshift | 2014-04-25 | 1 | -6/+3 |
| | |||||
* | Merge pull request #909 from jfhumann/fixes | Mattes D | 2014-04-22 | 1 | -5/+5 |
|\ | | | | | | | | | 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 | ||||
| * | Merge remote-tracking branch 'origin/master' into fixes | jfhumann | 2014-04-18 | 1 | -5/+4 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Authenticator.cpp src/ClientHandle.cpp src/Entities/Minecart.cpp src/Protocol/Protocol17x.cpp | ||||
| * | | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 1 | -5/+5 |
| | | | |||||
* | | | Fixed #904 | Tiger Wang | 2014-04-18 | 1 | -0/+5 |
| |/ |/| | |||||
* | | Rewrote redstone powering to use power levels | Tiger Wang | 2014-04-15 | 1 | -1/+1 |
| | | |||||
* | | Simplified pickup speed randomisation | Tiger Wang | 2014-04-12 | 1 | -4/+3 |
|/ | |||||
* | Fixed double projectile spawning. | madmaxoft | 2014-04-05 | 1 | -1/+0 |
| | | | | Two spawn packets were sent per projectile. | ||||
* | Removed unused constants. | madmaxoft | 2014-03-25 | 1 | -3/+0 |
| | | | | DeadlockDetect reads the value from the ini file, and world lighting has a separate queue now. | ||||
* | Fixed code style after recent merge. | madmaxoft | 2014-03-20 | 1 | -30/+28 |
| | |||||
* | Added braces | Tiger Wang | 2014-03-20 | 1 | -0/+2 |
| | |||||
* | ENUMified shrapnel level | Tiger Wang | 2014-03-20 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-18 | 1 | -6/+5 |
|\ | | | | | | | | | Conflicts: src/ChunkMap.cpp | ||||
| * | Merge branch 'master' into warnings | Tycho | 2014-03-14 | 1 | -3/+3 |
| |\ | |||||
| | * | Fixed a warning. | madmaxoft | 2014-03-14 | 1 | -3/+3 |
| | | | |||||
| * | | Added additional macros to support the MSVC size_t format and changed all formats to use the macros | Tycho | 2014-03-12 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'Werror' into warnings | Tycho | 2014-03-12 | 1 | -1/+0 |
| |\| | | | | | | | | | | | | | Conflicts: src/Globals.h | ||||
| | * | Unified Vector classes | andrew | 2014-03-11 | 1 | -1/+0 |
| | | | |||||
| * | | Fixed more Format issues | Tycho | 2014-03-11 | 1 | -2/+2 |
| |/ | |||||
* | | Added levels of shrapnel | Tiger Wang | 2014-03-18 | 1 | -1/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into awesometnt | Tiger Wang | 2014-03-10 | 1 | -11/+11 |
|\| | | | | | | | | | | | Conflicts: src/Items/ItemLighter.h src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | Merge pull request #768 from Howaner/BlockEntitys | Tiger Wang | 2014-03-09 | 1 | -2/+2 |
| |\ | | | | | | | Add TNT load/save | ||||
| | * | Merge branch 'master' into BlockEntitys | Howaner | 2014-03-08 | 1 | -8/+18 |
| | |\ | |||||
| | * | | Change TNT Fuse to ticks | Howaner | 2014-03-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into ballisticmissiles | Tiger Wang | 2014-03-09 | 1 | -27/+112 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | | | Improved formatting of username tabcomplete | Tiger Wang | 2014-03-09 | 1 | -7/+7 |
| | | | | |||||
| * | | | Implemented ballistic missiles (fireworks) | Tiger Wang | 2014-02-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | + Added fireworks | ||||
* | | | | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-10 | 1 | -27/+112 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #763 from Howaner/BlockEntitys | Mattes D | 2014-03-07 | 1 | -2/+11 |
| |\ \ \ | | | |/ | | |/| | Add Flower Pots | ||||
| | * | | 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/+9 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'xdot/master' | madmaxoft | 2014-03-06 | 1 | -8/+18 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Implemented vanilla-like fluid simulator | andrew | 2014-03-05 | 1 | -8/+18 |
| | | | | |||||
| * | | | Fixed an assert in map-loading. | madmaxoft | 2014-03-04 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | The maps were loaded too soon, the world wasn't initialized yet. | ||||
| * | | | Fixed previous weather changes. | madmaxoft | 2014-03-03 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | cWorld::GetDefaultWeatherInterval() returns -1 for unknown weather. | ||||
| * | | | Merge pull request #746 from Howaner/Slabs | Mattes D | 2014-03-03 | 1 | -13/+81 |
| |\ \ \ | | |/ / | |/| | | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs | ||||
| | * | | Add cancelling to WeatherChanging event. | Howaner | 2014-03-02 | 1 | -13/+40 |
| | | | | |||||
| | * | | More documentation (thanks to madmaxoft) and use GetBlockTypeMeta | Howaner | 2014-03-02 | 1 | -4/+8 |
| | | | | |||||
| | * | | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs | Howaner | 2014-03-02 | 1 | -0/+37 |
| | |/ | |||||
| * / | cBlockInfo now manages the respective cBlockHandler | andrew | 2014-03-02 | 1 | -1/+1 |
| |/ | |||||
* | | Shrapnel now configurable | Tiger Wang | 2014-03-10 | 1 | -2/+1 |
| | | |||||
* | | Added extra awesomeness to TNT | Tiger Wang | 2014-03-05 | 1 | -1/+5 |
|/ | | | | | | | + 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 | ||||
* | Merge pull request #669 from xdot/master | Tiger Wang | 2014-02-24 | 1 | -0/+8 |
|\ | | | | | Implementation of in-game maps :D | ||||
| * | Maps: Improvements | andrew | 2014-02-23 | 1 | -3/+3 |
| | | |||||
| * | Thread safe cMap manager | andrew | 2014-02-20 | 1 | -1/+2 |
| | | |||||
| * | Manual merge (Fixed conflicts) | andrew | 2014-02-20 | 1 | -95/+85 |
| |\ | |||||
| * | | Map item handler; Fixed several bugs | andrew | 2014-02-17 | 1 | -8/+20 |
| | | | |||||
| * | | Send map when selected | andrew | 2014-02-14 | 1 | -2/+43 |
| | | | |||||
| * | | IDCount Serialization | andrew | 2014-02-13 | 1 | -0/+54 |
| | | | |||||
* | | | Merge pull request #700 from Howaner/GlobalFixes | Mattes D | 2014-02-20 | 1 | -4/+6 |
|\ \ \ | |_|/ |/| | | Add new Trees (without Generator) | ||||
| * | | Add BlockNewLeaves.h and rename Darkoac to Darkoak | Howaner | 2014-02-19 | 1 | -6/+6 |
| | | | |||||
| * | | Add new Trees (without Generator) | Howaner | 2014-02-19 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #697 from Howaner/Skull | Mattes D | 2014-02-19 | 1 | -0/+9 |
|\ \ \ | |/ / |/| | | 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/+9 |
| | | | |||||
* | | | The cuboid for cWorld::SetAreaBiome() doesn't need sorting. | madmaxoft | 2014-02-18 | 1 | -1/+5 |
| | | | |||||
* | | | Added cWorld:SetAreaBiome() API function. | madmaxoft | 2014-02-18 | 1 | -0/+37 |
|/ / | | | | | | | Fixes #675. | ||||
* | | Removed the unnecessary LoopPlayersAndBroadcastChat() functions. | madmaxoft | 2014-02-15 | 1 | -1/+1 |
| | | |||||
* | | Implemented cCompositeChat. | madmaxoft | 2014-02-15 | 1 | -1/+19 |
| | | | | | | | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678. | ||||
* | | Merged branch 'narroo/master'. | madmaxoft | 2014-02-13 | 1 | -0/+22 |
|\ \ | |/ |/| | | | This merges pull request #661. | ||||
| * | Fixed formatting. Moved UnloadUnusedChunks from public to private. | narroo | 2014-02-11 | 1 | -0/+7 |
| | | |||||
| * | Fixed formatting of previous commit. | narroo | 2014-02-11 | 1 | -0/+5 |
| | | |||||
| * | Fixed bug #385. UnloadUnusedChunks now has the same interface as | narroo | 2014-02-11 | 1 | -0/+10 |
| | | | | | | | | | | | | SaveAllChunks. Meaning, QueueUnloadUnusedChunks and the supporting cTaskUnloadUnusedChunks has been added. Use QueueUnloadUnusedChunks from now on to prevent deadlocking. | ||||
* | | More gcc warnings fixed. | madmaxoft | 2014-02-11 | 1 | -3/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into ChunkStay | madmaxoft | 2014-02-09 | 1 | -6/+9 |
|\| | |||||
| * | Fixed compile and some warnings in MSVS | Tiger Wang | 2014-02-09 | 1 | -2/+0 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into playerimprovements | Tiger Wang | 2014-02-09 | 1 | -4/+36 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp | ||||
| * \ | Merge branch 'master' into playerimprovements | Tiger Wang | 2014-02-09 | 1 | -3/+3 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| * | | | Moved Gamemode setting into General root tag | Tiger Wang | 2014-02-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | Added sender name to PM if prefixes disabled | Tiger Wang | 2014-02-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | * Also moved the PVP setting into Mechanics | ||||
| * | | | Improved chat messaging functions | Tiger Wang | 2014-02-07 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API. | ||||
* | | | | Initial ChunkStay code. | madmaxoft | 2014-02-08 | 1 | -12/+0 |
| |_|/ |/| | | |||||
* | | | Fixed comment. | STRWarrior | 2014-02-08 | 1 | -1/+1 |
| | | | |||||
* | | | Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later). | STRWarrior | 2014-02-07 | 1 | -12/+8 |
| | | | |||||
* | | | Implemented an easy way of adding new redstone simulators. | STRWarrior | 2014-02-07 | 1 | -3/+37 |
| | | | | | | | | | | | | Also added a "noop" redstone simulator that does the same as the fluid version. | ||||
* | | | Merge pull request #646 from worktycho/warningfixes | Alexander Harkness | 2014-02-05 | 1 | -2/+2 |
|\ \ \ | |_|/ |/| | | Fixed most of the reordering warnings | ||||
| * | | Fixed most of the reordering warnings | Tycho | 2014-02-05 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #635 from tonibm19/master | Mattes D | 2014-02-04 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API | ||||
| * | | Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API | tonibm19 | 2014-02-03 | 1 | -1/+1 |
| |/ | |||||
* / | Increased Type safety of Biomes | Tycho | 2014-02-03 | 1 | -2/+2 |
|/ | | | | | 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 | ||||
* | Merge pull request #602 from mc-server/improvementsandfixes | Mattes D | 2014-02-03 | 1 | -3/+3 |
|\ | | | | | Redstone crash fix and current console line replace function | ||||
| * | Added IsBlockWaterOrIce() | Tiger Wang | 2014-02-02 | 1 | -1/+1 |
| | | |||||
| * | Revert "Added LOGREPLACELINE for line replacement" | Tiger Wang | 2014-02-02 | 1 | -5/+5 |
| | | | | | | | | This reverts commit 7d03876a3e11aedff0201a8330bfdb2b5523fc5e. | ||||
| * | Revert "Improved code" | Tiger Wang | 2014-02-02 | 1 | -2/+0 |
| | | | | | | | | This reverts commit d8aa0b0ec7a2ebea2fc157c623ae8cd7d0b6ba1c. | ||||
| * | Possibly fixed #618 | Tiger Wang | 2014-02-02 | 1 | -2/+2 |
| | | |||||
| * | Added checks for ice into IsBlockWater() | Tiger Wang | 2014-02-01 | 1 | -1/+1 |
| | | | | | | | | | | * This fixes players spawning in vast oceans of ice, as opposed to the previous water | ||||
| * | Improved code | Tiger Wang | 2014-01-31 | 1 | -0/+2 |
| | | | | | | | | | | * Fixed some issues * Fixed standard violation | ||||
| * | Added LOGREPLACELINE for line replacement | Tiger Wang | 2014-01-29 | 1 | -5/+5 |
| | | |||||
* | | Changed pointers to references | Tycho | 2014-02-01 | 1 | -4/+3 |
| | | |||||
* | | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-02-01 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| * | | Attempt at implementing #563 | tonibm19 | 2014-01-30 | 1 | -2/+1 |
| |/ | | | | | Not tested (I don't have RasPi) | ||||
| * | The world can now be configured wether farmers should be able to harvest crops. | STRWarrior | 2014-01-27 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-01-26 | 1 | -3/+37 |
|\| | | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h | ||||
| * | Did what xoft recommended | Tiger Wang | 2014-01-25 | 1 | -1/+1 |
| | | |||||
| * | Mob bugfixes | Tiger Wang | 2014-01-25 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | * Mobs no longer require constant line-of-sight to a player to remain aggravated * Fixed an ASSERT * Fixed mobs jumping * Fixed Idle state not properly using AI + Added FILE_IO_PREFIX to favicon loading + Implemented #563 | ||||
| * | Command block fixes 2 | andrew | 2014-01-23 | 1 | -1/+26 |
| | | |||||
* | | Refactored cBlockHandler::OnUse and dependents | Tycho | 2014-01-26 | 1 | -88/+5 |
|/ | |||||
* | cWorld now saves/loads the scoreboard | andrew | 2014-01-22 | 1 | -0/+9 |
| | |||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer | andrew | 2014-01-21 | 1 | -15/+21 |
|\ | |||||
| * | Changed the cWorld::ScheduleTask() signature. | madmaxoft | 2014-01-19 | 1 | -11/+21 |
| | | | | | | | | Now it takes the delay in ticks as an argument, and a cTask descendant as the task to run. Lua API has been updated similarly. | ||||
| * | Merge pull request #551 from worktycho/schedular | Mattes D | 2014-01-19 | 1 | -6/+2 |
| |\ | | | | | | | Implemented xoft's suggestion for a saturating counter in the scheduler | ||||
| | * | Fixed iterators bug | Tycho | 2014-01-18 | 1 | -2/+1 |
| | | | |||||
| | * | switched to using m_WorldAge rather than m_TickID | Tycho | 2014-01-18 | 1 | -6/+3 |
| | | | |||||
| | * | Increased tick count to long | Tycho | 2014-01-17 | 1 | -2/+2 |
| | | | |||||
| | * | Implemented xsofts suggestion for a saturating counter in the scheduler | Tycho | 2014-01-17 | 1 | -5/+5 |
| | | | |||||
* | | | Scoreboard protocol support | andrew | 2014-01-21 | 1 | -1/+56 |
|/ / | |||||
* | | Merge pull request #559 from mc-server/SpawnMobParticles | Mattes D | 2014-01-19 | 1 | -3/+0 |
|\ \ | | | | | | | Removed the particles when a mob spawns. | ||||
| * | | Removed the particles when a mob spawns. | STRWarrior | 2014-01-18 | 1 | -3/+0 |
| | | | |||||
* | | | Basic command block implementation | andrew | 2014-01-18 | 1 | -0/+9 |
|/ / | |||||
* / | Added user setting compression factor | Tycho | 2014-01-17 | 1 | -1/+3 |
|/ | |||||
* | Merge pull request #534 from mc-server/SpawnMinecart | Mattes D | 2014-01-17 | 1 | -0/+24 |
|\ | | | | | Added cWorld::SpawnMinecart. | ||||
| * | Renamed cEmptyMinecart to cRideableMinecart | STRWarrior | 2014-01-12 | 1 | -2/+2 |
| | | |||||
| * | EmptyMinecarts should be able to get a block inside of them. | STRWarrior | 2014-01-12 | 1 | -3/+3 |
| | | |||||
| * | Added cWorld::SpawnMinecart. | STRWarrior | 2014-01-12 | 1 | -0/+24 |
| | | |||||
* | | added cWorld::ScheduleTask Function | Tycho | 2014-01-14 | 1 | -0/+39 |
|/ | | | | | ScheduleTask schedules a SceduledTask object to be run x ticks in the future. In is exported to lua, fixes #150 | ||||
* | Decoupled cChunkGenerator from cWorld and cRoot. | madmaxoft | 2014-01-10 | 1 | -1/+77 |
| | | | | Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS. | ||||
* | rewrote queue not to use promises for waits | Tycho Bickerstaff | 2014-01-02 | 1 | -1/+4 |
| | |||||
* | fixed warnings in World.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -1/+3 |
| | |||||
* | Implented BroadcastParticleEffect | STRWarrior | 2013-12-22 | 1 | -0/+9 |
| | |||||
* | Fixed the rest of constructor reorders. | madmaxoft | 2013-12-20 | 1 | -6/+6 |
| | |||||
* | Removed some old cRedstone remnants | Tiger Wang | 2013-12-16 | 1 | -24/+0 |
| | |||||
* | This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions. | STRWarrior | 2013-12-15 | 1 | -0/+18 |
| | |||||
* | Implemented note block playing and fixed wire | Tiger Wang | 2013-12-14 | 1 | -0/+9 |
| | | | | Game of Thrones music in Minecraft, here I come! | ||||
* | Improved pickups spawning speed again | Tiger Wang | 2013-12-10 | 1 | -4/+4 |
| | |||||
* | Merge pull request #408 from mc-server/SpawnPoint_Fix | Mattes D | 2013-12-08 | 1 | -1/+1 |
|\ | | | | | Now spawn points will not be in deep oceans or rivers etc. | ||||
| * | Now spawn points will not be in deep oceans or rivers etc. | STRWarrior | 2013-12-08 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures | Tiger Wang | 2013-12-08 | 1 | -2/+13 |
|\| | | | | | | | | | | | | | 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 | -2/+1 |
| | | | | | | | | Ref.: #407 | ||||
| * | Added a SpawnFallingBlock function so plugins can make other blocks fall. | STRWarrior | 2013-12-07 | 1 | -0/+12 |
| | | |||||
* | | Bonemeal has particles, fixes #393 | Tiger Wang | 2013-12-08 | 1 | -0/+6 |
| | | |||||
* | | 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 | -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. | ||||
* | | Added pickup invalid item check | Tiger Wang | 2013-12-06 | 1 | -0/+11 |
|/ | | | | | They aren't spawned at all if their itemtype isn't valid; possibly fixes the client crashing with bad pickups. | ||||
* | Lava can spawn fire. | madmaxoft | 2013-12-04 | 1 | -0/+1 |
| | | | | Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65. | ||||
* | Changed cBlockHandler->OnUpdate() to use cChunk directly. | madmaxoft | 2013-11-30 | 1 | -2/+2 |
| | |||||
* | Explicitly set spawnpoint fixes. | madmaxoft | 2013-11-30 | 1 | -20/+11 |
| | | | | | The value names are case-insensitive. The debug message is printed only once. | ||||
* | Added the real tick duration to the OnWorldTick hook. | madmaxoft | 2013-11-30 | 1 | -9/+10 |
| | |||||
* | Made TNT pickups spawning chance 25% | Tiger Wang | 2013-11-27 | 1 | -1/+1 |
| | |||||
* | Merged master into redstonefixes | Tiger Wang | 2013-11-27 | 1 | -11/+73 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -0/+12 |
| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
* | Fixed another one. | Alexander Harkness | 2013-11-26 | 1 | -1/+1 |
| | |||||
* | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 1 | -0/+18 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+2715 |