summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Protocol125.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into redstoneTestsTycho2014-09-251-16/+74
|\ | | | | | | | | Conflicts: src/Mobs/Monster.h
| * Merge branch 'master' into EntityCustomNameHowaner2014-09-231-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.Howaner2014-09-181-13/+58
| | |
| | * 1.8: Fixed maps.Howaner2014-09-131-2/+2
| | |
| | * Removed GetProtocolVersion() from the protocols.Howaner2014-09-111-2/+1
| | |
| | * 1.8: Added ParticleEffect packet.Howaner2014-09-111-1/+1
| | |
| | * Added the player list to the 1.8 protocol.Howaner2014-09-091-3/+9
| | |
| | * Added GetProtocolVersion() to cProtocol.Howaner2014-09-081-1/+2
| | |
| | * Implemented packet compression.Howaner2014-09-081-1/+1
| | | | | | | | | ChunkData packet needs this.
| * | Added SetCustomName() to players.Howaner2014-09-021-12/+11
| |/
* / Added first test to show the object can be createdTycho2014-09-171-16/+16
|/
* Exported daylight cycle flag to the protocol.Howaner2014-08-111-1/+4
|
* Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-4/+4
|\ | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-211-4/+4
| |
* | Fix failed merge and other issuesTiger Wang2014-07-181-1/+1
| |
* | Merge branch 'master' into portalsTiger Wang2014-07-181-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.madmaxoft2014-07-171-9/+9
| |
| * Basic style fixes.madmaxoft2014-07-171-2/+2
| |
| * Normalized comments.madmaxoft2014-07-171-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.Howaner2014-07-131-1/+1
| |
| * Fixed respawningTiger Wang2014-06-291-3/+3
| | | | | | | | * Fixes #1103
| * Added generic entity-collecting.Mattes D2014-06-271-2/+2
| | | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098.
* | Portals animate and delay correctlyTiger Wang2014-06-121-4/+4
| |
* | Merge branch 'master' into portalsTiger Wang2014-06-101-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 D2014-06-081-3/+12
| | | | | | | | Fixes #1039, fixes #851
* | Implemented end and nether portalsTiger Wang2014-05-311-2/+2
|/
* Statistic Managerandrew2014-05-111-0/+28
|
* Fixed warnings in ClientHandle.madmaxoft2014-05-011-1/+1
|
* Merge pull request #940 from Howaner/GlobalFixesMattes D2014-04-281-1/+1
|\ | | | | Add entity invulnerable
| * Revert "Changed the old invulnerable methods from the wither to the new."Howaner2014-04-281-8/+1
| | | | | | This reverts commit d50f8f6f11f69e7e1e56be92fb2d72a5014a3e34.
| * Changed the old invulnerable methods from the wither to the new.Howaner2014-04-261-1/+8
| |
| * FixesHowaner2014-04-261-1/+1
| |
* | Fixed projectile source filenames, indentationsarchshift2014-04-281-1/+1
| |
* | Moved cArrowEntity out of ProjectileEntity.harchshift2014-04-271-1/+1
|/
* Merge pull request #909 from jfhumann/fixesMattes D2014-04-221-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 fixesjfhumann2014-04-181-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 codejfhumann2014-04-181-14/+18
| | |
* | | Modified many thingsdaniel09162014-04-171-2/+0
| | |
* | | Merge branch 'master' into Enchantingdaniel09162014-04-161-0/+42
|\ \ \ | | |/ | |/|
| * | Implemented the 1.7.6 protocol and authenticator.madmaxoft2014-04-141-0/+42
| |/ | | | | | | Server works both in online and offline modes with 1.7.9.
* | Fixed Errorsdaniel09162014-04-071-2/+2
| |
* | Merge remote-tracking branch 'upstream/master' into Enchantingdaniel09162014-04-071-73/+147
|\|
| * Explicit change record size.madmaxoft2014-04-041-1/+1
| |
| * More Clang warning fixes in the protocols.madmaxoft2014-04-041-69/+70
| |
| * Fixed some Clang warnings in protocols.madmaxoft2014-04-041-1/+1
| |
| * Merge pull request #831 from mc-server/WitherMattes D2014-04-021-0/+8
| |\ | | | | | | Wither
| | * Protocol: Wither metadataandrew2014-03-251-0/+8
| | |
| * | Console logging supports cCompositeChat as its parameters.madmaxoft2014-03-311-22/+1
| |/
| * Removed unused macroTycho2014-03-101-13/+0
| |
| * Merge pull request #777 from jfhumann/issue317Mattes D2014-03-091-1/+10
| |\ | | | | | | Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions
| | * Adjusted style of switch/caseJan-Fabian Humann2014-03-091-15/+5
| | |
| | * Changed if-else to switch-caseJan-Fabian Humann2014-03-081-13/+11
| | |
| | * Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting.Jan-Fabian Humann2014-03-081-1/+22
| | |
| * | WarningsTycho2014-03-071-1/+1
| |/
| * Manual merge (Fixed conflicts)andrew2014-02-201-0/+38
| |\
| | * Implemented cCompositeChat.madmaxoft2014-02-151-0/+38
| | | | | | | | | | | | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678.
| * | Map decorators; Map clientsandrew2014-02-181-0/+25
| | |
| * | Implementation of in-game mapsandrew2014-02-131-0/+27
| |/
| * Improved Type safety of eBlockFaceTycho2014-02-041-2/+2
| | | | | | | | May Fix #640
* | added EnchantItemPacket to older Protocolsdaniel09162014-02-011-1/+4
| |
* | Some updates for enchanting (2)daniel09162014-01-311-0/+15
|/
* Removed internal cEntity::GetRot() usage.madmaxoft2014-01-171-9/+9
|
* Removed obsoleted functionsTiger Wang2014-01-161-5/+5
|
* Added cClientHandle::SendPluginMessage().madmaxoft2014-01-091-0/+14
| | | | It is not yet exported in the API, though.
* Implented BroadcastParticleEffectSTRWarrior2013-12-221-0/+9
|
* Fixed pre 1.7 clients crashing.STRWarrior2013-12-151-2/+2
|
* Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison.STRWarrior2013-12-141-0/+30
|
* Renamed animation functionTiger Wang2013-12-071-2/+2
| | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know.
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-261-0/+18
| | | | | Conflicts: VC2008/MCServer.vcproj
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-0/+15
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-241-0/+1869