Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into Enchanting | daniel0916 | 2014-04-07 | 1 | -191/+423 |
|\ | |||||
| * | Merge branch 'master' into HTTPSizeT | madmaxoft | 2014-04-04 | 1 | -3/+3 |
| |\ | |||||
| | * | Fixed some Clang warnings in protocols. | madmaxoft | 2014-04-04 | 1 | -2/+2 |
| | | | |||||
| | * | Simplified and fixed slabs, fixes #835 | Tiger Wang | 2014-03-31 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed All signedness warnings in HTTPServer.cpp | Tycho | 2014-04-02 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #838 from mc-server/lilypads | worktycho | 2014-03-30 | 1 | -6/+8 |
| |\ | | | | | | | Lilypads | ||||
| | * | Compare for inequality in FACE_NONE checks | Tiger Wang | 2014-03-29 | 1 | -3/+3 |
| | | | |||||
| | * | Removed leftover clienthandle code | Tiger Wang | 2014-03-29 | 1 | -10/+6 |
| | | | |||||
| | * | Fixed block interaction rate check | Tiger Wang | 2014-03-28 | 1 | -2/+4 |
| | | | |||||
| | * | Implemented lilypad placement | Tiger Wang | 2014-03-23 | 1 | -4/+8 |
| | | | |||||
| * | | Fixed players not updating after world change | Tiger Wang | 2014-03-29 | 1 | -4/+2 |
| |/ | | | | | | | Addendum to 6dea7993f2a563a8b3a0746feeb2174922631526 | ||||
| * | Merge branch 'Werror' into warnings | Tycho | 2014-03-12 | 1 | -3/+0 |
| |\ | | | | | | | | | | | | | Conflicts: src/Globals.h | ||||
| | * | Merge branch 'master' into Werror | Tycho | 2014-03-12 | 1 | -3/+0 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: src/Generating/PieceGenerator.cpp | ||||
| | | * | Unified Vector classes | andrew | 2014-03-11 | 1 | -3/+0 |
| | | | | |||||
| * | | | Fixed a load of format string errors | Tycho | 2014-03-11 | 1 | -1/+1 |
| |/ / | |||||
| * / | Removed Some unnessicary macros | Tycho | 2014-03-10 | 1 | -13/+0 |
| |/ | |||||
| * | Merge pull request #731 from mc-server/ballisticmissiles | Tiger Wang | 2014-03-09 | 1 | -29/+19 |
| |\ | | | | | | | Ballistic firework missiles | ||||
| | * | != FACE_NONE | Tiger Wang | 2014-03-09 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' into ballisticmissiles | Tiger Wang | 2014-03-09 | 1 | -9/+28 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| | * | | Fixed data length issues | Tiger Wang | 2014-03-09 | 1 | -1/+1 |
| | | | | |||||
| | * | | CheckBlockInteractionsRate() fixed & enabled | Tiger Wang | 2014-03-09 | 1 | -29/+19 |
| | | | | |||||
| * | | | Merge pull request #777 from jfhumann/issue317 | Mattes D | 2014-03-09 | 1 | -28/+30 |
| |\ \ \ | | | | | | | | | | | Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions | ||||
| | * | | | Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting. | Jan-Fabian Humann | 2014-03-08 | 1 | -28/+30 |
| | | | | | |||||
| * | | | | Merge pull request #775 from worktycho/warnings | Mattes D | 2014-03-09 | 1 | -2/+2 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Fixed a few warnings | ||||
| | * | | | Fixed issues with int vs size_t and a few other warnings | Tycho | 2014-03-08 | 1 | -2/+2 |
| | |/ / | |||||
| * / / | Slight plugin messaging changes | Tiger Wang | 2014-03-09 | 1 | -0/+13 |
| |/ / | | | | | | | | | | | | | - Clients are not allowed to register duplicate channels - Clients are not allowed to use channels that were not registered | ||||
| * | | Add data backsending, when the Client interacts a Block and the Interact is cancelled. | Howaner | 2014-03-05 | 1 | -4/+10 |
| | | | |||||
| * | | cBlockInfo now manages the respective cBlockHandler | andrew | 2014-03-02 | 1 | -3/+3 |
| | | | |||||
| * | | Merge pull request #738 from xdot/master | Mattes D | 2014-03-02 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Refactored global block property arrays | ||||
| | * | | g_BlockXXX => cBlockInfo::XXX | andrew | 2014-03-01 | 1 | -1/+1 |
| | |/ | |||||
| * | | Use switch in GetStepSound | Howaner | 2014-02-28 | 1 | -1/+1 |
| | | | |||||
| * | | Fix Double Slabs, fix Slab Meta and add more things to burnable | Howaner | 2014-02-28 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #669 from xdot/master | Tiger Wang | 2014-02-24 | 1 | -0/+27 |
| |\ | | | | | | | Implementation of in-game maps :D | ||||
| | * | Manual merge (Fixed conflicts) | andrew | 2014-02-20 | 1 | -9/+34 |
| | |\ | |||||
| | * | | Map decorators; Map clients | andrew | 2014-02-18 | 1 | -13/+9 |
| | | | | |||||
| | * | | Map item handler; Fixed several bugs | andrew | 2014-02-17 | 1 | -2/+0 |
| | | | | |||||
| | * | | cMap::UpdateRadius | andrew | 2014-02-15 | 1 | -0/+2 |
| | | | | |||||
| | * | | Send map when selected | andrew | 2014-02-14 | 1 | -0/+13 |
| | | | | |||||
| | * | | Implementation of in-game maps | andrew | 2014-02-13 | 1 | -0/+18 |
| | | | | |||||
| * | | | Use the ItemCategorie::IsSword() Method. | Howaner | 2014-02-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | No Sword Block Destroying in Creative Mode | Howaner | 2014-02-23 | 1 | -0/+10 |
| | | | | |||||
| * | | | cClientHandle manages the client-registered plugin channels. | madmaxoft | 2014-02-20 | 1 | -10/+77 |
| | |/ | |/| | | | | | | | Fixes #706. | ||||
| * | | Implemented paintings, fixes #689 | Tiger Wang | 2014-02-18 | 1 | -0/+8 |
| | | | | | | | | | | | | + Implemented paintings | ||||
| * | | Links sent via chat messages are clickable. | madmaxoft | 2014-02-16 | 1 | -8/+14 |
| | | | | | | | | | | | | Fixes #658. | ||||
| * | | Add Locale to ClientHandle | Howaner | 2014-02-16 | 1 | -0/+1 |
| | | | |||||
| * | | Implemented cCompositeChat. | madmaxoft | 2014-02-15 | 1 | -1/+11 |
| |/ | | | | | | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678. | ||||
| * | Merge branch 'master' into playerimprovements | Tiger Wang | 2014-02-09 | 1 | -5/+5 |
| |\ | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| | * | Improved Type safety of eBlockFace | Tycho | 2014-02-04 | 1 | -5/+5 |
| | | | | | | | | | | | | May Fix #640 | ||||
| * | | Added sender name to PM if prefixes disabled | Tiger Wang | 2014-02-07 | 1 | -1/+1 |
| | | | | | | | | | | | | * Also moved the PVP setting into Mechanics | ||||
| * | | Improved chat messaging functions | Tiger Wang | 2014-02-07 | 1 | -6/+108 |
| | | | | | | | | | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API. | ||||
| * | | Server internally uses new functions | Tiger Wang | 2014-02-06 | 1 | -8/+6 |
| | | | |||||
| * | | Reduced max explosions per tick | Tiger Wang | 2014-02-05 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed explosions bug | Tiger Wang | 2014-02-05 | 1 | -20/+10 |
| | | | | | | | | | | | | * Fixed bug where explosions would sometimes never be sent | ||||
| * | | Fixed a crash bug | Tiger Wang | 2014-02-03 | 1 | -8/+2 |
| | | | |||||
| * | | Server now handles join messages also | Tiger Wang | 2014-02-03 | 1 | -9/+11 |
| |/ | | | | | | | * Revised as well hook documentation | ||||
| * | Changed Signiture of OnDigging | Tycho | 2014-02-01 | 1 | -3/+3 |
| | | |||||
| * | Changed Signiture of OnDestroyedByPlayer | Tycho | 2014-02-01 | 1 | -3/+4 |
| | | |||||
| * | Changed pointers to references | Tycho | 2014-02-01 | 1 | -4/+3 |
| | | |||||
| * | Changed signitures of Several BLockHandler Methods | Tycho | 2014-02-01 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check | ||||
| * | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-01-26 | 1 | -27/+12 |
| |\ | | | | | | | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h | ||||
| | * | Merge pull request #587 from mc-server/mobimprovements | Mattes D | 2014-01-25 | 1 | -1/+1 |
| | |\ | | | | | | | | | Mob improvements & rudimentary artificial intelligence | ||||
| | | * | Two minor changes | Tiger Wang | 2014-01-25 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fixed a possible deadlock on client disconnect. | madmaxoft | 2014-01-24 | 1 | -9/+0 |
| | |/ | |||||
| | * | Merge remote-tracking branch 'MikeHunsinger/master' | madmaxoft | 2014-01-24 | 1 | -2/+3 |
| | |\ | |||||
| | | * | Split TossItem into three Toss functions (Held, Equipped and Pickup) | Mike Hunsinger | 2014-01-23 | 1 | -2/+3 |
| | | | | |||||
| | * | | Command block fixes 2 | andrew | 2014-01-23 | 1 | -16/+9 |
| | | | | |||||
| * | | | Refactored cBlockHandler::OnUse and dependents | Tycho | 2014-01-26 | 1 | -1/+4 |
| | | | | |||||
| * | | | First attempt at Implementing Interfaces | Tycho | 2014-01-25 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge branch 'master' of https://github.com/mc-server/MCServer | andrew | 2014-01-21 | 1 | -8/+22 |
| |\| | |||||
| * | | Scoreboard SendTo() | andrew | 2014-01-21 | 1 | -0/+3 |
| | | | |||||
| * | | Scoreboard protocol support | andrew | 2014-01-21 | 1 | -0/+30 |
| | | | |||||
* | | | Some updates for enchanting (2) | daniel0916 | 2014-01-31 | 1 | -0/+36 |
| |/ |/| | |||||
* | | Merge pull request #565 from mc-server/commandblockfixes | Mattes D | 2014-01-19 | 1 | -3/+21 |
|\ \ | | | | | | | Command block fixes | ||||
| * | | Removed unneeded paramters | Tiger Wang | 2014-01-19 | 1 | -2/+2 |
| | | | |||||
| * | | Changed SendBlockEntity format slightly | Tiger Wang | 2014-01-19 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | * Writing NBT is now in Protocol, not BlockEntity files * Fixed a last output bug | ||||
| * | | Implemented MC|Brand response | Tiger Wang | 2014-01-19 | 1 | -3/+9 |
| | | | |||||
| * | | Improved command blocks | Tiger Wang | 2014-01-19 | 1 | -0/+9 |
| |/ | | | | | | | | | | | | | * 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 | ||||
* / | Rewritten SocketThreads for proper shutdown scenario. | madmaxoft | 2014-01-19 | 1 | -5/+1 |
|/ | | | | This fixes #560 and #390. | ||||
* | Command block fixes | andrew | 2014-01-18 | 1 | -5/+12 |
| | |||||
* | Parse the MC|AdvCdm plugin message | andrew | 2014-01-18 | 1 | -0/+64 |
| | |||||
* | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 1 | -2/+2 |
| | |||||
* | Implemented Ctrl-Q drop stack | Tiger Wang | 2014-01-15 | 1 | -0/+11 |
| | | | | Also fixed an issue with TossItems not respecting count. | ||||
* | Added cClientHandle::SendPluginMessage(). | madmaxoft | 2014-01-09 | 1 | -0/+9 |
| | | | | It is not yet exported in the API, though. | ||||
* | Plugin messages are received and handed to plugins. | madmaxoft | 2014-01-07 | 1 | -0/+9 |
| | | | | Note that MCS doesn't currently handle any channel registrations, this will come later on. | ||||
* | fixed ClientHandle warnings | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+1 |
| | |||||
* | Implented BroadcastParticleEffect | STRWarrior | 2013-12-22 | 1 | -0/+9 |
| | |||||
* | Fixed the rest of constructor reorders. | madmaxoft | 2013-12-20 | 1 | -21/+20 |
| | |||||
* | Merge pull request #450 from mc-server/redstonefixes | Mattes D | 2013-12-19 | 1 | -4/+26 |
|\ | | | | | Multiple fixes | ||||
| * | Fixed PlayerAbilities and creative | Tiger Wang | 2013-12-19 | 1 | -3/+3 |
| | | |||||
| * | Fixed 1.7 arm swing animation | Tiger Wang | 2013-12-19 | 1 | -1/+23 |
| | | |||||
* | | Disconnection message no longer shown if ping | Tiger Wang | 2013-12-18 | 1 | -5/+8 |
| | | |||||
* | | The "<>" of a player name is now coloured | Tiger Wang | 2013-12-18 | 1 | -1/+1 |
| | | |||||
* | | Fixed 1.7 player disconnection not calling hook | Tiger Wang | 2013-12-18 | 1 | -4/+14 |
|/ | | | | This fixes #357 | ||||
* | Renamed back EntityAnimation to PlayerAnimation | Tiger Wang | 2013-12-18 | 1 | -1/+1 |
| | | | | | This fixes #411 and partially reverts 30ead790490f04248b861db79fddde9148b552f4 | ||||
* | Fixed cClientHandle::Tick() being called from two threads. | madmaxoft | 2013-12-16 | 1 | -6/+43 |
| | | | | | When the player was initialized, the Tick() function continued to stream chunk, while the cWorld called Tick() from its tick thread. Final fix for #187. | ||||
* | Fixed multiple player spawn broadcasts. | madmaxoft | 2013-12-16 | 1 | -3/+0 |
| | |||||
* | Merge pull request #437 from mc-server/ShootTo_function | STRWarrior | 2013-12-15 | 1 | -2/+0 |
|\ | | | | | Shoot to function | ||||
| * | This adds a function that allows you to 'shoot' a player towards a direction. | STRWarrior | 2013-12-15 | 1 | -2/+0 |
| | | |||||
* | | Fixed calling OnPlayerJoined() in the wrong place. | madmaxoft | 2013-12-15 | 1 | -6/+1 |
|/ | | | | This is the first part of a fix for #187. | ||||
* | Moved reading flags to the protocol. | STRWarrior | 2013-12-15 | 1 | -17/+3 |
| | |||||
* | Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() function | STRWarrior | 2013-12-15 | 1 | -0/+33 |
| | |||||
* | Forgot to commit the ClientHandle. | STRWarrior | 2013-12-14 | 1 | -0/+18 |
| | |||||
* | Unknown packet type extended to 32 bits. | madmaxoft | 2013-12-12 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures | Tiger Wang | 2013-12-08 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp | ||||
| * | Moved bindings-related to a Bindings subfolder. | madmaxoft | 2013-12-08 | 1 | -1/+1 |
| | | | | | | | | Ref.: #407 | ||||
* | | Fixed trapdoors not toggling | Tiger Wang | 2013-12-07 | 1 | -1/+1 |
| | | | | | | | | The redstone simulator kept on resetting them. | ||||
* | | Renamed animation function | Tiger Wang | 2013-12-07 | 1 | -7/+7 |
| | | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know. | ||||
* | | Fixed bed leave animation | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
| | | |||||
* | | Updated comments for slabs | Tiger Wang | 2013-12-06 | 1 | -5/+6 |
|/ | |||||
* | Switched to using provided ReadItem function. | Samuel Barney | 2013-12-02 | 1 | -0/+9 |
| | | | | Fixed misplacing when clicking on the bottom of bottom slabs and the top of top slabs. | ||||
* | Properly fixed snow height, fixes #98 and #264 | Tiger Wang | 2013-11-30 | 1 | -9/+14 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -0/+9 |
| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 1 | -0/+12 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+2198 |