summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Protocol125.h (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Temporarily commented out override directives."Tycho2014-09-051-73/+73
| | | | | | | | | | | | | | | This reverts commit 6db727c60c01264dc9a9c209c5b335da8f53cd64. Conflicts: src/Bindings/PluginLua.h src/Blocks/BlockFire.h src/Generating/ChunkGenerator.h src/LoggerListeners.cpp src/Mobs/Components/AIAggressiveComponent.h src/Mobs/Monster.h src/OSSupport/IsThread.h src/Protocol/Authenticator.h src/UI/SlotArea.h
* Temporarily commented out override directives.Samuel Barney2014-08-211-73/+73
|
* Removed more references to cNewMonsterSamuel Barney2014-08-211-1/+0
|
* Ripped out references to NewMoster from the packet handlingSamuel Barney2014-08-211-1/+0
|
* Integrated NewMob into the protocols.Samuel Barney2014-08-211-0/+2
|
* Merge pull request #1296 from mc-server/LuaAPIFranz Reiter2014-08-121-1/+1
|\ | | | | Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
| * Exported daylight cycle flag to the protocol.Howaner2014-08-111-1/+1
| |
* | Gave names to unnamed enumsarchshift2014-08-111-1/+1
|/
* Merge branch 'master' into portalsTiger Wang2014-07-291-1/+1
|\ | | | | | | | | Conflicts: src/World.h
| * Removed redundant semicolons and re-added warningarchshift2014-07-241-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-3/+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-2/+2
| |
| * Code style: Fixed braces on separate lines.madmaxoft2014-07-191-1/+2
| |
* | Fix failed merge and other issuesTiger Wang2014-07-181-1/+1
| |
* | Merge branch 'master' into portalsTiger Wang2014-07-181-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Normalized comments.madmaxoft2014-07-171-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.Howaner2014-07-131-1/+1
| |
| * Fixed respawningTiger Wang2014-06-291-1/+1
| | | | | | | | * Fixes #1103
| * Added generic entity-collecting.Mattes D2014-06-271-1/+1
| | | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098.
* | Portals animate and delay correctlyTiger Wang2014-06-121-1/+1
|/
* Fixed deadlock when moving players to other worlds.Mattes D2014-06-081-1/+5
| | | | Fixes #1039, fixes #851
* Statistic Managerandrew2014-05-111-0/+1
|
* Fixed warnings in ClientHandle.madmaxoft2014-05-011-1/+1
|
* Merge branch 'master' into Enchantingdaniel09162014-04-161-16/+4
|\
| * Implemented the 1.7.6 protocol and authenticator.madmaxoft2014-04-141-16/+4
| | | | | | | | Server works both in online and offline modes with 1.7.9.
* | Merge remote-tracking branch 'upstream/master' into Enchantingdaniel09162014-04-071-4/+26
|\|
| * Fixed some Clang warnings in protocols.madmaxoft2014-04-041-1/+1
| |
| * Hotfix for MSVC compilation.madmaxoft2014-03-091-0/+1
| |
| * WarningsTycho2014-03-071-4/+17
| |
| * Manual merge (Fixed conflicts)andrew2014-02-201-0/+2
| |\
| | * Implemented paintings, fixes #689Tiger Wang2014-02-181-0/+1
| | | | | | | | | | | | + Implemented paintings
| | * Implemented cCompositeChat.madmaxoft2014-02-151-0/+1
| | | | | | | | | | | | | | | 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/+1
| | |
| * | Implementation of in-game mapsandrew2014-02-131-0/+2
| |/
| * Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-211-0/+1
| |\
| * | Scoreboard protocol supportandrew2014-01-211-2/+5
| | |
* | | Some updates for enchanting (2)daniel09162014-01-311-0/+1
| |/ |/|
* | Removed unneeded paramtersTiger Wang2014-01-191-1/+1
| |
* | Changed SendBlockEntity format slightlyTiger Wang2014-01-191-1/+1
| | | | | | | | | | * Writing NBT is now in Protocol, not BlockEntity files * Fixed a last output bug
* | Improved command blocksTiger Wang2014-01-191-0/+1
|/ | | | | | | * 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 cClientHandle::SendPluginMessage().madmaxoft2014-01-091-0/+1
| | | | It is not yet exported in the API, though.
* Implented BroadcastParticleEffectSTRWarrior2013-12-221-0/+1
|
* Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison.STRWarrior2013-12-141-0/+2
|
* Renamed animation functionTiger Wang2013-12-071-1/+1
| | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know.
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-261-0/+1
| | | | | Conflicts: VC2008/MCServer.vcproj
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-0/+1
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-241-0/+157
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 03:19:31 +0100