Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -3/+3 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 1 | -1/+1 |
| | | |||||
| * | 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. | ||||
* | | 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 | -1/+5 |
| | | | | Fixes #1039, fixes #851 | ||||
* | Statistic Manager | andrew | 2014-05-11 | 1 | -0/+1 |
| | |||||
* | Fixed connection encryption. | madmaxoft | 2014-05-03 | 1 | -1/+1 |
| | | | | Fixes #975. | ||||
* | Fixed warnings in ClientHandle. | madmaxoft | 2014-05-01 | 1 | -1/+1 |
| | |||||
* | Moved the rest of the Crypto objects into their own respective files. | madmaxoft | 2014-04-29 | 1 | -3/+4 |
| | |||||
* | Merge branch 'master' into Enchanting | daniel0916 | 2014-04-16 | 1 | -1/+21 |
|\ | |||||
| * | Implemented the 1.7.6 protocol and authenticator. | madmaxoft | 2014-04-14 | 1 | -1/+4 |
| | | | | | | | | Server works both in online and offline modes with 1.7.9. | ||||
| * | Initial 1.7.6 protocol support. | madmaxoft | 2014-04-14 | 1 | -0/+17 |
| | | | | | | | | Doesn't work yet because of missing UUIDs. | ||||
* | | Merge remote-tracking branch 'upstream/master' into Enchanting | daniel0916 | 2014-04-07 | 1 | -23/+49 |
|\| | |||||
| * | More Clang warning fixes in the protocols. | madmaxoft | 2014-04-04 | 1 | -2/+2 |
| | | |||||
| * | Fixed some Clang warnings in protocols. | madmaxoft | 2014-04-04 | 1 | -1/+1 |
| | | |||||
| * | Warnings | Tycho | 2014-03-07 | 1 | -1/+1 |
| | | |||||
| * | Manual merge (Fixed conflicts) | andrew | 2014-02-20 | 1 | -12/+27 |
| |\ | |||||
| | * | Implemented paintings, fixes #689 | Tiger Wang | 2014-02-18 | 1 | -0/+1 |
| | | | | | | | | | | | | + Implemented paintings | ||||
| | * | Implemented cCompositeChat. | madmaxoft | 2014-02-15 | 1 | -12/+26 |
| | | | | | | | | | | | | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678. | ||||
| * | | Map decorators; Map clients | andrew | 2014-02-18 | 1 | -0/+1 |
| | | | |||||
| * | | Implementation of in-game maps | andrew | 2014-02-13 | 1 | -0/+2 |
| |/ | |||||
| * | Protocol 1.7: Forced encryption on all connections. | madmaxoft | 2014-01-28 | 1 | -0/+2 |
| | | | | | | | | This is for testing purposes only, to find bugs in the encryption. Once the encryption is deemed stable, it will be enabled only for servers with enabled Authentication. | ||||
| * | Merged branch 'master' into ChangeToPolarSSL. | madmaxoft | 2014-01-25 | 1 | -0/+4 |
| |\ | |||||
| | * | Comm logging is available in both Debug and Release modes. | madmaxoft | 2014-01-25 | 1 | -2/+0 |
| | | | |||||
| | * | Added per-connection comm logging in debug mode. | madmaxoft | 2014-01-24 | 1 | -0/+5 |
| | | | | | | | | | | | | It is meant for debugging only, so it is compiled only into debug mode. It is activated by starting the server with "/logcomm" parameter. | ||||
| * | | PolarSSL is fully used for 1.3.2 protocol encryption. | madmaxoft | 2014-01-23 | 1 | -7/+6 |
| |/ | |||||
| * | Merge branch 'master' of https://github.com/mc-server/MCServer | andrew | 2014-01-21 | 1 | -0/+2 |
| |\ | |||||
| * | | Scoreboard protocol support | andrew | 2014-01-21 | 1 | -0/+3 |
| | | | |||||
* | | | Some updates for enchanting (2) | daniel0916 | 2014-01-31 | 1 | -1/+1 |
| | | | |||||
* | | | Some updates for enchanting | daniel0916 | 2014-01-24 | 1 | -1/+1 |
| | | | |||||
* | | | first changes for enchanting (not finished) | daniel0916 | 2014-01-20 | 1 | -0/+1 |
| |/ |/| | | | | | | | | | | | | | - added enchanting table block handler and added it to the blockhandler - added enchanting window - drop item in the slot 0 when the player close the window - added enchanting packet (1.7 only) - some more... | ||||
* | | Removed unneeded paramters | Tiger Wang | 2014-01-19 | 1 | -1/+1 |
| | | |||||
* | | Changed SendBlockEntity format slightly | Tiger Wang | 2014-01-19 | 1 | -2/+2 |
| | | | | | | | | | | * 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 | ||||
* | Added packet diagnostics to 1.7 protocol. | madmaxoft | 2014-01-16 | 1 | -2/+4 |
| | | | | When the packet is mis-interpreted, a log message is output about the packet type and lengths. | ||||
* | Added cClientHandle::SendPluginMessage(). | madmaxoft | 2014-01-09 | 1 | -0/+1 |
| | | | | It is not yet exported in the API, though. | ||||
* | Added warning(push) and warning(pop) around all of the inclusions of cryptopp/*.h | Diusrex | 2014-01-05 | 1 | -0/+14 |
| | | | | | | I also added a warning(push)/(pop) around crpytlib.cpp because it would go crazy with warnings. So now, the only warning from cryptopp that is not blocked is 'unreferenced local function has been removed', which also occurs at a single function. | ||||
* | Implented BroadcastParticleEffect | STRWarrior | 2013-12-22 | 1 | -0/+1 |
| | |||||
* | Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison. | STRWarrior | 2013-12-14 | 1 | -0/+2 |
| | |||||
* | Fixed threading issues affecting cProtocol172. | madmaxoft | 2013-12-13 | 1 | -28/+28 |
| | |||||
* | Renamed animation function | Tiger Wang | 2013-12-07 | 1 | -1/+1 |
| | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know. | ||||
* | Fixed the remaining derps | Alexander Harkness | 2013-11-27 | 1 | -2/+2 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -0/+1 |
| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
* | Further attempts to fix compile | Tiger Wang | 2013-11-25 | 1 | -2/+2 |
| | |||||
* | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 1 | -2/+2 |
| | |||||
* | 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/+258 |