tycho
|
e19693e529
|
Merge branch 'master' into PreventNewWarnings
Conflicts:
src/Inventory.cpp
|
2015-05-28 11:05:41 +01:00 |
|
tycho
|
77f1f58c0a
|
Make -Werror disabling file only
Ad fix a load of warnings
|
2015-05-19 19:32:10 +01:00 |
|
Tiger Wang
|
0dbba305b6
|
Fixes #2052
|
2015-05-18 14:30:16 +01:00 |
|
Mattes D
|
846d16315a
|
CheckBasicStyle: checks spaces around * and &.
|
2015-05-09 12:58:55 +02:00 |
|
Mattes D
|
44644ae025
|
Fixed reported parentheses around comparisons.
|
2014-12-05 12:58:47 +01:00 |
|
Tiger Wang
|
a26541a7c3
|
En masse NULL -> nullptr replace
|
2014-10-22 20:12:49 -07:00 |
|
Mattes D
|
bf16c5ed92
|
Type warning fixes.
|
2014-08-25 18:25:39 +03:00 |
|
Mattes D
|
0814a977f8
|
Merge pull request #1236 from Howaner/Inventory2
Fix item durability.
|
2014-07-27 21:39:39 +02:00 |
|
Howaner
|
ef4d68adfd
|
Merge branch 'master' into Inventory
|
2014-07-26 13:27:27 +02:00 |
|
Howaner
|
396739cc0f
|
Fix item durability.
Fixes #1181
|
2014-07-23 16:32:09 +02:00 |
|
madmaxoft
|
93d29555e5
|
Style: Normalized to no spaces before closing parenthesis.
|
2014-07-21 17:40:43 +02:00 |
|
madmaxoft
|
6be79575fd
|
Style: Normalized spaces after if, for and while.
|
2014-07-21 17:38:50 +02:00 |
|
Howaner
|
897d68dc35
|
Add armor items directly to the armor slots.
|
2014-07-20 01:22:58 +02:00 |
|
Howaner
|
51b91befbd
|
Added RemoveItem() function to the player inventory.
|
2014-07-18 23:11:59 +02:00 |
|
Howaner
|
2e9aed793a
|
Fixed the armor slot in creative mode. Also removed that armor get directly to the armor slot. It is extremely buggy and unnecessary.
|
2014-07-18 01:16:49 +02:00 |
|
madmaxoft
|
7fff12bfac
|
Fixed spaces around single-line comments.
There should be at least two spaces in front and one space after //-style comments.
|
2014-07-17 19:13:23 +02:00 |
|
Howaner
|
c8631d9a9b
|
Add DIG_STATUS_CANCELLED packet and add item resend, when a block can't place/break.
|
2014-05-09 23:10:02 +02:00 |
|
Howaner
|
10e3c262db
|
Send item back to the client when the item get damage.
|
2014-05-07 21:00:21 +02:00 |
|
Howaner
|
99b9e6dce5
|
Broadcast the Equipped Item, if the Slot is changed.
|
2014-03-06 11:08:47 +01:00 |
|
andrew
|
3b24bc870b
|
Map item handler; Fixed several bugs
|
2014-02-17 16:27:12 +02:00 |
|
Tiger Wang
|
74645fdfaa
|
Removed obsoleted functions
|
2014-01-16 19:00:49 +00:00 |
|
Tycho Bickerstaff
|
3152c72959
|
fixed warnings in Inventory.cpp
|
2013-12-31 09:16:42 +01:00 |
|
madmaxoft
|
2113ca3844
|
Fixed VC2008 compilation, normalized include paths.
|
2013-11-27 09:17:25 +01:00 |
|
Alexander Harkness
|
770ef8c60b
|
Fixed loads more of them.
|
2013-11-26 17:14:46 +00:00 |
|
Tiger Wang
|
e3db69c4ae
|
Attempt to fix compilation
|
2013-11-24 18:44:22 +00:00 |
|
Alexander Harkness
|
675b4aa878
|
Moved source to src
|
2013-11-24 14:19:41 +00:00 |
|