Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Broken | tycho | 2015-12-18 | 4 | -21/+21 |
| | |||||
* | Moved variables into scope, removed unused variables and fixed variables | Lukas Pioch | 2015-12-17 | 1 | -2/+1 |
| | |||||
* | Add enum for Sound and Particle Effects | Dave Tucker | 2015-11-24 | 1 | -3/+4 |
| | | | | | | Fixes #2603 Signed-off-by: Dave Tucker <dave@dtucker.co.uk> | ||||
* | Implemented brewing | Lukas Pioch | 2015-11-03 | 6 | -0/+372 |
| | |||||
* | Unified the doxy-comment format. | Mattes D | 2015-07-31 | 3 | -66/+54 |
| | |||||
* | Silenced and fixed many warning messages across multiple files. | Samuel Barney | 2015-07-29 | 5 | -43/+42 |
| | |||||
* | Fixed custom recipes result clientside bug. | Mattes D | 2015-07-26 | 1 | -0/+8 |
| | | | | Fixes #2345. | ||||
* | Fix comments | tycho | 2015-05-28 | 1 | -6/+9 |
| | |||||
* | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-28 | 2 | -12/+10 |
|\ | | | | | | | | | Conflicts: src/Inventory.cpp | ||||
| * | Merge pull request #2061 from mc-server/fixes | Alexander Harkness | 2015-05-27 | 2 | -12/+10 |
| |\ | | | | | | | Fixes | ||||
| | * | Fixes #2041 | Tiger Wang | 2015-05-24 | 1 | -3/+3 |
| | | | |||||
| | * | Fixes #2003 | Tiger Wang | 2015-05-18 | 2 | -9/+7 |
| | | | |||||
* | | | Made -Weverything an error. | tycho | 2015-05-24 | 3 | -7/+18 |
| | | | |||||
* | | | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-23 | 1 | -1/+1 |
|\| | | |||||
| * | | Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher. | Lukas Pioch | 2015-05-23 | 1 | -1/+1 |
| |/ | |||||
* / | Make -Werror disabling file only | tycho | 2015-05-19 | 1 | -0/+5 |
|/ | | | | Ad fix a load of warnings | ||||
* | CheckBasicStyle: checks spaces around * and &. | Mattes D | 2015-05-09 | 1 | -1/+1 |
| | |||||
* | More style checking. | Mattes D | 2015-05-09 | 4 | -4/+4 |
| | | | | Spaces around some operators are checked. | ||||
* | Narrowed WindowID to use only 7 bits. | Mattes D | 2015-04-21 | 2 | -3/+7 |
| | | | | Ref.: http://forum.mc-server.org/showthread.php?tid=1876 | ||||
* | Changed cEntity::m_UniqueID to UInt32. | Mattes D | 2015-03-21 | 1 | -7/+10 |
| | |||||
* | Moved window code into cpp files | Howaner | 2015-03-10 | 21 | -516/+836 |
| | |||||
* | Readded old comment | Howaner | 2015-02-06 | 1 | -0/+2 |
| | |||||
* | Readded old DistributeStackToAreas() comment. | Howaner | 2015-01-25 | 1 | -2/+5 |
| | |||||
* | C++11 and function rename. | Howaner | 2014-12-17 | 13 | -48/+51 |
| | |||||
* | Implemented vanilla-like shift click. | Howaner | 2014-12-13 | 15 | -105/+380 |
| | | | This fixes many visual bugs. | ||||
* | Own classes for all windows. | Howaner | 2014-12-13 | 16 | -591/+633 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into c++11 | Tiger Wang | 2014-12-06 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: src/OSSupport/Thread.cpp | ||||
| * | Fixed reported parentheses around comparisons. | Mattes D | 2014-12-05 | 1 | -1/+1 |
| | | |||||
* | | Merged branch 'master' into c++11. | Mattes D | 2014-10-23 | 1 | -1/+1 |
|\| | |||||
| * | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 4 | -44/+44 |
| | | |||||
* | | Replace &*[0] accesses with .data() | Tiger Wang | 2014-10-21 | 1 | -2/+2 |
| | | |||||
* | | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-20 | 4 | -44/+44 |
|/ | |||||
* | Merge pull request #1502 from mc-server/furnaces | Tiger Wang | 2014-10-18 | 2 | -27/+11 |
|\ | | | | | Improved furnaces | ||||
| * | Improved furnaces | Tiger Wang | 2014-10-03 | 2 | -27/+11 |
| | | | | | | | | | | | | | | | | * Fixed progress bar on 1.8 * Fixed bugs * Improved code * Fixes #1068 * Fixes #1070 | ||||
* | | Functions in cPluginManager get references instead of pointers. | Mattes D | 2014-10-15 | 1 | -2/+2 |
|/ | |||||
* | Suggestions | Tiger Wang | 2014-09-27 | 1 | -11/+57 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into chestcarts | Tiger Wang | 2014-09-27 | 2 | -1/+30 |
|\ | | | | | | | | | Conflicts: src/Entities/Minecart.cpp | ||||
| * | 1.8: Fixed inventory open packet. | Howaner | 2014-09-11 | 2 | -1/+30 |
| | | |||||
* | | e.t.c. -> etc. | Tiger Wang | 2014-09-13 | 1 | -1/+1 |
| | | | | | | etcetera, not egg tray conglomerate :P | ||||
* | | Added newlines | Tiger Wang | 2014-09-13 | 1 | -1/+5 |
| | | |||||
* | | Implemented Chest Minecarts | Tiger Wang | 2014-09-13 | 5 | -68/+95 |
|/ | |||||
* | Added comments. | Hownaer | 2014-08-28 | 1 | -1/+3 |
| | |||||
* | Fixed crashes and use std::swap. | Hownaer | 2014-08-28 | 1 | -6/+3 |
| | |||||
* | Enchanting table improvements. | Hownaer | 2014-08-28 | 4 | -134/+101 |
| | |||||
* | Renamed functions and added beacon json saving. | Howaner | 2014-07-31 | 1 | -2/+2 |
| | |||||
* | Added beacon. | Howaner | 2014-07-30 | 4 | -0/+276 |
| | |||||
* | Merge branch 'master' into portals | Tiger Wang | 2014-07-29 | 2 | -3/+16 |
|\ | | | | | | | | | Conflicts: src/World.h | ||||
| * | Change comment. | Howaner | 2014-07-26 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into Inventory | Howaner | 2014-07-26 | 3 | -9/+15 |
| |\ | |||||
| * | | Add armor items directly to the armor slots. | Howaner | 2014-07-20 | 2 | -3/+3 |
| | | | |||||
| * | | Moved comment. | Howaner | 2014-07-18 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed the armor slot in creative mode. Also removed that armor get directly to the armor slot. It is extremely buggy and unnecessary. | Howaner | 2014-07-18 | 1 | -0/+13 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 3 | -9/+15 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | 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 | 2 | -4/+4 |
| | | | |||||
| * | | Subdirs: Only add_library if not using MSVC | archshift | 2014-07-19 | 1 | -1/+3 |
| | | | |||||
| * | | UI/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+9 |
| |/ | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 5 | -97/+365 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp | ||||
| * | Fixed tabs used for alignment. | madmaxoft | 2014-07-17 | 1 | -2/+2 |
| | | |||||
| * | More trailing whitespace fixes. | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| | | |||||
| * | Basic style fixes. | madmaxoft | 2014-07-17 | 4 | -8/+8 |
| | | |||||
| * | Normalized comments. | madmaxoft | 2014-07-17 | 2 | -25/+25 |
| | | | | | | | | | | 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 | 2 | -9/+63 |
| |\ | | | | | | | 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 | 2 | -9/+63 |
| | | | | | | | | | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes | ||||
| * | | Merge pull request #1157 from Howaner/Window | Mattes D | 2014-07-09 | 3 | -41/+237 |
| |\ \ | | |/ | |/| | Add more inventory actions. | ||||
| | * | Removed unused include line. | Howaner | 2014-07-09 | 1 | -1/+0 |
| | | | |||||
| | * | Added inventory number click. | Howaner | 2014-07-09 | 2 | -1/+43 |
| | | | |||||
| | * | Added drop window action. | Howaner | 2014-07-06 | 3 | -25/+113 |
| | | | |||||
| | * | Add middle click. | Howaner | 2014-07-05 | 2 | -21/+88 |
| | | | |||||
| * | | Fixed crafting grid updating. | Mattes D | 2014-07-06 | 2 | -2/+21 |
| |/ | | | | | | | Fixes #1152. | ||||
| * | Merge pull request #1138 from mc-server/enderchest | Mattes D | 2014-07-02 | 2 | -5/+4 |
| |\ | | | | | | | Properly implemented enderchests | ||||
| | * | Removed bad comment | Tiger Wang | 2014-06-29 | 1 | -1/+0 |
| | | | |||||
| | * | Properly implemented enderchests | Tiger Wang | 2014-06-29 | 2 | -4/+4 |
| | | | |||||
| * | | 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 | ||||
| * | Merge pull request #1011 from SphinxC0re/SomeWarningFixes | Mattes D | 2014-06-04 | 1 | -0/+1 |
| |\ | | | | | | | Fixed some warnings | ||||
| | * | 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 | 2 | -2/+4 |
| | | | |||||
* | | | Suggestions | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
|/ / | |||||
* | | derp | worktycho | 2014-06-04 | 1 | -1/+1 |
| | | |||||
* | | Make sure m_StackSizeToBeUsedInRepair Always has a valid value | worktycho | 2014-06-04 | 1 | -1/+3 |
| | | |||||
* | | Players can't set items in the result slot, when they shift a item. | Howaner | 2014-06-01 | 2 | -0/+39 |
| | | |||||
* | | Add HandleSmeltItem() call for achievements. | Howaner | 2014-06-01 | 1 | -7/+11 |
| | | |||||
* | | Missing return; | Howaner | 2014-06-01 | 1 | -0/+1 |
| | | |||||
* | | Set DraggingItem to Slot directly. | Howaner | 2014-05-31 | 1 | -1/+1 |
| | | |||||
* | | Fix DBL bug. | Howaner | 2014-05-31 | 1 | -5/+4 |
| | | |||||
* | | Change "Slot.IsEmpty()" to "Slot.m_ItemCount <= 0" | Howaner | 2014-05-31 | 1 | -1/+1 |
| | | |||||
* | | Fix the furnace result slot. | Howaner | 2014-05-30 | 1 | -2/+90 |
| | | |||||
* | | Merge pull request #998 from mc-server/StatManager | Mattes D | 2014-05-18 | 2 | -1/+47 |
|\ \ | |/ |/| | Statistic Manager | ||||
| * | cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement() | andrew | 2014-05-12 | 2 | -1/+47 |
| | | |||||
* | | Fixed anvil exp removing | tonibm19 | 2014-05-16 | 1 | -1/+1 |
|/ | |||||
* | Fixed MSVC 64-bit build warnings. | Mattes D | 2014-05-09 | 2 | -2/+2 |
| | |||||
* | Change m_RepairCost to int. | Howaner | 2014-05-07 | 1 | -9/+3 |
| | |||||
* | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs. | Howaner | 2014-05-07 | 1 | -24/+36 |
| | |||||
* | Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count() | Howaner | 2014-05-06 | 1 | -6/+5 |
| | |||||
* | Fix SetRepairedItemName() in SlotArea.cpp | Howaner | 2014-05-05 | 1 | -1/+1 |
| | |||||
* | Add comments to CanTakeResultItem() | Howaner | 2014-05-05 | 1 | -5/+5 |
| | |||||
* | Add doxycomments to cSlotAreaAnvil functions. | Howaner | 2014-05-05 | 1 | -0/+2 |
| | |||||
* | Add anvil shift click. | Howaner | 2014-05-05 | 2 | -5/+86 |
| | |||||
* | This isn't a enchantment table :D | Howaner | 2014-05-05 | 1 | -1/+1 |
| | |||||
* | Add clicks, exp subtraction, item check, ... | Howaner | 2014-05-05 | 4 | -16/+204 |
| | |||||
* | Add MC|ItemName plugin message. | Howaner | 2014-05-05 | 4 | -8/+16 |
| | |||||
* | Add anvil window and slot area. | Howaner | 2014-05-05 | 4 | -0/+229 |
| | |||||
* | Cmake generated projects for IDEs include headers in project files. | archshift | 2014-04-25 | 1 | -0/+1 |
| | |||||
* | Add armor to switch() in ItemHandler.cpp | Howaner | 2014-04-24 | 1 | -1/+1 |
| | |||||
* | Fix armor in survival mode. | Howaner | 2014-04-24 | 2 | -1/+80 |
| | |||||
* | Merge pull request #909 from jfhumann/fixes | Mattes D | 2014-04-22 | 1 | -5/+6 |
|\ | | | | | | | | | 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 | ||||
| * | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 1 | -5/+6 |
| | | |||||
* | | Fixed MSVC compilation. | madmaxoft | 2014-04-20 | 1 | -1/+1 |
| | | |||||
* | | Fixed Code | daniel0916 | 2014-04-19 | 2 | -8/+5 |
| | | |||||
* | | Modified many things | daniel0916 | 2014-04-17 | 3 | -55/+54 |
| | | |||||
* | | Fixed double enchanting items | daniel0916 | 2014-04-16 | 1 | -2/+2 |
| | | |||||
* | | Added Book Enchanting | daniel0916 | 2014-04-15 | 1 | -1/+1 |
| | | |||||
* | | Add more checks to cSlotAreaEnchanting | Howaner | 2014-04-15 | 3 | -99/+212 |
| | | |||||
* | | Added ItemPlaceCount in SlotArea | daniel0916 | 2014-04-14 | 2 | -0/+35 |
| | | | | | | | | Thanks to Howaner for helping | ||||
* | | Blocked enchanting a item twice | daniel0916 | 2014-04-14 | 2 | -8/+10 |
| | | |||||
* | | Fixed Bookshelf Checking | daniel0916 | 2014-04-14 | 1 | -8/+10 |
| | | | | | | | | Code by LO1ZB | ||||
* | | Bug fixes | daniel0916 | 2014-04-14 | 2 | -21/+19 |
| | | |||||
* | | Fixed invisibility enchantments | daniel0916 | 2014-04-13 | 2 | -0/+4 |
| | | |||||
* | | Some Fixes | daniel0916 | 2014-04-13 | 1 | -1/+1 |
| | | |||||
* | | Fixed Bookshelves Checking (not completly) | daniel0916 | 2014-04-12 | 1 | -7/+10 |
| | | |||||
* | | Added complete Enchanting System | daniel0916 | 2014-04-12 | 3 | -20/+135 |
| | | | | | | | | http://minecraft.gamepedia.com/Enchantment_mechanics | ||||
* | | Merge remote-tracking branch 'upstream/master' into Enchanting | daniel0916 | 2014-04-07 | 4 | -8/+65 |
|\| | |||||
| * | Fixed non-virtual destructors warnings. | madmaxoft | 2014-03-28 | 1 | -0/+4 |
| | | |||||
| * | 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 multiple gcc warnings about unused params. | madmaxoft | 2014-02-28 | 2 | -3/+33 |
| | | |||||
| * | 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 |
| | | |||||
* | | Added Enchantment-Slot-Level generating | daniel0916 | 2014-04-07 | 1 | -9/+19 |
| | | |||||
* | | Some updates for enchanting | daniel0916 | 2014-01-24 | 2 | -13/+13 |
| | | |||||
* | | first changes for enchanting (not finished) | daniel0916 | 2014-01-20 | 4 | -0/+141 |
|/ | | | | | | | | - 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 internal cEntity::GetRot() usage. | madmaxoft | 2014-01-17 | 1 | -1/+1 |
| | |||||
* | Really did what xoft wanted | Tiger Wang | 2014-01-16 | 1 | -5/+8 |
| | |||||
* | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 2 | -4/+4 |
| | |||||
* | Possibly did what xoft wanted | Tiger Wang | 2014-01-16 | 1 | -10/+3 |
| | |||||
* | Implemented custom names and lore | Tiger Wang | 2014-01-15 | 1 | -0/+7 |
| | | | | | | + Added custom names and lore + Added saving and loading + Added writing and parsing of NBT | ||||
* | More MSVC warning fixes. | madmaxoft | 2014-01-07 | 1 | -2/+2 |
| | |||||
* | added zlib and UI | Tycho Bickerstaff | 2013-12-18 | 1 | -0/+11 |
| | |||||
* | 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 | ||||
* | Removed unused variable ResultSlot | Tycho Bickerstaff | 2013-12-08 | 1 | -1/+0 |
| | |||||
* | Fixed Warning Unhandeled enum values in switch as src/UI/SlotArea.cpp line 54 | worktycho | 2013-12-09 | 1 | -1/+4 |
| | |||||
* | Added basic ender chests | Tiger Wang | 2013-12-07 | 4 | -0/+106 |
| | | | | Note that they just mirror chests now, so no per player inventory. | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 5 | -0/+2521 |