Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Tentative fix for player-limit race condition (#3862) | Tiger Wang | 2017-07-28 | 1 | -8/+14 |
| | | | | | | | | | | * Attempts to fix #2257 Derived from d233e9843148313c71fbaba96ccff660e47b07b1 * Changed player count type to int * Clarified certain actions | ||||
* | Fixed memory leak in cClientHandle. (#3794) | Mattes D | 2017-06-26 | 1 | -5/+5 |
| | |||||
* | Fix assert when clicking blocks at the top of the world. | Mattes D | 2017-06-09 | 1 | -12/+16 |
| | |||||
* | Add rank prefix and suffix to player name in chat (#3730) | Heiko Hund | 2017-05-27 | 1 | -1/+5 |
| | | | Fixes issue #1721 | ||||
* | Off-hand/shield slot functional, save and load slot, bow + arrow functional (#3725) | Pablo Beltrán | 2017-05-24 | 1 | -0/+10 |
| | | | Fixes #3714. | ||||
* | Allow enabling/disabling of block change limit | mathiascode | 2017-05-19 | 1 | -1/+1 |
| | |||||
* | Fixed ClientHandle:GetProtocolVersion returning wrong number. | Mattes D | 2017-01-28 | 1 | -8/+2 |
| | |||||
* | Initial support for the 1.11 protocol. | Mattes D | 2016-12-16 | 1 | -2/+2 |
| | |||||
* | Fixed race conditions in cClientHandle's State. | Mattes D | 2016-11-19 | 1 | -157/+208 |
| | |||||
* | Anticheat fastbreak (#3411) | mohe2015 | 2016-11-06 | 1 | -0/+27 |
| | | | Added block hardness checks when breaking blocks. | ||||
* | Added SendMessageRaw for sending json string. | Lukas Pioch | 2016-10-21 | 1 | -0/+9 |
| | |||||
* | Spectators added (#2852) | bibo38 | 2016-10-12 | 1 | -2/+54 |
| | |||||
* | Use cChunkDef::Height for Y coord comparison where applicable. | Moritz Borcherding | 2016-09-27 | 1 | -2/+2 |
| | |||||
* | Fixed cCompositeChat's constructor LuaAPI bindings. | Mattes D | 2016-09-25 | 1 | -5/+3 |
| | | | | The tolua-generated constructor would return an extra string value. | ||||
* | Improve cPlayer::DoMoveToWorld (#3113) | LogicParrot | 2016-09-03 | 1 | -1/+0 |
| | |||||
* | Proper respawn packets on dimension travel | LogicParrot | 2016-08-29 | 1 | -1/+17 |
| | |||||
* | Fixed SendUnloadChunk bug (#3353) | LogicParrot | 2016-08-28 | 1 | -1/+1 |
| | |||||
* | Fix breaking ice in survival not giving a water's source (#3356) | ElNounch | 2016-08-28 | 1 | -1/+1 |
| | | | Fix #3355 | ||||
* | Fixed RasPi builds of unit tests. | Mattes D | 2016-08-04 | 1 | -1/+3 |
| | | | | | On RasPi with gcc 4.8.2, the asserts wouldn't compile when tests were enabled. Enforced the assumption that ASSERT code is generated only in Debug builds. | ||||
* | Tab completion across worlds (#3270) | Alexander Harkness | 2016-07-21 | 1 | -1/+13 |
| | | | Fixes #2563. | ||||
* | 1.9 / 1.9.2 / 1.9.3 / 1.9.4 protocol support (#3135) | Pokechu22 | 2016-05-14 | 1 | -1/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | Fixed some logout crashes | LogicParrot | 2016-04-24 | 1 | -2/+3 |
| | |||||
* | ClientHandle destruction thread safety | LogicParrot | 2016-04-23 | 1 | -2/+13 |
| | |||||
* | Auto clean bad world linkages | LogicParrot | 2016-04-19 | 1 | -0/+1 |
| | |||||
* | Minor improvements to player freeze | LogicParrot | 2016-04-05 | 1 | -4/+4 |
| | |||||
* | Improved player freeze code | LogicParrot | 2016-04-05 | 1 | -16/+19 |
| | |||||
* | Players never fall through unloaded chunks or end up inside solids on teleport | LogicParrot | 2016-03-31 | 1 | -1/+46 |
| | |||||
* | Proper entity destruction in non-ticking chunks | LogicParrot | 2016-02-19 | 1 | -19/+12 |
| | |||||
* | Don't remove water after ice block has been destroyed | Lukas Pioch | 2016-02-18 | 1 | -1/+5 |
| | |||||
* | Prevent player from falling when block breaking is denied | LogicParrot | 2016-02-08 | 1 | -0/+2 |
| | |||||
* | Updated old forum links | Mathias | 2016-01-31 | 1 | -1/+1 |
| | |||||
* | Improved tamed wolf pack cooperation and projectile reactions | LogicParrot | 2016-01-22 | 1 | -1/+1 |
| | |||||
* | Fix crash when tamed wolf is hit by arrows | LogicParrot | 2016-01-16 | 1 | -1/+4 |
| | |||||
* | Limited the username length to 16 characters. | bibo38 | 2016-01-13 | 1 | -0/+6 |
| | | | | | | This fixes a client crash, because Minecraft requires that a username is not longer than 16 characters. See also: http://minecraft.gamepedia.com/The_Player#Name Fixes #2545 | ||||
* | Tamed wolf assists owner (attack / defence) | LogicParrot | 2016-01-12 | 1 | -67/+69 |
| | |||||
* | Reorganised the redstone simulator | Tiger Wang | 2015-12-18 | 1 | -0/+6 |
| | | | | | | -> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan! * Uses classes and inheritance now * Speed should be improved | ||||
* | allow use failures to propagate from the entity/block to the player | Gargaj | 2015-12-13 | 1 | -7/+8 |
| | |||||
* | Add enum for Sound and Particle Effects | Dave Tucker | 2015-11-24 | 1 | -2/+3 |
| | | | | | | Fixes #2603 Signed-off-by: Dave Tucker <dave@dtucker.co.uk> | ||||
* | Examined a fix for #2588 | Tiger Wang | 2015-11-02 | 1 | -0/+6 |
| | |||||
* | Fixed a crash when sending messages too early after connection. | Mattes D | 2015-10-21 | 1 | -1/+12 |
| | |||||
* | Improved the data structure for storing loaded chunks | tycho | 2015-10-05 | 1 | -7/+7 |
| | | | | Should significantly increase the performance of deciding which chunks to stream | ||||
* | Maked it compileable for clang-3.7 | Lukas Pioch | 2015-09-25 | 1 | -5/+5 |
| | |||||
* | Refactored cProtocol Chat handling | tycho | 2015-09-21 | 1 | -8/+10 |
| | |||||
* | Fixed food drain bugs | Tiger Wang | 2015-08-20 | 1 | -24/+14 |
| | |||||
* | Fix old style casts and implicit conversions | Matti Hänninen | 2015-08-12 | 1 | -1/+1 |
| | |||||
* | Silenced and fixed many warning messages across multiple files. | Samuel Barney | 2015-07-29 | 1 | -23/+23 |
| | |||||
* | Improved maps | Tiger Wang | 2015-07-14 | 1 | -20/+2 |
| | |||||
* | Fixed warnings generated by 64-bit MSVC. | Mattes D | 2015-07-07 | 1 | -2/+2 |
| | |||||
* | Reinstate "Chunk queue collapsing" | Tiger Wang | 2015-06-10 | 1 | -15/+12 |
| | | | | | This reinstates commit f36acb683594daff5af3971dcbe3c3a171628b78 and reverts commit adfbc42c021e1bcfcb355933c0fd784306ce0e18. | ||||
* | Revert "Chunk queue collapsing" | worktycho | 2015-06-07 | 1 | -12/+15 |
| | |||||
* | Made the list of chunks to stream an unordered_set | tycho | 2015-06-05 | 1 | -15/+12 |
| | | | | This should increase performance of chunk streaming | ||||
* | Added system and above action bar chat messages | jan64 | 2015-06-02 | 1 | -0/+58 |
| | |||||
* | Fix Destroy() calling behaviour | Tiger Wang | 2015-05-30 | 1 | -1/+2 |
| | | | | * Fixes Core/#142 | ||||
* | Fix for the way connecting clients receive player lists and broadcast chat | b33duck | 2015-05-29 | 1 | -3/+3 |
| | |||||
* | Potential crash fixes | Tiger Wang | 2015-05-28 | 1 | -6/+3 |
| | | | | | * Potentially addresses my comment in #1969 * Probably fixes #2145 | ||||
* | Fixed ClientHandle not getting properly removed from the world | tycho | 2015-05-26 | 1 | -2/+9 |
| | | | | | when socket is closed whilst the client is being added to the world Fixes #1969 | ||||
* | Merge pull request #1848 from scottwillmoore/ImplementTitleCommand | Mattes D | 2015-05-26 | 1 | -0/+63 |
|\ | | | | | Implement backend for /title command | ||||
| * | Implement backend for /title command | Scott Moore | 2015-04-13 | 1 | -0/+63 |
| | | |||||
* | | Fixed chat message manipulation by plugins. | Mattes D | 2015-05-13 | 1 | -1/+1 |
| | | | | | | | | Plugins, in their OnChat hook, can change the chat message sent by a player. | ||||
* | | More style checking. | Mattes D | 2015-05-09 | 1 | -6/+6 |
| | | | | | | | | Spaces around some operators are checked. | ||||
* | | Added support for additional data in the ParticleEffect Packet | tycho | 2015-05-07 | 1 | -0/+9 |
| | | | | | | | | Also started refactoring how broadcasts are handled | ||||
* | | ClientHandle: Fixed re-sending refused right-clicks. | Mattes D | 2015-04-19 | 1 | -1/+8 |
| | | | | | | | | | | The coords weren't checked against Y boundary and -1 coords weren't sent. This fixes mc-server/Gallery#45. | ||||
* | | Placing a fluid from bucket calls plugin hooks. | Mattes D | 2015-04-14 | 1 | -1/+3 |
|/ | | | | Ref.: #1857. | ||||
* | Merge pull request #1826 from mc-server/UnifyPacketizer | Mattes D | 2015-03-24 | 1 | -14/+14 |
|\ | | | | | Unify packetizer | ||||
| * | 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 | -12/+12 |
| | | | | | | | | cByteBuffer now reads and writes any of the [U]Int<N> types. | ||||
* | | Correct world height validations. | Tommy Santerre | 2015-03-20 | 1 | -0/+6 |
|/ | | | | | Unify the way we test block above the current one (Height - 1 instead of a_RelY + 1). Allow generation of world of flat height = 255 | ||||
* | Merge pull request #1734 from mc-server/pistons | Mattes D | 2015-03-14 | 1 | -25/+4 |
|\ | | | | | Handle client 'leave bed' request | ||||
| * | Reverted non-functional changes | Tiger Wang | 2015-03-05 | 1 | -1/+2 |
| | | |||||
| * | Handle client 'leave bed' request | Tiger Wang | 2015-02-08 | 1 | -25/+3 |
| | | | | | | | | * Fixes #1728 | ||||
* | | Merge branch 'master' into Inventory | Howaner | 2015-03-09 | 1 | -2/+6 |
|\ \ | |||||
| * | | Fixed race condition for TCP link deleting. | Mattes D | 2015-02-22 | 1 | -2/+6 |
| |/ | | | | | | | This could have caused crashes when a client disconnected from the server. | ||||
* | | Merge branch 'master' into Inventory | Howaner | 2015-02-06 | 1 | -111/+134 |
|\| | |||||
| * | Fixed a deadlock in cClientHandle network sending. | Mattes D | 2015-01-27 | 1 | -4/+23 |
| | | |||||
| * | Client: Only decode protocol when there's actual data incoming. | Mattes D | 2015-01-27 | 1 | -2/+8 |
| | | |||||
| * | Fixed enchant packet handling. | Mattes D | 2015-01-27 | 1 | -3/+3 |
| | | |||||
| * | Converted cServer to use the cNetwork API. | Mattes D | 2015-01-27 | 1 | -108/+106 |
| | | |||||
* | | Merge branch 'master' into Inventory | Howaner | 2015-01-25 | 1 | -150/+12 |
|\| | |||||
| * | 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 | -148/+10 |
| | | | | | | | | Fixes #1618. | ||||
* | | Own classes for all windows. | Howaner | 2014-12-13 | 1 | -0/+3 |
|/ | |||||
* | Cosmetic touchups. | Mattes D | 2014-12-11 | 1 | -1/+1 |
| | | | | 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 | -1/+39 |
|\ | | | | | Prevent multiple logins with same username, unless allowed in settings | ||||
| * | Changed method call to DoesAllowMultiLogin() instead of IsAllowMultiLogin() | Vincent | 2014-12-10 | 1 | -1/+1 |
| | | | | | | | | Compiles correctly. | ||||
| * | Fixed return value in CheckMultiLogin() | Vincent | 2014-12-09 | 1 | -1/+2 |
| | | |||||
| * | Fixed indent problems and added return definitions to CheckMultiLogin(). | Vincent | 2014-12-09 | 1 | -3/+3 |
| | | | | | | | | | | 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 | -19/+22 |
| | | | | | | | | | | | | Added in indent to cPlayerListCallBack in cCallback class inside CheckMultiLogin(). Added doxy-comment for DoWithPlayer(). Changed comments on IsPlayerInQueue() and IsAllowMultiLogin() to doxy-comments. | ||||
| * | created callback in Root and changed CheckMultiLogin() to use the DoWithPlayer function at Root instead of World. | Vincent | 2014-12-08 | 1 | -1/+1 |
| | | |||||
| * | Fixed compile errors | Vincent | 2014-12-08 | 1 | -8/+3 |
| | | |||||
| * | removed last space in handlehandshake | Vincent | 2014-12-08 | 1 | -1/+0 |
| | | |||||
| * | Changed HandleHandshake to return the result of CheckMultiLogin instead of just true since it already returns true if it finds and kicks the current player. | Vincent | 2014-12-08 | 1 | -24/+23 |
| | | |||||
| * | Moved the check into a new function and just calls that function and a blank FindAndDoWithPlayer added. | Vincent | 2014-12-08 | 1 | -22/+38 |
| | | |||||
| * | Merge branch 'issue_1253' of https://github.com/p-mcgowan/MCServer into issue_1253 | Vincent | 2014-12-07 | 1 | -5/+5 |
| |\ | |||||
| | * | Changed Kick message | vincentleung1 | 2014-11-30 | 1 | -2/+2 |
| | | | |||||
| | * | removed extra space and fixed some formatting in cCallback | vincentleung1 | 2014-11-30 | 1 | -3/+3 |
| | | | |||||
| * | | changed from using iterator to auto for server and clienthandle | Vincent | 2014-12-07 | 1 | -2/+2 |
| |/ | |||||
| * | Uses callback for players already in World. | Vincent | 2014-11-30 | 1 | -5/+12 |
| | | |||||
| * | fixed naming of strings and changed from i to I | Vincent | 2014-11-29 | 1 | -4/+4 |
| | | |||||
| * | issue 1253 - prevent multiple logins with same username | Vincent | 2014-11-29 | 1 | -0/+18 |
| | | |||||
* | | Fixed c++11 branch issues. | Mattes D | 2014-12-07 | 1 | -4/+8 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into c++11 | Tiger Wang | 2014-12-06 | 1 | -0/+4 |
|\ \ | | | | | | | | | | | | | Conflicts: src/OSSupport/Thread.cpp | ||||
| * | | BasicStyle: Added missing braces to control statements. | Mattes D | 2014-12-05 | 1 | -0/+4 |
| |/ | |||||
* | | Merged branch 'origin/master' into c++11. | Mattes D | 2014-12-04 | 1 | -4/+10 |
|\| | |||||
| * | ClientHandle: Fixed max block place distance check. | Mattes D | 2014-11-25 | 1 | -4/+10 |
| | | | | | | | | Fixes #1492 | ||||
* | | Merge remote-tracking branch 'origin/master' into c++11 | Tiger Wang | 2014-11-23 | 1 | -11/+25 |
|\| | | | | | | | | | | | Conflicts: src/Noise/Noise.h src/World.h | ||||
| * | Merge pull request #1598 from mc-server/SignEditor | Mattes D | 2014-11-18 | 1 | -2/+8 |
| |\ | | | | | | | Fixed a security problem with signs. | ||||
| | * | Use LastPlacedSign instead of LastPlacedBlock. | Howaner | 2014-11-15 | 1 | -3/+4 |
| | | | |||||
| | * | Fixed a security problem with signs. | Howaner | 2014-11-15 | 1 | -2/+7 |
| | | | |||||
| * | | Fixed a wrong assert in cClientHandle::SetViewDistance(). | Mattes D | 2014-11-17 | 1 | -4/+8 |
| | | | |||||
| * | | Renamed m_UsedViewDistance to m_CurrentViewDistance | Howaner | 2014-11-15 | 1 | -8/+8 |
| | | | |||||
| * | | Renamed m_SetViewDistance to m_RequestedViewDistance | Howaner | 2014-11-15 | 1 | -4/+4 |
| | | | |||||
| * | | Use m_UsedViewDistance and m_SetViewDistance. | Howaner | 2014-11-14 | 1 | -8/+10 |
| | | | |||||
| * | | Merge branch 'master' into ViewDistance | Howaner | 2014-11-14 | 1 | -1/+1 |
| |\| | |||||
| | * | Fixed m_SentChunks list chunk removing. | Howaner | 2014-10-30 | 1 | -1/+1 |
| | | | |||||
| * | | Added a MaxViewDistance option. | Howaner | 2014-10-30 | 1 | -1/+3 |
| |/ | |||||
* | | Merged branch 'master' into c++11. | Mattes D | 2014-10-24 | 1 | -78/+150 |
|\| | |||||
| * | Use 3 priorities. | Howaner | 2014-10-23 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-23 | 1 | -25/+25 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkSender.cpp src/ClientHandle.cpp src/World.h | ||||
| | * | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 1 | -26/+26 |
| | | | |||||
| * | | Use two lists and 2 chunk send prioritys. | Howaner | 2014-10-21 | 1 | -41/+0 |
| | | | |||||
| * | | New c++11 stuff. | Howaner | 2014-10-21 | 1 | -4/+4 |
| | | | |||||
| * | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-21 | 1 | -7/+41 |
| |\| | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | | Added distance check. | Howaner | 2014-10-07 | 1 | -0/+12 |
| | | | |||||
| * | | Stream 4 chunks per tick. Added priority. | Howaner | 2014-10-06 | 1 | -13/+22 |
| | | | |||||
| * | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-06 | 1 | -2/+10 |
| |\ \ | |||||
| * | | | Better StreamNextChunk() method | Howaner | 2014-10-06 | 1 | -15/+116 |
| | | | | |||||
| * | | | Optimized chunk loader | Howaner | 2014-10-02 | 1 | -86/+77 |
| | | | | |||||
* | | | | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-20 | 1 | -26/+26 |
| | | | | |||||
* | | | | Migrated cSleep and cTimer to std::chrono | Tiger Wang | 2014-10-20 | 1 | -13/+5 |
| | | | | |||||
* | | | | Migrated random generators to std::random | Tiger Wang | 2014-10-19 | 1 | -12/+0 |
| |_|/ |/| | | |||||
* | | | 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 | -3/+34 |
| | | | |||||
* | | | Functions in cPluginManager get references instead of pointers. | Mattes D | 2014-10-15 | 1 | -2/+2 |
| | | | |||||
* | | | Usernames are lowercased before generating offline UUID. | Mattes D | 2014-10-15 | 1 | -1/+4 |
| |/ |/| | | | | | This breaks previous offline UUIDs, but it guarantees that future offline UUIDs will be the same even for usernames with wrong capitalization. | ||||
* | | cClientHandle: Added protocol version knowledge. | Mattes D | 2014-10-05 | 1 | -2/+10 |
|/ | |||||
* | Rewritten plugin messages, vanilla are being parsed directly. | madmaxoft | 2014-09-30 | 1 | -90/+30 |
| | | | | This should finally fix the compatibility problems between 1.7 and 1.8 protocols with the changes in the vanilla plugin messages. | ||||
* | Fixed trailing whitespace. | madmaxoft | 2014-09-28 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1466 from mc-server/endofsupport | Mattes D | 2014-09-28 | 1 | -14/+0 |
|\ | | | | | Removed protocols 1.2 to 1.6 | ||||
| * | Dropped support for <1.7.x | Tiger Wang | 2014-09-27 | 1 | -14/+0 |
| | | |||||
* | | Combined conditions | Masy98 | 2014-09-27 | 1 | -8/+11 |
| | | |||||
* | | Added barriers correctly | Masy98 | 2014-09-27 | 1 | -0/+5 |
|/ | |||||
* | Fixed players custom name in 1.8 | Howaner | 2014-09-26 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' into EntityCustomName | Howaner | 2014-09-23 | 1 | -64/+164 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-19 | 1 | -2/+10 |
| |\ | |||||
| | * | BungeeCord compatibility: don't overwrite UUID / properties. | madmaxoft | 2014-09-17 | 1 | -2/+10 |
| | | | |||||
| * | | Exported player list states to extra functions. | Howaner | 2014-09-18 | 1 | -6/+42 |
| | | | |||||
| * | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-14 | 1 | -1/+1 |
| |\| | |||||
| | * | Merge pull request #1353 from mc-server/Effects | Mattes D | 2014-09-13 | 1 | -1/+1 |
| | |\ | | | | | | | | | Added speed entity effect. | ||||
| | | * | Merge branch 'master' into Effects | Howaner | 2014-09-12 | 1 | -14/+30 |
| | | |\ | |||||
| | | * | | Added speed entity effect. | Hownaer | 2014-08-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | 1.8: Fixed maps. | Howaner | 2014-09-13 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-13 | 1 | -2/+20 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHoe.h | ||||
| | * | | | Play placesound from the middle of the block. | Howaner | 2014-09-12 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Fixed block place sounds. | Howaner | 2014-09-12 | 1 | -2/+14 |
| | | | | | |||||
| | * | | | Players in survival mode are not allowed to break a bedrock. | Howaner | 2014-09-12 | 1 | -0/+6 |
| | | |/ | | |/| | |||||
| * | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-12 | 1 | -1/+1 |
| |\| | | |||||
| | * | | Moved sound-configs into BlockID.h and fixed/ added loads of sounds | Masy98 | 2014-09-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed many right click issues. | Howaner | 2014-09-12 | 1 | -4/+10 |
| | | | | |||||
| * | | | 1.8: Fixed eating. | Howaner | 2014-09-12 | 1 | -0/+1 |
| | | | | |||||
| * | | | 1.8: Added ParticleEffect packet. | Howaner | 2014-09-11 | 1 | -2/+2 |
| | | | | |||||
| * | | | 1.8: Added MultiBlockChange packet. | Howaner | 2014-09-09 | 1 | -3/+4 |
| | | | | |||||
| * | | | Added the player list to the 1.8 protocol. | Howaner | 2014-09-09 | 1 | -3/+7 |
| | | | | |||||
| * | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-09 | 1 | -10/+10 |
| |\| | | |||||
| | * | | Merge pull request #1351 from LO1ZB/remove-a_RelY | Mattes D | 2014-09-03 | 1 | -10/+10 |
| | |\ \ | | | | | | | | | | | remove y-coord from chunks | ||||
| | | * | | remove y-coord from chunks | LO1ZB | 2014-08-28 | 1 | -10/+10 |
| | | | | | |||||
| * | | | | 1.8: Added new uuid field. | Howaner | 2014-09-09 | 1 | -17/+25 |
| | | | | | |||||
| * | | | | More fixes. | Howaner | 2014-09-08 | 1 | -11/+1 |
| | | | | | |||||
| * | | | | Fixed more 1.8 packets. | Howaner | 2014-09-08 | 1 | -12/+21 |
| |/ / / | |||||
| * | | | Merge branch 'master' into Inventory | Howaner | 2014-09-02 | 1 | -1/+2 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Fixed crashes and use std::swap. | Hownaer | 2014-08-28 | 1 | -3/+19 |
| | |/ | |/| | |||||
* | | | Added SetCustomName() to players. | Howaner | 2014-09-02 | 1 | -7/+5 |
| |/ |/| | |||||
* | | Fire can be destroyed with the sword in creative-mode | Hownaer | 2014-08-28 | 1 | -1/+2 |
|/ | |||||
* | Fixed item drop. | Howaner | 2014-08-22 | 1 | -14/+18 |
| | | | Fixes #1341 | ||||
* | Added initializers for class members. | Mattes D | 2014-08-21 | 1 | -0/+10 |
| | | | | As reported by Coverity, these weren't initialized. | ||||
* | Merge branch 'master' into Fire | Howaner | 2014-08-20 | 1 | -4/+4 |
|\ | |||||
| * | Exported daylight cycle flag to the protocol. | Howaner | 2014-08-11 | 1 | -9/+3 |
| | | |||||
| * | Added a comment and simplified code. | Howaner | 2014-08-10 | 1 | -6/+3 |
| | | |||||
| * | Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld. | Howaner | 2014-08-07 | 1 | -1/+10 |
| | | | | | | I need this for a GameRule plugin. | ||||
* | | Revert "Removes the fire if the block under the fire was broken." | Howaner | 2014-08-11 | 1 | -5/+0 |
| | | | | | | This reverts commit 01001d2a49a3366e9b1eccf938d5073ab9a2f06e. | ||||
* | | Removes the fire if the block under the fire was broken. | Howaner | 2014-08-11 | 1 | -0/+5 |
| | | |||||
* | | Moved the clicked-through block check to the top of the function. | Howaner | 2014-08-11 | 1 | -36/+17 |
| | | |||||
* | | Fixed cancelled fire interact from all directions. | Howaner | 2014-08-11 | 1 | -4/+12 |
|/ | |||||
* | Resending fire to the client when the interact cancelled. | Howaner | 2014-08-06 | 1 | -0/+8 |
| | |||||
* | Fixed a bug who can used from hacked clients. | Howaner | 2014-08-02 | 1 | -1/+16 |
| | |||||
* | Merge pull request #1255 from mc-server/NameToUUID | Mattes D | 2014-08-01 | 1 | -1/+2 |
|\ | | | | | Name to UUID | ||||
| * | Merged branch 'master' into NameToUUID. | madmaxoft | 2014-07-31 | 1 | -20/+8 |
| |\ | |||||
| * | | MojangAPI: Implemented UUID shortening and dashing. | madmaxoft | 2014-07-30 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #1272 from Howaner/Food | Mattes D | 2014-08-01 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | Fixed hunger bugs, Implemented golden apple, added jump statistic, added... | ||||
| * | | | Compile fix. | Howaner | 2014-08-01 | 1 | -2/+1 |
| | | | | |||||
| * | | | Import Statistics.h | Howaner | 2014-07-31 | 1 | -0/+1 |
| | | | | |||||
| * | | | Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects. | Howaner | 2014-07-31 | 1 | -1/+3 |
| | |/ | |/| | |||||
* | | | Renamed "select..." methods to "set..." and better IsValidEffect() function. | Howaner | 2014-07-31 | 1 | -2/+2 |
| | | | |||||
* | | | Renamed functions and added beacon json saving. | Howaner | 2014-07-31 | 1 | -12/+12 |
| | | | |||||
* | | | Added beacon. | Howaner | 2014-07-30 | 1 | -0/+54 |
|/ / | |||||
* | | Merged branch 'howaner/Options'. | madmaxoft | 2014-07-30 | 1 | -15/+4 |
|\ \ | |||||
| * | | Fixed group color's. | Howaner | 2014-07-27 | 1 | -15/+4 |
| |/ | |||||
* | | Slight cleanup after portals | Tiger Wang | 2014-07-29 | 1 | -2/+1 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-07-23 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 1 | -9/+9 |
|\| | | | | | | | | | | | | | | | 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 |
| | | |||||
| * | Fixed attempts to call c_str on ChatColors | archshift | 2014-07-19 | 1 | -4/+4 |
| | | |||||
| * | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 1 | -2/+2 |
| | | |||||
* | | Bug and crash fixes | Tiger Wang | 2014-07-20 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | * Fixes end portals' solidity * Fixed crashes to do with multithreading and removing an entity from the wrong world * Fixed crashes due to bad merge * Fixed crashes due to an object being deleted twice * Simplified cWorld::Start() and added comments to configuration files | ||||
* | | Fix failed merge and other issues | Tiger Wang | 2014-07-18 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -77/+53 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 creative players not being able to drink | archshift | 2014-07-18 | 1 | -3/+4 |
| | | | | | | | | Fixes #1215 | ||||
| * | 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 | -11/+13 |
| | | | | | | | | There should be at least two spaces in front and one space after //-style comments. | ||||
| * | Fixed basic whitespace problems. | madmaxoft | 2014-07-17 | 1 | -10/+10 |
| | | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines. | ||||
| * | Merge remote-tracking branch 'origin/master' into potions | madmaxoft | 2014-07-17 | 1 | -3/+4 |
| |\ | |||||
| | * | Merge pull request #1192 from mc-server/skinuuid | Mattes D | 2014-07-16 | 1 | -3/+4 |
| | |\ | | | | | | | | | Skins | ||||
| | | * | Store properties as Json::Value | Tiger Wang | 2014-07-16 | 1 | -1/+1 |
| | | | | |||||
| | | * | Player properties are now retrieved | Tiger Wang | 2014-07-14 | 1 | -3/+4 |
| | | | | |||||
| * | | | Merge branch 'master' into potions | madmaxoft | 2014-07-15 | 1 | -30/+7 |
| |\| | | |||||
| | * | | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 1 | -3/+3 |
| | |/ | |||||
| | * | Revert failed fix for #31 | Tiger Wang | 2014-07-13 | 1 | -27/+4 |
| | | | | | | | | | | | | This reverts commit 69dc9b4c9aea58ebd95e2dbd0205701dfc4ce54e. | ||||
| * | | Merge remote-tracking branch 'origin/master' into potions | archshift | 2014-07-10 | 1 | -41/+68 |
| |\| | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp | ||||
| | * | Unnecessary return | Howaner | 2014-06-30 | 1 | -2/+0 |
| | | | |||||
| | * | Fixed respawning | Tiger Wang | 2014-06-29 | 1 | -2/+2 |
| | | | | | | | | | | | | * Fixes #1103 | ||||
| | * | Fixed offline UUID generator. | Mattes D | 2014-06-29 | 1 | -2/+4 |
| | | | | | | | | | | | | It generated invalid UUIDs, too many hex chars. | ||||
| | * | Send statistics to the player, when he logged in. | Howaner | 2014-06-29 | 1 | -0/+3 |
| | | | |||||
| | * | Merge pull request #1132 from mc-server/RemoveMD5 | Mattes D | 2014-06-29 | 1 | -13/+9 |
| | |\ | | | | | | | | | Removed the md5 library, obsoleted by PolarSSL. | ||||
| | | * | Removed the md5 library, obsoleted by PolarSSL. | Mattes D | 2014-06-27 | 1 | -13/+9 |
| | | | | | | | | | | | | | | | | Fixes #1130. | ||||
| | * | | Fixed issue with breaking blocks at -1 coordinates | Tiger Wang | 2014-06-28 | 1 | -6/+1 |
| | | | | |||||
| | * | | Added generic entity-collecting. | Mattes D | 2014-06-27 | 1 | -2/+2 |
| | |/ | | | | | | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098. | ||||
| * | | ItemHandler: changed IsDrinkable() to take a short argument | archshift | 2014-06-17 | 1 | -3/+4 |
| | | | |||||
| * | | Implemented drinkable potions, noeffect entity effect, | archshift | 2014-06-17 | 1 | -3/+3 |
| | | | | | | | | | | | | Clears entity effects on death | ||||
| * | | Implemented milk, added documentation to Pawn.h | archshift | 2014-06-17 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/mc-server/MCServer into portals | Tiger Wang | 2014-06-24 | 1 | -0/+29 |
|\ \ \ | | |/ | |/| | |||||
| * | | Added cClientHandle::IsUUIDOnline function. | madmaxoft | 2014-06-21 | 1 | -0/+29 |
| | | | | | | | | | | | | Ref.: #771 | ||||
* | | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 1 | -16/+20 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| * | | Merge branch 'master' into GlobalFixes | Howaner | 2014-06-17 | 1 | -25/+20 |
| |\| | |||||
| * | | Add more documentation. | Howaner | 2014-06-17 | 1 | -0/+2 |
| | | | |||||
| * | | Add comment. | Howaner | 2014-06-17 | 1 | -0/+1 |
| | | | |||||
| * | | Revert "Fix right click bugs." | Howaner | 2014-06-17 | 1 | -41/+40 |
| | | | | | | | | | This reverts commit 61b6fdde7553dac6e2d5c5a071b9a13fa0d71b2f. | ||||
| * | | Fix fire break. | Howaner | 2014-05-28 | 1 | -16/+17 |
| | | | |||||
| * | | Fix right click bugs. | Howaner | 2014-05-28 | 1 | -40/+41 |
| | | | |||||
* | | | Portals animate and delay correctly | Tiger Wang | 2014-06-12 | 1 | -4/+3 |
| | | | |||||
* | | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 1 | -21/+17 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | 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 | -16/+5 |
| | | | | | | | | | | | | Fixes #1039, fixes #851 | ||||
| * | | Proper fix for long interaction. | madmaxoft | 2014-06-08 | 1 | -7/+14 |
| | | | | | | | | | | | | Fixes #1078 and #1038. | ||||
* | | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-04 | 1 | -2/+1 |
|\| | | |||||
| * | | Fixed bad coordinate | worktycho | 2014-06-04 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/pistonfixes' | Tiger Wang | 2014-06-02 | 1 | -1/+0 |
| |\ \ | | |/ | |/| | | | | | | | Conflicts: src/Chunk.cpp | ||||
| | * | Hopefully fixed piston duplication issues | Tiger Wang | 2014-05-25 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | * Fixes #879 * Fixes #714 | ||||
* | | | Implemented end and nether portals | Tiger Wang | 2014-05-31 | 1 | -4/+3 |
|/ / | |||||
* | | ClientHandle.cpp: Process look before pos | archshift | 2014-05-27 | 1 | -1/+1 |
| | | |||||
* | | ClientHandle.cpp: remove redundant code | archshift | 2014-05-26 | 1 | -22/+2 |
| | | | | | | | | HandlePlayerMoveLook() calls HandlePlayerPos() and HandlePlayerLook() to reduce code redundancy. | ||||
* | | Revert "Add more move checks" | madmaxoft | 2014-05-26 | 1 | -58/+16 |
| | | | | | | | | This reverts commit 989312c4e7f517ae324e857cb255211e3fd8bb06. | ||||
* | | Merge pull request #1003 from Howaner/GlobalFixes | Mattes D | 2014-05-26 | 1 | -16/+58 |
|\ \ | |/ |/| | Add more move checks | ||||
| * | Add more move checks | Howaner | 2014-05-16 | 1 | -16/+58 |
| | | | | | | | | | | - Invalid X/Y/Z/Stance check (std::isnan) - Illegal stance - Illegal position (32.000.000 is the world size) | ||||
* | | Merge pull request #1010 from mc-server/cactidamage | Alexander Harkness | 2014-05-19 | 1 | -2/+3 |
|\ \ | | | | | | | Implemented cacti damage | ||||
| * | | Implemented cacti damage | Tiger Wang | 2014-05-18 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | + Implemented cacti damage * Fixed pickup tossing (PR #994 bug) | ||||
* | | | Merge pull request #998 from mc-server/StatManager | Mattes D | 2014-05-18 | 1 | -1/+10 |
|\ \ \ | |/ / |/| | | Statistic Manager | ||||
| * | | Fixed stat serialization | andrew | 2014-05-11 | 1 | -8/+0 |
| | | | |||||
| * | | Statistic Manager | andrew | 2014-05-11 | 1 | -1/+18 |
| | | | |||||
* | | | Merge pull request #994 from Howaner/GlobalFixes | Mattes D | 2014-05-15 | 1 | -17/+80 |
|\ \ \ | | |/ | |/| | Add place/break radius, add dig cancel packet and add item resend on break/place cancel. | ||||
| * | | Fix compile error. | Howaner | 2014-05-15 | 1 | -1/+1 |
| | | | |||||
| * | | Move radius check. | Howaner | 2014-05-15 | 1 | -25/+40 |
| | | | |||||
| * | | Rename HandleBlockDigCancel to FinishDigAnimtion. | Howaner | 2014-05-11 | 1 | -3/+3 |
| | | | |||||
| * | | Add block place/break distance check. | Howaner | 2014-05-09 | 1 | -0/+21 |
| | | | |||||
| * | | Add DIG_STATUS_CANCELLED packet and add item resend, when a block can't place/break. | Howaner | 2014-05-09 | 1 | -17/+44 |
| |/ | |||||
* | | Merge branch 'master' into SslWebAdmin | Mattes D | 2014-05-10 | 1 | -5/+32 |
|\| | |||||
| * | Simplified the HandleAnvilItemName() code. | Howaner | 2014-05-06 | 1 | -7/+2 |
| | | |||||
| * | Changed HandleAnvilItemName() length to size_t in ClientHandle.h | Howaner | 2014-05-05 | 1 | -1/+1 |
| | | |||||
| * | Add clicks, exp subtraction, item check, ... | Howaner | 2014-05-05 | 1 | -1/+1 |
| | | |||||
| * | Add MC|ItemName plugin message. | Howaner | 2014-05-05 | 1 | -0/+32 |
| | | |||||
| * | Merge branch 'master' into redstoneimprovements | Tiger Wang | 2014-05-04 | 1 | -5/+14 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/FallingBlock.cpp src/Mobs/AggressiveMonster.cpp src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| | * | HOOK_DISCONNECT has cClientHandle as its first parameter. | madmaxoft | 2014-05-02 | 1 | -3/+3 |
| | | | | | | | | | | | | Ref.: #655. | ||||
| * | | Redstone simulator now directly accesses cChunk | Tiger Wang | 2014-04-27 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes | ||||
* | | | Merged branch 'master' into SslWebAdmin. | madmaxoft | 2014-05-01 | 1 | -2/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | More ClientHandle fixes. | madmaxoft | 2014-05-01 | 1 | -2/+2 |
| | | | |||||
| * | | Fixed warnings in ClientHandle. | madmaxoft | 2014-05-01 | 1 | -2/+2 |
| | | | |||||
* | | | Fixed crashes in the SSL HTTP connection. | madmaxoft | 2014-05-01 | 1 | -1/+2 |
|/ / | |||||
* | | Delayed sending the KeepAlive packet for 3 seconds after login. | madmaxoft | 2014-04-29 | 1 | -0/+5 |
| | | | | | | | | This should alleviate #889. | ||||
* | | Fixed braces. | madmaxoft | 2014-04-28 | 1 | -1/+5 |
| | | |||||
* | | Fixed missing return value warning in MSVC. | madmaxoft | 2014-04-28 | 1 | -0/+1 |
|/ | |||||
* | More small fixes. | archshift | 2014-04-26 | 1 | -9/+9 |
| | |||||
* | Moar alignment. | archshift | 2014-04-26 | 1 | -7/+7 |
| | |||||
* | Further refactored, Reverted Minecart change | archshift | 2014-04-26 | 1 | -57/+21 |
| | | | | Other small changes. | ||||
* | Merge remote-tracking branch 'upstream/master' | archshift | 2014-04-25 | 1 | -1/+1 |
|\ | |||||
| * | Fix armor in survival mode. | Howaner | 2014-04-24 | 1 | -1/+1 |
| | | |||||
* | | Oops, fixed that. | archshift | 2014-04-25 | 1 | -0/+2 |
| | | |||||
* | | Refactored SendChat(), placing the message-type formatting into its own function. | archshift | 2014-04-25 | 1 | -84/+78 |
|/ | | | | Removed default case warning in the process. | ||||
* | Merge pull request #909 from jfhumann/fixes | Mattes D | 2014-04-22 | 1 | -6/+8 |
|\ | | | | | | | | | 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 | ||||
| * | Declared one mutex as mutable in order to allow for const correct get accessors. | jfhumann | 2014-04-19 | 1 | -4/+4 |
| | | |||||
| * | Small style changes | jfhumann | 2014-04-18 | 1 | -1/+1 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into fixes | jfhumann | 2014-04-18 | 1 | -9/+53 |
| |\ | | | | | | | | | | | | | | | | | | | | | | 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 | -8/+10 |
| | | | |||||
* | | | Merge branch 'master' into Enchanting | daniel0916 | 2014-04-18 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #891 from mc-server/fixes | Mattes D | 2014-04-17 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Fixes to redstone & general | ||||
| | * | | Entities handle chunks properly again | Tiger Wang | 2014-04-12 | 1 | -1/+1 |
| | |/ | | | | | | | | | | | | | * Entities properly handle chunks * Changed EntityStatus enums to be less shouty | ||||
* | | | Removed old include | daniel0916 | 2014-04-18 | 1 | -1/+1 |
| | | | |||||
* | | | Fixed some Errors (not all) | daniel0916 | 2014-04-17 | 1 | -7/+10 |
| | | | |||||
* | | | Modified many things | daniel0916 | 2014-04-17 | 1 | -856/+1 |
| | | | |||||
* | | | Fixed conflicting enchantments checking | daniel0916 | 2014-04-16 | 1 | -23/+23 |
| | | | |||||
* | | | Added deletions from merge conflict | daniel0916 | 2014-04-16 | 1 | -0/+875 |
|/ / | |||||
* | | Attempted fix for the client crash with the new protocols. | madmaxoft | 2014-04-15 | 1 | -6/+9 |
| | | |||||
* | | Implemented the 1.7.6 protocol and authenticator. | madmaxoft | 2014-04-14 | 1 | -8/+22 |
| | | | | | | | | 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 | -0/+24 |
| | | | | | | | | 1.7.9 client works with these changes in offline mode. | ||||
* | | Added Yggdrasil Authentication System | daniel0916 | 2014-04-13 | 1 | -2/+5 |
|/ | | | | Code by Howaner. Fixes/Changes by me. | ||||
* | Merge branch 'master' into HTTPSizeT | madmaxoft | 2014-04-04 | 1 | -3/+3 |
|\ | |||||
| * | Fixed some Clang warnings in protocols. | madmaxoft | 2014-04-04 | 1 | -2/+2 |
| | | |||||
| * | Simplified and fixed slabs, fixes #835 | Tiger Wang | 2014-03-31 | 1 | -1/+1 |
| | | |||||
* | | Fixed All signedness warnings in HTTPServer.cpp | Tycho | 2014-04-02 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #838 from mc-server/lilypads | worktycho | 2014-03-30 | 1 | -6/+8 |
|\ | | | | | Lilypads | ||||
| * | Compare for inequality in FACE_NONE checks | Tiger Wang | 2014-03-29 | 1 | -3/+3 |
| | | |||||
| * | Removed leftover clienthandle code | Tiger Wang | 2014-03-29 | 1 | -10/+6 |
| | | |||||
| * | Fixed block interaction rate check | Tiger Wang | 2014-03-28 | 1 | -2/+4 |
| | | |||||
| * | Implemented lilypad placement | Tiger Wang | 2014-03-23 | 1 | -4/+8 |
| | | |||||
* | | Fixed players not updating after world change | Tiger Wang | 2014-03-29 | 1 | -4/+2 |
|/ | | | | Addendum to 6dea7993f2a563a8b3a0746feeb2174922631526 | ||||
* | Merge branch 'Werror' into warnings | Tycho | 2014-03-12 | 1 | -3/+0 |
|\ | | | | | | | | | Conflicts: src/Globals.h | ||||
| * | Merge branch 'master' into Werror | Tycho | 2014-03-12 | 1 | -3/+0 |
| |\ | | | | | | | | | | | | | Conflicts: src/Generating/PieceGenerator.cpp | ||||
| | * | Unified Vector classes | andrew | 2014-03-11 | 1 | -3/+0 |
| | | | |||||
* | | | Fixed a load of format string errors | Tycho | 2014-03-11 | 1 | -1/+1 |
|/ / | |||||
* / | Removed Some unnessicary macros | Tycho | 2014-03-10 | 1 | -13/+0 |
|/ | |||||
* | Merge pull request #731 from mc-server/ballisticmissiles | Tiger Wang | 2014-03-09 | 1 | -29/+19 |
|\ | | | | | Ballistic firework missiles | ||||
| * | != FACE_NONE | Tiger Wang | 2014-03-09 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into ballisticmissiles | Tiger Wang | 2014-03-09 | 1 | -9/+28 |
| |\ | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | | Fixed data length issues | Tiger Wang | 2014-03-09 | 1 | -1/+1 |
| | | | |||||
| * | | CheckBlockInteractionsRate() fixed & enabled | Tiger Wang | 2014-03-09 | 1 | -29/+19 |
| | | | |||||
* | | | Merge pull request #777 from jfhumann/issue317 | Mattes D | 2014-03-09 | 1 | -28/+30 |
|\ \ \ | | | | | | | | | Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions | ||||
| * | | | Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting. | Jan-Fabian Humann | 2014-03-08 | 1 | -28/+30 |
| | | | | |||||
* | | | | Merge pull request #775 from worktycho/warnings | Mattes D | 2014-03-09 | 1 | -2/+2 |
|\ \ \ \ | |_|_|/ |/| | | | Fixed a few warnings | ||||
| * | | | Fixed issues with int vs size_t and a few other warnings | Tycho | 2014-03-08 | 1 | -2/+2 |
| |/ / | |||||
* / / | Slight plugin messaging changes | Tiger Wang | 2014-03-09 | 1 | -0/+13 |
|/ / | | | | | | | | | - Clients are not allowed to register duplicate channels - Clients are not allowed to use channels that were not registered | ||||
* | | Add data backsending, when the Client interacts a Block and the Interact is cancelled. | Howaner | 2014-03-05 | 1 | -4/+10 |
| | | |||||
* | | cBlockInfo now manages the respective cBlockHandler | andrew | 2014-03-02 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #738 from xdot/master | Mattes D | 2014-03-02 | 1 | -1/+1 |
|\ \ | | | | | | | Refactored global block property arrays | ||||
| * | | g_BlockXXX => cBlockInfo::XXX | andrew | 2014-03-01 | 1 | -1/+1 |
| |/ | |||||
* | | Use switch in GetStepSound | Howaner | 2014-02-28 | 1 | -1/+1 |
| | | |||||
* | | Fix Double Slabs, fix Slab Meta and add more things to burnable | Howaner | 2014-02-28 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #669 from xdot/master | Tiger Wang | 2014-02-24 | 1 | -0/+27 |
|\ | | | | | Implementation of in-game maps :D | ||||
| * | Manual merge (Fixed conflicts) | andrew | 2014-02-20 | 1 | -9/+34 |
| |\ | |||||
| * | | Map decorators; Map clients | andrew | 2014-02-18 | 1 | -13/+9 |
| | | | |||||
| * | | Map item handler; Fixed several bugs | andrew | 2014-02-17 | 1 | -2/+0 |
| | | | |||||
| * | | cMap::UpdateRadius | andrew | 2014-02-15 | 1 | -0/+2 |
| | | | |||||
| * | | Send map when selected | andrew | 2014-02-14 | 1 | -0/+13 |
| | | | |||||
| * | | Implementation of in-game maps | andrew | 2014-02-13 | 1 | -0/+18 |
| | | | |||||
* | | | Use the ItemCategorie::IsSword() Method. | Howaner | 2014-02-23 | 1 | -1/+1 |
| | | | |||||
* | | | No Sword Block Destroying in Creative Mode | Howaner | 2014-02-23 | 1 | -0/+10 |
| | | | |||||
* | | | cClientHandle manages the client-registered plugin channels. | madmaxoft | 2014-02-20 | 1 | -10/+77 |
| |/ |/| | | | | | Fixes #706. | ||||
* | | Implemented paintings, fixes #689 | Tiger Wang | 2014-02-18 | 1 | -0/+8 |
| | | | | | | | | + Implemented paintings | ||||
* | | Links sent via chat messages are clickable. | madmaxoft | 2014-02-16 | 1 | -8/+14 |
| | | | | | | | | Fixes #658. | ||||
* | | Add Locale to ClientHandle | Howaner | 2014-02-16 | 1 | -0/+1 |
| | | |||||
* | | Implemented cCompositeChat. | madmaxoft | 2014-02-15 | 1 | -1/+11 |
|/ | | | | | 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 | ||||
* | | 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 | -6/+108 |
| | | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API. | ||||
* | | Server internally uses new functions | Tiger Wang | 2014-02-06 | 1 | -8/+6 |
| | | |||||
* | | Reduced max explosions per tick | Tiger Wang | 2014-02-05 | 1 | -1/+1 |
| | | |||||
* | | Fixed explosions bug | Tiger Wang | 2014-02-05 | 1 | -20/+10 |
| | | | | | | | | * Fixed bug where explosions would sometimes never be sent | ||||
* | | Fixed a crash bug | Tiger Wang | 2014-02-03 | 1 | -8/+2 |
| | | |||||
* | | Server now handles join messages also | Tiger Wang | 2014-02-03 | 1 | -9/+11 |
|/ | | | | * Revised as well hook documentation | ||||
* | Changed Signiture of OnDigging | Tycho | 2014-02-01 | 1 | -3/+3 |
| | |||||
* | Changed Signiture of OnDestroyedByPlayer | Tycho | 2014-02-01 | 1 | -3/+4 |
| | |||||
* | Changed pointers to references | Tycho | 2014-02-01 | 1 | -4/+3 |
| | |||||
* | Changed signitures of Several BLockHandler Methods | Tycho | 2014-02-01 | 1 | -1/+2 |
| | | | | | | | | | | | | | 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 | -27/+12 |
|\ | | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h | ||||
| * | Merge pull request #587 from mc-server/mobimprovements | Mattes D | 2014-01-25 | 1 | -1/+1 |
| |\ | | | | | | | Mob improvements & rudimentary artificial intelligence | ||||
| | * | Two minor changes | Tiger Wang | 2014-01-25 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed a possible deadlock on client disconnect. | madmaxoft | 2014-01-24 | 1 | -9/+0 |
| |/ | |||||
| * | Merge remote-tracking branch 'MikeHunsinger/master' | madmaxoft | 2014-01-24 | 1 | -2/+3 |
| |\ | |||||
| | * | Split TossItem into three Toss functions (Held, Equipped and Pickup) | Mike Hunsinger | 2014-01-23 | 1 | -2/+3 |
| | | | |||||
| * | | Command block fixes 2 | andrew | 2014-01-23 | 1 | -16/+9 |
| | | | |||||
* | | | Refactored cBlockHandler::OnUse and dependents | Tycho | 2014-01-26 | 1 | -1/+4 |
| | | | |||||
* | | | First attempt at Implementing Interfaces | Tycho | 2014-01-25 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'master' of https://github.com/mc-server/MCServer | andrew | 2014-01-21 | 1 | -8/+22 |
|\| | |||||
| * | Merge pull request #565 from mc-server/commandblockfixes | Mattes D | 2014-01-19 | 1 | -3/+21 |
| |\ | | | | | | | Command block fixes | ||||
| | * | Removed unneeded paramters | Tiger Wang | 2014-01-19 | 1 | -2/+2 |
| | | | |||||
| | * | Changed SendBlockEntity format slightly | Tiger Wang | 2014-01-19 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | * Writing NBT is now in Protocol, not BlockEntity files * Fixed a last output bug | ||||
| | * | Implemented MC|Brand response | Tiger Wang | 2014-01-19 | 1 | -3/+9 |
| | | | |||||
| | * | Improved command blocks | Tiger Wang | 2014-01-19 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | | Rewritten SocketThreads for proper shutdown scenario. | madmaxoft | 2014-01-19 | 1 | -5/+1 |
| |/ | | | | | | | This fixes #560 and #390. | ||||
* | | Scoreboard SendTo() | andrew | 2014-01-21 | 1 | -0/+3 |
| | | |||||
* | | Scoreboard protocol support | andrew | 2014-01-21 | 1 | -0/+30 |
|/ | |||||
* | Command block fixes | andrew | 2014-01-18 | 1 | -5/+12 |
| | |||||
* | Parse the MC|AdvCdm plugin message | andrew | 2014-01-18 | 1 | -0/+64 |
| | |||||
* | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 1 | -2/+2 |
| | |||||
* | Implemented Ctrl-Q drop stack | Tiger Wang | 2014-01-15 | 1 | -0/+11 |
| | | | | Also fixed an issue with TossItems not respecting count. | ||||
* | Added cClientHandle::SendPluginMessage(). | madmaxoft | 2014-01-09 | 1 | -0/+9 |
| | | | | It is not yet exported in the API, though. | ||||
* | Plugin messages are received and handed to plugins. | madmaxoft | 2014-01-07 | 1 | -0/+9 |
| | | | | Note that MCS doesn't currently handle any channel registrations, this will come later on. | ||||
* | fixed ClientHandle warnings | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+1 |
| | |||||
* | Implented BroadcastParticleEffect | STRWarrior | 2013-12-22 | 1 | -0/+9 |
| | |||||
* | Fixed the rest of constructor reorders. | madmaxoft | 2013-12-20 | 1 | -21/+20 |
| | |||||
* | Merge pull request #450 from mc-server/redstonefixes | Mattes D | 2013-12-19 | 1 | -4/+26 |
|\ | | | | | Multiple fixes | ||||
| * | Fixed PlayerAbilities and creative | Tiger Wang | 2013-12-19 | 1 | -3/+3 |
| | | |||||
| * | Fixed 1.7 arm swing animation | Tiger Wang | 2013-12-19 | 1 | -1/+23 |
| | | |||||
* | | Disconnection message no longer shown if ping | Tiger Wang | 2013-12-18 | 1 | -5/+8 |
| | | |||||
* | | The "<>" of a player name is now coloured | Tiger Wang | 2013-12-18 | 1 | -1/+1 |
| | | |||||
* | | Fixed 1.7 player disconnection not calling hook | Tiger Wang | 2013-12-18 | 1 | -4/+14 |
|/ | | | | This fixes #357 | ||||
* | Renamed back EntityAnimation to PlayerAnimation | Tiger Wang | 2013-12-18 | 1 | -1/+1 |
| | | | | | This fixes #411 and partially reverts 30ead790490f04248b861db79fddde9148b552f4 | ||||
* | Fixed cClientHandle::Tick() being called from two threads. | madmaxoft | 2013-12-16 | 1 | -6/+43 |
| | | | | | 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. | ||||
* | Fixed multiple player spawn broadcasts. | madmaxoft | 2013-12-16 | 1 | -3/+0 |
| | |||||
* | Merge pull request #437 from mc-server/ShootTo_function | STRWarrior | 2013-12-15 | 1 | -2/+0 |
|\ | | | | | Shoot to function | ||||
| * | This adds a function that allows you to 'shoot' a player towards a direction. | STRWarrior | 2013-12-15 | 1 | -2/+0 |
| | | |||||
* | | Fixed calling OnPlayerJoined() in the wrong place. | madmaxoft | 2013-12-15 | 1 | -6/+1 |
|/ | | | | This is the first part of a fix for #187. | ||||
* | Moved reading flags to the protocol. | STRWarrior | 2013-12-15 | 1 | -17/+3 |
| | |||||
* | Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() function | STRWarrior | 2013-12-15 | 1 | -0/+33 |
| | |||||
* | Forgot to commit the ClientHandle. | STRWarrior | 2013-12-14 | 1 | -0/+18 |
| | |||||
* | Unknown packet type extended to 32 bits. | madmaxoft | 2013-12-12 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures | Tiger Wang | 2013-12-08 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp | ||||
| * | Moved bindings-related to a Bindings subfolder. | madmaxoft | 2013-12-08 | 1 | -1/+1 |
| | | | | | | | | Ref.: #407 | ||||
* | | Fixed trapdoors not toggling | Tiger Wang | 2013-12-07 | 1 | -1/+1 |
| | | | | | | | | The redstone simulator kept on resetting them. | ||||
* | | Renamed animation function | Tiger Wang | 2013-12-07 | 1 | -7/+7 |
| | | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know. | ||||
* | | Fixed bed leave animation | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
| | | |||||
* | | Updated comments for slabs | Tiger Wang | 2013-12-06 | 1 | -5/+6 |
|/ | |||||
* | Switched to using provided ReadItem function. | Samuel Barney | 2013-12-02 | 1 | -0/+9 |
| | | | | Fixed misplacing when clicking on the bottom of bottom slabs and the top of top slabs. | ||||
* | Properly fixed snow height, fixes #98 and #264 | Tiger Wang | 2013-11-30 | 1 | -9/+14 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -0/+9 |
| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 1 | -0/+12 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+2198 |