| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 1 | -16/+74 |
| |\ | | | | | | | | | Conflicts: src/Mobs/Monster.h | ||||
| | * | Merge branch 'master' into EntityCustomName | Howaner | 2014-09-23 | 1 | -9/+68 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | | * | Exported player list states to extra functions. | Howaner | 2014-09-18 | 1 | -13/+58 |
| | | | | |||||
| | | * | 1.8: Fixed maps. | Howaner | 2014-09-13 | 1 | -2/+2 |
| | | | | |||||
| | | * | Removed GetProtocolVersion() from the protocols. | Howaner | 2014-09-11 | 1 | -2/+1 |
| | | | | |||||
| | | * | 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 | -3/+9 |
| | | | | |||||
| | | * | Added GetProtocolVersion() to cProtocol. | Howaner | 2014-09-08 | 1 | -1/+2 |
| | | | | |||||
| | | * | Implemented packet compression. | Howaner | 2014-09-08 | 1 | -1/+1 |
| | | | | | | | | | | ChunkData packet needs this. | ||||
| | * | | Added SetCustomName() to players. | Howaner | 2014-09-02 | 1 | -12/+11 |
| | |/ | |||||
| * / | Added first test to show the object can be created | Tycho | 2014-09-17 | 1 | -16/+16 |
| |/ | |||||
| * | Exported daylight cycle flag to the protocol. | Howaner | 2014-08-11 | 1 | -1/+4 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 1 | -4/+4 |
| |\ | | | | | | | | | | | | | | | 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 | -4/+4 |
| | | | |||||
| * | | 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 | -54/+54 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 tabs used for alignment. | madmaxoft | 2014-07-17 | 1 | -9/+9 |
| | | | |||||
| | * | Basic style fixes. | madmaxoft | 2014-07-17 | 1 | -2/+2 |
| | | | |||||
| | * | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -37/+37 |
| | | | | | | | | | | | 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 | -3/+3 |
| | | | | | | | | | * Fixes #1103 | ||||
| | * | 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. | ||||
| * | | Portals animate and delay correctly | Tiger Wang | 2014-06-12 | 1 | -4/+4 |
| | | | |||||
| * | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 1 | -1/+10 |
| |\| | | | | | | | | | | | | | | | | | 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 | -3/+12 |
| | | | | | | | | | Fixes #1039, fixes #851 | ||||
| * | | Implemented end and nether portals | Tiger Wang | 2014-05-31 | 1 | -2/+2 |
| |/ | |||||
| * | Statistic Manager | andrew | 2014-05-11 | 1 | -0/+28 |
| | | |||||
| * | Fixed warnings in ClientHandle. | madmaxoft | 2014-05-01 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #940 from Howaner/GlobalFixes | Mattes D | 2014-04-28 | 1 | -1/+1 |
| |\ | | | | | Add entity invulnerable | ||||
| | * | Revert "Changed the old invulnerable methods from the wither to the new." | Howaner | 2014-04-28 | 1 | -8/+1 |
| | | | | | | | This reverts commit d50f8f6f11f69e7e1e56be92fb2d72a5014a3e34. | ||||
| | * | Changed the old invulnerable methods from the wither to the new. | Howaner | 2014-04-26 | 1 | -1/+8 |
| | | | |||||
| | * | Fixes | Howaner | 2014-04-26 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed projectile source filenames, indentations | archshift | 2014-04-28 | 1 | -1/+1 |
| | | | |||||
| * | | Moved cArrowEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #909 from jfhumann/fixes | Mattes D | 2014-04-22 | 1 | -14/+18 |
| |\ | | | | | | | | | 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 | ||||
| | * | Merge remote-tracking branch 'origin/master' into fixes | jfhumann | 2014-04-18 | 1 | -0/+42 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | 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 | -14/+18 |
| | | | | |||||
| * | | | Modified many things | daniel0916 | 2014-04-17 | 1 | -2/+0 |
| | | | | |||||
| * | | | Merge branch 'master' into Enchanting | daniel0916 | 2014-04-16 | 1 | -0/+42 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Implemented the 1.7.6 protocol and authenticator. | madmaxoft | 2014-04-14 | 1 | -0/+42 |
| | |/ | | | | | | | Server works both in online and offline modes with 1.7.9. | ||||
| * | | Fixed Errors | daniel0916 | 2014-04-07 | 1 | -2/+2 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/master' into Enchanting | daniel0916 | 2014-04-07 | 1 | -73/+147 |
| |\| | |||||
| | * | Explicit change record size. | madmaxoft | 2014-04-04 | 1 | -1/+1 |
| | | | |||||
| | * | More Clang warning fixes in the protocols. | madmaxoft | 2014-04-04 | 1 | -69/+70 |
| | | | |||||
| | * | Fixed some Clang warnings in protocols. | madmaxoft | 2014-04-04 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #831 from mc-server/Wither | Mattes D | 2014-04-02 | 1 | -0/+8 |
| | |\ | | | | | | | Wither | ||||
| | | * | Protocol: Wither metadata | andrew | 2014-03-25 | 1 | -0/+8 |
| | | | | |||||
| | * | | Console logging supports cCompositeChat as its parameters. | madmaxoft | 2014-03-31 | 1 | -22/+1 |
| | |/ | |||||
| | * | Removed unused macro | Tycho | 2014-03-10 | 1 | -13/+0 |
| | | | |||||
| | * | Merge pull request #777 from jfhumann/issue317 | Mattes D | 2014-03-09 | 1 | -1/+10 |
| | |\ | | | | | | | Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions | ||||
| | | * | Adjusted style of switch/case | Jan-Fabian Humann | 2014-03-09 | 1 | -15/+5 |
| | | | | |||||
| | | * | Changed if-else to switch-case | Jan-Fabian Humann | 2014-03-08 | 1 | -13/+11 |
| | | | | |||||
| | | * | Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting. | Jan-Fabian Humann | 2014-03-08 | 1 | -1/+22 |
| | | | | |||||
| | * | | Warnings | Tycho | 2014-03-07 | 1 | -1/+1 |
| | |/ | |||||
| | * | Manual merge (Fixed conflicts) | andrew | 2014-02-20 | 1 | -0/+38 |
| | |\ | |||||
| | | * | Implemented cCompositeChat. | madmaxoft | 2014-02-15 | 1 | -0/+38 |
| | | | | | | | | | | | | | | | | 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/+25 |
| | | | | |||||
| | * | | Implementation of in-game maps | andrew | 2014-02-13 | 1 | -0/+27 |
| | |/ | |||||
| | * | Improved Type safety of eBlockFace | Tycho | 2014-02-04 | 1 | -2/+2 |
| | | | | | | | | | May Fix #640 | ||||
| * | | added EnchantItemPacket to older Protocols | daniel0916 | 2014-02-01 | 1 | -1/+4 |
| | | | |||||
| * | | Some updates for enchanting (2) | daniel0916 | 2014-01-31 | 1 | -0/+15 |
| |/ | |||||
| * | Removed internal cEntity::GetRot() usage. | madmaxoft | 2014-01-17 | 1 | -9/+9 |
| | | |||||
| * | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 1 | -5/+5 |
| | | |||||
| * | Added cClientHandle::SendPluginMessage(). | madmaxoft | 2014-01-09 | 1 | -0/+14 |
| | | | | | It is not yet exported in the API, though. | ||||
| * | Implented BroadcastParticleEffect | STRWarrior | 2013-12-22 | 1 | -0/+9 |
| | | |||||
| * | Fixed pre 1.7 clients crashing. | STRWarrior | 2013-12-15 | 1 | -2/+2 |
| | | |||||
| * | Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison. | STRWarrior | 2013-12-14 | 1 | -0/+30 |
| | | |||||
| * | Renamed animation function | Tiger Wang | 2013-12-07 | 1 | -2/+2 |
| | | | | | | 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/+18 |
| | | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
| * | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 1 | -0/+15 |
| | | | | | | Conflicts: GNUmakefile | ||||
| * | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+1869 |
 |
index : anonymous/cuberite | |
| A lightweight, fast and extensible game server for Minecraft | mirror |
| summaryrefslogtreecommitdiffstats |