summaryrefslogtreecommitdiffstats
path: root/src/UI (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fixed crashes and use std::swap.Hownaer2014-08-281-6/+3
|
* Enchanting table improvements.Hownaer2014-08-284-134/+101
|
* Renamed functions and added beacon json saving.Howaner2014-07-311-2/+2
|
* Added beacon.Howaner2014-07-304-0/+276
|
* Merge branch 'master' into portalsTiger Wang2014-07-292-3/+16
|\ | | | | | | | | Conflicts: src/World.h
| * Change comment.Howaner2014-07-261-1/+1
| |
| * Merge branch 'master' into InventoryHowaner2014-07-263-9/+15
| |\
| * | Add armor items directly to the armor slots.Howaner2014-07-202-3/+3
| | |
| * | Moved comment.Howaner2014-07-181-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.Howaner2014-07-181-0/+13
| | |
* | | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-223-9/+15
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * | Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-212-4/+4
| | |
| * | Subdirs: Only add_library if not using MSVCarchshift2014-07-191-1/+3
| | |
| * | UI/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+9
| |/
* | Merge branch 'master' into portalsTiger Wang2014-07-185-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.madmaxoft2014-07-171-2/+2
| |
| * More trailing whitespace fixes.madmaxoft2014-07-171-1/+1
| |
| * Basic style fixes.madmaxoft2014-07-174-8/+8
| |
| * Normalized comments.madmaxoft2014-07-172-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.Howaner2014-07-131-5/+5
| |
| * Merge pull request #1154 from mc-server/trappedchestsTiger Wang2014-07-132-9/+63
| |\ | | | | | | Implemented trapped chests & others
| | * Suggestions and bug fixTiger Wang2014-07-121-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 & othersTiger Wang2014-07-072-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/WindowMattes D2014-07-093-41/+237
| |\ \ | | |/ | |/| Add more inventory actions.
| | * Removed unused include line.Howaner2014-07-091-1/+0
| | |
| | * Added inventory number click.Howaner2014-07-092-1/+43
| | |
| | * Added drop window action.Howaner2014-07-063-25/+113
| | |
| | * Add middle click.Howaner2014-07-052-21/+88
| | |
| * | Fixed crafting grid updating.Mattes D2014-07-062-2/+21
| |/ | | | | | | Fixes #1152.
| * Merge pull request #1138 from mc-server/enderchestMattes D2014-07-022-5/+4
| |\ | | | | | | Properly implemented enderchests
| | * Removed bad commentTiger Wang2014-06-291-1/+0
| | |
| | * Properly implemented enderchestsTiger Wang2014-06-292-4/+4
| | |
| * | Only fixes the server crash.Howaner2014-07-011-6/+0
| | |
| * | Fix server-crash with non-existing items.Howaner2014-07-011-1/+7
| |/
* | Merge branch 'master' into portalsTiger Wang2014-06-101-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/SomeWarningFixesMattes D2014-06-041-0/+1
| |\ | | | | | | Fixed some warnings
| | * Changed the m_slotarea positionJulian Laubstein2014-05-191-2/+2
| | |
| | * Fixed some warnings in Server.cpp, and in UI/Julian Laubstein2014-05-192-2/+4
| | |
* | | SuggestionsTiger Wang2014-06-041-1/+1
|/ /
* | derpworktycho2014-06-041-1/+1
| |
* | Make sure m_StackSizeToBeUsedInRepair Always has a valid valueworktycho2014-06-041-1/+3
| |
* | Players can't set items in the result slot, when they shift a item.Howaner2014-06-012-0/+39
| |
* | Add HandleSmeltItem() call for achievements.Howaner2014-06-011-7/+11
| |
* | Missing return;Howaner2014-06-011-0/+1
| |
* | Set DraggingItem to Slot directly.Howaner2014-05-311-1/+1
| |
* | Fix DBL bug.Howaner2014-05-311-5/+4
| |
* | Change "Slot.IsEmpty()" to "Slot.m_ItemCount <= 0"Howaner2014-05-311-1/+1
| |
* | Fix the furnace result slot.Howaner2014-05-301-2/+90
| |
* | Merge pull request #998 from mc-server/StatManagerMattes D2014-05-182-1/+47
|\ \ | |/ |/| Statistic Manager
| * cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement()andrew2014-05-122-1/+47
| |
* | Fixed anvil exp removingtonibm192014-05-161-1/+1
|/
* Fixed MSVC 64-bit build warnings.Mattes D2014-05-092-2/+2
|
* Change m_RepairCost to int.Howaner2014-05-071-9/+3
|
* Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs.Howaner2014-05-071-24/+36
|
* Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count()Howaner2014-05-061-6/+5
|
* Fix SetRepairedItemName() in SlotArea.cppHowaner2014-05-051-1/+1
|
* Add comments to CanTakeResultItem()Howaner2014-05-051-5/+5
|
* Add doxycomments to cSlotAreaAnvil functions.Howaner2014-05-051-0/+2
|
* Add anvil shift click.Howaner2014-05-052-5/+86
|
* This isn't a enchantment table :DHowaner2014-05-051-1/+1
|
* Add clicks, exp subtraction, item check, ...Howaner2014-05-054-16/+204
|
* Add MC|ItemName plugin message.Howaner2014-05-054-8/+16
|
* Add anvil window and slot area.Howaner2014-05-054-0/+229
|
* Cmake generated projects for IDEs include headers in project files.archshift2014-04-251-0/+1
|
* Add armor to switch() in ItemHandler.cppHowaner2014-04-241-1/+1
|
* Fix armor in survival mode.Howaner2014-04-242-1/+80
|
* Merge pull request #909 from jfhumann/fixesMattes D2014-04-221-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 codejfhumann2014-04-181-5/+6
| |
* | Fixed MSVC compilation.madmaxoft2014-04-201-1/+1
| |
* | Fixed Codedaniel09162014-04-192-8/+5
| |
* | Modified many thingsdaniel09162014-04-173-55/+54
| |
* | Fixed double enchanting itemsdaniel09162014-04-161-2/+2
| |
* | Added Book Enchantingdaniel09162014-04-151-1/+1
| |
* | Add more checks to cSlotAreaEnchantingHowaner2014-04-153-99/+212
| |
* | Added ItemPlaceCount in SlotAreadaniel09162014-04-142-0/+35
| | | | | | | | Thanks to Howaner for helping
* | Blocked enchanting a item twicedaniel09162014-04-142-8/+10
| |
* | Fixed Bookshelf Checkingdaniel09162014-04-141-8/+10
| | | | | | | | Code by LO1ZB
* | Bug fixesdaniel09162014-04-142-21/+19
| |
* | Fixed invisibility enchantmentsdaniel09162014-04-132-0/+4
| |
* | Some Fixesdaniel09162014-04-131-1/+1
| |
* | Fixed Bookshelves Checking (not completly)daniel09162014-04-121-7/+10
| |
* | Added complete Enchanting Systemdaniel09162014-04-123-20/+135
| | | | | | | | http://minecraft.gamepedia.com/Enchantment_mechanics
* | Merge remote-tracking branch 'upstream/master' into Enchantingdaniel09162014-04-074-8/+65
|\|
| * Fixed non-virtual destructors warnings.madmaxoft2014-03-281-0/+4
| |
| * Added additional macros to support the MSVC size_t format and changed all formats to use the macrosTycho2014-03-121-1/+1
| |
| * Fixed a load of format string errorsTycho2014-03-111-1/+1
| |
| * Fixed multiple gcc warnings about unused params.madmaxoft2014-02-282-3/+33
| |
| * Fixed indentation once and for all.Mike Hunsinger2014-01-241-15/+15
| |
| * Fixed indentation and doxygen comments... For real this time.Mike Hunsinger2014-01-241-12/+12
| |
| * Fixed spacing and doxycomments.Mike Hunsinger2014-01-241-12/+10
| |
| * Removed extra lineMike Hunsinger2014-01-231-2/+0
| |
| * Split TossItem into three Toss functions (Held, Equipped and Pickup)Mike Hunsinger2014-01-231-5/+32
| |
* | Added Enchantment-Slot-Level generatingdaniel09162014-04-071-9/+19
| |
* | Some updates for enchantingdaniel09162014-01-242-13/+13
| |
* | first changes for enchanting (not finished)daniel09162014-01-204-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.madmaxoft2014-01-171-1/+1
|
* Really did what xoft wantedTiger Wang2014-01-161-5/+8
|
* Removed obsoleted functionsTiger Wang2014-01-162-4/+4
|
* Possibly did what xoft wantedTiger Wang2014-01-161-10/+3
|
* Implemented custom names and loreTiger Wang2014-01-151-0/+7
| | | | | | + Added custom names and lore + Added saving and loading + Added writing and parsing of NBT
* More MSVC warning fixes.madmaxoft2014-01-071-2/+2
|
* added zlib and UITycho Bickerstaff2013-12-181-0/+11
|
* added default fallthrough clause to switch at line 178 of src/UI/Window.cppTycho Bickerstaff2013-12-081-0/+4
|
* Reordered Listed Initalisation order in src/UI/Window.cppTycho Bickerstaff2013-12-081-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 ResultSlotTycho Bickerstaff2013-12-081-1/+0
|
* Fixed Warning Unhandeled enum values in switch as src/UI/SlotArea.cpp line 54worktycho2013-12-091-1/+4
|
* Added basic ender chestsTiger Wang2013-12-074-0/+106
| | | | Note that they just mirror chests now, so no per player inventory.
* Moved source to srcAlexander Harkness2013-11-245-0/+2521
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 17:13:53 +0100