summaryrefslogtreecommitdiffstats
path: root/src/UI/Window.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into portalsTiger Wang2014-07-181-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.madmaxoft2014-07-171-1/+1
| |
| * Basic style fixes.madmaxoft2014-07-171-1/+1
| |
| * Normalized comments.madmaxoft2014-07-171-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.Howaner2014-07-131-5/+5
| |
| * Merge pull request #1154 from mc-server/trappedchestsTiger Wang2014-07-131-8/+57
| |\ | | | | | | 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-071-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.Howaner2014-07-061-15/+7
| |/
| * Merge pull request #1138 from mc-server/enderchestMattes D2014-07-021-2/+2
| |\ | | | | | | Properly implemented enderchests
| | * Properly implemented enderchestsTiger Wang2014-06-291-2/+2
| | |
| * | 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
| * Changed the m_slotarea positionJulian Laubstein2014-05-191-2/+2
| |
| * Fixed some warnings in Server.cpp, and in UI/Julian Laubstein2014-05-191-1/+2
| |
* | SuggestionsTiger Wang2014-06-041-1/+1
|/
* Fixed MSVC 64-bit build warnings.Mattes D2014-05-091-1/+1
|
* Add clicks, exp subtraction, item check, ...Howaner2014-05-051-3/+32
|
* Add MC|ItemName plugin message.Howaner2014-05-051-1/+2
|
* Add anvil window and slot area.Howaner2014-05-051-0/+15
|
* Fixed Codedaniel09162014-04-191-6/+2
|
* Modified many thingsdaniel09162014-04-171-38/+3
|
* Add more checks to cSlotAreaEnchantingHowaner2014-04-151-1/+1
|
* Added complete Enchanting Systemdaniel09162014-04-121-1/+85
| | | | http://minecraft.gamepedia.com/Enchantment_mechanics
* Merge remote-tracking branch 'upstream/master' into Enchantingdaniel09162014-04-071-5/+28
|\
| * 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 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
| |
* | Some updates for enchantingdaniel09162014-01-241-1/+1
| |
* | first changes for enchanting (not finished)daniel09162014-01-201-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 functionsTiger Wang2014-01-161-1/+1
|
* 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
* Added basic ender chestsTiger Wang2013-12-071-0/+38
| | | | Note that they just mirror chests now, so no per player inventory.
* Moved source to srcAlexander Harkness2013-11-241-0/+886