Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Clean up GenerateChunk/TouchChunk | Tiger Wang | 2020-08-28 | 1 | -5/+2 |
| | | | | | | - Remove TouchChunk - Remove unused bool return value in GenerateChunk - Remove ShouldGenerateIfLoadFailed | ||||
* | Remove unneeded MarkDirty, SendToClients parameters of SetMeta | Tiger Wang | 2020-08-28 | 1 | -7/+3 |
| | | | | | | | | 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 | ||||
* | Removed const | Mattes D | 2020-08-27 | 1 | -2/+2 |
| | |||||
* | Changed tree-growing functions in cWorld to use Vector3i coords. | Mattes D | 2020-08-27 | 1 | -20/+15 |
| | |||||
* | OnBroken/OnPlaced are for entity actions | Tiger Wang | 2020-08-04 | 1 | -9/+5 |
| | | | | | | * Call OnPlaced/OnBroken in PlaceBlock/DigBlock - Remove unused Placing/Breaking handlers * Have the blockhandler's Check handle neighbour updating, instead of QueueTickBlockNeighbors | ||||
* | cWorld * -> cWorld (#4771) | Tiger Wang | 2020-07-14 | 1 | -16/+13 |
| | | | * cWorld * -> cWorld | ||||
* | Improve entity position updates (#4701) | Tiger Wang | 2020-05-04 | 1 | -4/+2 |
| | | | | | | | | | * Make puking pickups fly nicer * Improve entity position updates * Move determination of whether a delta is too big for a packet into the protocol handlers + Less jittery movement + Generalise CollectEntity to take any entity | ||||
* | Vector3 in Handlers (#4680) | Mattes D | 2020-04-21 | 1 | -0/+7 |
| | | | Refactored all cBlockHandler and cItemHandler descendants to use Vector3. | ||||
* | More Vector3 in cBlockHandler (#4644) | Mattes D | 2020-04-17 | 1 | -7/+6 |
| | | | | | * cBlockHandler.OnUpdate uses Vector3 params. Also slightly changed how block ticking works. | ||||
* | Using Super. | Mattes D | 2020-04-16 | 1 | -4/+14 |
| | |||||
* | Acquire chunk map CS when accessing player entities | Peter Bell | 2020-04-13 | 1 | -1/+1 |
| | |||||
* | Falling blocks can now be spawned at any position. (#4620) | Mattes D | 2020-04-09 | 1 | -3/+11 |
| | | | | | | | * 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. | ||||
* | Pulled the BlockID and BlockInfo headers from Globals.h. (#4591) | Mattes D | 2020-04-03 | 1 | -1/+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 | ||||
* | Lock hopper when powered by redstone (#4347) | Bond-009 | 2020-03-27 | 1 | -0/+4 |
| | | | | | | | | | * 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/+2 |
| | |||||
* | TNT position fixes (#4519) | Mat | 2020-03-22 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | Stabilise MoveToWorld (#4004) | Mat | 2020-03-05 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | Moved growing from cWorld / cChunk to cBlockHandler descendants. | Mattes D | 2019-10-28 | 1 | -35/+146 |
| | |||||
* | Refactored block-to-pickup conversion. (#4417) | Mattes D | 2019-10-16 | 1 | -13/+62 |
| | |||||
* | Refactored more of Entities and BlockEntities to use Vector3. (#4403) | Mattes D | 2019-09-29 | 1 | -7/+65 |
| | |||||
* | NBTChunkSerializer: Cleaned up interface. | Mattes D | 2019-09-24 | 1 | -1/+3 |
| | | | | | | 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 | -4/+1 |
| | |||||
* | Separated chunk generator from world / plugin interfaces. | Mattes D | 2019-09-06 | 1 | -9/+13 |
| | | | | The generator now only takes care of servicing synchronous "GetChunk(X, Y)" and "GetBiomes(X, Y)" requests. | ||||
* | Store and pass entity effect duration as an int not a short. (#4293) | Alexander Harkness | 2018-08-26 | 1 | -1/+1 |
| | | | Fixes #4292. | ||||
* | Experience orb (#4259) | changyong guo | 2018-08-02 | 1 | -2/+10 |
| | | | | | | | * 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 | -26/+5 |
| | | | Ref: https://github.com/cuberite/cuberite/pull/4264#discussion_r204769193 | ||||
* | Broadcast refactor (#4264) | peterbell10 | 2018-07-24 | 1 | -52/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | Keep players in gmNotSet (#4248) | changyong guo | 2018-07-23 | 1 | -0/+1 |
| | | | | This allows players game mode to update to the default after portal to another world. Fixes #4207 | ||||
* | improve rain simulation (#4017) | Alexander Harkness | 2017-12-26 | 1 | -10/+14 |
| | | | | | | | | | | | * 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 | -1/+1 |
| | | | | Prevents nullptr dereferences before Start has been called. | ||||
* | cWorld: Move Initialization from Start to the constructor. | peterbell10 | 2017-10-21 | 1 | -5/+11 |
| | | | | Start now does nothing more than launch the world's threads. | ||||
* | BroadcastBlockBreakAnimation and BroadcastBlockEntity use vectors (#4038) | Bond-009 | 2017-09-25 | 1 | -2/+2 |
| | |||||
* | Changed BroadcastSoundEffect, SendSoundEffect, and CastThunderbolt parameters to vectors (#3959) | Lane Kolbly | 2017-09-19 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | * 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 | ||||
* | Replace ItemCallbacks with lambdas (#3993) | peterbell10 | 2017-09-11 | 1 | -50/+33 |
| | |||||
* | Made world data paths adjustable, and added API to temporarily disable saving chunks to disk. (#3912) | Lane Kolbly | 2017-09-07 | 1 | -1/+17 |
| | |||||
* | Changed some int parameters to vector parameters (#3937) | Bond-009 | 2017-09-07 | 1 | -2/+16 |
| | |||||
* | Add cWorld::RemoveEntity and use in cEntity (#4003) | peterbell10 | 2017-09-05 | 1 | -0/+4 |
| | | | | | | * 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 | -34/+51 |
| | | | | This reverts commit 496c337cdfa593654018c171f6a74c28272265b5. | ||||
* | Replace ItemCallbacks with lambdas (#3948) | peterbell10 | 2017-09-01 | 1 | -51/+34 |
| | |||||
* | Add cUUID class (#3871) | peterbell10 | 2017-08-25 | 1 | -2/+3 |
| | |||||
* | Bed piston fix (#3956) | Lane Kolbly | 2017-08-25 | 1 | -1/+1 |
| | | | | | | | | | | | | * Threaded world interface into ConvertBlockToPickups * Changed how cBlockPiston::PushBlocks sets the old block to air, so that the block exists for the DropBlock call. * Removed unused a_Digger argument. * Removed incorrect comment * This time actually removed a_Digger references. | ||||
* | Fully implemented leashes (#3798) | Pablo Beltrán | 2017-08-21 | 1 | -1/+3 |
| | |||||
* | Merge pull request #3489 from cuberite/EntityOwnership | Tiger Wang | 2017-08-18 | 1 | -6/+13 |
|\ | | | | | * Changed entity ownership model to use smart pointers | ||||
| * | Changed entity ownership model to use smart pointers | Tiger Wang | 2017-08-07 | 1 | -6/+13 |
| | | |||||
* | | Changed int parameters to vector parameters in cCuboid and simulators (#3874) | Lane Kolbly | 2017-08-17 | 1 | -8/+18 |
|/ | |||||
* | Remove double includes part 2 (#3890) | peterbell10 | 2017-08-03 | 1 | -7/+0 |
| | |||||
* | Removed unused forward declarations (#3888) | Lukas Pioch | 2017-08-03 | 1 | -2/+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/+3 |
| | |||||
* | Added bed entity (#3823) | Lukas Pioch | 2017-07-07 | 1 | -0/+3 |
| | | | | | | | | | | * 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 | ||||
* | Update tolua and export EffectID | peterbell10 | 2017-06-29 | 1 | -1/+1 |
| | |||||
* | FastRandom rewrite (#3754) | peterbell10 | 2017-06-13 | 1 | -6/+2 |
| | |||||
* | Exported boat | Lukas Pioch | 2017-05-24 | 1 | -1/+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 | ||||
* | Clang 5.0 fixes | Lukas Pioch | 2017-05-21 | 1 | -1/+1 |
| | | | | | - Added override keyword - Removed inherited member variables | ||||
* | Added some blocks and items (#3503) | mathiascode | 2017-02-14 | 1 | -0/+1 |
| | |||||
* | World: Remember the age persistently. (#3556) | Mattes D | 2017-01-19 | 1 | -2/+5 |
| | |||||
* | DeadlockDetect now lists some tracked CS's stats. | Mattes D | 2017-01-18 | 1 | -5/+7 |
| | |||||
* | Initial support for the 1.11 protocol. | Mattes D | 2016-12-16 | 1 | -1/+1 |
| | |||||
* | Removed ClientHandle.h dependencies from common headers. | Mattes D | 2016-11-18 | 1 | -6/+3 |
| | |||||
* | Spectators added (#2852) | bibo38 | 2016-10-12 | 1 | -0/+4 |
| | |||||
* | APIDump: Reformatted the docs to include type information. | Mattes D | 2016-09-12 | 1 | -1/+2 |
| | | | | Also fixed a bit of documentation in the CPP source. | ||||
* | Configurable dirty unused chunk cap to avoid RAM overuse (#3359) | LogicParrot | 2016-09-03 | 1 | -2/+10 |
| | | | 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 | -3/+5 |
| | | | | 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 | -0/+3 |
| | |||||
* | Updated API documentation. | Mattes D | 2016-07-18 | 1 | -1/+1 |
| | |||||
* | removed cast from BlockTrapdoor.h (#3256) | gaurav sehgal | 2016-07-07 | 1 | -1/+1 |
| | |||||
* | Makes tall grass and large flowers bonemealable | QUSpilPrgm | 2016-06-03 | 1 | -0/+2 |
| | | | | Adds the bonemeal particle effect to some more places | ||||
* | Update Dispensers and let them act more like in Vanilla | QUSpilPrgm | 2016-06-03 | 1 | -6/+10 |
| | | | | | | | | - 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 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | Reduced unnecessary block updates | LogicParrot | 2016-04-22 | 1 | -2/+1 |
| | |||||
* | Updated cChunk::SetMeta, fixed grass growth, reduced markDirty/setMeta usage | LogicParrot | 2016-04-16 | 1 | -1/+2 |
| | |||||
* | Proper entity destruction in non-ticking chunks | LogicParrot | 2016-02-19 | 1 | -1/+0 |
| | |||||
* | Bulk clearing of whitespace | LogicParrot | 2016-02-05 | 1 | -127/+127 |
| | |||||
* | Exported GetSeed to lua and added file extension opendb to .gitignore. | Lukas Pioch | 2016-01-12 | 1 | -0/+3 |
| | |||||
* | Merge pull request #2542 from Haxi52/pinkstone | Tiger Wang | 2015-12-19 | 1 | -8/+0 |
|\ | | | | | Reorganised the redstone simulator | ||||
| * | Reorganised the redstone simulator | Tiger Wang | 2015-12-18 | 1 | -8/+0 |
| | | | | | | | | | | | | -> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan! * Uses classes and inheritance now * Speed should be improved | ||||
* | | Revised the explosion-related Lua API and docs. | Mattes D | 2015-12-18 | 1 | -14/+5 |
|/ | | | | Fixes #2746. | ||||
* | Add enum for Sound and Particle Effects | Dave Tucker | 2015-11-24 | 1 | -1/+2 |
| | | | | | | Fixes #2603 Signed-off-by: Dave Tucker <dave@dtucker.co.uk> | ||||
* | Improved spawn location calculations. | samoatesgames | 2015-11-13 | 1 | -1/+5 |
| | | | | | | | | | | - 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/+8 |
| | |||||
* | Added weather intervals to world.ini settings. | Mattes D | 2015-09-28 | 1 | -0/+3 |
| | |||||
* | Prepared ScheduleTask for threading refactor | Tiger Wang | 2015-09-25 | 1 | -103/+4 |
| | | | | | * Llama-ified and condensed Schedule/QueueTask - Removed hackery done with piston animations | ||||
* | Add new "ForEach" function: ForEachLoadedChunk. | tycho | 2015-09-24 | 1 | -1/+4 |
| | |||||
* | Unified the doxy-comment format. | Mattes D | 2015-07-31 | 1 | -7/+8 |
| | |||||
* | Merge pull request #2363 from scribblemaniac/improve-spider-ai | Tiger Wang | 2015-07-16 | 1 | -0/+1 |
|\ | | | | | Improved spider AI | ||||
| * | Improved spider AI | scribblemaniac | 2015-07-16 | 1 | -0/+1 |
| | | | | | | | | Fixes #2335 | ||||
* | | Spawn baby mobs | hallucino | 2015-07-16 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #2224 from cuberite/ChunkQueueCollapsing | worktycho | 2015-07-04 | 1 | -1/+1 |
|\ | | | | | Chunk queue collapsing: MK II | ||||
| * | Reinstate "Chunk queue collapsing" | Tiger Wang | 2015-06-10 | 1 | -1/+1 |
| | | | | | | | | | | This reinstates commit f36acb683594daff5af3971dcbe3c3a171628b78 and reverts commit adfbc42c021e1bcfcb355933c0fd784306ce0e18. | ||||
* | | Added a size check for portals. | STRWarrior | 2015-06-28 | 1 | -0/+18 |
| | | | | | | | | | | | | 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 | -0/+22 |
|/ | |||||
* | Revert "Chunk queue collapsing" | worktycho | 2015-06-07 | 1 | -1/+1 |
| | |||||
* | Moved Chunk Broadcasts over to the regular queue | tycho | 2015-06-05 | 1 | -1/+1 |
| | |||||
* | Made cLightingThread own its callbacks | tycho | 2015-05-30 | 1 | -2/+2 |
| | |||||
* | Made -Weverything an error. | tycho | 2015-05-24 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-23 | 1 | -4/+4 |
|\ | |||||
| * | Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher. | Lukas Pioch | 2015-05-23 | 1 | -4/+4 |
| | | |||||
* | | Fixed a lot of warnings | tycho | 2015-05-19 | 1 | -1/+1 |
|/ | |||||
* | More style checking. | Mattes D | 2015-05-09 | 1 | -3/+3 |
| | | | | Spaces around some operators are checked. | ||||
* | Added support for additional data in the ParticleEffect Packet | tycho | 2015-05-07 | 1 | -1/+6 |
| | | | | Also started refactoring how broadcasts are handled | ||||
* | Merge pull request #1826 from mc-server/UnifyPacketizer | Mattes D | 2015-03-24 | 1 | -20/+28 |
|\ | | | | | Unify packetizer | ||||
| * | Changed cEntity::m_UniqueID to UInt32. | Mattes D | 2015-03-21 | 1 | -20/+28 |
| | | |||||
* | | Changed linked world name variables and setters / getters. | Mattes D | 2015-03-21 | 1 | -15/+16 |
| | | | | | | | | | | 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 | -12/+8 |
|/ | | | | | 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. | ||||
* | Monsters will now attack. Additional checks have been added when generating spawn. | tumultenrx | 2015-03-13 | 1 | -0/+3 |
| | | | | 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 | -3/+6 |
| | |||||
* | cWorld: Fixed a type warning. | Mattes D | 2015-01-18 | 1 | -1/+1 |
| | |||||
* | Fix trailing whitespace | Tycho | 2015-01-11 | 1 | -1/+1 |
| | |||||
* | Initial convertion of a_Dt to std::chrono | Tycho | 2015-01-11 | 1 | -15/+13 |
| | | | | also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay | ||||
* | Refactored all player block placing to go through hooks. | Mattes D | 2014-12-24 | 1 | -0/+5 |
| | | | | Fixes #1618. | ||||
* | Merge branch 'master' into redstone | Tiger Wang | 2014-12-13 | 1 | -7/+26 |
|\ | |||||
| * | Merge pull request #1657 from mc-server/PrepareChunk | Mattes D | 2014-12-11 | 1 | -0/+6 |
| |\ | | | | | | | Prepare chunk | ||||
| | * | Added a cWorld:PrepareChunk function. | Mattes D | 2014-12-10 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | It prepares the chunk - loads or generates it and lights it. The spawn prepare process uses this function. | ||||
| * | | Merge pull request #1623 from p-mcgowan/issue_1253 | Mattes D | 2014-12-10 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | Prevent multiple logins with same username, unless allowed in settings | ||||
| | * | removed GetUsernames() from World | Vincent | 2014-11-30 | 1 | -3/+0 |
| | | | |||||
| | * | fixed naming of strings and changed from i to I | Vincent | 2014-11-29 | 1 | -1/+2 |
| | | | |||||
| | * | issue 1253 - prevent multiple logins with same username | Vincent | 2014-11-29 | 1 | -0/+2 |
| | | | |||||
| * | | Merged branch 'origin/master' into c++11. | Mattes D | 2014-12-04 | 1 | -1/+2 |
| |\ \ | |||||
| | * | | Improved comments for cWorld::DoWithPlayer(). | Mattes D | 2014-11-30 | 1 | -1/+2 |
| | |/ | |||||
| | * | cWorld: Rewritten spawn preparation. | Mattes D | 2014-11-22 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | 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 | -0/+2 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into c++11 | Tiger Wang | 2014-11-23 | 1 | -4/+14 |
| |\| | | | | | | | | | | | | | | | | Conflicts: src/Noise/Noise.h src/World.h | ||||
| | * | Merge pull request #1598 from mc-server/SignEditor | Mattes D | 2014-11-18 | 1 | -4/+1 |
| | |\ | | | | | | | | | Fixed a security problem with signs. | ||||
| | | * | Fixed a security problem with signs. | Howaner | 2014-11-15 | 1 | -4/+1 |
| | | | | |||||
| | * | | Merge branch 'master' into ViewDistance | Howaner | 2014-11-14 | 1 | -0/+3 |
| | |\| | |||||
| | | * | Fixed trailing whitespace. | Mattes D | 2014-11-12 | 1 | -1/+1 |
| | | | | |||||
| | | * | renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDump | Lukas Pioch | 2014-11-05 | 1 | -2/+2 |
| | | | | |||||
| | | * | Added FindAndDoWithUUID | Lukas Pioch | 2014-11-02 | 1 | -0/+3 |
| | | | | |||||
| | * | | ... in this world | Howaner | 2014-10-30 | 1 | -1/+1 |
| | | | | |||||
| | * | | Added a MaxViewDistance option. | Howaner | 2014-10-30 | 1 | -0/+10 |
| | |/ | |||||
| * | | Merged branch 'master' into c++11. | Mattes D | 2014-10-24 | 1 | -3/+3 |
| |\| | |||||
| * | | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-20 | 1 | -45/+45 |
| | | | |||||
| * | | Migrated random generators to std::random | Tiger Wang | 2014-10-19 | 1 | -1/+1 |
| | | | |||||
* | | | Cleaned up simulators | Tiger Wang | 2014-10-25 | 1 | -4/+3 |
| |/ |/| | |||||
* | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-23 | 1 | -183/+187 |
|\ \ | | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkSender.cpp src/ClientHandle.cpp src/World.h | ||||
| * | | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 1 | -185/+189 |
| | | | |||||
* | | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-21 | 1 | -143/+139 |
|\| | | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| * | | Merged branch 'master' of git://github.com/sriehl/MCServer | Mattes D | 2014-10-21 | 1 | -144/+140 |
| |\ \ | | |/ | |/| | |||||
| | * | convert old style casts to fix warnings | Steven Riehl | 2014-10-12 | 1 | -144/+140 |
| | | | |||||
* | | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-21 | 1 | -12/+13 |
|\| | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | | Functions in cPluginManager get references instead of pointers. | Mattes D | 2014-10-15 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed style. | Mattes D | 2014-10-13 | 1 | -1/+2 |
| | | | |||||
| * | | Aligned simulators | worktycho | 2014-10-12 | 1 | -5/+5 |
| | | | |||||
| * | | Moved a few objects to unique_ptr | tycho | 2014-10-10 | 1 | -9/+9 |
| |/ | |||||
* / | Stream 4 chunks per tick. Added priority. | Howaner | 2014-10-06 | 1 | -2/+2 |
|/ | |||||
* | Merge branch 'master' into Fixes | Howaner | 2014-09-26 | 1 | -5/+6 |
|\ | |||||
| * | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 1 | -27/+34 |
| |\ | | | | | | | | | | | | | 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 | -2/+2 |
| | | | | |||||
| * | | | Possibly decoupled IncrementalRedstoneSimulator from the rest of the server | Tycho | 2014-09-11 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | THis wil hopefully allow for unit testing | ||||
* | | | | Fixed players custom name in 1.8 | Howaner | 2014-09-26 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-19 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | Update World.h | nesco | 2014-09-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Preparing 1.8 update | nesco | 2014-09-16 | 1 | -0/+3 |
| | |/ | |/| | | | | Added Spectator gamemode | ||||
* | | | Exported player list states to extra functions. | Howaner | 2014-09-18 | 1 | -27/+31 |
| | | | |||||
* | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-13 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | Conflicts: src/Items/ItemHoe.h | ||||
| * | | Spawn exp if you break a mob spawner. | Howaner | 2014-09-12 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-12 | 1 | -3/+3 |
|\| | |||||
| * | TimeOfDay does not need to be an Int64 | Tycho | 2014-09-08 | 1 | -3/+3 |
| | | |||||
* | | 1.8: Added ParticleEffect packet. | Howaner | 2014-09-11 | 1 | -1/+1 |
| | | |||||
* | | Added the player list to the 1.8 protocol. | Howaner | 2014-09-09 | 1 | -1/+1 |
|/ | |||||
* | Rewritten chunk status to specify whether the chunk is in queue. | Mattes D | 2014-09-05 | 1 | -7/+7 |
| | | | | This fixes #1370. | ||||
* | Merge remote-tracking branch 'origin/master' into EntitiesInBox | madmaxoft | 2014-09-04 | 1 | -4/+4 |
|\ | |||||
| * | fix chunk regenerating | LO1ZB | 2014-08-29 | 1 | -1/+1 |
| | | |||||
| * | remove y-coord from chunks | LO1ZB | 2014-08-28 | 1 | -3/+3 |
| | | |||||
* | | Added cWorld::ForEachEntityInBox() | madmaxoft | 2014-09-03 | 1 | -0/+5 |
|/ | |||||
* | CheckBasicStyle checks the src folder as well. | madmaxoft | 2014-08-14 | 1 | -1/+1 |
| | |||||
* | Renamed functions. | Howaner | 2014-08-10 | 1 | -4/+4 |
| | |||||
* | Renamed m_DoDaylightCycle to m_CycleDaylight. | Howaner | 2014-08-08 | 1 | -4/+4 |
| | |||||
* | Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld. | Howaner | 2014-08-07 | 1 | -1/+13 |
| | | | I need this for a GameRule plugin. | ||||
* | Exported the beacon. | Howaner | 2014-07-30 | 1 | -0/+5 |
| | |||||
* | Merged branch 'howaner/Options'. | madmaxoft | 2014-07-30 | 1 | -0/+7 |
|\ | |||||
| * | Add "Broadcasting" settings to world.ini | Howaner | 2014-07-27 | 1 | -1/+7 |
| | | |||||
* | | Slight cleanup after portals | Tiger Wang | 2014-07-29 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-29 | 1 | -25/+25 |
|\| | | | | | | | | | Conflicts: src/World.h | ||||
| * | Removed redundant semicolons and re-added warning | archshift | 2014-07-24 | 1 | -6/+6 |
| | | |||||
| * | Added a queue for setting chunk data. | madmaxoft | 2014-07-24 | 1 | -18/+18 |
| | | | | | | | | Fixes #1196. | ||||
| * | Export BroadcastEntityAnimation with ToLua | archshift | 2014-07-22 | 1 | -1/+1 |
| | | | | | | Fixes #752 | ||||
* | | Speed improvements, crash fixes, & self-suggestions | Tiger Wang | 2014-07-22 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 1 | -5/+5 |
|\| | | | | | | | | | | | | | | | 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 | -4/+4 |
| | | |||||
| * | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 1 | -1/+1 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-07-21 | 1 | -0/+7 |
| | | |||||
* | | Bug and crash fixes | Tiger Wang | 2014-07-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | * 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 | -12/+0 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -29/+25 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -1/+1 |
| | | | | | | | | | | 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 | -4/+4 |
| | | | | | | | | There should be at least two spaces in front and one space after //-style comments. | ||||
| * | Fixed basic whitespace problems. | madmaxoft | 2014-07-17 | 1 | -7/+7 |
| | | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines. | ||||
| * | Made CreateProjectile a pointer | worktycho | 2014-07-13 | 1 | -1/+1 |
| | | |||||
| * | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #1154 from mc-server/trappedchests | Tiger Wang | 2014-07-13 | 1 | -13/+2 |
| |\ | | | | | | | Implemented trapped chests & others | ||||
| | * | Implemented trapped chests & others | Tiger Wang | 2014-07-07 | 1 | -13/+2 |
| | | | | | | | | | | | | | | | | | | | | | + 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/+7 |
| | | | | | | | | | | | | Fixes #1160. | ||||
| * | | Fixed arrow collection animation | Tiger Wang | 2014-07-09 | 1 | -1/+0 |
| |/ | | | | | | | * Fixed piston extension non-solidness | ||||
| * | Redstone simulator is alerted to lever unpowering | Tiger Wang | 2014-07-02 | 1 | -1/+1 |
| | | | | | | | | | | * Fixed the "fix" that broke the fix for #535, thereby fixing said issue * Fixed #535 | ||||
| * | Added generic entity-collecting. | Mattes D | 2014-06-27 | 1 | -0/+1 |
| | | | | | | | | | | 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 | -1/+2 |
|\| | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| * | Nullify deleted pointers. | archshift | 2014-06-19 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'master' into GlobalFixes | Howaner | 2014-06-17 | 1 | -8/+73 |
| |\ | |||||
| * | | Add DoWithBlockEntityAt() to WorldInterface.h | Howaner | 2014-06-17 | 1 | -1/+1 |
| | | | |||||
* | | | Fixed invalid iterators | Tiger Wang | 2014-06-21 | 1 | -3/+0 |
| | | | |||||
* | | | Cauldrons check the heightmap | Tiger Wang | 2014-06-14 | 1 | -3/+3 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-14 | 1 | -6/+32 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: src/World.h | ||||
| * | | Removed an unused fwd declaration. | madmaxoft | 2014-06-13 | 1 | -1/+0 |
| | | | |||||
| * | | Fixed constness | worktycho | 2014-06-11 | 1 | -5/+5 |
| | | | |||||
| * | | Compile fix | Tiger Wang | 2014-06-11 | 1 | -1/+1 |
| | | | |||||
| * | | Reduced code duplication | Tiger Wang | 2014-06-11 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | call @maxmaxoft! calling... call connected (0:20) call ended | ||||
| * | | IsWeatherSunnyAt does something useful :D | Tiger Wang | 2014-06-11 | 1 | -9/+5 |
| | | | |||||
| * | | SMICOLOSL | Alexander Harkness | 2014-06-11 | 1 | -4/+4 |
| | | | | | | | | | Meant to be semicolons up there. | ||||
| * | | Updated unnecessary function :/ | Tiger Wang | 2014-06-11 | 1 | -1/+5 |
| | | | |||||
| * | | Add DoxyComments to he weather things. | Alexander Harkness | 2014-06-11 | 1 | -7/+24 |
| | | | | | | | | | Also changed the function names. | ||||
| * | | Add new IsWeatherWet hook for cauldrons. | Alexander Harkness | 2014-06-11 | 1 | -1/+12 |
| | | | | | | | | | @madmaxoft can you comment? | ||||
* | | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 1 | -3/+27 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp | ||||
| * | | Fixed deadlock when moving players to other worlds. | Mattes D | 2014-06-08 | 1 | -2/+19 |
| | | | | | | | | | | | | Fixes #1039, fixes #851 | ||||
| * | | Added queue for adding entities to cWorld. | Mattes D | 2014-06-08 | 1 | -1/+8 |
| | | | | | | | | | | | | This alone doesn't work properly yet, further changes to cPlayer are needed. | ||||
* | | | Portal improvements and suggestions | Tiger Wang | 2014-06-10 | 1 | -2/+11 |
| | | | |||||
* | | | Suggestions | Tiger Wang | 2014-06-05 | 1 | -1/+3 |
| | | | |||||
* | | | Configurable portals | Tiger Wang | 2014-06-04 | 1 | -0/+24 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-04 | 1 | -1/+15 |
|\| | | |||||
| * | | Changed block send queue to use vectors | Tiger Wang | 2014-05-29 | 1 | -4/+2 |
| | | | | | | | | | | | | As suggested by @worktycho. | ||||
| * | | Hopefully fixed piston duplication issues | Tiger Wang | 2014-05-25 | 1 | -1/+17 |
| |/ | | | | | | | | | * Fixes #879 * Fixes #714 | ||||
* / | Cauldrons fill | Tiger Wang | 2014-05-29 | 1 | -2/+2 |
|/ | |||||
* | Merge branch 'master' into fixes | Tiger Wang | 2014-05-06 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: src/Vector3.h | ||||
| * | Redstone simulator now directly accesses cChunk | Tiger Wang | 2014-04-27 | 1 | -1/+1 |
| | | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes | ||||
* | | Merge branch 'master' into fixes. | madmaxoft | 2014-05-02 | 1 | -1/+4 |
|\| | |||||
| * | Moved the weather picker out of TickWeather(), squashing a warning and improving readability. | archshift | 2014-04-26 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'master' into fixes | Tiger Wang | 2014-04-24 | 1 | -1/+1 |
|\| | | | | | | | | | Conflicts: src/World.h | ||||
| * | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 1 | -1/+1 |
| | | |||||
* | | Small changes | Tiger Wang | 2014-04-23 | 1 | -1/+3 |
|/ | |||||
* | Merge branch 'master' into override | Tycho | 2014-04-05 | 1 | -13/+13 |
|\ | | | | | | | | | Conflicts: lib/tolua++/CMakeLists.txt | ||||
| * | Fixed a few clang warnings. | madmaxoft | 2014-03-30 | 1 | -3/+3 |
| | | |||||
| * | Minor fixes | andrew | 2014-03-25 | 1 | -10/+10 |
| | | |||||
| * | Wither invulnerability | andrew | 2014-03-24 | 1 | -1/+1 |
| | | |||||
* | | Added override specifier to functions declared in cWorld | Tycho | 2014-03-22 | 1 | -8/+8 |
|/ | |||||
* | ENUMified shrapnel level | Tiger Wang | 2014-03-20 | 1 | -6/+4 |
| | |||||
* | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-18 | 1 | -39/+39 |
|\ | | | | | | | | | Conflicts: src/ChunkMap.cpp | ||||
| * | Added override specifier where appropriate in cWorld. | madmaxoft | 2014-03-16 | 1 | -37/+38 |
| | | |||||
| * | Merge pull request #782 from mc-server/beds | Mattes D | 2014-03-16 | 1 | -4/+4 |
| |\ | | | | | | | Beds now work properly, fixes #707 | ||||
| | * | Beds now work properly fixes #707 | Tiger Wang | 2014-03-09 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also fixes FS392 Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp | ||||
| * | | Unified Vector classes | andrew | 2014-03-11 | 1 | -2/+1 |
| | | | |||||
* | | | Added levels of shrapnel | Tiger Wang | 2014-03-18 | 1 | -4/+8 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into awesometnt | Tiger Wang | 2014-03-10 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemLighter.h src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | | Merge pull request #768 from Howaner/BlockEntitys | Tiger Wang | 2014-03-09 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Add TNT load/save | ||||
| | * | | Merge branch 'master' into BlockEntitys | Howaner | 2014-03-08 | 1 | -1/+1 |
| | |\| | |||||
| | * | | Change TNT Fuse to ticks | Howaner | 2014-03-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into ballisticmissiles | Tiger Wang | 2014-03-09 | 1 | -5/+20 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | | | Implemented ballistic missiles (fireworks) | Tiger Wang | 2014-02-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | + Added fireworks | ||||
* | | | | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-10 | 1 | -5/+20 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #763 from Howaner/BlockEntitys | Mattes D | 2014-03-07 | 1 | -4/+9 |
| |\ \ \ | | | |/ | | |/| | 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 | -2/+7 |
| | | | | |||||
| * | | | Add SendBlockTo to cWorldInterface | Howaner | 2014-03-05 | 1 | -1/+1 |
| |/ / | |||||
| * | | Fixed previous weather changes. | madmaxoft | 2014-03-03 | 1 | -1/+2 |
| | | | | | | | | | | | | cWorld::GetDefaultWeatherInterval() returns -1 for unknown weather. | ||||
| * | | Add cancelling to WeatherChanging event. | Howaner | 2014-03-02 | 1 | -0/+3 |
| | | | |||||
| * | | More documentation (thanks to madmaxoft) and use GetBlockTypeMeta | Howaner | 2014-03-02 | 1 | -2/+2 |
| | | | |||||
| * | | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs | Howaner | 2014-03-02 | 1 | -0/+6 |
| |/ | |||||
* / | Shrapnel now configurable | Tiger Wang | 2014-03-10 | 1 | -0/+6 |
|/ | |||||
* | Maps: Improvements | andrew | 2014-02-23 | 1 | -3/+6 |
| | |||||
* | Thread safe cMap manager | andrew | 2014-02-20 | 1 | -2/+3 |
| | |||||
* | Manual merge (Fixed conflicts) | andrew | 2014-02-20 | 1 | -32/+56 |
|\ | |||||
| * | Merge pull request #697 from Howaner/Skull | Mattes D | 2014-02-19 | 1 | -0/+5 |
| |\ | | | | | | | Add Skulls/Heads to MCServer | ||||
| | * | Rename SkullEntity to MobHeadEntity | Howaner | 2014-02-19 | 1 | -4/+4 |
| | | | |||||
| | * | Add Heads completely | Howaner | 2014-02-18 | 1 | -0/+5 |
| | | | |||||
| * | | The cuboid for cWorld::SetAreaBiome() doesn't need sorting. | madmaxoft | 2014-02-18 | 1 | -1/+2 |
| | | | |||||
| * | | Added cWorld:SetAreaBiome() API function. | madmaxoft | 2014-02-18 | 1 | -1/+19 |
| | | | | | | | | | | | | Fixes #675. | ||||
| * | | Added a bit more documentation to cForEachChunkProvider. | madmaxoft | 2014-02-18 | 1 | -4/+7 |
| |/ | |||||
| * | Removed the unnecessary LoopPlayersAndBroadcastChat() functions. | madmaxoft | 2014-02-15 | 1 | -9/+7 |
| | | |||||
| * | Implemented cCompositeChat. | madmaxoft | 2014-02-15 | 1 | -1/+3 |
| | | | | | | | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678. | ||||
| * | Merge pull request #677 from mc-server/BroadcastParticleEffect | Alexander Harkness | 2014-02-15 | 1 | -1/+1 |
| |\ | | | | | | | Broadcast particle effect | ||||
| | * | Exported cWorld::BroadcastParticleEffect. | STRWarrior | 2014-02-15 | 1 | -1/+1 |
| | | | |||||
| * | | Merged branch 'narroo/master'. | madmaxoft | 2014-02-13 | 1 | -1/+14 |
| |\ \ | | |/ | |/| | | | | This merges pull request #661. | ||||
| | * | Fixed formatting. Moved UnloadUnusedChunks from public to private. | narroo | 2014-02-11 | 1 | -4/+3 |
| | | | |||||
| | * | Fixed formatting of previous commit. | narroo | 2014-02-11 | 1 | -2/+2 |
| | | | |||||
| | * | Fixed bug #385. UnloadUnusedChunks now has the same interface as | narroo | 2014-02-11 | 1 | -1/+15 |
| | | | | | | | | | | | | | | | | | | SaveAllChunks. Meaning, QueueUnloadUnusedChunks and the supporting cTaskUnloadUnusedChunks has been added. Use QueueUnloadUnusedChunks from now on to prevent deadlocking. | ||||
* | | | Send map when selected | andrew | 2014-02-14 | 1 | -0/+6 |
| | | | |||||
* | | | IDCount Serialization | andrew | 2014-02-13 | 1 | -0/+11 |
|/ / | |||||
* | | More gcc warnings fixed. | madmaxoft | 2014-02-11 | 1 | -1/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into ChunkStay | madmaxoft | 2014-02-09 | 1 | -3/+20 |
|\| | |||||
| * | Merge remote-tracking branch 'origin/master' into playerimprovements | Tiger Wang | 2014-02-09 | 1 | -0/+3 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp | ||||
| * \ | Merge branch 'master' into playerimprovements | Tiger Wang | 2014-02-09 | 1 | -2/+2 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| * | | | Improved chat messaging functions | Tiger Wang | 2014-02-07 | 1 | -10/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API. | ||||
| * | | | Added more chat functions | Tiger Wang | 2014-02-06 | 1 | -1/+11 |
| | | | | |||||
* | | | | Initial ChunkStay code. | madmaxoft | 2014-02-08 | 1 | -3/+0 |
| |_|/ |/| | | |||||
* | | | Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later). | STRWarrior | 2014-02-07 | 1 | -4/+4 |
| | | | |||||
* | | | Implemented an easy way of adding new redstone simulators. | STRWarrior | 2014-02-07 | 1 | -3/+6 |
| |/ |/| | | | | | Also added a "noop" redstone simulator that does the same as the fluid version. | ||||
* | | Merge pull request #635 from tonibm19/master | Mattes D | 2014-02-04 | 1 | -1/+1 |
|\ \ | | | | | | | Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API | ||||
| * | | Not exporting FindClosestPlayer | tonibm19 | 2014-02-03 | 1 | -1/+1 |
| | | | |||||
| * | | 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 | -1/+1 |
|/ | | | | | 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 | ||||
* | Changed pointers to references | Tycho | 2014-02-01 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-02-01 | 1 | -0/+3 |
|\ | | | | | | | | | Conflicts: src/World.h | ||||
| * | The world can now be configured wether farmers should be able to harvest crops. | STRWarrior | 2014-01-27 | 1 | -0/+3 |
| | | |||||
* | | Changed signitures of Several BLockHandler Methods | Tycho | 2014-02-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check | ||||
* | | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-01-26 | 1 | -1/+11 |
|\| | | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h | ||||
| * | Merge pull request #575 from worktycho/GeneratingBenchmark | Mattes D | 2014-01-25 | 1 | -3/+4 |
| |\ | | | | | | | More Interfaces to decouple Generator from the rest of the code | ||||
| * | | Mob bugfixes | Tiger Wang | 2014-01-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | -0/+9 |
| | | | |||||
* | | | Refactored cBlockHandler::OnUse and dependents | Tycho | 2014-01-26 | 1 | -28/+28 |
| | | | |||||
* | | | First attempt at Implementing Interfaces | Tycho | 2014-01-25 | 1 | -4/+5 |
| |/ |/| | |||||
* | | Merge branch 'master' into GeneratingBenchmark | Tycho | 2014-01-22 | 1 | -3/+12 |
|\| | | | | | | | | | Conflicts: src/World.h | ||||
| * | Merge branch 'master' of https://github.com/mc-server/MCServer | andrew | 2014-01-21 | 1 | -130/+146 |
| |\ | |||||
| * | | Scoreboard protocol support | andrew | 2014-01-21 | 1 | -1/+4 |
| | | | |||||
| * | | Basic scoreboard implementation | andrew | 2014-01-19 | 1 | -0/+6 |
| | | | |||||
* | | | Actually implemented interfaces | Tycho | 2014-01-20 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'ForEachChunkProvider' into GeneratingBenchmark | Tycho | 2014-01-20 | 1 | -6/+6 |
|\ \ \ | |_|/ |/| | | | | | | | | Conflicts: src/World.h | ||||
| * | | Seperated BlockArea From World | Tycho | 2014-01-20 | 1 | -3/+3 |
| | | | | | | | | | | | | If anyone can come up with a better name for the interface I'll change it, It contians to methods which do compleatly unrelated things | ||||
* | | | Changed the cWorld::ScheduleTask() signature. | madmaxoft | 2014-01-19 | 1 | -130/+146 |
| |/ |/| | | | | | 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. | ||||
* | | Command blocks: Execute() | andrew | 2014-01-18 | 1 | -1/+1 |
| | | |||||
* | | Basic command block implementation | andrew | 2014-01-18 | 1 | -6/+10 |
|/ | |||||
* | Added user setting compression factor | Tycho | 2014-01-17 | 1 | -0/+2 |
| | |||||
* | Merge pull request #534 from mc-server/SpawnMinecart | Mattes D | 2014-01-17 | 1 | -0/+3 |
|\ | | | | | Added cWorld::SpawnMinecart. | ||||
| * | Renamed cEmptyMinecart to cRideableMinecart | STRWarrior | 2014-01-12 | 1 | -1/+1 |
| | | |||||
| * | EmptyMinecarts should be able to get a block inside of them. | STRWarrior | 2014-01-12 | 1 | -1/+1 |
| | | |||||
| * | Added cWorld::SpawnMinecart. | STRWarrior | 2014-01-12 | 1 | -0/+3 |
| | | |||||
* | | added cWorld::ScheduleTask Function | Tycho | 2014-01-14 | 1 | -0/+24 |
|/ | | | | | 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 | -0/+24 |
| | | | | Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS. | ||||
* | Exported cWorld::BroadcastBlockAction(). | madmaxoft | 2014-01-06 | 1 | -1/+1 |
| | | | | As requested in #508; no guarantees about it. | ||||
* | fixed warnings in World.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+1 |
| | |||||
* | Replaced esCreeper with esMonster. | madmaxoft | 2013-12-23 | 1 | -1/+1 |
| | | | | Any monster will be able to explode, and also this fixes #425. | ||||
* | Implented BroadcastParticleEffect | STRWarrior | 2013-12-22 | 1 | -0/+1 |
| | |||||
* | Fixed the rest of constructor reorders. | madmaxoft | 2013-12-20 | 1 | -1/+1 |
| | |||||
* | Removed some old cRedstone remnants | Tiger Wang | 2013-12-16 | 1 | -5/+0 |
| | |||||
* | This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions. | STRWarrior | 2013-12-15 | 1 | -0/+2 |
| | |||||
* | Implemented note block playing and fixed wire | Tiger Wang | 2013-12-14 | 1 | -0/+5 |
| | | | | Game of Thrones music in Minecraft, here I come! | ||||
* | Redstone data is now loaded on chunk load | Tiger Wang | 2013-12-13 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures | Tiger Wang | 2013-12-08 | 1 | -0/+3 |
|\ | | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp | ||||
| * | Added a SpawnFallingBlock function so plugins can make other blocks fall. | STRWarrior | 2013-12-07 | 1 | -0/+3 |
| | | |||||
* | | Renamed animation function | Tiger Wang | 2013-12-07 | 1 | -1/+1 |
| | | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know. | ||||
* | | Fixed duplication glitch with QueueSetBlock | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
|/ | | | | | | | 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. | ||||
* | Lava can spawn fire. | madmaxoft | 2013-12-04 | 1 | -0/+3 |
| | | | | Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65. | ||||
* | Added the real tick duration to the OnWorldTick hook. | madmaxoft | 2013-11-30 | 1 | -1/+1 |
| | |||||
* | Merged master into redstonefixes | Tiger Wang | 2013-11-27 | 1 | -1/+5 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -0/+3 |
| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 1 | -2/+8 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+744 |