Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |