/cuberite

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Coverity merge #1128

Merged
merged 57 commits into from Jun 26, 2014

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@worktycho @madmaxoft @Howaner @tonibm19 @tigerw
@worktycho
Member

worktycho commented Jun 26, 2014

No description provided.

Howaner and others added some commits Jun 16, 2014

@Howaner
Add bow charging animation
e504239
@Howaner
Fix bow sound and creative arrow pickup.
885a50d
@Howaner
This isn't needed
Loading status checks…
b45e85a
@Howaner
Split Broadcast Sound Effect function call in multiple lines.
Loading status checks…
a1fd0b0
@Howaner
Float, not Double
Loading status checks…
d89f03b
@Howaner
The same: Float, not Double
Loading status checks…
37de638
@Howaner
derp
Loading status checks…
ce06ec1
@Howaner
Add door sound
Loading status checks…
0d08b9a
@Howaner
Add UNUSED() Tags
Loading status checks…
8de8768
@Howaner
Add fence gate sound.
bde51d8
@Howaner
Fix fence gate sound (Redstone simulator).
Loading status checks…
bcf798f
@Howaner
Merge branch 'master' into Blocks
Loading status checks…
2da7768
@tonibm19
Added pig riding. 
Now you can ride a pig using a carrot on a stick.
Loading status checks…
3e15c92
@tigerw
Rewrote furnace recipe parser 
* Fixes #110
Loading status checks…
a908f39
@tigerw
Removed debugging code
Loading status checks…
537467f
@tigerw
Suggestions
Loading status checks…
4a01fba
@worktycho
Fixed compile errors
Loading status checks…
63ce2e8
@worktycho
Fixed invalid iterator 
Fixes CID 60408
Loading status checks…
119ba56
@worktycho
Fixed missing break 
Fixes CID 68409
Loading status checks…
3c0452e
@tigerw
Chests don't open if obstructed 
* Fixes FS383
b2bf466
@tigerw
Fixed another daylight sensor bug 
Additionally fixed unpowering across chunks.
3ec8b33
@tigerw
Merge branch 'master' of https://github.com/mc-server/MCServer
Loading status checks…
c13cffc
@Howaner
Changed 0xFFFFFFFB to ~0x04
Loading status checks…
bebfb23
@madmaxoft
Merge pull request #1105 from Howaner/Blocks 
Added door and fence gate sounds.
Loading status checks…
fe95dfa
@tigerw
Suggestions
c476fc3
@tigerw
Merge remote-tracking branch 'origin/furnaceparsing' into furnaceparsing 
Conflicts:
	src/FurnaceRecipe.cpp
Loading status checks…
dc8817f
@madmaxoft

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft Jun 22, 2014

Member

Parenthesis around the comparison
Member

madmaxoft commented on src/FurnaceRecipe.cpp in c476fc3 Jun 22, 2014

Parenthesis around the comparison

madmaxoft and others added some commits Jun 23, 2014

@madmaxoft
Added a (disabled) block meta mirror / rotate test code. 
This will perform basic sanity checks on block metadata mirroring and rotating. cMetaRotator must disable its asserts in order for this to work.
Loading status checks…
6a77705
@madmaxoft
VoronoiMap: Added a missing initializer. 
Fixes CID 68410.
Loading status checks…
59270fd
@tigerw
Parenthesised comparison
Loading status checks…
7a23692
@madmaxoft
Debuggers: Fixed the Blaze rod query tool.
Loading status checks…
4306092
@madmaxoft
Fixed crashes in HopperEntity. 
Some of the coords were off and some functions were assuming too much.
Fixes the crash reported in http://forum.mc-server.org/showthread.php?tid=1497
7423704
@madmaxoft
Added asserts for cChunk::GetBlockEntity() coords.
Loading status checks…
1da3956
@madmaxoft
Fixed BlockInfo initialization. 
Now cBlockInfo is initialized in the getter, instead of "at any time during startup", which included "after it was already needed".
Loading status checks…
a1d2c11
@Howaner
Fix pickup combining over the maximum stack size.
Loading status checks…
5ab01c4
@Howaner
Add entity health saving.
Loading status checks…
d4e1277
@Howaner
Better combining.
Loading status checks…
2dd7a03
@worktycho
Merge pull request #1125 from Howaner/Entities 
Add entity health saving.
Loading status checks…
03da9ae
@Howaner
Optimize combining.
Loading status checks…
dbcb7f8
@madmaxoft
BlockInfo is now a proper C++ singleton. 
It is properly initialized before it is ever used.
Loading status checks…
e9aecfd
@madmaxoft
Merge pull request #1126 from mc-server/BlockInfoInit 
BlockInfo is now a proper C++ singleton.
Loading status checks…
af3779a
@Howaner
Merge branch 'master' into Bow
Loading status checks…
eaf3676
@Howaner
GameMode check
Loading status checks…
f969554
@Howaner
Merge branch 'master' into Pickups
9b7f1e3
@madmaxoft
Merged branch 'tonibm19/master'.
Loading status checks…
7102e9e
@madmaxoft
Merge remote-tracking branch 'origin/furnaceparsing'
3216fba
@Howaner
Fixed a comment and changed CombineCount to short.
Loading status checks…
cba273d
@Howaner
Add comment.
Loading status checks…
bf32298
@madmaxoft
FurnaceRecipe parser: Added an else branch, changed to a switch.
b90b0a1
@madmaxoft
FurnaceRecipe parser: Made the parser more forgiving. 
Errors don't cause a stop in the parsing, but rather just skip the offending line.
Loading status checks…
67e3c64
@madmaxoft
FurnaceRecipe: Moved the parsing into separate functions for clarity.
Loading status checks…
55bbdfa
@madmaxoft
Fixed misformed trimming.
Loading status checks…
ec10151
@madmaxoft
FurnaceRecipe parsing: Fixed whitespace removing.
Loading status checks…
0df644c
@madmaxoft
Merged branch 'howaner/Pickups'.
Loading status checks…
4826990
@madmaxoft
Merged branch 'howaner/Bow'. 
Removed the pickup collection broadcast due to bad code.
Loading status checks…
e60b73c

worktycho added a commit that referenced this pull request Jun 26, 2014

@worktycho
Merge pull request #1128 from mc-server/master 
Coverity merge
dd1c107

@worktycho worktycho merged commit dd1c107 into coverity_scan Jun 26, 2014
1 of 2 checks passed

1 of 2 checks passed

continuous-integration/travis-ci The Travis CI build is in progress
Details
continuous-integration/appveyor AppVeyor build succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment