flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
10,786 Commits 1 Branch 0 Tags 92 MiB
cb64e99377
Commit Graph

193 Commits

Author SHA1 Message Date
madmaxoft
c03161f75d Fixed tabs used for alignment. 2014-07-17 23:16:55 +02:00
madmaxoft
d0cc9aedb3 More trailing whitespace fixes. 2014-07-17 23:16:54 +02:00
madmaxoft
5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +02:00
madmaxoft
2423fbf2ef Normalized comments. 
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.
 2014-07-17 22:15:34 +02:00
Howaner
d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Tiger Wang
5f72cdac38 Merge pull request #1154 from mc-server/trappedchests 
Implemented trapped chests & others
 2014-07-12 23:24:32 +01:00
Tiger Wang
e71e432633 Suggestions and bug fix 
* 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
 2014-07-12 22:06:25 +01:00
Mattes D
ea24a4f4aa Merge pull request #1157 from Howaner/Window 
Add more inventory actions.
 2014-07-09 23:27:02 +02:00
Howaner
0d88e71d18 Removed unused include line. 2014-07-09 14:35:01 +02:00
Howaner
3615bf825b Added inventory number click. 2014-07-09 14:30:06 +02:00
Tiger Wang
9e44b0aae1 Implemented trapped chests & others 
+ Added trapped chests
* Fixed a bunch of bugs in the redstone simulator concerning wires and
repeaters
* Other potential bugfixes
 2014-07-06 23:50:22 +01:00
Mattes D
562d14e8ec Fixed crafting grid updating. 
Fixes #1152.
 2014-07-06 14:42:28 +02:00
Howaner
9d7a59012c Added drop window action. 2014-07-06 00:40:59 +02:00
Howaner
7a78f23b4a Add middle click. 2014-07-05 14:00:04 +02:00
Mattes D
39fff19955 Merge pull request #1138 from mc-server/enderchest 
Properly implemented enderchests
 2014-07-02 22:59:21 +02:00
Howaner
64e6667435 Only fixes the server crash. 2014-07-01 20:34:50 +02:00
Howaner
64f6ddf1e2 Fix server-crash with non-existing items. 2014-07-01 14:47:49 +02:00
Tiger Wang
909e0ed95b Removed bad comment 2014-06-29 11:41:50 +01:00
Tiger Wang
dde641ce83 Properly implemented enderchests 2014-06-29 11:36:38 +01:00
Tiger Wang
bfa8aaf41b Merge branch 'master' into portals 
Conflicts:
	src/ClientHandle.cpp
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol17x.cpp
 2014-06-10 20:51:22 +01:00
Tiger Wang
74cd4f5521 Suggestions 2014-06-04 18:59:56 +01:00
Mattes D
c11488ccd7 Merge pull request #1011 from SphinxC0re/SomeWarningFixes 
Fixed some warnings
 2014-06-04 18:02:45 +02:00
worktycho
c94d0c8144 derp 2014-06-04 11:39:21 +01:00
worktycho
98c575ebc2 Make sure m_StackSizeToBeUsedInRepair Always has a valid value 2014-06-04 11:12:06 +01:00
Howaner
12f3c0fcdf Players can't set items in the result slot, when they shift a item. 2014-06-01 00:50:35 +02:00
Howaner
a18b6c2311 Add HandleSmeltItem() call for achievements. 2014-06-01 00:43:09 +02:00
Howaner
5368e66486 Missing return; 2014-06-01 00:29:17 +02:00
Howaner
2030800ad7 Set DraggingItem to Slot directly. 2014-05-31 00:27:24 +02:00
Howaner
d422aa4081 Fix DBL bug. 2014-05-31 00:25:20 +02:00
Howaner
01fc93857c Change "Slot.IsEmpty()" to "Slot.m_ItemCount <= 0" 2014-05-31 00:22:24 +02:00
Howaner
843288493e Fix the furnace result slot. 2014-05-30 23:41:17 +02:00
Julian Laubstein
7e2effb2d8 Changed the m_slotarea position 2014-05-19 15:46:36 +02:00
Julian Laubstein
fb7f2993bf Fixed some warnings in Server.cpp, and in UI/ 2014-05-19 14:34:34 +02:00
Mattes D
ac00568183 Merge pull request #998 from mc-server/StatManager 
Statistic Manager
 2014-05-18 22:30:34 +02:00
tonibm19
5724dcc2c1 Fixed anvil exp removing 2014-05-16 19:33:57 +02:00
andrew
b3d2b5b2c9 cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement() 2014-05-12 17:05:09 +03:00
Mattes D
fb58ef55be Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
Howaner
fbb6404cc8 Change m_RepairCost to int. 2014-05-07 20:43:37 +02:00
Howaner
d6cb6e0423 Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs. 2014-05-07 12:30:30 +02:00
Howaner
954b59d6f4 Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count() 2014-05-06 19:38:09 +02:00
Howaner
a138671e0e Fix SetRepairedItemName() in SlotArea.cpp 2014-05-05 17:36:22 +02:00
Howaner
f2617d0683 Add comments to CanTakeResultItem() 2014-05-05 17:34:44 +02:00
Howaner
c162d69e7b Add doxycomments to cSlotAreaAnvil functions. 2014-05-05 17:34:41 +02:00
Howaner
ecc62dbb9c Add anvil shift click. 2014-05-05 17:34:35 +02:00
Howaner
ca3c9ce84d This isn't a enchantment table :D 2014-05-05 17:34:32 +02:00
Howaner
7fe6e40bf7 Add clicks, exp subtraction, item check, ... 2014-05-05 17:34:29 +02:00
Howaner
6ac332cd06 Add MC|ItemName plugin message. 2014-05-05 17:34:24 +02:00
Howaner
3c102870f6 Add anvil window and slot area. 2014-05-05 17:34:17 +02:00
archshift
e47dab84f3 Cmake generated projects for IDEs include headers in project files. 2014-04-25 09:56:15 -07:00
Howaner
376dc880b3 Add armor to switch() in ItemHandler.cpp 2014-04-24 23:03:04 +02:00
Howaner
9cbb3a339f Fix armor in survival mode. 2014-04-24 20:41:25 +02:00
Mattes D
6492aa000b Merge pull request #909 from jfhumann/fixes 
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
 2014-04-22 13:34:32 +02:00
