summaryrefslogtreecommitdiffstats
path: root/src/Protocol (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Replaced includes with forward declarationsLukas Pioch2017-08-132-2/+5
|
* Removed unneeded includes (#3902)Lukas Pioch2017-08-061-1/+0
|
* Remove double includes part 2 (#3890)peterbell102017-08-031-1/+0
|
* Removed unused forward declarations (#3888)Lukas Pioch2017-08-034-24/+1
|
* Handle Teleport Confirmation Packet (#3884)Lane Kolbly2017-08-022-4/+26
| | | + Added code to drop incoming client position packets until the most recent teleport was confirmed.
* cParsedNBT: Improved error reporting (#3876)peterbell102017-07-302-2/+6
| | | | | | * cParsedNBT: Improved error reporting * Fix typos
* Tentative fix for player-limit race condition (#3862)Tiger Wang2017-07-286-24/+24
| | | | | | | | | | * Attempts to fix #2257 Derived from d233e9843148313c71fbaba96ccff660e47b07b1 * Changed player count type to int * Clarified certain actions
* Handle incomplete packets in cProtocolRecognizerpeterbell102017-07-262-44/+58
|
* Remove smart pointer macrospeterbell102017-07-211-1/+1
|
* Handle middle mouse drag (#3847)peterbell102017-07-132-0/+6
|
* Added basic ocelot behavior (#3829)Bond-0092017-07-122-0/+36
|
* Send player message when clicking on advancements or green book. (#3845)Lukas Pioch2017-07-122-2/+24
|
* Added bed entity (#3823)Lukas Pioch2017-07-073-0/+40
| | | | | | | | | | * Added bed entity * Export cBedEntity to lua * Set color of bed through item damage value * Added bed entity to APIDoc * NBT: Added loading and saving * Crafting recipes for the colored beds
* Fixes double right click on entities till off-hand actions gets implemented (#3821)Pablo Beltrán2017-07-031-2/+8
|
* Protocol: Do not assume anything about unknown packets. (#3647)Mattes D2017-06-161-35/+38
|
* Added missing 1.12 packet changesmathiascode2017-06-142-0/+30
|
* Protocol 1.12: Fixed missing override specifierMattes D2017-06-141-3/+3
|
* Added support for protocol 1.12 (#3757)Lukas Pioch2017-06-145-3/+1589
|
* Added WriteBlockEntity to 1.10 and 1.11 and fixed mob spawnerLukas Pioch2017-06-096-2/+235
|
* Exported boatLukas Pioch2017-05-243-3/+3
| | | | | | | - NBT: Added saving / loading of material - Added the material in the item handler of the boat - Drop the correct boat if destroyed - APIDoc: Added desc and functions
* Spawn eggs works againLukas Pioch2017-05-221-3/+5
|
* Clang 5.0 fixesLukas Pioch2017-05-213-3/+3
| | | | | - Added override keyword - Removed inherited member variables
* Use FastWriter instead of StyledWritermathiascode2017-05-165-8/+9
|
* VarInt metadata written correctly for boats (#3709)peterbell102017-05-153-9/+9
| | | | * Varint metadata written correctly for boats
* Add 1.11 entity metadata (#3601)Pokechu222017-03-034-5/+845
|
* Corrected particles (#3577)mathiascode2017-02-262-26/+18
| | | Fixes wrong IDs causing particles to become unknown to the server.
* Add 1.11.1/1.11.2 protocol (#3575)mathiascode2017-02-216-13/+86
|
* Added some blocks and items (#3503)mathiascode2017-02-142-0/+20
|
* Fixed ClientHandle:GetProtocolVersion returning wrong number.Mattes D2017-01-282-4/+4
|
* Track skin part and main hand preferences (#3498)Pokechu222017-01-033-6/+38
|
* Initial support for the 1.11 protocol.Mattes D2016-12-1613-441/+668
|
* Removed ClientHandle.h dependencies from common headers.Mattes D2016-11-181-0/+2
|
* Added SendMessageRaw for sending json string.Lukas Pioch2016-10-217-0/+42
|
* Spectators added (#2852)bibo382016-10-127-1/+67
|
* Enclosed Clang pragmas with ifdef's (#3373)bibo382016-09-061-4/+7
| | | Fixes a warning in MSVC
* Added support for the Minecraft 1.10 protocol(#210) (#3348)bibo382016-09-027-37/+959
| | | | | | | | | | * Added support for the Minecraft 1.10 protocol(#210) * Fixed the Clang compilation errors * Fixed wrong sound pitch value and fixed SendPlayerSpawn Metadata value. * Prefixed each enum item with the appropriate class name.
* Proper respawn packets on dimension travelLogicParrot2016-08-297-38/+10
|
* Fixed type-casting-related warnings.Mattes D2016-08-244-26/+22
|
* Fixing string literal catching word letter as hexa-digitElNounch2016-08-172-2/+2
| | | | | | Was sending "\x08C""uberite" as plugin identifier, aka a String of lenght (Varint 0x8c 0x75 ->) 14988 characters but only 7 provided Now sending "\x08""Cuberite" as plugin identifier, aka a String of lenght (Varint 0x08 ->) 8 characters, with 8 provided Fix BungeeCord compatibility
* Dropped 1.7 support (#3253)Mathias2016-07-217-3662/+2
|
* CMake: Remove needless minimum version specifications.Mattes D2016-07-181-2/+0
|
* Fixes for boat entities (#3265)beeduck2016-07-182-3/+87
| | | protocol for vehicles now properly handled, protocol for boat paddles now properly handled, boats can no longer spawn underwater, boats now properly float, boat metadata now properly broadcasted.
* 1.9 / 1.9.2 / 1.9.3 / 1.9.4 protocol support (#3135)Pokechu222016-05-1412-78/+5198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Semistable update to 15w31a I'm going through snapshots in a sequential order since it should make things easier, and since protocol version history is written. * Update to 15w34b protocol Also, fix an issue with the Entity Equipment packet from the past version. Clients are able to connect and do stuff! * Partially update to 15w35e Chunk data doesn't work, but the client joins. I'm waiting to do chunk data because chunk data has an incomplete format until 15w36d. * Add '/blk' debug command This command lets one see what block they are looking at, and makes figuring out what's supposed to be where in a highly broken chunk possible. * Fix CRLF normalization in CheckBasicStyle.lua Normally, this doesn't cause an issue, but when running from cygwin, it detects the CR as whitespace and creates thousands of violations for every single line. Lua, when run on windows, will normalize automatically, but when run via cygwin, it won't. The bug was simply that gsub was returning a replaced version, but not changing the parameter, so the replaced version was ignored. * Update to 15w40b This includes chunk serialization. Fully functional chunk serialization for 1.9. I'm not completely happy with the chunk serialization as-is (correct use of palettes would be great), but cuberite also doesn't skip sending empty chunks so this performance optimization should probably come later. The creation of a full buffer is suboptimal, but it's the easiest way to implement this code. * Write long-by-long rather than creating a buffer This is a bit faster and should be equivalent. However, the code still doesn't look too good. * Update to 15w41a protocol This includes the new set passengers packet, which works off of the ridden entity, not the rider. That means, among other things, that information about the previously ridden vehicle is needed when detaching. So a new method with that info was added. * Update to 15w45a * 15w51b protocol * Update to 1.9.0 protocol Closes #3067. There are still a few things that need to be worked out (picking up items, effects, particles, and most importantly inventory), but in general this should work. I'll make a few more changes tomorrow to get the rest of the protocol set up, along with 1.9.1/1.9.2 (which did make a few changes). Chunks, however, _are_ working, along with most other parts of the game (placing/breaking blocks). * Fix item pickup packet not working That was a silly mistake, but at least it was an easy one. * 1.9.2 protocol support * Fix version info found in server list ping Thus, the client reports that it can connect rather than saying that the server is out of date. This required creating separate classes for 1.9.1 and 1.9.2, unfortunately. * Fix build errors generated by clang These didn't happen in MSVC. * Add protocol19x.cpp and protocol19x.h to CMakeLists * Ignore warnings in protocol19x that are ignored in protocol18x * Document BLOCK_FACE and DIG_STATUS constants * Fix BLOCK_FACE links and add separate section for DIG_STATUS * Fix bat animation and object spawning The causes of both of these are explained in #3135, but the gist is that both were typos. * Implement Use Item packet This means that buckets, bows, fishing rods, and several other similar items now work when not looking at a block. * Handle DIG_STATUS_SWAP_ITEM_IN_HAND * Add support for spawn eggs and potions The items are transformed from the 1.9 version to the 1.8 version when reading and transformed back when sending. * Remove spammy potion debug logging * Fix wolf collar color metadata The wrong type was being used, causing several clientside issues (including the screen going black). * Fix 1.9 chunk sending in the nether The nether and the end don't send skylight. * Fix clang build errors * Fix water bottles becoming mundane potions This happened because the can become splash potion bit got set incorrectly. Water bottles and mundane potions are only differentiated by the fact that water bottles have a metadata of 0, so setting that bit made it a mundane potion. Also add missing break statements to the read item NBT switch, which would otherwise break items with custom names and also cause incorrect "Unimplemented NBT data when parsing!" logging. * Copy Protocol18x as Protocol19x Aditionally, method and class names have been swapped to clean up other diffs. This commit is only added to make the following diffs more readable; it doesn't make any other changes (beyond class names). * Make thrown potions use the correct appearence This was caused by potions now using metadata. * Add missing api doc for cSplashPotionEntity::GetItem * Fix compile error in SplashPotionEntity.cpp * Fix fix of cSplashPotionEntity API doc * Temporarilly disable fall damage particles These were causing issues in 1.9 due to the changed effect ID. * Properly send a kick packet when connecting with an invalid version This means that the client no longer waits on the server screen with no indication whatsoever. However, right now the server list ping isn't implemented for unknown versions, so it'll only load "Old" on the ping. I also added a GetVarIntSize method to cByteBuffer. This helps clean up part of the code here (and I think it could clean up other parts), but it may make sense for it to be moved elsewhere (or declared in a different way). * Handle server list pings from unrecognized versions This isn't the cleanest way of writing it (it feels odd to use ProtocolRecognizer to send packets, and the addition of m_InPingForUnrecognizedVersion feels like the wrong technique), but it works and I can't think of a better way (apart from creating a full separate protocol class to handle only the ping... which would be worse). * Use cPacketizer for the disconnect packet This also should fix clang build errors. * Add 1.9.3 / 1.9.4 support * Fix incorrect indentation in APIDesc
* Bulk clearing of whitespaceLogicParrot2016-02-0512-284/+284
|
* Changed the format of the MobHead data to allow MobHeads working on MInecraft 1.8bibo382016-01-112-2/+15
| | | | | | The NBT format now carries the texture data and transmit it to the client. See: http://minecraft.gamepedia.com/Head#Block_entity Related to #2674
* Fixed not working packet decompressionbibo382016-01-101-13/+18
| | | | | | | A compressed packed contains always the uncompressed size, but in the code this size was threatened as the compressed data size. This created a failure, when the client compressed a packet. See: http://wiki.vg/Protocol#With_compression Fixes #2841 Fixes #2467
* Fixed Clang warnings.Mattes D2016-01-061-2/+2
|
* Renamed leftover strings to Cuberite / Server, as needed.Mattes D2016-01-011-1/+1
| | | | Also upgraded the user setting file for MSVC to 2013.
* Fixed problems in cBlockingSslClientSocket.Mattes D2015-12-301-2/+2
|
* Added GeoTrust Root Certificateworktycho2015-12-221-1/+24
|
* Added HTTPS links wherever they are supported.Alexander Harkness2015-12-191-27/+23
|
* Moved variables into scope, removed unused variables and fixed variablesLukas Pioch2015-12-171-2/+1
|
* allow horse control (still quite buggy)Gargaj2015-12-151-1/+5
|
* implement breedingGargaj2015-11-291-5/+21
|
* fix escaped characters in signs (fixes #1736, fixes #2170)Gargaj2015-11-241-1/+6
|
* Add enum for Sound and Particle EffectsDave Tucker2015-11-247-9/+11
| | | | | | Fixes #2603 Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
* changed mob age from char to intJulian Laubstein2015-11-161-10/+7
|
* idle/deflating creeper should be -1Gargaj2015-11-092-2/+2
| | | | according to http://wiki.vg/Entities#Creeper
* Update Loops required for JsonCPPLukas Pioch2015-10-262-8/+8
|
* Improved types of utf 16 stringstycho2015-10-021-3/+3
|
* Merge pull request #2465 from electromatter/masterworktycho2015-09-271-0/+14
|\ | | | | Added BungeeCord support for Protocol18x
| * Merge branch 'master' into masterelectromatter2015-09-227-219/+22
| |\
| * | added bungeecord support for protocol18xEric Chai2015-09-061-0/+14
| | |
* | | Namechange to CuberiteMattes D2015-09-255-11/+11
| |/ |/|
* | Refactored cProtocol Chat handlingtycho2015-09-217-219/+22
|/
* Merge pull request #2380 from cuberite/travisTiger Wang2015-08-201-1/+1
|\ | | | | Use container-based infrastructure
| * Use container-based infrastructure for TravisTiger Wang2015-08-201-1/+1
| |
* | Fixed food drain bugsTiger Wang2015-08-201-4/+1
|/
* Fix old style casts and implicit conversionsMatti Hänninen2015-08-122-6/+6
|
* Unified the doxy-comment format.Mattes D2015-07-312-9/+13
|
* Silenced and fixed many warning messages across multiple files.Samuel Barney2015-07-2910-140/+138
|
* Added Rabbit Metadata values.bibo382015-07-171-8/+11
| | | | | Added the Rabbit Types and the MoreCarrotTicks value. Types are selected randomly on creation. Fixes #1867
* Merge pull request #2348 from bibo38/customnameTiger Wang2015-07-152-10/+27
|\ | | | | Added CustomName and Health to sended Metadata of Monsters.
| * Added CustomName and Health to sended Metadata of Monsters.bibo382015-07-152-10/+27
| | | | | | | | Fixes #2113
* | Merge pull request #2353 from SamJBarney/DyedArmorJulian Laubstein2015-07-152-4/+24
|\ \ | | | | | | Implements Dyed Leather Armor
| * | Leather Armor can now be dyed.Samuel Barney2015-07-152-4/+24
| |/ | | | | | | * Created new color class to handle dye-related coloring
* | Merge pull request #2349 from cuberite/mapsTiger Wang2015-07-157-122/+56
|\ \ | | | | | | Improved maps
| * | Improved mapsTiger Wang2015-07-147-122/+56
| |/
* / Support ageable mobsHallucino2015-07-141-15/+48
|/ | | | Move ageable stuff in Monster directly
* Fixes compilation failures on MacOSX 10.10Samuel Barney2015-07-091-1/+1
| | | | | * Replace old c-style casts with c++ casts * Added `-Wno-error=old-style-cast` to Protocol18x.cpp
* Fixed warnings generated by 64-bit MSVC.Mattes D2015-07-072-8/+8
|
* Fixed Middle-Click Button in the ClickWindow-Packet.bibo382015-06-252-2/+2
| | | | | | 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
* Check the return value of InflateStringTiger Wang2015-06-181-2/+1
| | | | Fixes #2256
* Removed version 29 serilizationtycho2015-06-162-62/+0
| | | | This has been unused since support for <1.7 has been dropped.
* Fix incorrent experience sending for 1.7 clientsjan642015-06-071-2/+2
|
* Changed SendAboveActionBarMessage / SendSystemMessage to be a noop for < 1.8 clientsjan642015-06-031-1/+11
|
* Added system and above action bar chat messagesjan642015-06-027-4/+196
|
* Merge branch 'master' into PreventNewWarningstycho2015-05-287-0/+247
|\ | | | | | | | | Conflicts: src/Inventory.cpp
| * Merge pull request #1848 from scottwillmoore/ImplementTitleCommandMattes D2015-05-267-0/+247
| |\ | | | | | | Implement backend for /title command
| | * Implement backend for /title commandScott Moore2015-04-137-0/+247
| | |
* | | Made -Weverything an error.tycho2015-05-241-2/+6
| | |
* | | Merge branch 'master' into PreventNewWarningstycho2015-05-232-7/+39
|\| |
| * | Close Ssl Socket on destroyTiger Wang2015-05-231-1/+0
| | | | | | | | | | | | * Fixes #2072
| * | Added Equifax root CA.Mattes D2015-05-212-6/+39
| | | | | | | | | | | | | | | | | | Fixes #2076. Closes #2081. Ref.: #2072.
* | | Make -Werror disabling file onlytycho2015-05-191-0/+5
| | | | | | | | | | | | Ad fix a load of warnings
* | | Merge branch 'master' into PreventNewWarningstycho2015-05-194-16/+16
|\| | | | | | | | | | | | | | Conflicts: src/Blocks/BlockLeaves.h
| * | Merge pull request #2019 from mc-server/OverrideArgsAlexander Harkness2015-05-194-16/+16
| |\ \ | | | | | | | | Initial Implementation of command line arguments
| | * | Initial implementation of IniFile overloadingtycho2015-05-164-16/+16
| | | |
* | | | Fixed a lot of warningstycho2015-05-192-3/+3
|/ / /
* / / Fixed inventory handling.Mattes D2015-05-161-2/+2
|/ / | | | | | | Fixes #2035.
* | Fixed creative click-outsideTiger Wang2015-05-121-1/+1
| | | | | | | | * Fixes #1995
* | CheckBasicStyle: checks spaces around * and &.Mattes D2015-05-091-2/+2
| |
* | More style checking.Mattes D2015-05-093-6/+6
| | | | | | | | Spaces around some operators are checked.
* | Added support for additional data in the ParticleEffect Packettycho2015-05-077-0/+71
| | | | | | | | Also started refactoring how broadcasts are handled
* | Merge pull request #1938 from jan64/masterMattes D2015-05-042-3/+3
|\ \ | | | | | | Change visual protocol name to include MCServer
| * | Change visual protocol name to include MCServerjan642015-05-042-3/+3
| | |
* | | Entity improvementsTiger Wang2015-05-041-1/+1
|/ / | | | | | | | | | | | | | | •Pathfinder improvements •Fixes #1217 •Fixes #1933 Merge remote-tracking branch 'SafwatHalaby/water2' into fixes
* | Updated MC versions in ProtocolRecognizer.hwiseoldman952015-04-281-1/+1
| |
* | Protocol 1.8: Limit the amount of displayed data on NBT parse failure.Mattes D2015-04-201-1/+1
| |
* | Fixed arm swing animationTiger Wang2015-04-171-1/+1
|/ | | * Fixes #1861
* Added VarInt64, normalized cPacketizer datatype names.Mattes D2015-03-225-673/+682
|
* Unified cPacketizer across all protocols.Mattes D2015-03-2210-757/+857
|
* Fixed signedness warnings in Protocol.Mattes D2015-03-217-9/+9
|
* Fixed signedness issues in protocols.Mattes D2015-03-214-60/+74
|
* Unified cByteBuffer types.Mattes D2015-03-216-185/+241
| | | | cByteBuffer now reads and writes any of the [U]Int<N> types.
* Merge pull request #1810 from mc-server/paintingsMattes D2015-03-152-10/+2
|\ | | | | Paintings
| * cPainting saving implementedTiger Wang2015-03-142-10/+2
| | | | | | | | Additionally, it now inherits from cHangingEntity.
* | Merge pull request #1734 from mc-server/pistonsMattes D2015-03-141-3/+1
|\ \ | |/ |/| Handle client 'leave bed' request
| * Handle client 'leave bed' requestTiger Wang2015-02-081-3/+1
| | | | | | | | * Fixes #1728
* | 1.8 Protocol: Fixed a possible race condition.Mattes D2015-02-241-5/+9
|/ | | | Fixes #1759.
* Protocol 1.7: Fixed Coverity issues.Mattes D2015-02-081-4/+7
| | | | Fixes CID 66411, CID 103166 and CID 103167.
* Added IsOnGround() to cEntityHowaner2015-02-071-6/+6
|
* Removed cFile::ReplaceFileNameInvalidChars().Mattes D2015-01-271-1/+3
| | | | Its only usage in cProtocol18 has been changed to a simple string replace - only the IPv6's colons were causing problems.
* Protocol18: Fixed failure with invalig logfile names.Mattes D2015-01-271-8/+15
|
* Fixed warnings in 1.7 protocol.Mattes D2015-01-181-106/+127
|
* Fixed Linux compilation.Mattes D2015-01-032-2/+2
|
* Protocols: Ignore garbage data at the end of PluginMessage packets.Mattes D2015-01-032-0/+21
| | | | Fixes #1692.
* Refactored all player block placing to go through hooks.Mattes D2014-12-242-4/+4
| | | | Fixes #1618.
* Fixed coverity issues in protocols.Mattes D2014-12-212-4/+11
| | | | Fixes CID 73099, CID 66411.
* cMojangAPI: Fixed a possible problem with thread termination order.Mattes D2014-12-071-5/+17
|
* Removed unused imports.Howaner2014-11-292-2/+0
|
* Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes.Howaner2014-11-294-2/+4
|
* Finished mob spawner implementation.Howaner2014-11-181-0/+13
|
* Merge branch 'master' into MobSpawnerHowaner2014-11-1821-4806/+420
|\ | | | | | | | | Conflicts: MCServer/Plugins/Core
| * Merge pull request #1565 from mc-server/MergedIniFileMattes D2014-10-242-2/+2
| |\ | | | | | | Merged ini file
| | * Merged IniFile into main MCS sources.Mattes D2014-10-232-2/+2
| | |
| * | Merge branch 'master' into ChunkLoaderHowaner2014-10-235-96/+96
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkSender.cpp src/ClientHandle.cpp src/World.h
| | * En masse NULL -> nullptr replaceTiger Wang2014-10-235-94/+94
| | |
| | * Properly exported cItemFrame and cHangingEntity to Lua.Mattes D2014-10-212-2/+2
| | |
| * | Merge branch 'master' into ChunkLoaderHowaner2014-10-219-28/+144
| |\| | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp
| | * Merge pull request #1502 from mc-server/furnacesTiger Wang2014-10-187-7/+7
| | |\ | | | | | | | | Improved furnaces
| | | * Improved furnacesTiger Wang2014-10-037-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed progress bar on 1.8 * Fixed bugs * Improved code * Fixes #1068 * Fixes #1070
| | * | cMojangAPI: Don't update data if server is in offline mode.Mattes D2014-10-172-3/+6
| | | |
| | * | cMojangAPI: Added periodical refreshes.Mattes D2014-10-062-19/+132
| | | |
| * | | Merge branch 'master' into ChunkLoaderHowaner2014-10-062-1/+2
| |\| |
| | * | cClientHandle: Added protocol version knowledge.Mattes D2014-10-052-1/+2
| | |/
| * / Optimized chunk loaderHowaner2014-10-022-0/+2
| |/
| * Fixed a missing semicolon.madmaxoft2014-09-301-1/+1
| |
| * Rewritten plugin messages, vanilla are being parsed directly.madmaxoft2014-09-304-13/+172
| | | | | | | | This should finally fix the compatibility problems between 1.7 and 1.8 protocols with the changes in the vanilla plugin messages.
| * Style fixes.madmaxoft2014-09-291-3/+3
| |
| * Plugin messages: Vanilla prefixes its payloads with VarInt lengths.madmaxoft2014-09-281-4/+13
| |
| * Revert "1.8: Fixed plugin messages."madmaxoft2014-09-281-1/+3
| | | | | | | | This reverts commit 04ee8c43dd17eb98d1e3d66ff691898e9f269b95.
| * Protocol 1.8: Fixed possible crash on malformed packet.madmaxoft2014-09-281-0/+5
| |
| * Merge pull request #1466 from mc-server/endofsupportMattes D2014-09-2818-4692/+11
| |\ | | | | | | Removed protocols 1.2 to 1.6
| | * Compilation fixTiger Wang2014-09-281-1/+1
| | |
| | * Bug fixTiger Wang2014-09-271-2/+15
| | |
| | * Dropped support for <1.7.xTiger Wang2014-09-2718-4700/+6
| | |
| * | 1.8: Fixed plugin messages.Howaner2014-09-271-3/+4
| |/
* | Merge branch 'master' into MobSpawnerHowaner2014-09-2616-562/+4277
|\| | | | | | | | | | | Conflicts: src/MobSpawner.h src/Mobs/Monster.h
| * Merge branch 'master' into FixesHowaner2014-09-263-46/+46
| |\
| | * Merge pull request #1419 from mc-server/redstoneTestsworktycho2014-09-263-46/+46
| | |\ | | | | | | | | Added test mocking to IncrementalRedstoneSimulator
| | | * Merge branch 'master' into redstoneTestsTycho2014-09-252-10/+11
| | | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/Simulator/IncrementalRedstoneSimulator.cpp
| | | * \ Merge branch 'master' into redstoneTestsTycho2014-09-2516-527/+4240
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h
| | | * \ \ Merge branch 'master' into redstoneTestsTycho2014-09-172-4/+17
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/ChunkInterface.h
| | | * | | | Added first test to show the object can be createdTycho2014-09-172-31/+31
| | | | | | |
| * | | | | | Fixed players custom name in 1.8Howaner2014-09-269-57/+20
| |/ / / / /
| * | | | | Protocol 1.8: Fixed plugin message packet.madmaxoft2014-09-251-1/+3
| | | | | |
| * | | | | Added cByteBuffer::WriteBEUShort().madmaxoft2014-09-251-1/+1
| | | | | |
| * | | | | Merge pull request #1452 from Howaner/FixesMattes D2014-09-251-5/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | Fixes
| | * \ \ \ \ Merge branch 'master' into FixesHowaner2014-09-252-10/+11
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Use the json writer to write sign texts.Howaner2014-09-251-5/+10
| | | |_|_|/ | | |/| | | | | | | | | Without this change the client disconnects if the text contains "
| * | | | | Protocol 1.8: Handling packet compression properly.madmaxoft2014-09-252-14/+39
| | | | | | | | | | | | | | | | | | | | | | | | The compression didn't work with CommLog turned on.
| * | | | | Protocol 1.8: Added checks for values presence.madmaxoft2014-09-251-2/+8
| | |/ / / | |/| | | | | | | | | | | | | Reported by @worktycho / Coverity.
| * | | | 1.8 Protocol: Fixed problems with no-payload packets.madmaxoft2014-09-251-6/+7
| | | | |
| * | | | 1.7 Protocol: fixed potential problems with no-payload packets.madmaxoft2014-09-251-4/+4
| |/ / /
| * | | Fixed compiler warnings in 1.8 protocol.madmaxoft2014-09-231-2/+2
| | | |
| * | | Merge branch 'master' into EntityCustomNameHowaner2014-09-2316-519/+4216
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Updated README.mdHowaner2014-09-221-1/+1
| | | | |
| | * | | Hotfixed 1.8 item reading.Howaner2014-09-222-6/+6
| | | | |
| | * | | Changed metadata reading again.Howaner2014-09-222-173/+7
| | | | |
| | * | | Fixed item nbt reading.Howaner2014-09-222-3/+168
| | | | |
| | * | | Code improvements.Howaner2014-09-194-38/+36
| | | | |
| | * | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-192-1/+14
| | |\ \ \
| | * | | | Exported player list states to extra functions.Howaner2014-09-189-426/+616
| | | | | |
| | * | | | 1.8: Simplified item metadata reading.Howaner2014-09-181-7/+3
| | | | | |
| | * | | | Simplified WriteUUID()Howaner2014-09-141-9/+9
| | | | | |
| | * | | | Fixed warnings.Howaner2014-09-141-3/+3
| | | | | |
| | * | | | 1.8: Updated scoreboard packets.Howaner2014-09-131-3/+7
| | | | | |
| | * | | | Moved chat json creating to the CompositeChat class.Howaner2014-09-134-346/+8
| | | | | |
| | * | | | 1.8: Fixed maps.Howaner2014-09-139-35/+33
| | | | | |
| | * | | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-131-3/+3
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHoe.h
| | * | | | | Fixed wrong buffer length in the 1.8 protocol.Howaner2014-09-121-10/+4
| | | | | | |
| | * | | | | 1.8: Fixed ReadItem()Howaner2014-09-121-19/+39
| | | | | | |
| | * | | | | 1.8: Added difficulty sendingHowaner2014-09-121-0/+6
| | | | | | |
| | * | | | | 1.8: Fixed block entities.Howaner2014-09-121-8/+2
| | | | | | |
| | * | | | | 1.8: Fixed workbench, enchanting and anvil window.Howaner2014-09-121-3/+19
| | | | | | |
| | * | | | | 1.8: Enderman, byte -> shortHowaner2014-09-121-1/+1
| | | | | | |
| | * | | | | 1.8: Fixed enderman spawning.Howaner2014-09-121-1/+1
| | | | | | |
| | * | | | | 1.8: Fixed inventory open packet.Howaner2014-09-111-3/+2
| | | | | | |
| | * | | | | Removed GetProtocolVersion() from the protocols.Howaner2014-09-117-19/+6
| | | | | | |
| | * | | | | 1.8: Fixed sign placing.Howaner2014-09-111-1/+1
| | | | | | |
| | * | | | | 1.8: Fixed hangings.Howaner2014-09-113-31/+88
| | | | | | |
| | * | | | | 1.8: Added ParticleEffect packet.Howaner2014-09-1111-26/+103
| | | | | | |
| | * | | | | 1.8: Added MultiBlockChange packet.Howaner2014-09-093-51/+82
| | | | | | |
| | * | | | | Added the player list to the 1.8 protocol.Howaner2014-09-099-21/+92
| | | | | | |
| | * | | | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-092-7/+8
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | PlayerSpawn packet: Send the correct uuid.Howaner2014-09-091-5/+1
| | | | | | |
| | * | | | | 1.8: Added new uuid field.Howaner2014-09-092-0/+19
| | | | | | |
| | * | | | | More fixes.Howaner2014-09-082-1/+6
| | | | | | |
| | * | | | | Recoded cProtocol180 class.Howaner2014-09-084-589/+2690
| | | | | | |
| | * | | | | 1.8: Fixed tab complete.Howaner2014-09-083-2/+20
| | | | | | |
| | * | | | | Fixed more 1.8 packets.Howaner2014-09-084-35/+243
| | | | | | |
| | * | | | | Updated chunk sending to 1.8Howaner2014-09-084-26/+22
| | | | | | |
| | * | | | | Added GetProtocolVersion() to cProtocol.Howaner2014-09-088-26/+29
| | | | | | |
| | * | | | | Implemented packet compression.Howaner2014-09-087-35/+117
| | | | | | | | | | | | | | | | | | | | | ChunkData packet needs this.
| | * | | | | Fixed client errors.Howaner2014-09-045-52/+79
| | | | | | |
| | * | | | | Added more 1.8 protocol things.Howaner2014-09-046-14/+632
| | | | | | |
| | * | | | | Started implementing of the 1.8 protocol.Howaner2014-09-047-7/+502
| | | | | | |
| * | | | | | Merge branch 'master' into EntityCustomNameHowaner2014-09-021-6/+24
| |\| | | | |
| * | | | | | Added SetCustomName() to players.Howaner2014-09-028-25/+45
| | | | | | |
| * | | | | | Added CustomName to cMonster.Howaner2014-09-011-0/+10
| | | | | | |
* | | | | | | Implemented mob spawner.Howaner2014-09-191-1/+13
| |_|_|_|/ / |/| | | | |
* | | | | | Added an explicit setting for allowing BungeeCord handshake.madmaxoft2014-09-171-1/+1
| |_|_|_|/ |/| | | |
* | | | | Full BungeeCord compatibility.madmaxoft2014-09-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1392. Fixes SpigotMC/BungeeCord#1211.
* | | | | Initial BungeeCord support.madmaxoft2014-09-172-1/+10
| |_|_|/ |/| | | | | | | | | | | Ref.: #1392
* | | | Spawn exp if you break a mob spawner.Howaner2014-09-121-3/+3
| |_|/ |/| |
* | | Added Y-wise asserts to signs.Mattes D2014-09-061-0/+1
| | | | | | | | | | | | This should help detect #1313's second case.
* | | Alpha-sorted protocol 1.7 senders.Mattes D2014-09-061-7/+7
| |/ |/|
* | Make sure packets are validworktycho2014-09-011-6/+24
|/ | | Fixes CID 66408, 66409 and 72045
* Init RankMgr pointer to NULLworktycho2014-08-311-1/+2
|
* Merge pull request #1290 from mc-server/RanksMattes D2014-08-262-5/+40
|\ | | | | Rewriting permission system to use UUIDs and Ranks
| * Merge remote-tracking branch 'origin/master' into RanksMattes D2014-08-223-43/+91
| |\
| * | cMojangAPI updates cRankManager's playernames.Mattes D2014-08-212-1/+40
| | |
| * | cMojangAPI: Fixed MakeUUID___() bindings.Mattes D2014-08-211-4/+0
| | | | | | | | | | | | ToLua would generate a shadow return value for the input strings.
* | | Type warning fixes.Mattes D2014-08-251-1/+1
| | |
* | | Fixed a type warning.Mattes D2014-08-251-2/+2
| |/ |/|
* | Fixed 1.7.2 login packet reading.Mattes D2014-08-211-1/+5
| | | | | | | | Fixes #1317.
* | Merge pull request #1339 from mc-server/HooksSTRWarrior2014-08-203-42/+86
|\ \ | |/ |/| Added HOOK_SERVER_PING
| * Renamed a_Motd to a_ServerDescription.Howaner2014-08-202-7/+7
| |
| * Added a_ClientHandle to the HOOK_SERVER_PING hook.Howaner2014-08-202-2/+5
| |
| * Added "HOOK_SERVER_PING" call to older protocolsHowaner2014-08-201-13/+12
| |
| * Cleaned up code.Howaner2014-08-201-1/+0
| |
| * Added HOOK_SERVER_PINGHowaner2014-08-202-29/+72
| |
* | Merge pull request #1296 from mc-server/LuaAPIFranz Reiter2014-08-129-10/+24
|\ \ | |/ |/| Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
| * Exported daylight cycle flag to the protocol.Howaner2014-08-119-10/+24
| |
* | cProtocol172: Check return values.madmaxoft2014-08-111-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
* | Gave names to unnamed enumsarchshift2014-08-111-1/+1
|/
* MojangAPI: Fixed PlayerNameToUUID().madmaxoft2014-08-041-1/+1
|
* Fixed #1286Howaner2014-08-041-1/+1
|
* Merge pull request #1285 from mc-server/StrCaseRefactorMattes D2014-08-042-32/+24
|\ | | | | Refactored case-conversion functions.
| * Refactored case-conversion functions.madmaxoft2014-08-042-32/+24
| | | | | | | | StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place.
* | Changed properties for-loop.Howaner2014-08-041-1/+1
| |
* | Fixed skins in mc 1.7.9/1.7.10Howaner2014-08-031-6/+5
|/
* cMojangAPI: Added UUID-to-Name lookup.madmaxoft2014-08-033-60/+424
| | | | Also fixed the bindings, now all functions are static-like.
* Added cMojangAPI:GetUUIDFromPlayerName().madmaxoft2014-08-032-0/+35
| | | | This is a simpler way to ask for a single name -> uuid conversion.
* Merge pull request #1255 from mc-server/NameToUUIDMattes D2014-08-016-147/+619
|\ | | | | Name to UUID
| * Merged branch 'master' into NameToUUID.madmaxoft2014-07-319-17/+17
| |\
| * | Removed trailing whitespace.madmaxoft2014-07-311-2/+2
| | |
| * | MojangAPI: Moved the settings to a separate ini section.madmaxoft2014-07-311-2/+2
| | |
| * | MojangAPI: Added a UseCachedOnly param to GetUUIDsFromPlayerNames().madmaxoft2014-07-312-4/+9
| | |
| * | MojangAPI: Renamed cache file to MojangAPI.sqlite.madmaxoft2014-07-301-2/+2
| | |
| * | MojangAPI: Clarified the UUID conversion code.madmaxoft2014-07-302-4/+17
| | |
| * | MojangAPI: Implemented UUID shortening and dashing.madmaxoft2014-07-303-20/+31
| | |
| * | Exported cMojangAPI to Lua.madmaxoft2014-07-301-1/+12
| | |
| * | Added a cMojangAPI class for PlayerName -> UUID lookups, with cache.madmaxoft2014-07-305-237/+556
| | | | | | | | | | | | The cache is persisted into a SQLite DB file on server shutdown.
| * | cAuthenticator: Added GetUUIDsFromPlayerNames().madmaxoft2014-07-282-3/+116
| | |
* | | Renamed functions and added beacon json saving.Howaner2014-07-311-2/+2
| | |
* | | Added beacon.Howaner2014-07-301-0/+15
| |/ |/|
* | Merge branch 'master' into portalsTiger Wang2014-07-292-2/+2
|\| | | | | | | | | Conflicts: src/World.h
| * Removed redundant semicolons and re-added warningarchshift2014-07-242-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-2210-82/+106
|\| | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-217-11/+11
| |
| * Style: Normalized spaces after if, for and while.madmaxoft2014-07-211-1/+1
| |
| * Fixed attempts to call c_str on ChatColorsarchshift2014-07-191-2/+2
| |
| * Code style: Fixed braces on separate lines.madmaxoft2014-07-191-1/+2
| |
| * Fixed spaces after commas in protocol data.madmaxoft2014-07-191-7/+7
| | | | | | | | The JSON data is well-formatted with spaces, too; we can afford to waste the few bytes.
| * Fixed style: spaces after commas.madmaxoft2014-07-192-2/+2
| |
| * Merge pull request #1214 from mc-server/anti-globMattes D2014-07-191-5/+25
| |\ | | | | | | CMake - Explicitly lists all source files
| | * Subdirs: Only add_library if not using MSVCarchshift2014-07-191-1/+3
| | |
| | * Protocol/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+23
| | |
| * | Authenticator.cpp: Killed a global destructor warningarchshift2014-07-191-53/+56
| |/
* | Fix failed merge and other issuesTiger Wang2014-07-187-7/+7
| |
* | Merge branch 'master' into portalsTiger Wang2014-07-1815-259/+351
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * ProtocolRecognizer.cpp: removed unused NumBytesReadarchshift2014-07-181-2/+0
| |
| * Fixed tabs used for alignment.madmaxoft2014-07-172-12/+13
| |
| * Basic style fixes.madmaxoft2014-07-176-9/+9
| |
| * Normalized comments.madmaxoft2014-07-179-86/+86
| | | | | | | | | | 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/skinuuidMattes D2014-07-163-98/+199
| |\ | | | | | | Skins
| | * SuggestionsTiger Wang2014-07-161-2/+5
| | |
| | * Function renameTiger Wang2014-07-162-3/+3
| | |
| | * Unified functionsTiger Wang2014-07-162-34/+28
| | | | | | | | | | | | Thanks @Howaner!
| | * Store properties as Json::ValueTiger Wang2014-07-163-12/+20
| | |
| | * Player properties are now retrievedTiger Wang2014-07-143-102/+198
| | |
| * | Fixed MSVC warnings in SoundEffect functions.madmaxoft2014-07-132-14/+6
| | |
| * | Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-139-24/+25
| |/
| * Merge pull request #1154 from mc-server/trappedchestsTiger Wang2014-07-131-2/+2
| |\ | | | | | | Implemented trapped chests & others
| | * Implemented trapped chests & othersTiger Wang2014-07-071-2/+2
| | | | | | | | | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes
| * | Merge pull request #1135 from mc-server/fixesTiger Wang2014-07-091-1/+1
| |\ \ | | |/ | |/| Fixes to projectiles and the undead
| | * Crash and compile fixTiger Wang2014-07-041-1/+1
| | |
| * | Fixed respawningTiger Wang2014-06-299-15/+15
| | | | | | | | | | | | * Fixes #1103
| * | Send statistics to the player, when he logged in.Howaner2014-06-291-2/+1
| | |
| * | Added generic entity-collecting.Mattes D2014-06-279-15/+15
| |/ | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098.
* | Merge branch 'master' into portalsTiger Wang2014-06-211-0/+1
|\| | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * Nullify deleted pointers.archshift2014-06-191-0/+1
| |
* | Portals animate and delay correctlyTiger Wang2014-06-129-17/+17
| |
* | Merge branch 'master' into portalsTiger Wang2014-06-105-3/+29
|\| | | | | | | | | | | | | | | | | 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-0810-16/+42
| | | | | | | | Fixes #1039, fixes #851
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-041-1/+2
|\|
| * Fixed a crash in message formatter.madmaxoft2014-05-281-1/+2
| | | | | | | | The code would fail if a message is sent to a player not yet added to a world.
* | Implemented end and nether portalsTiger Wang2014-05-319-13/+13
|/
* cCompositeChat message type is now formattedTiger Wang2014-05-191-1/+1
|
* Added client translation to achievementsTiger Wang2014-05-191-0/+29
|
* cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement()andrew2014-05-121-5/+1
|
* Statistic Managerandrew2014-05-117-7/+84
|
* Fixed MSVC 64-bit build warnings.Mattes D2014-05-092-11/+11
|
* Change m_RepairCost to int.Howaner2014-05-071-2/+2
|
* Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs.Howaner2014-05-071-0/+11
|
* Hotfixed Chunked transfer encoding in Yggdrasil.madmaxoft2014-05-031-1/+1
| | | | By using HTTP/1.0, we're disabling the support for the Chunked encoding on the server. This is a hotfix for #979, a proper parser implementation is still needed.
* Fixed connection encryption.madmaxoft2014-05-031-1/+1
| | | | Fixes #975.
* Fixed warnings in ClientHandle.madmaxoft2014-05-017-7/+7
|
* Removed the unused cBlockingTCPLink class.madmaxoft2014-04-301-1/+0
|
* Removed unneeded #includes.madmaxoft2014-04-291-6/+0
|
* Moved the rest of the Crypto objects into their own respective files.madmaxoft2014-04-294-23/+14
|
* Moved cRsaPrivateKey to PolarSSL++, rewritten using existing objects.madmaxoft2014-04-292-2/+2
|
* Merged branch 'master' into SslWrappers.madmaxoft2014-04-283-6/+11
|\
| * Merge pull request #940 from Howaner/GlobalFixesMattes D2014-04-282-2/+2
| |\ | | | | | | Add entity invulnerable
| | * Revert "Changed the old invulnerable methods from the wither to the new."Howaner2014-04-282-16/+2
| | | | | | | | | This reverts commit d50f8f6f11f69e7e1e56be92fb2d72a5014a3e34.
| | * Changed the old invulnerable methods from the wither to the new.Howaner2014-04-262-2/+16
| | |
| | * FixesHowaner2014-04-262-2/+2
| | |
| * | Merge pull request #954 from mc-server/projectiles-splitMattes D2014-04-282-1/+3
| |\ \ | | | | | | | | Totally refactored ProjectileEntity.h, splitting up into several files.
| | * | Fixed projectile source filenames, indentationsarchshift2014-04-282-3/+3
| | | |
| | * | Moved cFireworkEntity out of ProjectileEntity.harchshift2014-04-271-0/+1
| | | |
| | * | Moved cArrowEntity out of ProjectileEntity.harchshift2014-04-272-1/+2
| | |/
| * | Another attempt at #889.madmaxoft2014-04-271-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 #948 from jfhumann/staticFixesMattes D2014-04-271-0/+33
| |\ \ | | |/ | |/| Fixes motivated by Coverity #1
| | * Fixes resource leaks in the yggdrasil authenticator. (CID 43617)jfhumann2014-04-261-0/+33
| | |
| * | Cmake generated projects for IDEs include headers in project files.archshift2014-04-251-0/+1
| |/
* | Added the G1 root cert.madmaxoft2014-04-281-2/+29
| | | | | | | | Now the authenticator finally works.
* | Rewritten cAuthenticator to use the new PolarSSL++ wrapper classes.madmaxoft2014-04-271-91/+45
| |
* | Authenticator uses some C++ SSL objects.madmaxoft2014-04-241-19/+40
|/
* Merge pull request #909 from jfhumann/fixesMattes D2014-04-227-80/+104
|\ | | | | | | | | 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
| * Small style changesjfhumann2014-04-182-7/+7
| |
| * Merge remote-tracking branch 'origin/master' into fixesjfhumann2014-04-189-43/+719
| |\ | | | | | | | | | | | | | | | | | | | | | 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-186-77/+100
| | |
* | | Allow 1.6.4 Forge clients to log in.Mattes D2014-04-212-0/+20
| | | | | | | | | | | | Fixes #913.
* | | Merge branch 'master' into Enchantingdaniel09162014-04-181-5/+131
|\ \ \ | | |/ | |/|
| * | Added asserts for proper game state.madmaxoft2014-04-161-5/+131
| | | | | | | | | | | | This is to help hunt #889.
* | | Modified many thingsdaniel09162014-04-171-2/+0
| | |
* | | Merge branch 'master' into Enchantingdaniel09162014-04-169-38/+587
|\| |
| * | Attempted fix for the client crash with the new protocols.madmaxoft2014-04-151-0/+7
| | |
| * | Implemented the 1.7.6 protocol and authenticator.madmaxoft2014-04-148-119/+169
| | | | | | | | | | | | Server works both in online and offline modes with 1.7.9.
| * | A client UUID is generated when the server is in offline mode.madmaxoft2014-04-141-4/+10
| | | | | | | | | | | | 1.7.9 client works with these changes in offline mode.
| * | Merge remote-tracking branch 'daniel0916/YggdrasilAuthentication' into Proto176madmaxoft2014-04-143-1/+420
| |\ \
| | * | Fixed mistakedaniel09162014-04-132-2/+2
| | | |
| | * | Fixed Error?daniel09162014-04-131-2/+2
| | | |
| | * | Code Updatedaniel09162014-04-131-4/+5
| | | |
| | * | Added Yggdrasil Authentication Systemdaniel09162014-04-132-0/+418
| | |/ | | | | | | | | | Code by Howaner. Fixes/Changes by me.
| * / Initial 1.7.6 protocol support.madmaxoft2014-04-144-2/+69
| |/ | | | | | | Doesn't work yet because of missing UUIDs.
* | Bug fixesdaniel09162014-04-141-3/+0
| |
* | Fixed Errorsdaniel09162014-04-071-2/+2
| |
* | Merge remote-tracking branch 'upstream/master' into Enchantingdaniel09162014-04-0715-366/+1139
|\|
| * Fixed 1.6.4 client crash on composite chat messages.madmaxoft2014-04-062-0/+14
| |
| * Fixed crash in protocols sending 64-bit ints.madmaxoft2014-04-061-1/+1
| | | | | | | | Fixes #855.
| * Explicit change record size.madmaxoft2014-04-041-1/+1
| |
| * Fixed format string mismatch.madmaxoft2014-04-041-1/+1
| |
| * More Clang warning fixes in the protocols.madmaxoft2014-04-046-81/+82
| |
| * Fixed CreateHexDump's signedness.madmaxoft2014-04-041-1/+1
| |
| * More Clang warning fixes in the protocols.madmaxoft2014-04-041-28/+37
| |
| * Fixed some Clang warnings in protocols.madmaxoft2014-04-0410-26/+31
| |
| * Merge pull request #831 from mc-server/WitherMattes D2014-04-022-0/+18
| |\ | | | | | | Wither
| | * Protocol: Wither metadataandrew2014-03-252-0/+18
| | |
| * | Console logging supports cCompositeChat as its parameters.madmaxoft2014-03-311-22/+1
| |/
| * Plugins can set flying speed.madmaxoft2014-03-201-2/+1
| |
| * Rewritten player speeds to be relative unit-less.madmaxoft2014-03-202-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 macrosTycho2014-03-122-7/+7
| |
| * Fixed a load of format string errorsTycho2014-03-112-4/+4
| |
| * Fixed format errors in protocolTycho2014-03-111-3/+3
| |
| * Removed unused macroTycho2014-03-101-13/+0
| |
| * Merge pull request #731 from mc-server/ballisticmissilesTiger Wang2014-03-091-25/+52
| |\ | | | | | | Ballistic firework missiles
| | * Merge branch 'master' into ballisticmissilesTiger Wang2014-03-091-1/+15
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp
| | * | Implemented ballistic missiles (fireworks)Tiger Wang2014-02-271-25/+52
| | | | | | | | | | | | | | | | + Added fireworks
| * | | Hotfix for MSVC compilation.madmaxoft2014-03-091-0/+1
| | | |
| * | | Merge pull request #777 from jfhumann/issue317Mattes D2014-03-093-3/+29
| |\ \ \ | | | | | | | | | | Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions
| | * | | Adjusted style of switch/caseJan-Fabian Humann2014-03-093-45/+15
| | | | |
| | * | | Changed if-else to switch-caseJan-Fabian Humann2014-03-083-39/+33
| | | | |
| | * | | Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting.Jan-Fabian Humann2014-03-083-3/+65
| | | |/ | | |/|
| * | | Fixed issues with int vs size_t and a few other warningsTycho2014-03-081-2/+2
| | | |
| * | | WarningsTycho2014-03-079-12/+25
| |/ /
| * / Add Flower PotsHowaner2014-03-071-1/+15
| |/
| * Manual merge (Fixed conflicts)andrew2014-02-209-17/+291
| |\
| | * Merge pull request #697 from Howaner/SkullMattes D2014-02-191-0/+15
| | |\ | | | | | | | | Add Skulls/Heads to MCServer
| | | * Rename SkullEntity to MobHeadEntityHowaner2014-02-191-9/+9
| | | |
| | | * Add break to Protocol17x.cpp and use new comment delimiterHowaner2014-02-191-0/+1
| | | |
| | | * Add Skulls/HeadsHowaner2014-02-171-0/+14
| | | |
| | * | Merge branch 'master' into itemframesTiger Wang2014-02-186-0/+28
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Entity.h src/WorldStorage/NBTChunkSerializer.cpp
| | | * | Implemented paintings, fixes #689Tiger Wang2014-02-186-0/+28
| | | |/ | | | | | | | | | | | | + Implemented paintings
| | * | De-breaked stuffTiger Wang2014-02-181-2/+0
| | | |
| | * | Implemented item frames, a part of #689Tiger Wang2014-02-181-2/+14
| | |/ | | | | | | | | | | | | + Implemented Item Frames * Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!)
| | * Add Locale to ClientHandleHowaner2014-02-163-2/+4
| | |
| | * Set max. Players in the Tablist to 60Howaner2014-02-161-1/+1
| | |
| | * Implemented cCompositeChat.madmaxoft2014-02-157-12/+231
| | | | | | | | | | | | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678.
| * | Map decorators; Map clientsandrew2014-02-187-1/+60
| | |
| * | Implementation of in-game mapsandrew2014-02-137-0/+91
| |/
| * Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-091-2/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp
| | * Improved the signedness conversion.madmaxoft2014-02-051-2/+2
| | |
| | * Protocol 1.7: Fixed a signed / unsigned comparison warning.madmaxoft2014-02-041-2/+2
| | |
| * | Merge branch 'master' into playerimprovementsTiger Wang2014-02-093-7/+7
| |\| | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua
| | * Protocol 1.7 uses char for blockface.madmaxoft2014-02-041-2/+2
| | | | | | | | | | | | That should fix #644 on RasPi.
| | * Improved Type safety of eBlockFaceTycho2014-02-043-5/+5
| | | | | | | | | | | | May Fix #640
| * | Fixed a bunch of MSVS warningsTiger Wang2014-02-051-1/+2
| |/ | | | | | | | | * Possibly also fixed some bugs with pathfinding and TNT, though unlikely
| * Limited sign lines to 15 chars.madmaxoft2014-01-291-4/+5
| | | | | | | | Fixes #598.
| * Added 1.7.4 to the list of supported protocols.madmaxoft2014-01-291-1/+1
| |
| * Protocol 1.7: Encryption is enabled only with auth.madmaxoft2014-01-291-1/+1
| |
| * Protocol 1.7: Forced encryption on all connections.madmaxoft2014-01-282-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.madmaxoft2014-01-261-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.madmaxoft2014-01-252-0/+87
| |\
| | * Comm logging is available in both Debug and Release modes.madmaxoft2014-01-252-12/+16
| | |
| | * Protocol17: Comm logging shows the data left over from previous parse.madmaxoft2014-01-251-2/+15
| | |
| | * Added per-connection comm logging in debug mode.madmaxoft2014-01-242-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.madmaxoft2014-01-231-3/+3
| |\|
| | * Fixed 1.5.x scoreboard packet IDsandrew2014-01-231-3/+3
| | |
| * | PolarSSL is fully used for 1.3.2 protocol encryption.madmaxoft2014-01-236-139/+51
| |/
| * Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-217-6/+90
| |\
| | * Fix a crash but somewhere...Alexander Harkness2014-01-201-2/+1
| | |
| * | Scoreboard SendTo()andrew2014-01-211-3/+3
| | |
| * | Scoreboard protocol supportandrew2014-01-218-5/+141
| | |
* | | added EnchantItemPacket to older Protocolsdaniel09162014-02-011-1/+4
| | |
* | | Some updates for enchanting (2)daniel09162014-01-314-14/+21
| | |
* | | removed hook from enchanting commitdaniel09162014-01-241-1/+1
| | |
* | | Some updates for enchantingdaniel09162014-01-242-4/+12
| | |
* | | first changes for enchanting (not finished)daniel09162014-01-202-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/EnchantmentsFixMattes D2014-01-192-4/+6
|\ \ | | | | | | Enchantments fix
| * | Switched EnchantmentSerilizer to namespaceTycho2014-01-192-4/+4
| | |
| * | Spilt Writing of Enchantments to seperate classTycho2014-01-192-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 paramtersTiger Wang2014-01-196-11/+19
| |
* | Changed SendBlockEntity format slightlyTiger Wang2014-01-196-13/+46
| | | | | | | | | | * Writing NBT is now in Protocol, not BlockEntity files * Fixed a last output bug
* | Improved command blocksTiger Wang2014-01-196-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/SpawnMinecartMattes D2014-01-171-2/+17
|\ | | | | Added cWorld::SpawnMinecart.
| * Renamed cEmptyMinecart to cRideableMinecartSTRWarrior2014-01-121-6/+6
| |
| * EmptyMinecarts should be able to get a block inside of them.STRWarrior2014-01-121-1/+16
| |
* | Removed internal cEntity::GetRot() usage.madmaxoft2014-01-173-14/+14
| |
* | Merge remote-tracking branch 'origin/customnames'madmaxoft2014-01-174-12/+62
|\ \
| * | Changed newline character because of issuesTiger Wang2014-01-161-3/+3
| | |
| * | Removed obsoleted functionsTiger Wang2014-01-163-7/+7
| | |
| * | Merge remote-tracking branch 'origin/master' into customnamesTiger Wang2014-01-162-30/+40
| |\ \
| * | | Implemented custom names and loreTiger Wang2014-01-151-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.madmaxoft2014-01-171-4/+21
| | | |
* | | | Fixed block break packet numberTiger Wang2014-01-161-1/+1
| | | |
* | | | Protocol 1.7: Unknown packets are dumped to log in Debug mode.madmaxoft2014-01-161-1/+14
| |/ / |/| |
* | | Added packet diagnostics to 1.7 protocol.madmaxoft2014-01-162-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.madmaxoft2014-01-131-2/+23
|/ | | | This fixes #495
* Fixed wrong packet number for PluginMessage packet.madmaxoft2014-01-091-1/+1
|
* Added cClientHandle::SendPluginMessage().madmaxoft2014-01-097-0/+40
| | | | It is not yet exported in the API, though.
* Merge pull request #516 from mc-server/faviconAlexander Harkness2014-01-071-1/+1
|\ | | | | Fixed favicons
| * Fixed faviconsTiger Wang2014-01-071-1/+1
| |
* | Plugin messages are received and handed to plugins.madmaxoft2014-01-071-1/+1
|/ | | | Note that MCS doesn't currently handle any channel registrations, this will come later on.
* Merge pull request #514 from derouinw/masterMattes D2014-01-071-0/+3
|\ | | | | Implement favicon for 1.7.2
| * A few more touch upsBill Derouin2014-01-071-11/+1
| |
| * Removed unused lineBill Derouin2014-01-071-1/+0
| |
| * Implement favicon for 1.7.2Bill Derouin2014-01-072-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.madmaxoft2014-01-072-3/+3
| |
* | Fixed a few MSVC warnings.madmaxoft2014-01-064-5/+4
|/
* Added warning(push) and warning(pop) around all of the inclusions of cryptopp/*.hDiusrex2014-01-054-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.madmaxoft2014-01-021-3/+3
| | | | Ref.: #420.
* Implented BroadcastParticleEffectSTRWarrior2013-12-229-2/+65
|
* Merge branch 'master' into cmakeTycho Bickerstaff2013-12-211-2/+2
|\
| * Fixed minor warnings.madmaxoft2013-12-201-2/+2
| |
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-191-10/+3
|\|
| * Fixed PlayerAbilities and creativeTiger Wang2013-12-191-10/+3
| |
* | moved protocol to globTycho Bickerstaff2013-12-191-1/+5
| |
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-187-7/+115
|\|
| * Fixed player falling through the floor on spawn.madmaxoft2013-12-171-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.madmaxoft2013-12-151-1/+1
| | | | | | | | The player was spawned 1.62 blocks below their pos. This fixes #323.
| * Moved reading flags to the protocol.STRWarrior2013-12-151-1/+19
| |
| * Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() functionSTRWarrior2013-12-151-2/+10
| |
| * Fixed pre 1.7 clients crashing.STRWarrior2013-12-151-2/+2
| |
| * Merge pull request #431 from mc-server/Entity_EffectsMattes D2013-12-147-0/+82
| |\ | | | | | | Entity Effects
| | * Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison.STRWarrior2013-12-147-0/+82
| | |
| * | Removed leftover debugging messages from cProtocol172.madmaxoft2013-12-141-4/+0
| |/
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-112-195/+191
|\|
| * Fixed threading issues affecting cProtocol172.madmaxoft2013-12-132-191/+191
| |
| * Fixed protocol 1.7 recovery after unknown packet.madmaxoft2013-12-121-4/+0
| |
* | more cmakeTycho Bickerstaff2013-12-101-0/+7
|/
* Fixed tabcompletion packet, fixes #356Tiger Wang2013-12-081-8/+4
|
* Fixed falling block metas, fixes #406Tiger Wang2013-12-081-1/+1
|
* Renamed animation functionTiger Wang2013-12-077-10/+10
| | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know.
* Removed stray printf, again.Samuel Barney2013-12-021-1/+0
|
* Switched to using provided ReadItem function.Samuel Barney2013-12-021-17/+3
| | | | Fixed misplacing when clicking on the bottom of bottom slabs and the top of top slabs.
* Removed stray printf.Samuel Barney2013-12-021-1/+0
|
* Fixed 1.7 slab and stair placement.Samuel Barney2013-12-021-0/+19
|
* Fixed the remaining derpsAlexander Harkness2013-11-274-5/+5
|
* Fixed some of tiger's derpyness.Alexander Harkness2013-11-271-2/+2
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-267-0/+48
| | | | | Conflicts: VC2008/MCServer.vcproj
* Further attempts to fix compileTiger Wang2013-11-255-7/+7
|
* Attempt to fix compilationTiger Wang2013-11-245-8/+8
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-247-1/+42
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-2417-0/+7588