Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -6/+6 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Basic style fixes. | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| | | |||||
| * | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -2/+2 |
| | | | | | | | | | | 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. | ||||
| * | 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. | ||||
| * | Fixed deadlock when moving players to other worlds. | Mattes D | 2014-06-08 | 1 | -1/+1 |
| | | | | | | | | Fixes #1039, fixes #851 | ||||
* | | Portals animate and delay correctly | Tiger Wang | 2014-06-12 | 1 | -1/+1 |
| | | |||||
* | | Implemented end and nether portals | Tiger Wang | 2014-05-31 | 1 | -1/+1 |
|/ | |||||
* | Statistic Manager | andrew | 2014-05-11 | 1 | -0/+1 |
| | |||||
* | Fixed warnings in ClientHandle. | madmaxoft | 2014-05-01 | 1 | -1/+1 |
| | |||||
* | Implemented the 1.7.6 protocol and authenticator. | madmaxoft | 2014-04-14 | 1 | -0/+1 |
| | | | | Server works both in online and offline modes with 1.7.9. | ||||
* | Initial 1.7.6 protocol support. | madmaxoft | 2014-04-14 | 1 | -2/+3 |
| | | | | Doesn't work yet because of missing UUIDs. | ||||
* | 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 | -0/+2 |
|\ | |||||
| * | Implemented paintings, fixes #689 | Tiger Wang | 2014-02-18 | 1 | -0/+1 |
| | | | | | | | | + Implemented paintings | ||||
| * | Implemented cCompositeChat. | madmaxoft | 2014-02-15 | 1 | -0/+1 |
| | | | | | | | | | | 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 |
|/ | |||||
* | Added 1.7.4 to the list of supported protocols. | madmaxoft | 2014-01-29 | 1 | -1/+1 |
| | |||||
* | 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/+3 |
|/ | |||||
* | Added cClientHandle::SendPluginMessage(). | madmaxoft | 2014-01-09 | 1 | -0/+1 |
| | | | | It is not yet exported in the API, though. | ||||
* | 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 |
| | |||||
* | 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/+1 |
| | | | | | 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/+152 |