madmaxoft
7b246d9a8d Fixed MSVC compilation. 2014-04-20 13:50:37 +02:00
daniel0916
a6de7bf1cd Fixed Code 2014-04-19 15:10:50 +02:00
jfhumann
013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
daniel0916
f9343a8490 Modified many things 2014-04-17 13:15:35 +02:00
daniel0916
8c33b3c415 Fixed double enchanting items 2014-04-16 13:31:37 +02:00
daniel0916
36f747d674 Added Book Enchanting 2014-04-15 21:43:52 +02:00
Howaner
e81fc2779e Add more checks to cSlotAreaEnchanting 2014-04-15 21:12:59 +02:00
daniel0916
b5401ec03a Added ItemPlaceCount in SlotArea 
Thanks to Howaner for helping
 2014-04-14 22:05:04 +02:00
daniel0916
a51a099c81 Blocked enchanting a item twice 2014-04-14 13:39:44 +02:00
daniel0916
fb26d2ba87 Fixed Bookshelf Checking 
Code by LO1ZB
 2014-04-14 11:56:50 +02:00
daniel0916
856e900bf8 Bug fixes 2014-04-14 11:48:12 +02:00
daniel0916
fce9ea65c3 Fixed invisibility enchantments 2014-04-13 22:15:10 +02:00
daniel0916
1429d2f1b1 Some Fixes 2014-04-13 13:33:47 +02:00
daniel0916
dd1f8fb1f5 Fixed Bookshelves Checking (not completly) 2014-04-12 18:52:17 +02:00
daniel0916
e6e702e7fd Added complete Enchanting System 
http://minecraft.gamepedia.com/Enchantment_mechanics
 2014-04-12 14:58:46 +02:00
daniel0916
2e9754ac1c Merge remote-tracking branch 'upstream/master' into Enchanting 2014-04-07 20:12:17 +02:00
daniel0916
af566d5a79 Added Enchantment-Slot-Level generating 2014-04-07 19:52:35 +02:00
madmaxoft
773ce7fde6 Fixed non-virtual destructors warnings. 2014-03-28 21:35:45 +01:00
Tycho
862e219443 Added additional macros to support the MSVC size_t format and changed all formats to use the macros 2014-03-12 10:34:50 -07:00
Tycho
16b27c4b7a Fixed a load of format string errors 2014-03-11 14:16:08 -07:00
madmaxoft
1826461884 Fixed multiple gcc warnings about unused params. 2014-02-28 16:26:23 +01:00
daniel0916
bfac00f280 Some updates for enchanting 2014-01-24 20:01:21 +01:00
Mike Hunsinger
7c12247263 Fixed indentation once and for all. 2014-01-23 20:11:10 -07:00
Mike Hunsinger
9926ea58e8 Fixed indentation and doxygen comments... For real this time. 2014-01-23 20:01:08 -07:00
Mike Hunsinger
11948b1d4b Fixed spacing and doxycomments. 2014-01-23 19:54:00 -07:00
Mike Hunsinger
00d7317746 Removed extra line 2014-01-23 00:53:00 -07:00
Mike Hunsinger
41b05416c7 Split TossItem into three Toss functions (Held, Equipped and Pickup) 2014-01-23 00:27:39 -07:00
daniel0916
0c2b307eab first changes for enchanting (not finished) 
- 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...
 2014-01-20 18:22:08 +01:00
madmaxoft
aec5200893 Removed internal cEntity::GetRot() usage. 2014-01-17 11:11:17 +01:00
Tiger Wang
590a8c45c5 Really did what xoft wanted 2014-01-16 21:41:08 +00:00
Tiger Wang
74645fdfaa Removed obsoleted functions 2014-01-16 19:00:49 +00:00
Tiger Wang
5d03e49c13 Possibly did what xoft wanted 2014-01-16 18:44:11 +00:00
Tiger Wang
fcafd5a2e0 Implemented custom names and lore 
+ Added custom names and lore
+ Added saving and loading
+ Added writing and parsing of NBT
 2014-01-15 22:38:03 +00:00
madmaxoft
39a1bcdea0 More MSVC warning fixes. 2014-01-07 17:07:49 +01:00
Tycho Bickerstaff
95ebc37faa added zlib and UI 2013-12-18 19:10:47 +00:00
Tycho Bickerstaff
c1dbe8a19e added default fallthrough clause to switch at line 178 of src/UI/Window.cpp 2013-12-07 23:51:18 +00:00
Tycho Bickerstaff
ae369618ca Reordered Listed Initalisation order in src/UI/Window.cpp 
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
 2013-12-07 23:51:18 +00:00
Tycho Bickerstaff
cd7813f0f5 Removed unused variable ResultSlot 2013-12-07 23:33:18 +00:00
worktycho
a99bece3fa Fixed Warning Unhandeled enum values in switch as src/UI/SlotArea.cpp line 54 2013-12-09 13:57:09 +00:00
Tiger Wang
347e80bdd8 Added basic ender chests 
Note that they just mirror chests now, so no per player inventory.
 2013-12-07 00:18:58 +00:00
Alexander Harkness
675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00