Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Optimized chunk loader | Howaner | 2014-10-02 | 1 | -86/+77 |
| | |||||
* | Rewritten plugin messages, vanilla are being parsed directly. | madmaxoft | 2014-09-30 | 1 | -90/+30 |
| | | | | This should finally fix the compatibility problems between 1.7 and 1.8 protocols with the changes in the vanilla plugin messages. | ||||
* | Fixed trailing whitespace. | madmaxoft | 2014-09-28 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1466 from mc-server/endofsupport | Mattes D | 2014-09-28 | 1 | -14/+0 |
|\ | | | | | Removed protocols 1.2 to 1.6 | ||||
| * | Dropped support for <1.7.x | Tiger Wang | 2014-09-27 | 1 | -14/+0 |
| | | |||||
* | | Combined conditions | Masy98 | 2014-09-27 | 1 | -8/+11 |
| | | |||||
* | | Added barriers correctly | Masy98 | 2014-09-27 | 1 | -0/+5 |
|/ | |||||
* | Fixed players custom name in 1.8 | Howaner | 2014-09-26 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' into EntityCustomName | Howaner | 2014-09-23 | 1 | -64/+164 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -2/+10 |
| |\ | |||||
| | * | BungeeCord compatibility: don't overwrite UUID / properties. | madmaxoft | 2014-09-17 | 1 | -2/+10 |
| | | | |||||
| * | | Exported player list states to extra functions. | Howaner | 2014-09-18 | 1 | -6/+42 |
| | | | |||||
| * | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-14 | 1 | -1/+1 |
| |\| | |||||
| | * | Merge pull request #1353 from mc-server/Effects | Mattes D | 2014-09-13 | 1 | -1/+1 |
| | |\ | | | | | | | | | Added speed entity effect. | ||||
| | | * | Merge branch 'master' into Effects | Howaner | 2014-09-12 | 1 | -14/+30 |
| | | |\ | |||||
| | | * | | Added speed entity effect. | Hownaer | 2014-08-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | 1.8: Fixed maps. | Howaner | 2014-09-13 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-13 | 1 | -2/+20 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHoe.h | ||||
| | * | | | Play placesound from the middle of the block. | Howaner | 2014-09-12 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Fixed block place sounds. | Howaner | 2014-09-12 | 1 | -2/+14 |
| | | | | | |||||
| | * | | | Players in survival mode are not allowed to break a bedrock. | Howaner | 2014-09-12 | 1 | -0/+6 |
| | | |/ | | |/| | |||||
| * | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-12 | 1 | -1/+1 |
| |\| | | |||||
| | * | | Moved sound-configs into BlockID.h and fixed/ added loads of sounds | Masy98 | 2014-09-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed many right click issues. | Howaner | 2014-09-12 | 1 | -4/+10 |
| | | | | |||||
| * | | | 1.8: Fixed eating. | Howaner | 2014-09-12 | 1 | -0/+1 |
| | | | | |||||
| * | | | 1.8: Added ParticleEffect packet. | Howaner | 2014-09-11 | 1 | -2/+2 |
| | | | | |||||
| * | | | 1.8: Added MultiBlockChange packet. | Howaner | 2014-09-09 | 1 | -3/+4 |
| | | | | |||||
| * | | | Added the player list to the 1.8 protocol. | Howaner | 2014-09-09 | 1 | -3/+7 |
| | | | | |||||
| * | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-09 | 1 | -10/+10 |
| |\| | | |||||
| | * | | Merge pull request #1351 from LO1ZB/remove-a_RelY | Mattes D | 2014-09-03 | 1 | -10/+10 |
| | |\ \ | | | | | | | | | | | remove y-coord from chunks | ||||
| | | * | | remove y-coord from chunks | LO1ZB | 2014-08-28 | 1 | -10/+10 |
| | | | | | |||||
| * | | | | 1.8: Added new uuid field. | Howaner | 2014-09-09 | 1 | -17/+25 |
| | | | | | |||||
| * | | | | More fixes. | Howaner | 2014-09-08 | 1 | -11/+1 |
| | | | | | |||||
| * | | | | Fixed more 1.8 packets. | Howaner | 2014-09-08 | 1 | -12/+21 |
| |/ / / | |||||
| * | | | Merge branch 'master' into Inventory | Howaner | 2014-09-02 | 1 | -1/+2 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Fixed crashes and use std::swap. | Hownaer | 2014-08-28 | 1 | -3/+19 |
| | |/ | |/| | |||||
* | | | Added SetCustomName() to players. | Howaner | 2014-09-02 | 1 | -7/+5 |
| |/ |/| | |||||
* | | Fire can be destroyed with the sword in creative-mode | Hownaer | 2014-08-28 | 1 | -1/+2 |
|/ | |||||
* | Fixed item drop. | Howaner | 2014-08-22 | 1 | -14/+18 |
| | | | Fixes #1341 | ||||
* | Added initializers for class members. | Mattes D | 2014-08-21 | 1 | -0/+10 |
| | | | | As reported by Coverity, these weren't initialized. | ||||
* | Merge branch 'master' into Fire | Howaner | 2014-08-20 | 1 | -4/+4 |
|\ | |||||
| * | Exported daylight cycle flag to the protocol. | Howaner | 2014-08-11 | 1 | -9/+3 |
| | | |||||
| * | Added a comment and simplified code. | Howaner | 2014-08-10 | 1 | -6/+3 |
| | | |||||
| * | Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld. | Howaner | 2014-08-07 | 1 | -1/+10 |
| | | | | | | I need this for a GameRule plugin. | ||||
* | | Revert "Removes the fire if the block under the fire was broken." | Howaner | 2014-08-11 | 1 | -5/+0 |
| | | | | | | This reverts commit 01001d2a49a3366e9b1eccf938d5073ab9a2f06e. | ||||
* | | Removes the fire if the block under the fire was broken. | Howaner | 2014-08-11 | 1 | -0/+5 |
| | | |||||
* | | Moved the clicked-through block check to the top of the function. | Howaner | 2014-08-11 | 1 | -36/+17 |
| | | |||||
* | | Fixed cancelled fire interact from all directions. | Howaner | 2014-08-11 | 1 | -4/+12 |
|/ | |||||
* | Resending fire to the client when the interact cancelled. | Howaner | 2014-08-06 | 1 | -0/+8 |
| | |||||
* | Fixed a bug who can used from hacked clients. | Howaner | 2014-08-02 | 1 | -1/+16 |
| | |||||
* | Merge pull request #1255 from mc-server/NameToUUID | Mattes D | 2014-08-01 | 1 | -1/+2 |
|\ | | | | | Name to UUID | ||||
| * | Merged branch 'master' into NameToUUID. | madmaxoft | 2014-07-31 | 1 | -20/+8 |
| |\ | |||||
| * | | MojangAPI: Implemented UUID shortening and dashing. | madmaxoft | 2014-07-30 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #1272 from Howaner/Food | Mattes D | 2014-08-01 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | Fixed hunger bugs, Implemented golden apple, added jump statistic, added... | ||||
| * | | | Compile fix. | Howaner | 2014-08-01 | 1 | -2/+1 |
| | | | | |||||
| * | | | Import Statistics.h | Howaner | 2014-07-31 | 1 | -0/+1 |
| | | | | |||||
| * | | | Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects. | Howaner | 2014-07-31 | 1 | -1/+3 |
| | |/ | |/| | |||||
* | | | Renamed "select..." methods to "set..." and better IsValidEffect() function. | Howaner | 2014-07-31 | 1 | -2/+2 |
| | | | |||||
* | | | Renamed functions and added beacon json saving. | Howaner | 2014-07-31 | 1 | -12/+12 |
| | | | |||||
* | | | Added beacon. | Howaner | 2014-07-30 | 1 | -0/+54 |
|/ / | |||||
* | | Merged branch 'howaner/Options'. | madmaxoft | 2014-07-30 | 1 | -15/+4 |
|\ \ | |||||
| * | | Fixed group color's. | Howaner | 2014-07-27 | 1 | -15/+4 |
| |/ | |||||
* | | Slight cleanup after portals | Tiger Wang | 2014-07-29 | 1 | -2/+1 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-07-23 | 1 | -2/+2 |
| | | |||||
* | | 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 to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 1 | -3/+3 |
| | | |||||
| * | Fixed attempts to call c_str on ChatColors | archshift | 2014-07-19 | 1 | -4/+4 |
| | | |||||
| * | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 1 | -2/+2 |
| | | |||||
* | | Bug and crash fixes | Tiger Wang | 2014-07-20 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | * Fixes end portals' solidity * Fixed crashes to do with multithreading and removing an entity from the wrong world * Fixed crashes due to bad merge * Fixed crashes due to an object being deleted twice * Simplified cWorld::Start() and added comments to configuration files | ||||
* | | Fix failed merge and other issues | Tiger Wang | 2014-07-18 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -77/+53 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 creative players not being able to drink | archshift | 2014-07-18 | 1 | -3/+4 |
| | | | | | | | | Fixes #1215 | ||||
| * | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| | | | | | | | | | | 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. | ||||
| * | Fixed spaces around single-line comments. | madmaxoft | 2014-07-17 | 1 | -11/+13 |
| | | | | | | | | There should be at least two spaces in front and one space after //-style comments. | ||||
| * | Fixed basic whitespace problems. | madmaxoft | 2014-07-17 | 1 | -10/+10 |
| | | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines. | ||||
| * | Merge remote-tracking branch 'origin/master' into potions | madmaxoft | 2014-07-17 | 1 | -3/+4 |
| |\ | |||||
| | * | Merge pull request #1192 from mc-server/skinuuid | Mattes D | 2014-07-16 | 1 | -3/+4 |
| | |\ | | | | | | | | | Skins | ||||
| | | * | Store properties as Json::Value | Tiger Wang | 2014-07-16 | 1 | -1/+1 |
| | | | | |||||
| | | * | Player properties are now retrieved | Tiger Wang | 2014-07-14 | 1 | -3/+4 |
| | | | | |||||
| * | | | Merge branch 'master' into potions | madmaxoft | 2014-07-15 | 1 | -30/+7 |
| |\| | | |||||
| | * | | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 1 | -3/+3 |
| | |/ | |||||
| | * | Revert failed fix for #31 | Tiger Wang | 2014-07-13 | 1 | -27/+4 |
| | | | | | | | | | | | | This reverts commit 69dc9b4c9aea58ebd95e2dbd0205701dfc4ce54e. | ||||
| * | | Merge remote-tracking branch 'origin/master' into potions | archshift | 2014-07-10 | 1 | -41/+68 |
| |\| | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp | ||||
| | * | Unnecessary return | Howaner | 2014-06-30 | 1 | -2/+0 |
| | | | |||||
| | * | Fixed respawning | Tiger Wang | 2014-06-29 | 1 | -2/+2 |
| | | | | | | | | | | | | * Fixes #1103 | ||||
| | * | Fixed offline UUID generator. | Mattes D | 2014-06-29 | 1 | -2/+4 |
| | | | | | | | | | | | | It generated invalid UUIDs, too many hex chars. | ||||
| | * | Send statistics to the player, when he logged in. | Howaner | 2014-06-29 | 1 | -0/+3 |
| | | | |||||
| | * | Merge pull request #1132 from mc-server/RemoveMD5 | Mattes D | 2014-06-29 | 1 | -13/+9 |
| | |\ | | | | | | | | | Removed the md5 library, obsoleted by PolarSSL. | ||||
| | | * | Removed the md5 library, obsoleted by PolarSSL. | Mattes D | 2014-06-27 | 1 | -13/+9 |
| | | | | | | | | | | | | | | | | Fixes #1130. | ||||
| | * | | Fixed issue with breaking blocks at -1 coordinates | Tiger Wang | 2014-06-28 | 1 | -6/+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. | ||||
| * | | ItemHandler: changed IsDrinkable() to take a short argument | archshift | 2014-06-17 | 1 | -3/+4 |
| | | | |||||
| * | | Implemented drinkable potions, noeffect entity effect, | archshift | 2014-06-17 | 1 | -3/+3 |
| | | | | | | | | | | | | Clears entity effects on death | ||||
| * | | Implemented milk, added documentation to Pawn.h | archshift | 2014-06-17 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/mc-server/MCServer into portals | Tiger Wang | 2014-06-24 | 1 | -0/+29 |
|\ \ \ | | |/ | |/| | |||||
| * | | Added cClientHandle::IsUUIDOnline function. | madmaxoft | 2014-06-21 | 1 | -0/+29 |
| | | | | | | | | | | | | Ref.: #771 | ||||
* | | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 1 | -16/+20 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| * | | Merge branch 'master' into GlobalFixes | Howaner | 2014-06-17 | 1 | -25/+20 |
| |\| | |||||
| * | | Add more documentation. | Howaner | 2014-06-17 | 1 | -0/+2 |
| | | | |||||
| * | | Add comment. | Howaner | 2014-06-17 | 1 | -0/+1 |
| | | | |||||
| * | | Revert "Fix right click bugs." | Howaner | 2014-06-17 | 1 | -41/+40 |
| | | | | | | | | | This reverts commit 61b6fdde7553dac6e2d5c5a071b9a13fa0d71b2f. | ||||
| * | | Fix fire break. | Howaner | 2014-05-28 | 1 | -16/+17 |
| | | | |||||
| * | | Fix right click bugs. | Howaner | 2014-05-28 | 1 | -40/+41 |
| | | | |||||
* | | | Portals animate and delay correctly | Tiger Wang | 2014-06-12 | 1 | -4/+3 |
| | | | |||||
* | | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 1 | -21/+17 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | 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 | -16/+5 |
| | | | | | | | | | | | | Fixes #1039, fixes #851 | ||||
| * | | Proper fix for long interaction. | madmaxoft | 2014-06-08 | 1 | -7/+14 |
| | | | | | | | | | | | | Fixes #1078 and #1038. | ||||
* | | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-04 | 1 | -2/+1 |
|\| | | |||||
| * | | Fixed bad coordinate | worktycho | 2014-06-04 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/pistonfixes' | Tiger Wang | 2014-06-02 | 1 | -1/+0 |
| |\ \ | | |/ | |/| | | | | | | | Conflicts: src/Chunk.cpp | ||||
| | * | Hopefully fixed piston duplication issues | Tiger Wang | 2014-05-25 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | * Fixes #879 * Fixes #714 | ||||
* | | | Implemented end and nether portals | Tiger Wang | 2014-05-31 | 1 | -4/+3 |
|/ / | |||||
* | | ClientHandle.cpp: Process look before pos | archshift | 2014-05-27 | 1 | -1/+1 |
| | | |||||
* | | ClientHandle.cpp: remove redundant code | archshift | 2014-05-26 | 1 | -22/+2 |
| | | | | | | | | HandlePlayerMoveLook() calls HandlePlayerPos() and HandlePlayerLook() to reduce code redundancy. | ||||
* | | Revert "Add more move checks" | madmaxoft | 2014-05-26 | 1 | -58/+16 |
| | | | | | | | | This reverts commit 989312c4e7f517ae324e857cb255211e3fd8bb06. | ||||
* | | Merge pull request #1003 from Howaner/GlobalFixes | Mattes D | 2014-05-26 | 1 | -16/+58 |
|\ \ | |/ |/| | Add more move checks | ||||
| * | Add more move checks | Howaner | 2014-05-16 | 1 | -16/+58 |
| | | | | | | | | | | - Invalid X/Y/Z/Stance check (std::isnan) - Illegal stance - Illegal position (32.000.000 is the world size) | ||||
* | | Merge pull request #1010 from mc-server/cactidamage | Alexander Harkness | 2014-05-19 | 1 | -2/+3 |
|\ \ | | | | | | | Implemented cacti damage | ||||
| * | | Implemented cacti damage | Tiger Wang | 2014-05-18 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | + Implemented cacti damage * Fixed pickup tossing (PR #994 bug) | ||||
* | | | Merge pull request #998 from mc-server/StatManager | Mattes D | 2014-05-18 | 1 | -1/+10 |
|\ \ \ | |/ / |/| | | Statistic Manager | ||||
| * | | Fixed stat serialization | andrew | 2014-05-11 | 1 | -8/+0 |
| | | | |||||
| * | | Statistic Manager | andrew | 2014-05-11 | 1 | -1/+18 |
| | | | |||||
* | | | Merge pull request #994 from Howaner/GlobalFixes | Mattes D | 2014-05-15 | 1 | -17/+80 |
|\ \ \ | | |/ | |/| | Add place/break radius, add dig cancel packet and add item resend on break/place cancel. | ||||
| * | | Fix compile error. | Howaner | 2014-05-15 | 1 | -1/+1 |
| | | | |||||
| * | | Move radius check. | Howaner | 2014-05-15 | 1 | -25/+40 |
| | | | |||||
| * | | Rename HandleBlockDigCancel to FinishDigAnimtion. | Howaner | 2014-05-11 | 1 | -3/+3 |
| | | | |||||
| * | | Add block place/break distance check. | Howaner | 2014-05-09 | 1 | -0/+21 |
| | | | |||||
| * | | Add DIG_STATUS_CANCELLED packet and add item resend, when a block can't place/break. | Howaner | 2014-05-09 | 1 | -17/+44 |
| |/ | |||||
* | | Merge branch 'master' into SslWebAdmin | Mattes D | 2014-05-10 | 1 | -5/+32 |
|\| | |||||
| * | Simplified the HandleAnvilItemName() code. | Howaner | 2014-05-06 | 1 | -7/+2 |
| | | |||||
| * | Changed HandleAnvilItemName() length to size_t in ClientHandle.h | Howaner | 2014-05-05 | 1 | -1/+1 |
| | | |||||
| * | Add clicks, exp subtraction, item check, ... | Howaner | 2014-05-05 | 1 | -1/+1 |
| | | |||||
| * | Add MC|ItemName plugin message. | Howaner | 2014-05-05 | 1 | -0/+32 |
| | | |||||
| * | Merge branch 'master' into redstoneimprovements | Tiger Wang | 2014-05-04 | 1 | -5/+14 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/FallingBlock.cpp src/Mobs/AggressiveMonster.cpp src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| | * | HOOK_DISCONNECT has cClientHandle as its first parameter. | madmaxoft | 2014-05-02 | 1 | -3/+3 |
| | | | | | | | | | | | | Ref.: #655. | ||||
| * | | Redstone simulator now directly accesses cChunk | Tiger Wang | 2014-04-27 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes | ||||
* | | | Merged branch 'master' into SslWebAdmin. | madmaxoft | 2014-05-01 | 1 | -2/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | More ClientHandle fixes. | madmaxoft | 2014-05-01 | 1 | -2/+2 |
| | | | |||||
| * | | Fixed warnings in ClientHandle. | madmaxoft | 2014-05-01 | 1 | -2/+2 |
| | | | |||||
* | | | Fixed crashes in the SSL HTTP connection. | madmaxoft | 2014-05-01 | 1 | -1/+2 |
|/ / | |||||
* | | Delayed sending the KeepAlive packet for 3 seconds after login. | madmaxoft | 2014-04-29 | 1 | -0/+5 |
| | | | | | | | | This should alleviate #889. | ||||
* | | Fixed braces. | madmaxoft | 2014-04-28 | 1 | -1/+5 |
| | | |||||
* | | Fixed missing return value warning in MSVC. | madmaxoft | 2014-04-28 | 1 | -0/+1 |
|/ | |||||
* | More small fixes. | archshift | 2014-04-26 | 1 | -9/+9 |
| | |||||
* | Moar alignment. | archshift | 2014-04-26 | 1 | -7/+7 |
| | |||||
* | Further refactored, Reverted Minecart change | archshift | 2014-04-26 | 1 | -57/+21 |
| | | | | Other small changes. | ||||
* | Merge remote-tracking branch 'upstream/master' | archshift | 2014-04-25 | 1 | -1/+1 |
|\ | |||||
| * | Fix armor in survival mode. | Howaner | 2014-04-24 | 1 | -1/+1 |
| | | |||||
* | | Oops, fixed that. | archshift | 2014-04-25 | 1 | -0/+2 |
| | | |||||
* | | Refactored SendChat(), placing the message-type formatting into its own function. | archshift | 2014-04-25 | 1 | -84/+78 |
|/ | | | | Removed default case warning in the process. | ||||
* | Merge pull request #909 from jfhumann/fixes | Mattes D | 2014-04-22 | 1 | -6/+8 |
|\ | | | | | | | | | 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 | ||||
| * | Declared one mutex as mutable in order to allow for const correct get accessors. | jfhumann | 2014-04-19 | 1 | -4/+4 |
| | | |||||
| * | Small style changes | jfhumann | 2014-04-18 | 1 | -1/+1 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into fixes | jfhumann | 2014-04-18 | 1 | -9/+53 |
| |\ | | | | | | | | | | | | | | | | | | | | | | 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 | -8/+10 |
| | | | |||||
* | | | Merge branch 'master' into Enchanting | daniel0916 | 2014-04-18 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #891 from mc-server/fixes | Mattes D | 2014-04-17 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Fixes to redstone & general | ||||
| | * | | Entities handle chunks properly again | Tiger Wang | 2014-04-12 | 1 | -1/+1 |
| | |/ | | | | | | | | | | | | | * Entities properly handle chunks * Changed EntityStatus enums to be less shouty | ||||
* | | | Removed old include | daniel0916 | 2014-04-18 | 1 | -1/+1 |
| | | | |||||
* | | | Fixed some Errors (not all) | daniel0916 | 2014-04-17 | 1 | -7/+10 |
| | | | |||||
* | | | Modified many things | daniel0916 | 2014-04-17 | 1 | -856/+1 |
| | | | |||||
* | | | Fixed conflicting enchantments checking | daniel0916 | 2014-04-16 | 1 | -23/+23 |
| | | | |||||
* | | | Added deletions from merge conflict | daniel0916 | 2014-04-16 | 1 | -0/+875 |
|/ / | |||||
* | | Attempted fix for the client crash with the new protocols. | madmaxoft | 2014-04-15 | 1 | -6/+9 |
| | | |||||
* | | Implemented the 1.7.6 protocol and authenticator. | madmaxoft | 2014-04-14 | 1 | -8/+22 |
| | | | | | | | | 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 | -0/+24 |
| | | | | | | | | 1.7.9 client works with these changes in offline mode. | ||||
* | | Added Yggdrasil Authentication System | daniel0916 | 2014-04-13 | 1 | -2/+5 |
|/ | | | | Code by Howaner. Fixes/Changes by me. | ||||
* | Merge branch 'master' into HTTPSizeT | madmaxoft | 2014-04-04 | 1 | -3/+3 |
|\ | |||||
| * | Fixed some Clang warnings in protocols. | madmaxoft | 2014-04-04 | 1 | -2/+2 |
| | | |||||
| * | Simplified and fixed slabs, fixes #835 | Tiger Wang | 2014-03-31 | 1 | -1/+1 |
| | | |||||
* | | Fixed All signedness warnings in HTTPServer.cpp | Tycho | 2014-04-02 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #838 from mc-server/lilypads | worktycho | 2014-03-30 | 1 | -6/+8 |
|\ | | | | | Lilypads | ||||
| * | Compare for inequality in FACE_NONE checks | Tiger Wang | 2014-03-29 | 1 | -3/+3 |
| | | |||||
| * | Removed leftover clienthandle code | Tiger Wang | 2014-03-29 | 1 | -10/+6 |
| | | |||||
| * | Fixed block interaction rate check | Tiger Wang | 2014-03-28 | 1 | -2/+4 |
| | | |||||
| * | Implemented lilypad placement | Tiger Wang | 2014-03-23 | 1 | -4/+8 |
| | | |||||
* | | Fixed players not updating after world change | Tiger Wang | 2014-03-29 | 1 | -4/+2 |
|/ | | | | Addendum to 6dea7993f2a563a8b3a0746feeb2174922631526 | ||||
* | Merge branch 'Werror' into warnings | Tycho | 2014-03-12 | 1 | -3/+0 |
|\ | | | | | | | | | Conflicts: src/Globals.h | ||||
| * | Merge branch 'master' into Werror | Tycho | 2014-03-12 | 1 | -3/+0 |
| |\ | | | | | | | | | | | | | Conflicts: src/Generating/PieceGenerator.cpp | ||||
| | * | Unified Vector classes | andrew | 2014-03-11 | 1 | -3/+0 |
| | | | |||||
* | | | Fixed a load of format string errors | Tycho | 2014-03-11 | 1 | -1/+1 |
|/ / | |||||
* / | Removed Some unnessicary macros | Tycho | 2014-03-10 | 1 | -13/+0 |
|/ | |||||
* | Merge pull request #731 from mc-server/ballisticmissiles | Tiger Wang | 2014-03-09 | 1 | -29/+19 |
|\ | | | | | Ballistic firework missiles | ||||
| * | != FACE_NONE | Tiger Wang | 2014-03-09 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into ballisticmissiles | Tiger Wang | 2014-03-09 | 1 | -9/+28 |
| |\ | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | | Fixed data length issues | Tiger Wang | 2014-03-09 | 1 | -1/+1 |
| | | | |||||
| * | | CheckBlockInteractionsRate() fixed & enabled | Tiger Wang | 2014-03-09 | 1 | -29/+19 |
| | | | |||||
* | | | Merge pull request #777 from jfhumann/issue317 | Mattes D | 2014-03-09 | 1 | -28/+30 |
|\ \ \ | | | | | | | | | Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions | ||||
| * | | | Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting. | Jan-Fabian Humann | 2014-03-08 | 1 | -28/+30 |
| | | | | |||||
* | | | | Merge pull request #775 from worktycho/warnings | Mattes D | 2014-03-09 | 1 | -2/+2 |
|\ \ \ \ | |_|_|/ |/| | | | Fixed a few warnings | ||||
| * | | | Fixed issues with int vs size_t and a few other warnings | Tycho | 2014-03-08 | 1 | -2/+2 |
| |/ / | |||||
* / / | Slight plugin messaging changes | Tiger Wang | 2014-03-09 | 1 | -0/+13 |
|/ / | | | | | | | | | - Clients are not allowed to register duplicate channels - Clients are not allowed to use channels that were not registered | ||||
* | | Add data backsending, when the Client interacts a Block and the Interact is cancelled. | Howaner | 2014-03-05 | 1 | -4/+10 |
| | | |||||
* | | cBlockInfo now manages the respective cBlockHandler | andrew | 2014-03-02 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #738 from xdot/master | Mattes D | 2014-03-02 | 1 | -1/+1 |
|\ \ | | | | | | | Refactored global block property arrays | ||||
| * | | g_BlockXXX => cBlockInfo::XXX | andrew | 2014-03-01 | 1 | -1/+1 |
| |/ | |||||
* | | Use switch in GetStepSound | Howaner | 2014-02-28 | 1 | -1/+1 |
| | | |||||
* | | Fix Double Slabs, fix Slab Meta and add more things to burnable | Howaner | 2014-02-28 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #669 from xdot/master | Tiger Wang | 2014-02-24 | 1 | -0/+27 |
|\ | | | | | Implementation of in-game maps :D | ||||
| * | Manual merge (Fixed conflicts) | andrew | 2014-02-20 | 1 | -9/+34 |
| |\ | |||||
| * | | Map decorators; Map clients | andrew | 2014-02-18 | 1 | -13/+9 |
| | | | |||||
| * | | Map item handler; Fixed several bugs | andrew | 2014-02-17 | 1 | -2/+0 |
| | | | |||||
| * | | cMap::UpdateRadius | andrew | 2014-02-15 | 1 | -0/+2 |
| | | | |||||
| * | | Send map when selected | andrew | 2014-02-14 | 1 | -0/+13 |
| | | | |||||
| * | | Implementation of in-game maps | andrew | 2014-02-13 | 1 | -0/+18 |
| | | | |||||
* | | | Use the ItemCategorie::IsSword() Method. | Howaner | 2014-02-23 | 1 | -1/+1 |
| | | | |||||
* | | | No Sword Block Destroying in Creative Mode | Howaner | 2014-02-23 | 1 | -0/+10 |
| | | | |||||
* | | | cClientHandle manages the client-registered plugin channels. | madmaxoft | 2014-02-20 | 1 | -10/+77 |
| |/ |/| | | | | | Fixes #706. | ||||
* | | Implemented paintings, fixes #689 | Tiger Wang | 2014-02-18 | 1 | -0/+8 |
| | | | | | | | | + Implemented paintings | ||||
* | | Links sent via chat messages are clickable. | madmaxoft | 2014-02-16 | 1 | -8/+14 |
| | | | | | | | | Fixes #658. | ||||
* | | Add Locale to ClientHandle | Howaner | 2014-02-16 | 1 | -0/+1 |
| | | |||||
* | | Implemented cCompositeChat. | madmaxoft | 2014-02-15 | 1 | -1/+11 |
|/ | | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678. | ||||
* | Merge branch 'master' into playerimprovements | Tiger Wang | 2014-02-09 | 1 | -5/+5 |
|\ | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| * | Improved Type safety of eBlockFace | Tycho | 2014-02-04 | 1 | -5/+5 |
| | | | | | | | | May Fix #640 | ||||
* | | Added sender name to PM if prefixes disabled | Tiger Wang | 2014-02-07 | 1 | -1/+1 |
| | | | | | | | | * Also moved the PVP setting into Mechanics | ||||
* | | Improved chat messaging functions | Tiger Wang | 2014-02-07 | 1 | -6/+108 |
| | | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API. | ||||
* | | Server internally uses new functions | Tiger Wang | 2014-02-06 | 1 | -8/+6 |
| | | |||||
* | | Reduced max explosions per tick | Tiger Wang | 2014-02-05 | 1 | -1/+1 |
| | | |||||
* | | Fixed explosions bug | Tiger Wang | 2014-02-05 | 1 | -20/+10 |
| | | | | | | | | * Fixed bug where explosions would sometimes never be sent | ||||
* | | Fixed a crash bug | Tiger Wang | 2014-02-03 | 1 | -8/+2 |
| | | |||||
* | | Server now handles join messages also | Tiger Wang | 2014-02-03 | 1 | -9/+11 |
|/ | | | | * Revised as well hook documentation | ||||
* | Changed Signiture of OnDigging | Tycho | 2014-02-01 | 1 | -3/+3 |
| | |||||
* | Changed Signiture of OnDestroyedByPlayer | Tycho | 2014-02-01 | 1 | -3/+4 |
| | |||||
* | Changed pointers to references | Tycho | 2014-02-01 | 1 | -4/+3 |
| | |||||
* | Changed signitures of Several BLockHandler Methods | Tycho | 2014-02-01 | 1 | -1/+2 |
| | | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check | ||||
* | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-01-26 | 1 | -27/+12 |
|\ | | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h | ||||
| * | Merge pull request #587 from mc-server/mobimprovements | Mattes D | 2014-01-25 | 1 | -1/+1 |
| |\ | | | | | | | Mob improvements & rudimentary artificial intelligence | ||||
| | * | Two minor changes | Tiger Wang | 2014-01-25 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed a possible deadlock on client disconnect. | madmaxoft | 2014-01-24 | 1 | -9/+0 |
| |/ | |||||
| * | Merge remote-tracking branch 'MikeHunsinger/master' | madmaxoft | 2014-01-24 | 1 | -2/+3 |
| |\ | |||||
| | * | Split TossItem into three Toss functions (Held, Equipped and Pickup) | Mike Hunsinger | 2014-01-23 | 1 | -2/+3 |
| | | | |||||
| * | | Command block fixes 2 | andrew | 2014-01-23 | 1 | -16/+9 |
| | | | |||||
* | | | Refactored cBlockHandler::OnUse and dependents | Tycho | 2014-01-26 | 1 | -1/+4 |
| | | | |||||
* | | | First attempt at Implementing Interfaces | Tycho | 2014-01-25 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'master' of https://github.com/mc-server/MCServer | andrew | 2014-01-21 | 1 | -8/+22 |
|\| | |||||
| * | Merge pull request #565 from mc-server/commandblockfixes | Mattes D | 2014-01-19 | 1 | -3/+21 |
| |\ | | | | | | | Command block fixes | ||||
| | * | Removed unneeded paramters | Tiger Wang | 2014-01-19 | 1 | -2/+2 |
| | | | |||||
| | * | Changed SendBlockEntity format slightly | Tiger Wang | 2014-01-19 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | * Writing NBT is now in Protocol, not BlockEntity files * Fixed a last output bug | ||||
| | * | Implemented MC|Brand response | Tiger Wang | 2014-01-19 | 1 | -3/+9 |
| | | | |||||
| | * | Improved command blocks | Tiger Wang | 2014-01-19 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | * Their command and previous output are displayed on the client * They have a BlockHandler implementation, so you can't place blocks on them anymore + As a side effect, implemented UpdateBlockEntity | ||||
| * | | Rewritten SocketThreads for proper shutdown scenario. | madmaxoft | 2014-01-19 | 1 | -5/+1 |
| |/ | | | | | | | This fixes #560 and #390. | ||||
* | | Scoreboard SendTo() | andrew | 2014-01-21 | 1 | -0/+3 |
| | | |||||
* | | Scoreboard protocol support | andrew | 2014-01-21 | 1 | -0/+30 |
|/ | |||||
* | Command block fixes | andrew | 2014-01-18 | 1 | -5/+12 |
| | |||||
* | Parse the MC|AdvCdm plugin message | andrew | 2014-01-18 | 1 | -0/+64 |
| | |||||
* | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 1 | -2/+2 |
| | |||||
* | Implemented Ctrl-Q drop stack | Tiger Wang | 2014-01-15 | 1 | -0/+11 |
| | | | | Also fixed an issue with TossItems not respecting count. | ||||
* | Added cClientHandle::SendPluginMessage(). | madmaxoft | 2014-01-09 | 1 | -0/+9 |
| | | | | It is not yet exported in the API, though. | ||||
* | Plugin messages are received and handed to plugins. | madmaxoft | 2014-01-07 | 1 | -0/+9 |
| | | | | Note that MCS doesn't currently handle any channel registrations, this will come later on. | ||||
* | fixed ClientHandle warnings | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+1 |
| | |||||
* | Implented BroadcastParticleEffect | STRWarrior | 2013-12-22 | 1 | -0/+9 |
| | |||||
* | Fixed the rest of constructor reorders. | madmaxoft | 2013-12-20 | 1 | -21/+20 |
| | |||||
* | Merge pull request #450 from mc-server/redstonefixes | Mattes D | 2013-12-19 | 1 | -4/+26 |
|\ | | | | | Multiple fixes | ||||
| * | Fixed PlayerAbilities and creative | Tiger Wang | 2013-12-19 | 1 | -3/+3 |
| | | |||||
| * | Fixed 1.7 arm swing animation | Tiger Wang | 2013-12-19 | 1 | -1/+23 |
| | | |||||
* | | Disconnection message no longer shown if ping | Tiger Wang | 2013-12-18 | 1 | -5/+8 |
| | | |||||
* | | The "<>" of a player name is now coloured | Tiger Wang | 2013-12-18 | 1 | -1/+1 |
| | | |||||
* | | Fixed 1.7 player disconnection not calling hook | Tiger Wang | 2013-12-18 | 1 | -4/+14 |
|/ | | | | This fixes #357 | ||||
* | Renamed back EntityAnimation to PlayerAnimation | Tiger Wang | 2013-12-18 | 1 | -1/+1 |
| | | | | | This fixes #411 and partially reverts 30ead790490f04248b861db79fddde9148b552f4 | ||||
* | Fixed cClientHandle::Tick() being called from two threads. | madmaxoft | 2013-12-16 | 1 | -6/+43 |
| | | | | | When the player was initialized, the Tick() function continued to stream chunk, while the cWorld called Tick() from its tick thread. Final fix for #187. | ||||
* | Fixed multiple player spawn broadcasts. | madmaxoft | 2013-12-16 | 1 | -3/+0 |
| | |||||
* | Merge pull request #437 from mc-server/ShootTo_function | STRWarrior | 2013-12-15 | 1 | -2/+0 |
|\ | | | | | Shoot to function | ||||
| * | This adds a function that allows you to 'shoot' a player towards a direction. | STRWarrior | 2013-12-15 | 1 | -2/+0 |
| | | |||||
* | | Fixed calling OnPlayerJoined() in the wrong place. | madmaxoft | 2013-12-15 | 1 | -6/+1 |
|/ | | | | This is the first part of a fix for #187. | ||||
* | Moved reading flags to the protocol. | STRWarrior | 2013-12-15 | 1 | -17/+3 |
| | |||||
* | Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() function | STRWarrior | 2013-12-15 | 1 | -0/+33 |
| | |||||
* | Forgot to commit the ClientHandle. | STRWarrior | 2013-12-14 | 1 | -0/+18 |
| | |||||
* | Unknown packet type extended to 32 bits. | madmaxoft | 2013-12-12 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures | Tiger Wang | 2013-12-08 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp | ||||
| * | Moved bindings-related to a Bindings subfolder. | madmaxoft | 2013-12-08 | 1 | -1/+1 |
| | | | | | | | | Ref.: #407 | ||||
* | | Fixed trapdoors not toggling | Tiger Wang | 2013-12-07 | 1 | -1/+1 |
| | | | | | | | | The redstone simulator kept on resetting them. | ||||
* | | Renamed animation function | Tiger Wang | 2013-12-07 | 1 | -7/+7 |
| | | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know. | ||||
* | | Fixed bed leave animation | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
| | | |||||
* | | Updated comments for slabs | Tiger Wang | 2013-12-06 | 1 | -5/+6 |
|/ | |||||
* | Switched to using provided ReadItem function. | Samuel Barney | 2013-12-02 | 1 | -0/+9 |
| | | | | Fixed misplacing when clicking on the bottom of bottom slabs and the top of top slabs. | ||||
* | Properly fixed snow height, fixes #98 and #264 | Tiger Wang | 2013-11-30 | 1 | -9/+14 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -0/+9 |
| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 1 | -0/+12 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+2198 |