| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -40/+81 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | More trailing whitespace fixes. | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| | | | |||||
| | * | Basic style fixes. | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| | | | |||||
| | * | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -9/+9 |
| | | | | | | | | | | | 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. | ||||
| | * | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 1 | -5/+5 |
| | | | |||||
| | * | Merge pull request #1154 from mc-server/trappedchests | Tiger Wang | 2014-07-13 | 1 | -8/+57 |
| | |\ | | | | | | | Implemented trapped chests & others | ||||
| | | * | Suggestions and bug fix | Tiger Wang | 2014-07-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | * Fixed hoppers pushing/pulling to/from (trapped)chests that do not form a double-chest with the chest type directly connected to said hopper; thank you, @madmaxoft | ||||
| | | * | Implemented trapped chests & others | Tiger Wang | 2014-07-07 | 1 | -8/+57 |
| | | | | | | | | | | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes | ||||
| | * | | Added drop window action. | Howaner | 2014-07-06 | 1 | -15/+7 |
| | |/ | |||||
| | * | Merge pull request #1138 from mc-server/enderchest | Mattes D | 2014-07-02 | 1 | -2/+2 |
| | |\ | | | | | | | Properly implemented enderchests | ||||
| | | * | Properly implemented enderchests | Tiger Wang | 2014-06-29 | 1 | -2/+2 |
| | | | | |||||
| | * | | Only fixes the server crash. | Howaner | 2014-07-01 | 1 | -6/+0 |
| | | | | |||||
| | * | | Fix server-crash with non-existing items. | Howaner | 2014-07-01 | 1 | -1/+7 |
| | |/ | |||||
| * | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 1 | -0/+1 |
| |\| | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp | ||||
| | * | Changed the m_slotarea position | Julian Laubstein | 2014-05-19 | 1 | -2/+2 |
| | | | |||||
| | * | Fixed some warnings in Server.cpp, and in UI/ | Julian Laubstein | 2014-05-19 | 1 | -1/+2 |
| | | | |||||
| * | | Suggestions | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
| |/ | |||||
| * | Fixed MSVC 64-bit build warnings. | Mattes D | 2014-05-09 | 1 | -1/+1 |
| | | |||||
| * | Add clicks, exp subtraction, item check, ... | Howaner | 2014-05-05 | 1 | -3/+32 |
| | | |||||
| * | Add MC|ItemName plugin message. | Howaner | 2014-05-05 | 1 | -1/+2 |
| | | |||||
| * | Add anvil window and slot area. | Howaner | 2014-05-05 | 1 | -0/+15 |
| | | |||||
| * | Fixed Code | daniel0916 | 2014-04-19 | 1 | -6/+2 |
| | | |||||
| * | Modified many things | daniel0916 | 2014-04-17 | 1 | -38/+3 |
| | | |||||
| * | Add more checks to cSlotAreaEnchanting | Howaner | 2014-04-15 | 1 | -1/+1 |
| | | |||||
| * | Added complete Enchanting System | daniel0916 | 2014-04-12 | 1 | -1/+85 |
| | | | | | http://minecraft.gamepedia.com/Enchantment_mechanics | ||||
| * | Merge remote-tracking branch 'upstream/master' into Enchanting | daniel0916 | 2014-04-07 | 1 | -5/+28 |
| |\ | |||||
| | * | Added additional macros to support the MSVC size_t format and changed all formats to use the macros | Tycho | 2014-03-12 | 1 | -1/+1 |
| | | | |||||
| | * | Fixed a load of format string errors | Tycho | 2014-03-11 | 1 | -1/+1 |
| | | | |||||
| | * | Fixed indentation once and for all. | Mike Hunsinger | 2014-01-24 | 1 | -15/+15 |
| | | | |||||
| | * | Fixed indentation and doxygen comments... For real this time. | Mike Hunsinger | 2014-01-24 | 1 | -12/+12 |
| | | | |||||
| | * | Fixed spacing and doxycomments. | Mike Hunsinger | 2014-01-24 | 1 | -12/+10 |
| | | | |||||
| | * | Removed extra line | Mike Hunsinger | 2014-01-23 | 1 | -2/+0 |
| | | | |||||
| | * | Split TossItem into three Toss functions (Held, Equipped and Pickup) | Mike Hunsinger | 2014-01-23 | 1 | -5/+32 |
| | | | |||||
| * | | Some updates for enchanting | daniel0916 | 2014-01-24 | 1 | -1/+1 |
| | | | |||||
| * | | first changes for enchanting (not finished) | daniel0916 | 2014-01-20 | 1 | -0/+15 |
| |/ | | | | | | | | - 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... | ||||
| * | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 1 | -1/+1 |
| | | |||||
| * | added default fallthrough clause to switch at line 178 of src/UI/Window.cpp | Tycho Bickerstaff | 2013-12-08 | 1 | -0/+4 |
| | | |||||
| * | Reordered Listed Initalisation order in src/UI/Window.cpp | Tycho Bickerstaff | 2013-12-08 | 1 | -2/+2 |
| | | | | | | | | Reordered the Listed Initalisation order for CWindow to the executed initalisation order. The compiler initalises values in the order the fields are declared not the initalisations listed | ||||
| * | Added basic ender chests | Tiger Wang | 2013-12-07 | 1 | -0/+38 |
| | | | | | Note that they just mirror chests now, so no per player inventory. | ||||
| * | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+886 |
 |
index : anonymous/cuberite | |
| A lightweight, fast and extensible game server for Minecraft | mirror |
| summaryrefslogtreecommitdiffstats |