Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | Unify entity spawn packet sending | Tiger Wang | 2020-05-01 | 1 | -5/+1 |
| | |||||
* | Vector3 in Handlers (#4680) | Mattes D | 2020-04-21 | 1 | -1/+1 |
| | | | Refactored all cBlockHandler and cItemHandler descendants to use Vector3. | ||||
* | Delet SpawnObject params | Tiger Wang | 2020-04-20 | 1 | -1/+1 |
| | | | | | | * Fix #4679 awkward... | ||||
* | Initial resource pack support (#4622) | Mat | 2020-04-07 | 1 | -0/+1 |
| | |||||
* | cClientHandle: Only allow m_State to increase (#4533) | peterbell10 | 2020-03-28 | 1 | -0/+4 |
| | | | | | | | * cClientHandle: Only allow m_State to increase * WasAddedToWorld was incorrect if kicked * Rewrite cClient::Destroy with a guard clause | ||||
* | Store and pass entity effect duration as an int not a short. (#4293) | Alexander Harkness | 2018-08-26 | 1 | -1/+1 |
| | | | Fixes #4292. | ||||
* | recover hotbar selected slot after reconnect (#4249) | changyong guo | 2018-07-23 | 1 | -0/+1 |
| | | | | | | | 1. implement protocol message SendHeldItemChange 2. add save / load inventory equipped item slot in JSON 3. send held item slot message after player connect to server Fixes #4189 | ||||
* | Rewrite cClientHandle::HandleRightClick (#4089) | 9caihezi | 2018-01-08 | 1 | -1/+2 |
| | | | | | | | | | | | | | * Add hand parameter to distinguish main hand/off hand. * Add a new function cClientHandle::HandleUseItem to separate the functionality of using an item without a target block. This matches the protocol with client version >= 1.9 * Always actively update the status of a block if the placement fails (by out of reach or rejected by plugin). * Do not call plugin callback CallHookPlayerRightClick(-1, 255, -1, -1, 0, 0, 0) when using item. The CallHookPlayerUsingItem will still be called. Now at most one of CallHookPlayerRightClick, CallHookPlayerUsingBlock, CallHookPlayerUsingItem and CallHookPlayerEating will be called based on the type of action (not including the used version of callbacks). * Do not count using item as BlockInteractionsRate check (Using item takes time). * Now we can open chests(etc.) when sneaking as long as the player's hand is empty. This is what vanilla server does. | ||||
* | Implement horse inventory (#4053) | peterbell10 | 2017-10-21 | 1 | -0/+4 |
| | | | | | | | | | | * Implement horse inventory * Fix sign conversions * Add API doc for ItemCategory::IsHorseArmor * Improve HandleOpenHorseInventory comment and style fixes. | ||||
* | Changed BroadcastSoundEffect, SendSoundEffect, and CastThunderbolt parameters to vectors (#3959) | Lane Kolbly | 2017-09-19 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | * 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 | ||||
* | Shutdown connection when disconnect packet sent (#3999) | Alexander Harkness | 2017-09-08 | 1 | -7/+1 |
| | |||||
* | Updated APIDoc (#3985) | Lukas Pioch | 2017-09-07 | 1 | -1/+1 |
| | |||||
* | Implement Forge protocol handshake support (#3869) | satoshinm | 2017-08-27 | 1 | -0/+29 |
| | |||||
* | Add cUUID class (#3871) | peterbell10 | 2017-08-25 | 1 | -15/+13 |
| | |||||
* | Fully implemented leashes (#3798) | Pablo Beltrán | 2017-08-21 | 1 | -0/+2 |
| | |||||
* | Merge pull request #3489 from cuberite/EntityOwnership | Tiger Wang | 2017-08-18 | 1 | -0/+3 |
|\ | | | | | * Changed entity ownership model to use smart pointers | ||||
| * | Changed entity ownership model to use smart pointers | Tiger Wang | 2017-08-07 | 1 | -0/+3 |
| | | |||||
* | | Replaced includes with forward declarations | Lukas Pioch | 2017-08-13 | 1 | -1/+1 |
|/ | |||||
* | Removed unneeded includes (#3902) | Lukas Pioch | 2017-08-06 | 1 | -2/+0 |
| | |||||
* | Remove double includes part 2 (#3890) | peterbell10 | 2017-08-03 | 1 | -4/+1 |
| | |||||
* | Removed unused forward declarations (#3888) | Lukas Pioch | 2017-08-03 | 1 | -4/+0 |
| | |||||
* | Remove smart pointer macros | peterbell10 | 2017-07-21 | 1 | -1/+1 |
| | |||||
* | Fixed memory leak in cClientHandle. (#3794) | Mattes D | 2017-06-26 | 1 | -1/+1 |
| | |||||
* | Clang 5.0 fixes | Lukas Pioch | 2017-05-21 | 1 | -1/+1 |
| | | | | | - Added override keyword - Removed inherited member variables | ||||
* | Fixed ClientHandle:GetProtocolVersion returning wrong number. | Mattes D | 2017-01-28 | 1 | -1/+1 |
| | |||||
* | Initial support for the 1.11 protocol. | Mattes D | 2016-12-16 | 1 | -1/+1 |
| | |||||
* | Use CMake's Android generators to crosscompile | Tiger Wang | 2016-12-12 | 1 | -1/+1 |
| | |||||
* | Fixed race conditions in cClientHandle's State. | Mattes D | 2016-11-19 | 1 | -11/+21 |
| | |||||
* | Add Lua API export for titles. (#3408) | mohe2015 | 2016-11-13 | 1 | -7/+7 |
| | |||||
* | Anticheat fastbreak (#3411) | mohe2015 | 2016-11-06 | 1 | -0/+6 |
| | | | Added block hardness checks when breaking blocks. | ||||
* | Added SendMessageRaw for sending json string. | Lukas Pioch | 2016-10-21 | 1 | -0/+1 |
| | |||||
* | Spectators added (#2852) | bibo38 | 2016-10-12 | 1 | -0/+2 |
| | |||||
* | Improve cPlayer::DoMoveToWorld (#3113) | LogicParrot | 2016-09-03 | 1 | -1/+2 |
| | |||||
* | Proper respawn packets on dimension travel | LogicParrot | 2016-08-29 | 1 | -0/+3 |
| | |||||
* | 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 | ||||
* | Improved player freeze code | LogicParrot | 2016-04-05 | 1 | -0/+2 |
| | |||||
* | Players never fall through unloaded chunks or end up inside solids on teleport | LogicParrot | 2016-03-31 | 1 | -0/+9 |
| | |||||
* | Bulk clearing of whitespace | LogicParrot | 2016-02-05 | 1 | -54/+54 |
| | |||||
* | Fixed race conditions | Lukas Pioch | 2016-01-17 | 1 | -1/+1 |
| | |||||
* | 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 the data structure for storing loaded chunks | tycho | 2015-10-05 | 1 | -1/+1 |
| | | | | Should significantly increase the performance of deciding which chunks to stream | ||||
* | Fixed food drain bugs | Tiger Wang | 2015-08-20 | 1 | -1/+8 |
| | |||||
* | Fix old style casts and implicit conversions | Matti Hänninen | 2015-08-12 | 1 | -2/+2 |
| | |||||
* | Unified the doxy-comment format. | Mattes D | 2015-07-31 | 1 | -1/+1 |
| | |||||
* | Silenced and fixed many warning messages across multiple files. | Samuel Barney | 2015-07-29 | 1 | -1/+1 |
| | |||||
* | Improved maps | Tiger Wang | 2015-07-14 | 1 | -3/+1 |
| | |||||
* | Merge pull request #2224 from cuberite/ChunkQueueCollapsing | worktycho | 2015-07-04 | 1 | -4/+4 |
|\ | | | | | Chunk queue collapsing: MK II | ||||
| * | Reinstate "Chunk queue collapsing" | Tiger Wang | 2015-06-10 | 1 | -4/+4 |
| | | | | | | | | | | This reinstates commit f36acb683594daff5af3971dcbe3c3a171628b78 and reverts commit adfbc42c021e1bcfcb355933c0fd784306ce0e18. | ||||
* | | use atomic for state, to avoid torn reads | tycho | 2015-06-27 | 1 | -2/+2 |
|/ | |||||
* | Revert "Chunk queue collapsing" | worktycho | 2015-06-07 | 1 | -4/+4 |
| | |||||
* | Made the list of chunks to stream an unordered_set | tycho | 2015-06-05 | 1 | -4/+4 |
| | | | | This should increase performance of chunk streaming | ||||
* | Added system and above action bar chat messages | jan64 | 2015-06-02 | 1 | -0/+4 |
| | |||||
* | Merge pull request #1848 from scottwillmoore/ImplementTitleCommand | Mattes D | 2015-05-26 | 1 | -0/+7 |
|\ | | | | | Implement backend for /title command | ||||
| * | Implement backend for /title command | Scott Moore | 2015-04-13 | 1 | -0/+7 |
| | | |||||
* | | 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 | -0/+2 |
|/ | | | | Also started refactoring how broadcasts are handled | ||||
* | Fixed signedness warnings in Protocol. | Mattes D | 2015-03-21 | 1 | -1/+1 |
| | |||||
* | Fixed signedness issues in protocols. | Mattes D | 2015-03-21 | 1 | -1/+1 |
| | |||||
* | Unified cByteBuffer types. | Mattes D | 2015-03-21 | 1 | -10/+12 |
| | | | | cByteBuffer now reads and writes any of the [U]Int<N> types. | ||||
* | Fixed a deadlock in cClientHandle network sending. | Mattes D | 2015-01-27 | 1 | -1/+5 |
| | |||||
* | Converted cServer to use the cNetwork API. | Mattes D | 2015-01-27 | 1 | -30/+50 |
| | |||||
* | Fixed warnings in 1.7 protocol. | Mattes D | 2015-01-18 | 1 | -2/+2 |
| | |||||
* | Refactored all player block placing to go through hooks. | Mattes D | 2014-12-24 | 1 | -3/+0 |
| | | | | Fixes #1618. | ||||
* | Cosmetic touchups. | Mattes D | 2014-12-11 | 1 | -2/+2 |
| | | | | Removed trailing whitespace, added cast to remove warning, added file seeking in case of corrupt files. | ||||
* | Merge pull request #1623 from p-mcgowan/issue_1253 | Mattes D | 2014-12-10 | 1 | -0/+4 |
|\ | | | | | Prevent multiple logins with same username, unless allowed in settings | ||||
| * | Fixed indent problems and added return definitions to CheckMultiLogin(). | Vincent | 2014-12-09 | 1 | -1/+2 |
| | | | | | | | | | | Changed from IsAllowMultiLogin() to DoesAllowMultiLogin(). Fixed CheckMultiLogin() to not run to the end without returning a value. | ||||
| * | Changed CheckMultiLogin() to not have main body wrapped in an if statement. | Vincent | 2014-12-08 | 1 | -0/+1 |
| | | | | | | | | | | | | Added in indent to cPlayerListCallBack in cCallback class inside CheckMultiLogin(). Added doxy-comment for DoWithPlayer(). Changed comments on IsPlayerInQueue() and IsAllowMultiLogin() to doxy-comments. | ||||
| * | Fixed compile errors | Vincent | 2014-12-08 | 1 | -1/+1 |
| | | |||||
| * | Moved the check into a new function and just calls that function and a blank FindAndDoWithPlayer added. | Vincent | 2014-12-08 | 1 | -0/+2 |
| | | |||||
* | | Fixed c++11 branch issues. | Mattes D | 2014-12-07 | 1 | -4/+7 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into c++11 | Tiger Wang | 2014-11-23 | 1 | -8/+17 |
|\| | | | | | | | | | | | Conflicts: src/Noise/Noise.h src/World.h | ||||
| * | Merge pull request #1598 from mc-server/SignEditor | Mattes D | 2014-11-18 | 1 | -0/+3 |
| |\ | | | | | | | Fixed a security problem with signs. | ||||
| | * | Use LastPlacedSign instead of LastPlacedBlock. | Howaner | 2014-11-15 | 1 | -5/+2 |
| | | | |||||
| | * | Fixed a security problem with signs. | Howaner | 2014-11-15 | 1 | -0/+6 |
| | | | |||||
| * | | Renamed m_UsedViewDistance to m_CurrentViewDistance | Howaner | 2014-11-15 | 1 | -3/+3 |
| | | | |||||
| * | | Renamed m_SetViewDistance to m_RequestedViewDistance | Howaner | 2014-11-15 | 1 | -3/+3 |
| | | | |||||
| * | | Renamed GetSettedViewDistance() to GetRequestedViewDistance() | Howaner | 2014-11-15 | 1 | -2/+2 |
| | | | |||||
| * | | Use m_UsedViewDistance and m_SetViewDistance. | Howaner | 2014-11-14 | 1 | -7/+13 |
| |/ | |||||
* | | Merged branch 'master' into c++11. | Mattes D | 2014-10-24 | 1 | -3/+8 |
|\| | |||||
| * | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-21 | 1 | -1/+2 |
| |\ | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | | Stream 4 chunks per tick. Added priority. | Howaner | 2014-10-06 | 1 | -3/+4 |
| | | | |||||
| * | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-06 | 1 | -0/+9 |
| |\ \ | |||||
| * | | | Better StreamNextChunk() method | Howaner | 2014-10-06 | 1 | -0/+4 |
| | | | | |||||
| * | | | Optimized chunk loader | Howaner | 2014-10-02 | 1 | -5/+5 |
| | | | | |||||
* | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-10-20 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Fixed minor style issues. | Mattes D | 2014-10-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | Migrated cSleep and cTimer to std::chrono | Tiger Wang | 2014-10-20 | 1 | -5/+5 |
|/ / / | |||||
* | | | Merge pull request #1502 from mc-server/furnaces | Tiger Wang | 2014-10-18 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Improved furnaces | ||||
| * | | | Improved furnaces | Tiger Wang | 2014-10-03 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | * Fixed progress bar on 1.8 * Fixed bugs * Improved code * Fixes #1068 * Fixes #1070 | ||||
* | / | Merged branch 'fix_chunks'. | Mattes D | 2014-10-16 | 1 | -0/+1 |
| |/ |/| | |||||
* | | cClientHandle: Added protocol version knowledge. | Mattes D | 2014-10-05 | 1 | -0/+9 |
|/ | |||||
* | cClientHandle: Alpha-sorted the sending functions. | madmaxoft | 2014-10-01 | 1 | -7/+7 |
| | |||||
* | Rewritten plugin messages, vanilla are being parsed directly. | madmaxoft | 2014-09-30 | 1 | -15/+40 |
| | | | | This should finally fix the compatibility problems between 1.7 and 1.8 protocols with the changes in the vanilla plugin messages. | ||||
* | Dropped support for <1.7.x | Tiger Wang | 2014-09-27 | 1 | -1/+0 |
| | |||||
* | 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 | -1/+13 |
|\ | |||||
| * | Full BungeeCord compatibility. | madmaxoft | 2014-09-17 | 1 | -1/+13 |
| | | | | | | | | | | Fixes #1392. Fixes SpigotMC/BungeeCord#1211. | ||||
* | | Exported player list states to extra functions. | Howaner | 2014-09-18 | 1 | -67/+71 |
| | | |||||
* | | 1.8: Fixed maps. | Howaner | 2014-09-13 | 1 | -2/+2 |
| | | |||||
* | | 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 |
|/ | |||||
* | Exported cClientHandle:GetIPString() to Lua API. | Mattes D | 2014-09-07 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1351 from LO1ZB/remove-a_RelY | Mattes D | 2014-09-03 | 1 | -1/+1 |
|\ | | | | | remove y-coord from chunks | ||||
| * | remove y-coord from chunks | LO1ZB | 2014-08-28 | 1 | -1/+1 |
| | | |||||
* | | Fixed crashes and use std::swap. | Hownaer | 2014-08-28 | 1 | -1/+1 |
|/ | |||||
* | Exported daylight cycle flag to the protocol. | Howaner | 2014-08-11 | 1 | -1/+1 |
| | |||||
* | Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld. | Howaner | 2014-08-07 | 1 | -1/+1 |
| | | | I need this for a GameRule plugin. | ||||
* | Merge pull request #1255 from mc-server/NameToUUID | Mattes D | 2014-08-01 | 1 | -1/+7 |
|\ | | | | | Name to UUID | ||||
| * | Merged branch 'master' into NameToUUID. | madmaxoft | 2014-07-31 | 1 | -1/+1 |
| |\ | |||||
| * | | MojangAPI: Implemented UUID shortening and dashing. | madmaxoft | 2014-07-30 | 1 | -1/+7 |
| | | | |||||
* | | | Added beacon. | Howaner | 2014-07-30 | 1 | -1/+4 |
| |/ |/| | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-29 | 1 | -3/+3 |
|\| | | | | | | | | | Conflicts: src/World.h | ||||
| * | Moar view distance! | tonibm19 | 2014-07-23 | 1 | -2/+2 |
| | | | | | | | | Let's blow up our computers! :D | ||||
| * | Export SendEntityAnimation to ToLua | archshift | 2014-07-22 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 1 | -3/+3 |
|\| | | | | | | | | | | | | | | | 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 | -3/+3 |
| | | |||||
* | | Fix failed merge and other issues | Tiger Wang | 2014-07-18 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -22/+26 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp | ||||
| * | Fixed spaces around single-line comments. | madmaxoft | 2014-07-17 | 1 | -7/+9 |
| | | | | | | | | 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. | ||||
| * | Merge pull request #1192 from mc-server/skinuuid | Mattes D | 2014-07-16 | 1 | -2/+8 |
| |\ | | | | | | | Skins | ||||
| | * | Store properties as Json::Value | Tiger Wang | 2014-07-16 | 1 | -4/+7 |
| | | | |||||
| | * | Player properties are now retrieved | Tiger Wang | 2014-07-14 | 1 | -1/+4 |
| | | | |||||
| * | | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 1 | -1/+1 |
| |/ | |||||
| * | Revert failed fix for #31 | Tiger Wang | 2014-07-13 | 1 | -4/+0 |
| | | | | | | | | This reverts commit 69dc9b4c9aea58ebd95e2dbd0205701dfc4ce54e. | ||||
| * | Fixed respawning | Tiger Wang | 2014-06-29 | 1 | -1/+1 |
| | | | | | | | | * Fixes #1103 | ||||
| * | Added generic entity-collecting. | Mattes D | 2014-06-27 | 1 | -1/+1 |
| | | | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098. | ||||
* | | Merge branch 'master' of https://github.com/mc-server/MCServer into portals | Tiger Wang | 2014-06-24 | 1 | -2/+9 |
|\| | |||||
| * | Added cClientHandle::IsUUIDOnline function. | madmaxoft | 2014-06-21 | 1 | -2/+9 |
| | | | | | | | | Ref.: #771 | ||||
* | | Portals animate and delay correctly | Tiger Wang | 2014-06-12 | 1 | -1/+1 |
|/ | |||||
* | Fixed deadlock when moving players to other worlds. | Mattes D | 2014-06-08 | 1 | -3/+3 |
| | | | | Fixes #1039, fixes #851 | ||||
* | Added queue for adding entities to cWorld. | Mattes D | 2014-06-08 | 1 | -1/+2 |
| | | | | This alone doesn't work properly yet, further changes to cPlayer are needed. | ||||
* | Revert "Add more move checks" | madmaxoft | 2014-05-26 | 1 | -1/+1 |
| | | | | This reverts commit 989312c4e7f517ae324e857cb255211e3fd8bb06. | ||||
* | Merge pull request #1003 from Howaner/GlobalFixes | Mattes D | 2014-05-26 | 1 | -1/+1 |
|\ | | | | | Add more move checks | ||||
| * | Add more move checks | Howaner | 2014-05-16 | 1 | -1/+1 |
| | | | | | | | | | | - Invalid X/Y/Z/Stance check (std::isnan) - Illegal stance - Illegal position (32.000.000 is the world size) | ||||
* | | cCompositeChat message type is now formatted | Tiger Wang | 2014-05-19 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #998 from mc-server/StatManager | Mattes D | 2014-05-18 | 1 | -0/+2 |
|\ \ | | | | | | | Statistic Manager | ||||
| * | | Statistic Manager | andrew | 2014-05-11 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #994 from Howaner/GlobalFixes | Mattes D | 2014-05-15 | 1 | -0/+3 |
|\ \ \ | | |/ | |/| | Add place/break radius, add dig cancel packet and add item resend on break/place cancel. | ||||
| * | | Rename HandleBlockDigCancel to FinishDigAnimtion. | Howaner | 2014-05-11 | 1 | -2/+2 |
| | | | |||||
| * | | Add DIG_STATUS_CANCELLED packet and add item resend, when a block can't place/break. | Howaner | 2014-05-09 | 1 | -0/+3 |
| |/ | |||||
* | | Merge branch 'master' into SslWebAdmin | Mattes D | 2014-05-10 | 1 | -0/+3 |
|\| | |||||
| * | Add MC|ItemName plugin message. | Howaner | 2014-05-05 | 1 | -0/+3 |
| | | |||||
* | | Merged branch 'master' into SslWebAdmin. | madmaxoft | 2014-05-01 | 1 | -1/+1 |
|\| | |||||
| * | More ClientHandle fixes. | madmaxoft | 2014-05-01 | 1 | -1/+1 |
| | | |||||
* | | Fixed crashes in the SSL HTTP connection. | madmaxoft | 2014-05-01 | 1 | -1/+1 |
|/ | |||||
* | Further refactored, Reverted Minecart change | archshift | 2014-04-26 | 1 | -1/+3 |
| | | | | Other small changes. | ||||
* | Refactored SendChat(), placing the message-type formatting into its own function. | archshift | 2014-04-25 | 1 | -0/+3 |
| | | | | Removed default case warning in the process. | ||||
* | Modified many things | daniel0916 | 2014-04-17 | 1 | -3/+0 |
| | |||||
* | Fixed conflicting enchantments checking | daniel0916 | 2014-04-16 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into Enchanting | daniel0916 | 2014-04-16 | 1 | -1/+16 |
|\ | |||||
| * | Implemented the 1.7.6 protocol and authenticator. | madmaxoft | 2014-04-14 | 1 | -1/+7 |
| | | | | | | | | Server works both in online and offline modes with 1.7.9. | ||||
| * | A client UUID is generated when the server is in offline mode. | madmaxoft | 2014-04-14 | 1 | -1/+6 |
| | | | | | | | | 1.7.9 client works with these changes in offline mode. | ||||
| * | Added Yggdrasil Authentication System | daniel0916 | 2014-04-13 | 1 | -1/+5 |
| | | | | | | | | Code by Howaner. Fixes/Changes by me. | ||||
* | | Code Optimization | daniel0916 | 2014-04-15 | 1 | -2/+3 |
| | | |||||
* | | Modified names | daniel0916 | 2014-04-15 | 1 | -2/+2 |
| | | |||||
* | | Fixed invisibility enchantments | daniel0916 | 2014-04-13 | 1 | -0/+1 |
| | | |||||
* | | Added complete Enchanting System | daniel0916 | 2014-04-12 | 1 | -1/+4 |
| | | | | | | | | http://minecraft.gamepedia.com/Enchantment_mechanics | ||||
* | | Added deleted things for merging | daniel0916 | 2014-04-07 | 1 | -0/+3 |
|/ | |||||
* | Merge branch 'master' into HTTPSizeT | madmaxoft | 2014-04-04 | 1 | -3/+3 |
|\ | |||||
| * | Fixed some Clang warnings in protocols. | madmaxoft | 2014-04-04 | 1 | -1/+1 |
| | | |||||
| * | Simplified and fixed slabs, fixes #835 | Tiger Wang | 2014-03-31 | 1 | -2/+2 |
| | | |||||
* | | Fixed All signedness warnings in HTTPServer.cpp | Tycho | 2014-04-02 | 1 | -1/+1 |
|/ | |||||
* | Unified Vector classes | andrew | 2014-03-11 | 1 | -1/+1 |
| | |||||
* | Merge pull request #731 from mc-server/ballisticmissiles | Tiger Wang | 2014-03-09 | 1 | -1/+3 |
|\ | | | | | Ballistic firework missiles | ||||
| * | CheckBlockInteractionsRate() fixed & enabled | Tiger Wang | 2014-03-09 | 1 | -1/+3 |
| | | |||||
* | | Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting. | Jan-Fabian Humann | 2014-03-08 | 1 | -1/+3 |
|/ | |||||
* | Merge pull request #669 from xdot/master | Tiger Wang | 2014-02-24 | 1 | -0/+4 |
|\ | | | | | Implementation of in-game maps :D | ||||
| * | Manual merge (Fixed conflicts) | andrew | 2014-02-20 | 1 | -2/+11 |
| |\ | |||||
| * | | Map decorators; Map clients | andrew | 2014-02-18 | 1 | -0/+2 |
| | | | |||||
| * | | IDCount Serialization | andrew | 2014-02-13 | 1 | -2/+2 |
| | | | |||||
| * | | Implementation of in-game maps | andrew | 2014-02-13 | 1 | -0/+2 |
| | | | |||||
* | | | cClientHandle manages the client-registered plugin channels. | madmaxoft | 2014-02-20 | 1 | -26/+46 |
| |/ |/| | | | | | Fixes #706. | ||||
* | | Implemented paintings, fixes #689 | Tiger Wang | 2014-02-18 | 1 | -0/+2 |
| | | | | | | | | + Implemented paintings | ||||
* | | Add Locale to ClientHandle | Howaner | 2014-02-16 | 1 | -1/+6 |
| | | |||||
* | | 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 branch 'master' into playerimprovements | Tiger Wang | 2014-02-09 | 1 | -5/+5 |
|\ | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| * | Improved Type safety of eBlockFace | Tycho | 2014-02-04 | 1 | -5/+5 |
| | | | | | | | | May Fix #640 | ||||
* | | Improved chat messaging functions | Tiger Wang | 2014-02-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API. | ||||
* | | Fixed explosions bug | Tiger Wang | 2014-02-05 | 1 | -11/+2 |
|/ | | | | * Fixed bug where explosions would sometimes never be sent | ||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer | andrew | 2014-01-21 | 1 | -0/+1 |
|\ | |||||
| * | Removed unneeded paramters | Tiger Wang | 2014-01-19 | 1 | -1/+1 |
| | | |||||
| * | Changed SendBlockEntity format slightly | Tiger Wang | 2014-01-19 | 1 | -2/+1 |
| | | | | | | | | | | * Writing NBT is now in Protocol, not BlockEntity files * Fixed a last output bug | ||||
| * | Improved command blocks | Tiger Wang | 2014-01-19 | 1 | -0/+2 |
| | | | | | | | | | | | | | | * Their command and previous output are displayed on the client * They have a BlockHandler implementation, so you can't place blocks on them anymore + As a side effect, implemented UpdateBlockEntity | ||||
* | | Scoreboard protocol support | andrew | 2014-01-21 | 1 | -0/+4 |
|/ | |||||
* | Parse the MC|AdvCdm plugin message | andrew | 2014-01-18 | 1 | -0/+3 |
| | |||||
* | Added handshake processing to protocol 1.7. | madmaxoft | 2014-01-13 | 1 | -0/+6 |
| | | | | This fixes #495 | ||||
* | Added cClientHandle::SendPluginMessage(). | madmaxoft | 2014-01-09 | 1 | -0/+1 |
| | | | | It is not yet exported in the API, though. | ||||
* | Plugin messages are received and handed to plugins. | madmaxoft | 2014-01-07 | 1 | -0/+1 |
| | | | | Note that MCS doesn't currently handle any channel registrations, this will come later on. | ||||
* | Implented BroadcastParticleEffect | STRWarrior | 2013-12-22 | 1 | -0/+1 |
| | |||||
* | Fixed the rest of constructor reorders. | madmaxoft | 2013-12-20 | 1 | -9/+0 |
| | |||||
* | Removed some old cRedstone remnants | Tiger Wang | 2013-12-16 | 1 | -1/+0 |
| | |||||
* | Fixed cClientHandle::Tick() being called from two threads. | madmaxoft | 2013-12-16 | 1 | -0/+4 |
| | | | | | When the player was initialized, the Tick() function continued to stream chunk, while the cWorld called Tick() from its tick thread. Final fix for #187. | ||||
* | Moved reading flags to the protocol. | STRWarrior | 2013-12-15 | 1 | -1/+1 |
| | |||||
* | Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() function | STRWarrior | 2013-12-15 | 1 | -0/+2 |
| | |||||
* | Forgot to commit the ClientHandle. | STRWarrior | 2013-12-14 | 1 | -0/+2 |
| | |||||
* | Unknown packet type extended to 32 bits. | madmaxoft | 2013-12-12 | 1 | -1/+1 |
| | |||||
* | Renamed animation function | Tiger Wang | 2013-12-07 | 1 | -1/+1 |
| | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know. | ||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -0/+2 |
| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 1 | -0/+1 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+331 |