Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into Enchanting | daniel0916 | 2014-04-07 | 15 | -366/+1139 |
|\ | |||||
| * | Fixed 1.6.4 client crash on composite chat messages. | madmaxoft | 2014-04-06 | 2 | -0/+14 |
| | | |||||
| * | Fixed crash in protocols sending 64-bit ints. | madmaxoft | 2014-04-06 | 1 | -1/+1 |
| | | | | | | | | Fixes #855. | ||||
| * | Explicit change record size. | madmaxoft | 2014-04-04 | 1 | -1/+1 |
| | | |||||
| * | Fixed format string mismatch. | madmaxoft | 2014-04-04 | 1 | -1/+1 |
| | | |||||
| * | More Clang warning fixes in the protocols. | madmaxoft | 2014-04-04 | 6 | -81/+82 |
| | | |||||
| * | Fixed CreateHexDump's signedness. | madmaxoft | 2014-04-04 | 1 | -1/+1 |
| | | |||||
| * | More Clang warning fixes in the protocols. | madmaxoft | 2014-04-04 | 1 | -28/+37 |
| | | |||||
| * | Fixed some Clang warnings in protocols. | madmaxoft | 2014-04-04 | 10 | -26/+31 |
| | | |||||
| * | Merge pull request #831 from mc-server/Wither | Mattes D | 2014-04-02 | 2 | -0/+18 |
| |\ | | | | | | | Wither | ||||
| | * | Protocol: Wither metadata | andrew | 2014-03-25 | 2 | -0/+18 |
| | | | |||||
| * | | Console logging supports cCompositeChat as its parameters. | madmaxoft | 2014-03-31 | 1 | -22/+1 |
| |/ | |||||
| * | Plugins can set flying speed. | madmaxoft | 2014-03-20 | 1 | -2/+1 |
| | | |||||
| * | Rewritten player speeds to be relative unit-less. | madmaxoft | 2014-03-20 | 2 | -5/+6 |
| | | | | | | | | Value of 1 means "default speed", 2 means "double the speed", 0.5 means "half the speed". This allows for easier plugins and is more future-proof. | ||||
| * | Added additional macros to support the MSVC size_t format and changed all formats to use the macros | Tycho | 2014-03-12 | 2 | -7/+7 |
| | | |||||
| * | Fixed a load of format string errors | Tycho | 2014-03-11 | 2 | -4/+4 |
| | | |||||
| * | Fixed format errors in protocol | Tycho | 2014-03-11 | 1 | -3/+3 |
| | | |||||
| * | Removed unused macro | Tycho | 2014-03-10 | 1 | -13/+0 |
| | | |||||
| * | Merge pull request #731 from mc-server/ballisticmissiles | Tiger Wang | 2014-03-09 | 1 | -25/+52 |
| |\ | | | | | | | Ballistic firework missiles | ||||
| | * | Merge branch 'master' into ballisticmissiles | Tiger Wang | 2014-03-09 | 1 | -1/+15 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| | * | | Implemented ballistic missiles (fireworks) | Tiger Wang | 2014-02-27 | 1 | -25/+52 |
| | | | | | | | | | | | | | | | | + Added fireworks | ||||
| * | | | Hotfix for MSVC compilation. | madmaxoft | 2014-03-09 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge pull request #777 from jfhumann/issue317 | Mattes D | 2014-03-09 | 3 | -3/+29 |
| |\ \ \ | | | | | | | | | | | Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions | ||||
| | * | | | Adjusted style of switch/case | Jan-Fabian Humann | 2014-03-09 | 3 | -45/+15 |
| | | | | | |||||
| | * | | | Changed if-else to switch-case | Jan-Fabian Humann | 2014-03-08 | 3 | -39/+33 |
| | | | | | |||||
| | * | | | Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting. | Jan-Fabian Humann | 2014-03-08 | 3 | -3/+65 |
| | | |/ | | |/| | |||||
| * | | | Fixed issues with int vs size_t and a few other warnings | Tycho | 2014-03-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | Warnings | Tycho | 2014-03-07 | 9 | -12/+25 |
| |/ / | |||||
| * / | Add Flower Pots | Howaner | 2014-03-07 | 1 | -1/+15 |
| |/ | |||||
| * | Manual merge (Fixed conflicts) | andrew | 2014-02-20 | 9 | -17/+291 |
| |\ | |||||
| | * | Merge pull request #697 from Howaner/Skull | Mattes D | 2014-02-19 | 1 | -0/+15 |
| | |\ | | | | | | | | | Add Skulls/Heads to MCServer | ||||
| | | * | Rename SkullEntity to MobHeadEntity | Howaner | 2014-02-19 | 1 | -9/+9 |
| | | | | |||||
| | | * | Add break to Protocol17x.cpp and use new comment delimiter | Howaner | 2014-02-19 | 1 | -0/+1 |
| | | | | |||||
| | | * | Add Skulls/Heads | Howaner | 2014-02-17 | 1 | -0/+14 |
| | | | | |||||
| | * | | Merge branch 'master' into itemframes | Tiger Wang | 2014-02-18 | 6 | -0/+28 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Entity.h src/WorldStorage/NBTChunkSerializer.cpp | ||||
| | | * | | Implemented paintings, fixes #689 | Tiger Wang | 2014-02-18 | 6 | -0/+28 |
| | | |/ | | | | | | | | | | | | | + Implemented paintings | ||||
| | * | | De-breaked stuff | Tiger Wang | 2014-02-18 | 1 | -2/+0 |
| | | | | |||||
| | * | | Implemented item frames, a part of #689 | Tiger Wang | 2014-02-18 | 1 | -2/+14 |
| | |/ | | | | | | | | | | | | | + Implemented Item Frames * Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!) | ||||
| | * | Add Locale to ClientHandle | Howaner | 2014-02-16 | 3 | -2/+4 |
| | | | |||||
| | * | Set max. Players in the Tablist to 60 | Howaner | 2014-02-16 | 1 | -1/+1 |
| | | | |||||
| | * | Implemented cCompositeChat. | madmaxoft | 2014-02-15 | 7 | -12/+231 |
| | | | | | | | | | | | | | | | 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 | 7 | -1/+60 |
| | | | |||||
| * | | Implementation of in-game maps | andrew | 2014-02-13 | 7 | -0/+91 |
| |/ | |||||
| * | Merge remote-tracking branch 'origin/master' into playerimprovements | Tiger Wang | 2014-02-09 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp | ||||
| | * | Improved the signedness conversion. | madmaxoft | 2014-02-05 | 1 | -2/+2 |
| | | | |||||
| | * | Protocol 1.7: Fixed a signed / unsigned comparison warning. | madmaxoft | 2014-02-04 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' into playerimprovements | Tiger Wang | 2014-02-09 | 3 | -7/+7 |
| |\| | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| | * | Protocol 1.7 uses char for blockface. | madmaxoft | 2014-02-04 | 1 | -2/+2 |
| | | | | | | | | | | | | That should fix #644 on RasPi. | ||||
| | * | Improved Type safety of eBlockFace | Tycho | 2014-02-04 | 3 | -5/+5 |
| | | | | | | | | | | | | May Fix #640 | ||||
| * | | Fixed a bunch of MSVS warnings | Tiger Wang | 2014-02-05 | 1 | -1/+2 |
| |/ | | | | | | | | | * Possibly also fixed some bugs with pathfinding and TNT, though unlikely | ||||
| * | Limited sign lines to 15 chars. | madmaxoft | 2014-01-29 | 1 | -4/+5 |
| | | | | | | | | Fixes #598. | ||||
| * | Added 1.7.4 to the list of supported protocols. | madmaxoft | 2014-01-29 | 1 | -1/+1 |
| | | |||||
| * | Protocol 1.7: Encryption is enabled only with auth. | madmaxoft | 2014-01-29 | 1 | -1/+1 |
| | | |||||
| * | Protocol 1.7: Forced encryption on all connections. | madmaxoft | 2014-01-28 | 2 | -3/+101 |
| | | | | | | | | This is for testing purposes only, to find bugs in the encryption. Once the encryption is deemed stable, it will be enabled only for servers with enabled Authentication. | ||||
| * | Fixed client packet parsing. | madmaxoft | 2014-01-26 | 1 | -12/+33 |
| | | | | | | | | | | When the packet wouldn't fit the current buffer, the server would mis-parse the next packet. This was the cause for #541. Also modified comm logging, now each direction can be turned on separately. | ||||
| * | Merged branch 'master' into ChangeToPolarSSL. | madmaxoft | 2014-01-25 | 2 | -0/+87 |
| |\ | |||||
| | * | Comm logging is available in both Debug and Release modes. | madmaxoft | 2014-01-25 | 2 | -12/+16 |
| | | | |||||
| | * | Protocol17: Comm logging shows the data left over from previous parse. | madmaxoft | 2014-01-25 | 1 | -2/+15 |
| | | | |||||
| | * | Added per-connection comm logging in debug mode. | madmaxoft | 2014-01-24 | 2 | -0/+69 |
| | | | | | | | | | | | | It is meant for debugging only, so it is compiled only into debug mode. It is activated by starting the server with "/logcomm" parameter. | ||||
| * | | Merge branch 'master' into ChangeToPolarSSL. | madmaxoft | 2014-01-23 | 1 | -3/+3 |
| |\| | |||||
| | * | Fixed 1.5.x scoreboard packet IDs | andrew | 2014-01-23 | 1 | -3/+3 |
| | | | |||||
| * | | PolarSSL is fully used for 1.3.2 protocol encryption. | madmaxoft | 2014-01-23 | 6 | -139/+51 |
| |/ | |||||
| * | Merge branch 'master' of https://github.com/mc-server/MCServer | andrew | 2014-01-21 | 7 | -6/+90 |
| |\ | |||||
| | * | Fix a crash but somewhere... | Alexander Harkness | 2014-01-20 | 1 | -2/+1 |
| | | | |||||
| * | | Scoreboard SendTo() | andrew | 2014-01-21 | 1 | -3/+3 |
| | | | |||||
| * | | Scoreboard protocol support | andrew | 2014-01-21 | 8 | -5/+141 |
| | | | |||||
* | | | added EnchantItemPacket to older Protocols | daniel0916 | 2014-02-01 | 1 | -1/+4 |
| | | | |||||
* | | | Some updates for enchanting (2) | daniel0916 | 2014-01-31 | 4 | -14/+21 |
| | | | |||||
* | | | removed hook from enchanting commit | daniel0916 | 2014-01-24 | 1 | -1/+1 |
| | | | |||||
* | | | Some updates for enchanting | daniel0916 | 2014-01-24 | 2 | -4/+12 |
| | | | |||||
* | | | first changes for enchanting (not finished) | daniel0916 | 2014-01-20 | 2 | -0/+18 |
| |/ |/| | | | | | | | | | | | | | - added enchanting table block handler and added it to the blockhandler - added enchanting window - drop item in the slot 0 when the player close the window - added enchanting packet (1.7 only) - some more... | ||||
* | | Merge pull request #569 from worktycho/EnchantmentsFix | Mattes D | 2014-01-19 | 2 | -4/+6 |
|\ \ | | | | | | | Enchantments fix | ||||
| * | | Switched EnchantmentSerilizer to namespace | Tycho | 2014-01-19 | 2 | -4/+4 |
| | | | |||||
| * | | Spilt Writing of Enchantments to seperate class | Tycho | 2014-01-19 | 2 | -4/+6 |
| |/ | | | | | | | | | | | | | Created a new class cEnchantmentSerializer to serilize Enchantments to NBT. This breaks a dependecy chain between cChunkGenerator and cWorld. cEnchantmentSerializer is seperate from NBTWriter as it needs to access private members of cEnchantments so having it seperate reduces the spread of the frein modifier | ||||
* | | Removed unneeded paramters | Tiger Wang | 2014-01-19 | 6 | -11/+19 |
| | | |||||
* | | Changed SendBlockEntity format slightly | Tiger Wang | 2014-01-19 | 6 | -13/+46 |
| | | | | | | | | | | * Writing NBT is now in Protocol, not BlockEntity files * Fixed a last output bug | ||||
* | | Improved command blocks | Tiger Wang | 2014-01-19 | 6 | -0/+42 |
|/ | | | | | | | * 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 | ||||
* | Merge pull request #534 from mc-server/SpawnMinecart | Mattes D | 2014-01-17 | 1 | -2/+17 |
|\ | | | | | Added cWorld::SpawnMinecart. | ||||
| * | Renamed cEmptyMinecart to cRideableMinecart | STRWarrior | 2014-01-12 | 1 | -6/+6 |
| | | |||||
| * | EmptyMinecarts should be able to get a block inside of them. | STRWarrior | 2014-01-12 | 1 | -1/+16 |
| | | |||||
* | | Removed internal cEntity::GetRot() usage. | madmaxoft | 2014-01-17 | 3 | -14/+14 |
| | | |||||
* | | Merge remote-tracking branch 'origin/customnames' | madmaxoft | 2014-01-17 | 4 | -12/+62 |
|\ \ | |||||
| * | | Changed newline character because of issues | Tiger Wang | 2014-01-16 | 1 | -3/+3 |
| | | | |||||
| * | | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 3 | -7/+7 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into customnames | Tiger Wang | 2014-01-16 | 2 | -30/+40 |
| |\ \ | |||||
| * | | | Implemented custom names and lore | Tiger Wang | 2014-01-15 | 1 | -5/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | + Added custom names and lore + Added saving and loading + Added writing and parsing of NBT | ||||
* | | | | Protocol 1.7: More output on unknown packets / protocol states. | madmaxoft | 2014-01-17 | 1 | -4/+21 |
| | | | | |||||
* | | | | Fixed block break packet number | Tiger Wang | 2014-01-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Protocol 1.7: Unknown packets are dumped to log in Debug mode. | madmaxoft | 2014-01-16 | 1 | -1/+14 |
| |/ / |/| | | |||||
* | | | Added packet diagnostics to 1.7 protocol. | madmaxoft | 2014-01-16 | 2 | -30/+40 |
|/ / | | | | | | | When the packet is mis-interpreted, a log message is output about the packet type and lengths. | ||||
* / | Added handshake processing to protocol 1.7. | madmaxoft | 2014-01-13 | 1 | -2/+23 |
|/ | | | | This fixes #495 | ||||
* | Fixed wrong packet number for PluginMessage packet. | madmaxoft | 2014-01-09 | 1 | -1/+1 |
| | |||||
* | Added cClientHandle::SendPluginMessage(). | madmaxoft | 2014-01-09 | 7 | -0/+40 |
| | | | | It is not yet exported in the API, though. | ||||
* | Merge pull request #516 from mc-server/favicon | Alexander Harkness | 2014-01-07 | 1 | -1/+1 |
|\ | | | | | Fixed favicons | ||||
| * | Fixed favicons | Tiger Wang | 2014-01-07 | 1 | -1/+1 |
| | | |||||
* | | Plugin messages are received and handed to plugins. | madmaxoft | 2014-01-07 | 1 | -1/+1 |
|/ | | | | Note that MCS doesn't currently handle any channel registrations, this will come later on. | ||||
* | Merge pull request #514 from derouinw/master | Mattes D | 2014-01-07 | 1 | -0/+3 |
|\ | | | | | Implement favicon for 1.7.2 | ||||
| * | A few more touch ups | Bill Derouin | 2014-01-07 | 1 | -11/+1 |
| | | |||||
| * | Removed unused line | Bill Derouin | 2014-01-07 | 1 | -1/+0 |
| | | |||||
| * | Implement favicon for 1.7.2 | Bill Derouin | 2014-01-07 | 2 | -0/+14 |
| | | | | | | | | | | Favicon data is a png encoded in base64 which is stored in the server and sent in the server response packet | ||||
* | | Fixed a few MSVC warnings. | madmaxoft | 2014-01-07 | 2 | -3/+3 |
| | | |||||
* | | Fixed a few MSVC warnings. | madmaxoft | 2014-01-06 | 4 | -5/+4 |
|/ | |||||
* | Added warning(push) and warning(pop) around all of the inclusions of cryptopp/*.h | Diusrex | 2014-01-05 | 4 | -2/+52 |
| | | | | | | I also added a warning(push)/(pop) around crpytlib.cpp because it would go crazy with warnings. So now, the only warning from cryptopp that is not blocked is 'unreferenced local function has been removed', which also occurs at a single function. | ||||
* | More memory alignment fixes. | madmaxoft | 2014-01-02 | 1 | -3/+3 |
| | | | | Ref.: #420. | ||||
* | Implented BroadcastParticleEffect | STRWarrior | 2013-12-22 | 9 | -2/+65 |
| | |||||
* | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-21 | 1 | -2/+2 |
|\ | |||||
| * | Fixed minor warnings. | madmaxoft | 2013-12-20 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-19 | 1 | -10/+3 |
|\| | |||||
| * | Fixed PlayerAbilities and creative | Tiger Wang | 2013-12-19 | 1 | -10/+3 |
| | | |||||
* | | moved protocol to glob | Tycho Bickerstaff | 2013-12-19 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-18 | 7 | -7/+115 |
|\| | |||||
| * | Fixed player falling through the floor on spawn. | madmaxoft | 2013-12-17 | 1 | -1/+5 |
| | | | | | | | | The 1.7 client seems to have math issues with exact coords. Adding 0.001 to the Y coord fixed the problem. | ||||
| * | Fixed player spawning packet. | madmaxoft | 2013-12-15 | 1 | -1/+1 |
| | | | | | | | | The player was spawned 1.62 blocks below their pos. This fixes #323. | ||||
| * | Moved reading flags to the protocol. | STRWarrior | 2013-12-15 | 1 | -1/+19 |
| | | |||||
| * | Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() function | STRWarrior | 2013-12-15 | 1 | -2/+10 |
| | | |||||
| * | Fixed pre 1.7 clients crashing. | STRWarrior | 2013-12-15 | 1 | -2/+2 |
| | | |||||
| * | Merge pull request #431 from mc-server/Entity_Effects | Mattes D | 2013-12-14 | 7 | -0/+82 |
| |\ | | | | | | | Entity Effects | ||||
| | * | Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison. | STRWarrior | 2013-12-14 | 7 | -0/+82 |
| | | | |||||
| * | | Removed leftover debugging messages from cProtocol172. | madmaxoft | 2013-12-14 | 1 | -4/+0 |
| |/ | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-11 | 2 | -195/+191 |
|\| | |||||
| * | Fixed threading issues affecting cProtocol172. | madmaxoft | 2013-12-13 | 2 | -191/+191 |
| | | |||||
| * | Fixed protocol 1.7 recovery after unknown packet. | madmaxoft | 2013-12-12 | 1 | -4/+0 |
| | | |||||
* | | more cmake | Tycho Bickerstaff | 2013-12-10 | 1 | -0/+7 |
|/ | |||||
* | Fixed tabcompletion packet, fixes #356 | Tiger Wang | 2013-12-08 | 1 | -8/+4 |
| | |||||
* | Fixed falling block metas, fixes #406 | Tiger Wang | 2013-12-08 | 1 | -1/+1 |
| | |||||
* | Renamed animation function | Tiger Wang | 2013-12-07 | 7 | -10/+10 |
| | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know. | ||||
* | Removed stray printf, again. | Samuel Barney | 2013-12-02 | 1 | -1/+0 |
| | |||||
* | Switched to using provided ReadItem function. | Samuel Barney | 2013-12-02 | 1 | -17/+3 |
| | | | | Fixed misplacing when clicking on the bottom of bottom slabs and the top of top slabs. | ||||
* | Removed stray printf. | Samuel Barney | 2013-12-02 | 1 | -1/+0 |
| | |||||
* | Fixed 1.7 slab and stair placement. | Samuel Barney | 2013-12-02 | 1 | -0/+19 |
| | |||||
* | Fixed the remaining derps | Alexander Harkness | 2013-11-27 | 4 | -5/+5 |
| | |||||
* | Fixed some of tiger's derpyness. | Alexander Harkness | 2013-11-27 | 1 | -2/+2 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 7 | -0/+48 |
| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
* | Further attempts to fix compile | Tiger Wang | 2013-11-25 | 5 | -7/+7 |
| | |||||
* | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 5 | -8/+8 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 7 | -1/+42 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 17 | -0/+7588 |