Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Warnings improvements | Tiger Wang | 2020-12-18 | 1 | -7/+7 |
| | | | | | | | | | * Turn off global-constructors warning. These are needed to implement cRoot signal handler functionality * Add Clang flags based on version lookup instead of a compile test. The CMake config process is single threaded and slow enough already * Reduced GetStackValue verbosity + Clarify EnchantmentLevel, StayCount, AlwaysTicked, ViewDistance signedness + Give SettingsRepositoryInterface a move constructor to simplify main.cpp code - Remove do {} while (false) construction in redstone handler | ||||
* | Anvil fixes (#4976) | KingCol13 | 2020-10-10 | 1 | -47/+61 |
| | | | | | | | | | | | | | * Rewrite to use wiki target/sacrifice terminology. * Fix negative damages. * Prevent repairing if output matches target. * Make target and sacrifice const. * Pre-PR tidy-up * Keep m_MaximumCost updated. | ||||
* | Fix cmake not adding Werror on clang, and _lots_ of warnings (#4963) | peterbell10 | 2020-10-05 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | * Fix cmake not adding Werror on clang, and _lots_ of warnings * WIP: Build fixes * Cannot make intermediate blockhandler instance * Tiger's changes * Fix BitIndex check * Handle invalid NextState values in cMultiVersionProtocol Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com> | ||||
* | Remove SetProperty(...cPlayer) | Tiger Wang | 2020-10-03 | 6 | -133/+89 |
| | | | | Enchantment table, anvil windows are already opened one per-player. | ||||
* | Enchanting table shows detail on hover. Enchanting is deterministic. (#4937) | KingCol13 | 2020-10-01 | 4 | -37/+93 |
| | | | | | * Use lapis for enchanting, subtract correct number of levels, ClientHandle now selects from pregenerated list. Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com> | ||||
* | Added end portal and enchanting table block entities | 12xx12 | 2020-09-20 | 2 | -3/+3 |
| | |||||
* | Add Statistics and Achievements for newer Network standards | 12xx12 | 2020-08-19 | 1 | -13/+13 |
| | |||||
* | Added HandleCraftItem call to ShiftClickedResult to make sure achievements are awarded (#4791) | 12xx12 | 2020-08-01 | 1 | -0/+3 |
| | |||||
* | Introduce recipe book functionality (#4493) | Tobias Wilken | 2020-07-14 | 6 | -17/+87 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Introduce recipe book functionality The recipe book helps especially new players. Missing it gives the impression that cuberite is not as advanced as it is. The handling of the recipe book uses the following functions: - Unlock Recipes (https://wiki.vg/index.php?title=Protocol&oldid=14204#Unlock_Recipes) to make recipes available and show the notification for new recipes. Initialization is done on player login for known ones, the update is done when new items are discovered. - Craft Recipe Request (https://wiki.vg/index.php?title=Protocol&oldid=14204#Craft_Recipe_Request) when the user selects a recipe from the recipe book to fill the slots. Known recipes are initialized on player login via `Unlock Recipes` with `Action` 0. As soon as a new recipe is discovered this is added via `Unlock Recipes` with `Action` 1. To be able to know and recognize new recipes the player class is extended with `KnownItems` and `KnownRecipes`. As soon as a player touches an item this is compared to the list of `KnownItems`, if the item is unknown the recipes are checked for this item and the other ingredients are checked with the list of `KnownItems`. If a full match is discovered the recipe is unlocked with the client and stored in the `KnownRecipes`. To unlock recipes the recipe ID is sent to the client. A mapping file (for protocol 1.12.2) translated the minecraft recipe names to ids. The crafting.txt is extended with and minecraft recipe names is possible. Limitations: Only a single recipe is added to the crafting area. Multiple clicks or shift click does not increase the number of builds. Co-authored-by: peterbell10 <peterbell10@live.co.uk> * Address first issues mentioned by @peterbell10 - Some linting - Extract loading of recipe specific protocol mapping into a function - Build `RecipeNameMap` only once - Use `std::optional` - Extract `LoadRecipe` from `Window` * Start to implement new suggestions * Update with suggestions from @peterbell10 * Some minor cleanup * Update protocol packet IDs * Remove unused include * Include header in cmake * Change a vector to integer counter * Change dromedaryCase method names to PascalCase * Address suggestions from @madmaxoft * Read Protocol subdirectories to load recipe books To load all recipebooks iterate over the `Protocol` subdirectories to find mapping files. Co-authored-by: peterbell10 <peterbell10@live.co.uk> | ||||
* | cWindow: Convert XYZ to Vector3 (#4764) | MaxwellScroggs | 2020-07-04 | 8 | -40/+21 |
| | |||||
* | Upgrade to C++17 [CMake] (#4717) | Tiger Wang | 2020-05-16 | 1 | -9/+5 |
| | | | * Make our CMake slightly less insane | ||||
* | Enable some more clang-tidy linter checks (#4738) | peterbell10 | 2020-05-15 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Avoid inefficient AString -> c_str() -> AString round trip * Avoid redundant string init expressions * Avoid unnecessary return, continue, etc. * Add .clang-format to help with clang-tidy fix-its * Avoid unnecessary passing by value * Avoid unnecessary local copying * Avoid copying in range-for loops * Avoid over-complicated boolean expressions * Some violations missed by my local clang-tidy * Allow unnecessary continue statements * Add brackets * Another expression missed locally * Move BindingsProcessor call into clang-tidy.sh and add space * Fix pushd not found error * Different grouping of CheckBlockInteractionRate | ||||
* | Update submodules (#4727) | peterbell10 | 2020-05-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | Closes #4708 This updates jsoncpp, mbedtls, TCLAP and SQLiteCpp to their latest stable release. A few additional changes were needed: * jsoncpp deprecated Reader, FastWriter and StyledWriter which I've replaced with some helper functions in JsonUtils.cpp * SQLiteCpp changed how it builds with external sqlite libraries, now expecting them to be installed. The simplest path was to remove sqlite from cuberite's submodule and just use SQLiteCpp's internal version. | ||||
* | Improve entity position updates (#4701) | Tiger Wang | 2020-05-04 | 1 | -4/+1 |
| | | | | | | | | | * Make puking pickups fly nicer * Improve entity position updates * Move determination of whether a delta is too big for a packet into the protocol handlers + Less jittery movement + Generalise CollectEntity to take any entity | ||||
* | Using Super. | Mattes D | 2020-04-16 | 25 | -104/+126 |
| | |||||
* | Inventory changes (#4561) | Mat | 2020-03-28 | 1 | -5/+2 |
| | | | Co-Authored-By: peterbell10 <peterbell10@live.co.uk> | ||||
* | Toss all items from enchantment table (#4569) | Mat | 2020-03-28 | 1 | -2/+2 |
| | |||||
* | Refactored more of Entities and BlockEntities to use Vector3. (#4403) | Mattes D | 2019-09-29 | 12 | -18/+19 |
| | |||||
* | Force all headers other than "Globals.h" to be included with relative paths (#4269) | peterbell10 | 2018-08-29 | 3 | -7/+4 |
| | | | | | | | Closes #4236 CMake now creates a header file in the build directory under the path "include/Globals.h" which just includes "src/Globals.h" with an absolute path. Then instead of adding "src/" to the include directories, it adds "include/". #include "Globals.h" still works by including the build generated file and any other src-relative path will not work. | ||||
* | Handle the lapis slot separately (#4286) | Nate | 2018-08-17 | 1 | -0/+36 |
| | | | | | This is my attempt to fix #4112. The root cause of the issue was that the lapis slot was treated exactly the same as the enchanting slot, so it on the server side it would only ever slot one item. My fix is to check if its the second slot in the window, then check if it's lapis (it would slot whatever). If it is lapis I call the base click handler. | ||||
* | Experience orb (#4259) | changyong guo | 2018-08-02 | 1 | -1/+1 |
| | | | | | | | * Replace cWorld::FindClosesPlayer with cWorld::DoWithClosestPlayer * Implement experience reward splitting into the orb sizes used in vanilla * Modified speed calculation in cExpOrb::Tick to make the orbs fly towards the player Fixes #4216 | ||||
* | cWorld: Manually bind deprecated broadcast functions (#4265) | peterbell10 | 2018-07-27 | 1 | -3/+4 |
| | | | Ref: https://github.com/cuberite/cuberite/pull/4264#discussion_r204769193 | ||||
* | CheckBasicStyle: Check number of empty lines between functions (#4267) | peterbell10 | 2018-07-26 | 2 | -2/+6 |
| | | | | Add check for number of empty lines between functions and fix the corresponding failures | ||||
* | Prefer static_cast to reinterpret_cast (#4223) | peterbell10 | 2018-05-02 | 1 | -3/+3 |
| | | | | | | | * Change reinterpret_cast -> static_cast wherever possible * Remove more unnecessary `const_cast`s. reinterpret_casts should be avoided for the same reason as c-style casts - they don't do any type-checking. reinterpret_cast was mainly being used for down-casting in inheritance hierarchies but static_cast works just as well while also making sure that there is actually an inheritance relationship there. | ||||
* | Smelting Gives Experience (#4094) | Alex Sweet | 2018-04-11 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Smelting Exp Smelting now gives experience * Furnace.txt update Exp rewards are entered in furnace.txt, Reward calculation is now done is the furnaceentity class * furnace.txt update Changed alignment tabs to spaces Included documentation of exp in recipe * Updated StringToFloat changed strtod to strtof * Explicit Float to Int * Reworked Smelting Rewards * No C casts -Adds new function to the api -Sets reward counter to 0 in furnace constructor * Style and exp lock removed -Fixed style mistakes accoring to PR notes -XP isn't locked to a single player anymore * No Smelter API -Removed SetLastSmelter and GetLastSmelter -Fixed comments -Fixed log reward amounts | ||||
* | A player's inventory is always opened by its owner. (#4176) | peterbell10 | 2018-01-28 | 1 | -4/+6 |
| | | | | | Fixes #4093 Window updates are only broadcast to players in the m_OpenedBy list. Normally players are added after sending a window open packet but no packet is sent for a player's inventory. This meant broadcasts were never sent for the inventory window. | ||||
* | cWindow: Fix slot area priority when double click stacking. (#4086) | peterbell10 | 2018-01-15 | 2 | -34/+6 |
| | | | Fixes #4084 | ||||
* | Add the fmt library (#4065) | peterbell10 | 2018-01-03 | 2 | -1/+2 |
| | | | | | | | * Replaces AppendVPrintf with fmt::sprintf * fmt::ArgList now used as a type safe alternative to varargs. * Removed SIZE_T_FMT compatibility macros. fmt::sprintf is fully portable and supports %zu. * Adds FLOG functions to log with fmt's native formatting style. | ||||
* | Implement horse inventory (#4053) | peterbell10 | 2017-10-21 | 5 | -0/+241 |
| | | | | | | | | | | * Implement horse inventory * Fix sign conversions * Add API doc for ItemCategory::IsHorseArmor * Improve HandleOpenHorseInventory comment and style fixes. | ||||
* | Changed BroadcastSoundEffect, SendSoundEffect, and CastThunderbolt parameters to vectors (#3959) | Lane Kolbly | 2017-09-19 | 5 | -27/+17 |
| | | | | | | | | | | | | | | | | | | * Made BroadcastSoundEffect take vector parameters. * Added docs for new vectored methods * Removed old code * Fixed lua warnings * Made old BroadcastSoundEffect not an override. * m_Block to m_BlockPos, used Vector3d constructor where prettier. * a_Block to a_BlockPos * Changed thunderbolt a_Block to a_BlockPos | ||||
* | Fix switch warnings (#4013) | peterbell10 | 2017-09-14 | 2 | -7/+5 |
| | | | | | | | | | | | | | | | * Fix switch warnings * Fix a variety of -Wswitch and -Wswitch-enum warnings * Remove unneeded -Wno-error flags * Reorganise some eMonsterType switches * Alpha sort eMonsterType cases in WriteMobMetadata and in cNBTChunkSerializer::AddMonsterEntity * List all mob types in protocol 1.12 and NBTChunkSerializer * cStructGenTrees::GetNumTrees: remove switch default * cWSSAnvil::LoadOldMinecartFromNBT: Log unhandled minecart type | ||||
* | Replace ItemCallbacks with lambdas (#3993) | peterbell10 | 2017-09-11 | 2 | -9/+11 |
| | |||||
* | Revert "Replace ItemCallbacks with lambdas (#3948)" | LogicParrot | 2017-09-02 | 2 | -13/+11 |
| | | | | This reverts commit 496c337cdfa593654018c171f6a74c28272265b5. | ||||
* | Replace ItemCallbacks with lambdas (#3948) | peterbell10 | 2017-09-01 | 2 | -11/+13 |
| | |||||
* | Add cLuaWindow OnClicked Callback (#3901) | Lane Kolbly | 2017-08-17 | 1 | -1/+1 |
| | |||||
* | Changed int parameters to vector parameters in cCuboid and simulators (#3874) | Lane Kolbly | 2017-08-17 | 1 | -4/+4 |
| | |||||
* | Replaced includes with forward declarations | Lukas Pioch | 2017-08-13 | 1 | -1/+2 |
| | |||||
* | Removed double includes (#3885) | Lukas Pioch | 2017-08-02 | 2 | -2/+0 |
| | |||||
* | Added anvil enchantment handling. (#3857) | Lane Kolbly | 2017-07-28 | 1 | -4/+5 |
| | | | + Added anvil enchantment handling. | ||||
* | Handle middle mouse drag (#3847) | peterbell10 | 2017-07-13 | 2 | -10/+41 |
| | |||||
* | FastRandom rewrite (#3754) | peterbell10 | 2017-06-13 | 1 | -4/+3 |
| | |||||
* | Off-hand/shield slot functional, save and load slot, bow + arrow functional (#3725) | Pablo Beltrán | 2017-05-24 | 2 | -0/+18 |
| | | | Fixes #3714. | ||||
* | Clang 5.0 fixes | Lukas Pioch | 2017-05-21 | 4 | -7/+7 |
| | | | | | - Added override keyword - Removed inherited member variables | ||||
* | Corrected brewingstand and added support for fuel | Lukas Pioch | 2017-05-08 | 3 | -77/+80 |
| | |||||
* | Updated sounds and effect IDs (#3422) | mathiascode | 2017-02-15 | 3 | -7/+7 |
| | |||||
* | Fixed bindings for cBlockArea:Read and Write. (#3568) | Mattes D | 2017-02-05 | 2 | -3/+3 |
| | | | The original bindings accepted nil as the World param, causing a crash. | ||||
* | Removed ClientHandle.h dependencies from common headers. | Mattes D | 2016-11-18 | 5 | -0/+5 |
| | |||||
* | Spectators added (#2852) | bibo38 | 2016-10-12 | 1 | -0/+8 |
| | |||||
* | Fixed type-casting-related warnings. | Mattes D | 2016-08-24 | 1 | -2/+2 |
| | |||||
* | CMake: Remove needless minimum version specifications. | Mattes D | 2016-07-18 | 1 | -2/+0 |
| | |||||
* | Updated API documentation. | Mattes D | 2016-07-18 | 1 | -2/+6 |
| | |||||
* | Changed cLuaWindow callbacks to use cLuaState::cCallback. | Mattes D | 2016-06-27 | 1 | -1/+1 |
| | |||||
* | Revert "Lua callback" | Mattes D | 2016-03-21 | 1 | -1/+1 |
| | |||||
* | Changed cLuaWindow callbacks to use cLuaState::cCallback. | Mattes D | 2016-03-17 | 1 | -1/+1 |
| | |||||
* | Bulk clearing of whitespace | LogicParrot | 2016-02-05 | 7 | -123/+123 |
| | |||||
* | Updated old forum links | Mathias | 2016-01-31 | 1 | -1/+1 |
| | |||||
* | Renamed leftover strings to Cuberite / Server, as needed. | Mattes D | 2016-01-01 | 1 | -1/+1 |
| | | | | Also upgraded the user setting file for MSVC to 2013. | ||||
* | Reorganised the redstone simulator | Tiger Wang | 2015-12-18 | 1 | -12/+4 |
| | | | | | | -> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan! * Uses classes and inheritance now * Speed should be improved | ||||
* | 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 |