Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix old style casts and implicit conversions | Matti Hänninen | 2015-08-12 | 1 | -2/+2 |
| | |||||
* | Silenced and fixed many warning messages across multiple files. | Samuel Barney | 2015-07-29 | 1 | -28/+29 |
| | |||||
* | Merge pull request #2348 from bibo38/customname | Tiger Wang | 2015-07-15 | 1 | -9/+13 |
|\ | | | | | Added CustomName and Health to sended Metadata of Monsters. | ||||
| * | Added CustomName and Health to sended Metadata of Monsters. | bibo38 | 2015-07-15 | 1 | -9/+13 |
| | | | | | | | | Fixes #2113 | ||||
* | | Merge pull request #2353 from SamJBarney/DyedArmor | Julian Laubstein | 2015-07-15 | 1 | -2/+12 |
|\ \ | | | | | | | Implements Dyed Leather Armor | ||||
| * | | Leather Armor can now be dyed. | Samuel Barney | 2015-07-15 | 1 | -2/+12 |
| |/ | | | | | | | * Created new color class to handle dye-related coloring | ||||
* / | Improved maps | Tiger Wang | 2015-07-14 | 1 | -44/+35 |
|/ | |||||
* | Fixed Middle-Click Button in the ClickWindow-Packet. | bibo38 | 2015-06-25 | 1 | -1/+1 |
| | | | | | | See http://wiki.vg/Protocol#Click_Window The MiddleClick has the button 2 and not 0. Now you can max an item in an inventory in Creative mode, without inventory desync. Bugfix #2260 | ||||
* | Fix incorrent experience sending for 1.7 clients | jan64 | 2015-06-07 | 1 | -2/+2 |
| | |||||
* | Changed SendAboveActionBarMessage / SendSystemMessage to be a noop for < 1.8 clients | jan64 | 2015-06-03 | 1 | -1/+11 |
| | |||||
* | Added system and above action bar chat messages | jan64 | 2015-06-02 | 1 | -1/+55 |
| | |||||
* | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-28 | 1 | -0/+63 |
|\ | | | | | | | | | Conflicts: src/Inventory.cpp | ||||
| * | Merge pull request #1848 from scottwillmoore/ImplementTitleCommand | Mattes D | 2015-05-26 | 1 | -0/+63 |
| |\ | | | | | | | Implement backend for /title command | ||||
| | * | Implement backend for /title command | Scott Moore | 2015-04-13 | 1 | -0/+63 |
| | | | |||||
* | | | Fixed a lot of warnings | tycho | 2015-05-19 | 1 | -2/+2 |
|/ / | |||||
* | | More style checking. | Mattes D | 2015-05-09 | 1 | -2/+2 |
| | | | | | | | | Spaces around some operators are checked. | ||||
* | | Added support for additional data in the ParticleEffect Packet | tycho | 2015-05-07 | 1 | -0/+10 |
| | | | | | | | | Also started refactoring how broadcasts are handled | ||||
* | | Change visual protocol name to include MCServer | jan64 | 2015-05-04 | 1 | -2/+2 |
|/ | |||||
* | Added VarInt64, normalized cPacketizer datatype names. | Mattes D | 2015-03-22 | 1 | -328/+329 |
| | |||||
* | Unified cPacketizer across all protocols. | Mattes D | 2015-03-22 | 1 | -279/+266 |
| | |||||
* | Fixed signedness warnings in Protocol. | Mattes D | 2015-03-21 | 1 | -2/+2 |
| | |||||
* | Fixed signedness issues in protocols. | Mattes D | 2015-03-21 | 1 | -48/+52 |
| | |||||
* | Unified cByteBuffer types. | Mattes D | 2015-03-21 | 1 | -97/+123 |
| | | | | cByteBuffer now reads and writes any of the [U]Int<N> types. | ||||
* | cPainting saving implemented | Tiger Wang | 2015-03-14 | 1 | -1/+1 |
| | | | | Additionally, it now inherits from cHangingEntity. | ||||
* | Protocol 1.7: Fixed Coverity issues. | Mattes D | 2015-02-08 | 1 | -4/+7 |
| | | | | Fixes CID 66411, CID 103166 and CID 103167. | ||||
* | Fixed warnings in 1.7 protocol. | Mattes D | 2015-01-18 | 1 | -106/+127 |
| | |||||
* | Fixed Linux compilation. | Mattes D | 2015-01-03 | 1 | -1/+1 |
| | |||||
* | Protocols: Ignore garbage data at the end of PluginMessage packets. | Mattes D | 2015-01-03 | 1 | -0/+11 |
| | | | | Fixes #1692. | ||||
* | Refactored all player block placing to go through hooks. | Mattes D | 2014-12-24 | 1 | -2/+2 |
| | | | | Fixes #1618. | ||||
* | Fixed coverity issues in protocols. | Mattes D | 2014-12-21 | 1 | -2/+5 |
| | | | | Fixes CID 73099, CID 66411. | ||||
* | Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes. | Howaner | 2014-11-29 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into MobSpawner | Howaner | 2014-11-18 | 1 | -12/+91 |
|\ | | | | | | | | | Conflicts: MCServer/Plugins/Core | ||||
| * | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-23 | 1 | -4/+4 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkSender.cpp src/ClientHandle.cpp src/World.h | ||||
| | * | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 1 | -3/+3 |
| | | | |||||
| | * | Properly exported cItemFrame and cHangingEntity to Lua. | Mattes D | 2014-10-21 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-21 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| | * | Improved furnaces | Tiger Wang | 2014-10-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Fixed progress bar on 1.8 * Fixed bugs * Improved code * Fixes #1068 * Fixes #1070 | ||||
| * | | Optimized chunk loader | Howaner | 2014-10-02 | 1 | -0/+1 |
| |/ | |||||
| * | Fixed a missing semicolon. | madmaxoft | 2014-09-30 | 1 | -1/+1 |
| | | |||||
| * | Rewritten plugin messages, vanilla are being parsed directly. | madmaxoft | 2014-09-30 | 1 | -0/+92 |
| | | | | | | | | This should finally fix the compatibility problems between 1.7 and 1.8 protocols with the changes in the vanilla plugin messages. | ||||
| * | Dropped support for <1.7.x | Tiger Wang | 2014-09-27 | 1 | -14/+0 |
| | | |||||
* | | Merge branch 'master' into MobSpawner | Howaner | 2014-09-26 | 1 | -214/+118 |
|\| | | | | | | | | | | | Conflicts: src/MobSpawner.h src/Mobs/Monster.h | ||||
| * | Merge branch 'master' into Fixes | Howaner | 2014-09-26 | 1 | -15/+15 |
| |\ | |||||
| | * | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 1 | -4/+4 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| | * \ | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 1 | -196/+112 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h | ||||
| | * \ \ | Merge branch 'master' into redstoneTests | Tycho | 2014-09-17 | 1 | -3/+16 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/ChunkInterface.h | ||||
| | * | | | | Added first test to show the object can be created | Tycho | 2014-09-17 | 1 | -15/+15 |
| | | | | | | |||||
| * | | | | | Fixed players custom name in 1.8 | Howaner | 2014-09-26 | 1 | -16/+4 |
| | |_|_|/ | |/| | | | |||||
| * | | | | 1.7 Protocol: fixed potential problems with no-payload packets. | madmaxoft | 2014-09-25 | 1 | -4/+4 |
| | |_|/ | |/| | | |||||
| * | | | Merge branch 'master' into EntityCustomName | Howaner | 2014-09-23 | 1 | -195/+101 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * \ \ | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-19 | 1 | -0/+13 |
| | |\ \ \ | |||||
| | * | | | | Exported player list states to extra functions. | Howaner | 2014-09-18 | 1 | -7/+59 |
| | | | | | | |||||
| | * | | | | Moved chat json creating to the CompositeChat class. | Howaner | 2014-09-13 | 1 | -170/+3 |
| | | | | | | |||||
| | * | | | | 1.8: Fixed maps. | Howaner | 2014-09-13 | 1 | -3/+2 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-13 | 1 | -3/+3 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHoe.h | ||||
| | * | | | | | Removed GetProtocolVersion() from the protocols. | Howaner | 2014-09-11 | 1 | -3/+1 |
| | | | | | | | |||||
| | * | | | | | 1.8: Fixed hangings. | Howaner | 2014-09-11 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | 1.8: Added ParticleEffect packet. | Howaner | 2014-09-11 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Added the player list to the 1.8 protocol. | Howaner | 2014-09-09 | 1 | -4/+9 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-09 | 1 | -0/+1 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | * | | | | | More fixes. | Howaner | 2014-09-08 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Recoded cProtocol180 class. | Howaner | 2014-09-08 | 1 | -56/+16 |
| | | | | | | | |||||
| | * | | | | | Fixed more 1.8 packets. | Howaner | 2014-09-08 | 1 | -19/+40 |
| | | | | | | | |||||
| | * | | | | | Updated chunk sending to 1.8 | Howaner | 2014-09-08 | 1 | -6/+6 |
| | | | | | | | |||||
| | * | | | | | Added GetProtocolVersion() to cProtocol. | Howaner | 2014-09-08 | 1 | -14/+12 |
| | | | | | | | |||||
| | * | | | | | Implemented packet compression. | Howaner | 2014-09-08 | 1 | -1/+25 |
| | | | | | | | | | | | | | | | | | | | | | ChunkData packet needs this. | ||||
| | * | | | | | Fixed client errors. | Howaner | 2014-09-04 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Added more 1.8 protocol things. | Howaner | 2014-09-04 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Started implementing of the 1.8 protocol. | Howaner | 2014-09-04 | 1 | -2/+4 |
| | | | | | | | |||||
| * | | | | | | Added SetCustomName() to players. | Howaner | 2014-09-02 | 1 | -6/+20 |
| | | | | | | | |||||
| * | | | | | | Added CustomName to cMonster. | Howaner | 2014-09-01 | 1 | -0/+10 |
| |/ / / / / | |||||
* | | | / / | Implemented mob spawner. | Howaner | 2014-09-19 | 1 | -1/+13 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Added an explicit setting for allowing BungeeCord handshake. | madmaxoft | 2014-09-17 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Full BungeeCord compatibility. | madmaxoft | 2014-09-17 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | Fixes #1392. Fixes SpigotMC/BungeeCord#1211. | ||||
* | | | | Initial BungeeCord support. | madmaxoft | 2014-09-17 | 1 | -0/+9 |
| |_|/ |/| | | | | | | | | Ref.: #1392 | ||||
* | | | Spawn exp if you break a mob spawner. | Howaner | 2014-09-12 | 1 | -3/+3 |
| |/ |/| | |||||
* | | Added Y-wise asserts to signs. | Mattes D | 2014-09-06 | 1 | -0/+1 |
|/ | | | | This should help detect #1313's second case. | ||||
* | Fixed 1.7.2 login packet reading. | Mattes D | 2014-08-21 | 1 | -1/+5 |
| | | | | Fixes #1317. | ||||
* | Merge pull request #1339 from mc-server/Hooks | STRWarrior | 2014-08-20 | 1 | -28/+70 |
|\ | | | | | Added HOOK_SERVER_PING | ||||
| * | Renamed a_Motd to a_ServerDescription. | Howaner | 2014-08-20 | 1 | -3/+3 |
| | | |||||
| * | Added a_ClientHandle to the HOOK_SERVER_PING hook. | Howaner | 2014-08-20 | 1 | -2/+2 |
| | | |||||
| * | Cleaned up code. | Howaner | 2014-08-20 | 1 | -1/+0 |
| | | |||||
| * | Added HOOK_SERVER_PING | Howaner | 2014-08-20 | 1 | -28/+71 |
| | | |||||
* | | Merge pull request #1296 from mc-server/LuaAPI | Franz Reiter | 2014-08-12 | 1 | -1/+6 |
|\ \ | |/ |/| | Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld. | ||||
| * | Exported daylight cycle flag to the protocol. | Howaner | 2014-08-11 | 1 | -1/+6 |
| | | |||||
* | | cProtocol172: Check return values. | madmaxoft | 2014-08-11 | 1 | -4/+9 |
|/ | | | | Fixes CID 43489, CID 43490, CID 43491, CID 43493, CID 66410, CID 66411, CID 66416, CID 66417, CID 66418, CID 66419, CID 66420, CID 66421, CID 66422, CID 66423, CID 66424, CID 66425, CID 66429, CID 66430, CID 66431 | ||||
* | Fixed #1286 | Howaner | 2014-08-04 | 1 | -1/+1 |
| | |||||
* | Changed properties for-loop. | Howaner | 2014-08-04 | 1 | -1/+1 |
| | |||||
* | Fixed skins in mc 1.7.9/1.7.10 | Howaner | 2014-08-03 | 1 | -6/+5 |
| | |||||
* | Merge pull request #1255 from mc-server/NameToUUID | Mattes D | 2014-08-01 | 1 | -3/+3 |
|\ | | | | | Name to UUID | ||||
| * | Merged branch 'master' into NameToUUID. | madmaxoft | 2014-07-31 | 1 | -4/+4 |
| |\ | |||||
| * | | MojangAPI: Implemented UUID shortening and dashing. | madmaxoft | 2014-07-30 | 1 | -3/+3 |
| | | | |||||
* | | | Renamed functions and added beacon json saving. | Howaner | 2014-07-31 | 1 | -2/+2 |
| | | | |||||
* | | | Added beacon. | Howaner | 2014-07-30 | 1 | -0/+15 |
| |/ |/| | |||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 1 | -9/+9 |
|\| | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp | ||||
| * | Style: Normalized spaces after if, for and while. | madmaxoft | 2014-07-21 | 1 | -1/+1 |
| | | |||||
| * | Fixed spaces after commas in protocol data. | madmaxoft | 2014-07-19 | 1 | -7/+7 |
| | | | | | | | | The JSON data is well-formatted with spaces, too; we can afford to waste the few bytes. | ||||
| * | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 1 | -1/+1 |
| | | |||||
* | | 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 | -49/+60 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -3/+4 |
| | | |||||
| * | Basic style fixes. | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| | | |||||
| * | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -32/+32 |
| | | | | | | | | | | 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. | ||||
| * | Merge pull request #1192 from mc-server/skinuuid | Mattes D | 2014-07-16 | 1 | -1/+12 |
| |\ | | | | | | | Skins | ||||
| | * | Suggestions | Tiger Wang | 2014-07-16 | 1 | -2/+5 |
| | | | |||||
| | * | Store properties as Json::Value | Tiger Wang | 2014-07-16 | 1 | -6/+2 |
| | | | |||||
| | * | Player properties are now retrieved | Tiger Wang | 2014-07-14 | 1 | -1/+13 |
| | | | |||||
| * | | Fixed MSVC warnings in SoundEffect functions. | madmaxoft | 2014-07-13 | 1 | -7/+3 |
| | | | |||||
| * | | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 1 | -5/+9 |
| |/ | |||||
| * | Merge pull request #1135 from mc-server/fixes | Tiger Wang | 2014-07-09 | 1 | -1/+1 |
| |\ | | | | | | | Fixes to projectiles and the undead | ||||
| | * | Crash and compile fix | Tiger Wang | 2014-07-04 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed respawning | Tiger Wang | 2014-06-29 | 1 | -3/+3 |
| | | | | | | | | | | | | * Fixes #1103 | ||||
| * | | Send statistics to the player, when he logged in. | Howaner | 2014-06-29 | 1 | -2/+1 |
| | | | |||||
| * | | 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 | ||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-04 | 1 | -1/+2 |
|\| | |||||
| * | Fixed a crash in message formatter. | madmaxoft | 2014-05-28 | 1 | -1/+2 |
| | | | | | | | | The code would fail if a message is sent to a player not yet added to a world. | ||||
* | | Implemented end and nether portals | Tiger Wang | 2014-05-31 | 1 | -2/+2 |
|/ | |||||
* | cCompositeChat message type is now formatted | Tiger Wang | 2014-05-19 | 1 | -1/+1 |
| | |||||
* | Added client translation to achievements | Tiger Wang | 2014-05-19 | 1 | -0/+29 |
| | |||||
* | cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement() | andrew | 2014-05-12 | 1 | -5/+1 |
| | |||||
* | Statistic Manager | andrew | 2014-05-11 | 1 | -7/+41 |
| | |||||
* | Fixed MSVC 64-bit build warnings. | Mattes D | 2014-05-09 | 1 | -9/+9 |
| | |||||
* | Change m_RepairCost to int. | Howaner | 2014-05-07 | 1 | -2/+2 |
| | |||||
* | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs. | Howaner | 2014-05-07 | 1 | -0/+11 |
| | |||||
* | Fixed warnings in ClientHandle. | madmaxoft | 2014-05-01 | 1 | -1/+1 |
| | |||||
* | Moved the rest of the Crypto objects into their own respective files. | madmaxoft | 2014-04-29 | 1 | -2/+3 |
| | |||||
* | Moved cRsaPrivateKey to PolarSSL++, rewritten using existing objects. | madmaxoft | 2014-04-29 | 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 |
| | | |||||
* | | Merge pull request #954 from mc-server/projectiles-split | Mattes D | 2014-04-28 | 1 | -0/+2 |
|\ \ | | | | | | | Totally refactored ProjectileEntity.h, splitting up into several files. | ||||
| * | | Fixed projectile source filenames, indentations | archshift | 2014-04-28 | 1 | -2/+2 |
| | | | |||||
| * | | Moved cFireworkEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 1 | -0/+1 |
| | | | |||||
| * | | Moved cArrowEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 1 | -0/+1 |
| |/ | |||||
* / | Another attempt at #889. | madmaxoft | 2014-04-27 | 1 | -3/+5 |
|/ | | | | The packet was being sent after the state was adjusted, so another thread *may* have sent another packet in the meantime. | ||||
* | Merge pull request #909 from jfhumann/fixes | Mattes D | 2014-04-22 | 1 | -37/+48 |
|\ | | | | | | | | | 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 | -24/+217 |
| |\ | | | | | | | | | | | | | | | | | | | | | | 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 | -37/+48 |
| | | | |||||
* | | | Merge branch 'master' into Enchanting | daniel0916 | 2014-04-18 | 1 | -5/+131 |
|\ \ \ | | |/ | |/| | |||||
| * | | Added asserts for proper game state. | madmaxoft | 2014-04-16 | 1 | -5/+131 |
| | | | | | | | | | | | | This is to help hunt #889. | ||||
* | | | Merge branch 'master' into Enchanting | daniel0916 | 2014-04-16 | 1 | -19/+86 |
|\| | | |||||
| * | | Attempted fix for the client crash with the new protocols. | madmaxoft | 2014-04-15 | 1 | -0/+7 |
| | | | |||||
| * | | Implemented the 1.7.6 protocol and authenticator. | madmaxoft | 2014-04-14 | 1 | -22/+40 |
| | | | | | | | | | | | | Server works both in online and offline modes with 1.7.9. | ||||
| * | | A client UUID is generated when the server is in offline mode. | madmaxoft | 2014-04-14 | 1 | -4/+10 |
| | | | | | | | | | | | | 1.7.9 client works with these changes in offline mode. | ||||
| * | | Merge remote-tracking branch 'daniel0916/YggdrasilAuthentication' into Proto176 | madmaxoft | 2014-04-14 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fixed mistake | daniel0916 | 2014-04-13 | 1 | -1/+1 |
| | |/ | |||||
| * / | Initial 1.7.6 protocol support. | madmaxoft | 2014-04-14 | 1 | -0/+36 |
| |/ | | | | | | | Doesn't work yet because of missing UUIDs. | ||||
* | | Bug fixes | daniel0916 | 2014-04-14 | 1 | -3/+0 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into Enchanting | daniel0916 | 2014-04-07 | 1 | -64/+614 |
|\| | |||||
| * | Fixed format string mismatch. | madmaxoft | 2014-04-04 | 1 | -1/+1 |
| | | |||||
| * | More Clang warning fixes in the protocols. | madmaxoft | 2014-04-04 | 1 | -1/+1 |
| | | |||||
| * | Fixed some Clang warnings in protocols. | madmaxoft | 2014-04-04 | 1 | -2/+2 |
| | | |||||
| * | Protocol: Wither metadata | andrew | 2014-03-25 | 1 | -0/+10 |
| | | |||||
| * | Plugins can set flying speed. | madmaxoft | 2014-03-20 | 1 | -2/+1 |
| | | |||||
| * | Rewritten player speeds to be relative unit-less. | madmaxoft | 2014-03-20 | 1 | -3/+4 |
| | | | | | | | | 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 | 1 | -6/+6 |
| | | |||||
| * | Fixed a load of format string errors | Tycho | 2014-03-11 | 1 | -3/+3 |
| | | |||||
| * | Fixed format errors in protocol | Tycho | 2014-03-11 | 1 | -3/+3 |
| | | |||||
| * | 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 | ||||
| * | | | Merge pull request #777 from jfhumann/issue317 | Mattes D | 2014-03-09 | 1 | -1/+9 |
| |\ \ \ | | | | | | | | | | | 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/+21 |
| | | |/ | | |/| | |||||
| * | | | Fixed issues with int vs size_t and a few other warnings | Tycho | 2014-03-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | Warnings | Tycho | 2014-03-07 | 1 | -1/+1 |
| |/ / | |||||
| * / | Add Flower Pots | Howaner | 2014-03-07 | 1 | -1/+15 |
| |/ | |||||
| * | Manual merge (Fixed conflicts) | andrew | 2014-02-20 | 1 | -3/+198 |
| |\ | |||||
| | * | 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 | 1 | -0/+15 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Entity.h src/WorldStorage/NBTChunkSerializer.cpp | ||||
| | | * | | Implemented paintings, fixes #689 | Tiger Wang | 2014-02-18 | 1 | -0/+15 |
| | | |/ | | | | | | | | | | | | | + 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 | 1 | -0/+2 |
| | | | |||||
| | * | Set max. Players in the Tablist to 60 | Howaner | 2014-02-16 | 1 | -1/+1 |
| | | | |||||
| | * | Implemented cCompositeChat. | madmaxoft | 2014-02-15 | 1 | -0/+153 |
| | | | | | | | | | | | | | | | 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/+20 |
| | | | |||||
| * | | Implementation of in-game maps | andrew | 2014-02-13 | 1 | -0/+35 |
| |/ | |||||
| * | 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 | 1 | -4/+4 |
| |\| | | | | | | | | | | | | | 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 | 1 | -2/+2 |
| | | | | | | | | | | | | 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. | ||||
| * | 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 | 1 | -3/+99 |
| | | | | | | | | 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 | 1 | -0/+83 |
| |\ | |||||
| | * | Comm logging is available in both Debug and Release modes. | madmaxoft | 2014-01-25 | 1 | -10/+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 | 1 | -0/+64 |
| | | | | | | | | | | | | It is meant for debugging only, so it is compiled only into debug mode. It is activated by starting the server with "/logcomm" parameter. | ||||
| * | | PolarSSL is fully used for 1.3.2 protocol encryption. | madmaxoft | 2014-01-23 | 1 | -4/+4 |
| |/ | |||||
| * | Merge branch 'master' of https://github.com/mc-server/MCServer | andrew | 2014-01-21 | 1 | -4/+72 |
| |\ | |||||
| | * | 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 | 1 | -0/+40 |
| | | | |||||
* | | | Some updates for enchanting (2) | daniel0916 | 2014-01-31 | 1 | -13/+4 |
| | | | |||||
* | | | removed hook from enchanting commit | daniel0916 | 2014-01-24 | 1 | -1/+1 |
| | | | |||||
* | | | Some updates for enchanting | daniel0916 | 2014-01-24 | 1 | -3/+11 |
| | | | |||||
* | | | first changes for enchanting (not finished) | daniel0916 | 2014-01-20 | 1 | -0/+17 |
| |/ |/| | | | | | | | | | | | | | - 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 | 1 | -2/+3 |
|\ \ | | | | | | | Enchantments fix | ||||
| * | | Switched EnchantmentSerilizer to namespace | Tycho | 2014-01-19 | 1 | -2/+2 |
| | | | |||||
| * | | Spilt Writing of Enchantments to seperate class | Tycho | 2014-01-19 | 1 | -2/+3 |
| |/ | | | | | | | | | | | | | 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 | 1 | -5/+13 |
| | | |||||
* | | Changed SendBlockEntity format slightly | Tiger Wang | 2014-01-19 | 1 | -4/+39 |
| | | | | | | | | | | * Writing NBT is now in Protocol, not BlockEntity files * Fixed a last output bug | ||||
* | | Improved command blocks | Tiger Wang | 2014-01-19 | 1 | -0/+25 |
|/ | | | | | | | * 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 |
| | | |||||
* | | Merge remote-tracking branch 'origin/customnames' | madmaxoft | 2014-01-17 | 1 | -5/+55 |
|\ \ | |||||
| * | | Changed newline character because of issues | Tiger Wang | 2014-01-16 | 1 | -3/+3 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into customnames | Tiger Wang | 2014-01-16 | 1 | -28/+36 |
| |\ \ | |||||
| * | | | 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 | 1 | -28/+36 |
|/ / | | | | | | | 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 | 1 | -0/+12 |
| | | | | 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 |
| | | |||||
| * | Implement favicon for 1.7.2 | Bill Derouin | 2014-01-07 | 1 | -0/+13 |
| | | | | | | | | | | 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 | 1 | -1/+1 |
| | | |||||
* | | Fixed a few MSVC warnings. | madmaxoft | 2014-01-06 | 1 | -1/+0 |
|/ | |||||
* | Implented BroadcastParticleEffect | STRWarrior | 2013-12-22 | 1 | -0/+18 |
| | |||||
* | Fixed PlayerAbilities and creative | Tiger Wang | 2013-12-19 | 1 | -10/+3 |
| | |||||
* | 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 |
| | |||||
* | Merge pull request #431 from mc-server/Entity_Effects | Mattes D | 2013-12-14 | 1 | -0/+24 |
|\ | | | | | Entity Effects | ||||
| * | Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison. | STRWarrior | 2013-12-14 | 1 | -0/+24 |
| | | |||||
* | | Removed leftover debugging messages from cProtocol172. | madmaxoft | 2013-12-14 | 1 | -4/+0 |
|/ | |||||
* | Fixed threading issues affecting cProtocol172. | madmaxoft | 2013-12-13 | 1 | -163/+163 |
| | |||||
* | Fixed protocol 1.7 recovery after unknown packet. | madmaxoft | 2013-12-12 | 1 | -4/+0 |
| | |||||
* | 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 | 1 | -2/+2 |
| | | | | | 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 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -0/+15 |
| | | | | | 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/+1917 |