flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
6,997 Commits 1 Branch 0 Tags 92 MiB
7f42ba9fc1
Commit Graph

358 Commits

Author SHA1 Message Date
madmaxoft
6be79575fd Style: Normalized spaces after if, for and while. 2014-07-21 17:38:50 +02:00
Tiger Wang
d0e7b2f18b Merge branch 'master' into saplingsandleaves 
Conflicts:
	src/Bindings/DeprecatedBindings.cpp
	src/Blocks/BlockSapling.h
 2014-07-20 12:02:23 +01:00
Tiger Wang
f68b04e029 Proper comment for DropBlock() 2014-07-20 12:00:20 +01:00
madmaxoft
00c524519e Fixed style: spaces after commas. 2014-07-19 14:53:41 +02:00
archshift
3d368b015e Blocks/CMakeLists.txt: Fixed header list after merge of master 2014-07-18 17:41:44 -07:00
archshift
725d1fd1e2 Subdirs: Only add_library if not using MSVC 2014-07-18 17:41:43 -07:00
archshift
61c4e2e5cb Blocks/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:42 -07:00
madmaxoft
23037ce7ec Normalized code style for both sign handlers. 2014-07-18 22:41:48 +02:00
Tiger Wang
37140ae578 Merge branch 'master' into portals 
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
 2014-07-18 20:10:51 +01:00
Howaner
44c944716b Removed cBlockSignPostHandler descend. 2014-07-18 17:04:01 +02:00
Howaner
eeacb6f222 Added a extra wall sign handler. 
Fixes #1119
 2014-07-18 02:19:30 +02:00
Tiger Wang
0f8c24e04d Fixed issues relating to saplings and leaves 
- Removed cBlockInfo::RequiresSpecialTool
* Fixes #1195
* Fixes #1201
 2014-07-17 22:26:53 +01:00
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
7a9f9ab744 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-07-17 22:23:08 +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
68cc9c6f91 Fix sapling drop. 2014-07-17 21:35:34 +02:00
Mattes D
5147220f12 Merge pull request #1189 from Masy98/Blocks 
Added various missing blocks in the lists in BlockInfo.cpp
 2014-07-15 14:54:45 +02:00
madmaxoft
9a970479ef Fixed code formatting. 2014-07-15 14:54:24 +02:00
madmaxoft
639dfdb67d Merge remote-tracking branch 'origin/ClearMetaMixin' 2014-07-15 14:44:18 +02:00
Masy98
2d245264b1 Added various missing blocks in the lists in BlockInfo.cpp 2014-07-15 13:34:45 +02:00
Tycho
01a31a1872 Added super typedef 2014-07-15 12:27:36 +01:00
Tycho
0e5fa2662a COnverted Lilypad back to mixin 2014-07-15 00:01:16 +01:00
Tycho
8fd636aa72 Revert "Converted some blockhandlers to use cClearMetaOnDrop" 
This reverts commit 333f4f982c.
 2014-07-14 23:59:24 +01:00
Tiger Wang
5b1552435f Fixed some meta resetting bugs 
* Fixes #1174
* Fixes #1171
 2014-07-14 21:57:44 +01:00
Tycho
2cd3443fbb Added documentation 2014-07-14 21:21:17 +01:00
Tycho
333f4f982c Converted some blockhandlers to use cClearMetaOnDrop 2014-07-14 20:50:56 +01:00
Tycho
093b5c6456 Simplified ClearMetaOnDrop 2014-07-14 20:33:30 +01:00
Tycho
515c3cbc67 Added cClearOnDrop Mixin to cPumpkin 2014-07-14 20:28:16 +01:00
Tycho
1929d16724 Added first implementation of cClearMetaOnDrop 2014-07-14 20:26:36 +01:00
Howaner
d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02: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
Tiger Wang
416c160fb5 Suggestions 2014-07-11 19:40:33 +01:00
Tiger Wang
6a33fa84ae Suggestions 2014-07-11 12:43:24 +01: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
Tiger Wang
19caba5125 Redstone simulator is alerted to lever unpowering 
* Fixed the "fix" that broke the fix for #535, thereby fixing said issue
* Fixed #535
 2014-07-02 18:46:00 +01:00
Tiger Wang
61cb08b546 Implemented tripwire(s) (hooks) 
* Fixes #944
 2014-06-28 20:44:34 +01:00
Tiger Wang
de543ff73f Added more block exceptions to torches 2014-06-28 00:29:32 +01:00
Tiger Wang
0a20e19a64 Minor change to buttons and levers 
+ They now detect if the block they are on occupies its voxel, instead
of just being solid
 2014-06-28 00:29:19 +01:00
Tiger Wang
bd5df3d3b9 Merge branch 'master' of https://github.com/mc-server/MCServer into portals 2014-06-24 21:15:48 +01:00
madmaxoft
6a77705d4e 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.
 2014-06-23 07:23:54 +02:00
madmaxoft
dd6a9f6559 Fixed the slab vertical mirroring. 2014-06-23 00:15:56 +02:00
madmaxoft
d61ff4da3b Fixed sign and lever rotations. 2014-06-23 00:15:55 +02:00
Mattes D
fe95dfa758 Merge pull request #1105 from Howaner/Blocks 
Added door and fence gate sounds.
 2014-06-22 20:56:24 +02:00
Tiger Wang
7615ed90c0 Merge branch 'master' into portals 
Conflicts:
	src/Chunk.cpp
	src/Entities/Entity.h
	src/Entities/Player.h
 2014-06-21 22:14:23 +01:00
Mattes D
c30b7b8735 Merge pull request #1045 from Howaner/GlobalFixes 
Little fixes
 2014-06-18 18:23:18 +02:00
archshift
21b9253ee6 Merge pull request #1100 from Howaner/Slabs 2014-06-18 00:47:08 -07:00
Howaner
bde51d8778 Add fence gate sound. 2014-06-17 19:08:36 +02:00
Howaner
c60ba8a52d Merge branch 'master' into GlobalFixes 2014-06-17 19:03:56 +02:00
Howaner
8de8768f02 Add UNUSED() Tags 2014-06-17 17:01:23 +02:00
Howaner
0d08b9a62e Add door sound 2014-06-17 17:00:51 +02:00
Howaner
8e927e6e2b Check block type from cBlockEntity 2014-06-17 14:45:29 +02:00
Mattes D
f682646d3a Merge pull request #1099 from Howaner/Blocks 
Glass-made blocks don't drop pickups.
 2014-06-17 14:03:24 +02:00
Howaner
a4d4621fbe Add parenthesis 2014-06-17 12:47:18 +02:00
Howaner
a89524d533 Add DoWithBlockEntityAt() to WorldInterface.h 2014-06-17 01:15:38 +02:00
Howaner
1316d2d24d Add end lines to BlockPressurePlate.h 2014-06-17 00:41:31 +02:00
Howaner
43ff96f664 Add pressure plate handler 2014-06-17 00:40:35 +02:00
Howaner
9dea609194 Fix doubleslab meta. 2014-06-16 23:35:30 +02:00
Howaner
7c4b8306aa Glass shouldn't drop. 2014-06-16 23:05:29 +02:00
Tycho
84c83e0deb Fix a few warnings 2014-06-16 15:03:07 +01:00
Tiger Wang
a70b8298b6 Cauldrons check the heightmap 2014-06-14 10:14:04 +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
madmaxoft
2b45e720ad Added Y coord checks and documentation to cBlockDoorHandler. 2014-06-09 21:35:46 +02:00
madmaxoft
dcc71a3b7b Merge remote-tracking branch 'howaner/Redstone' 2014-06-09 21:20:26 +02:00
Tiger Wang
156c9851b8 Suggestions 2014-06-05 17:58:29 +01:00
Tiger Wang
01f38d8836 Added checks for no downfall biomes 2014-06-04 13:22:50 +01:00
Tiger Wang
86e5273cd1 Merge remote-tracking branch 'origin/master' into portals 2014-06-04 13:14:38 +01:00
Tiger Wang
a84f107400 Suggestions two 2014-06-01 20:00:11 +01:00
Tiger Wang
576f89c1d5 Implemented bed homes 
+ Implemented bed home positions
* Fixed some inventory and health server/client mismatches after world
change
 2014-06-01 18:46:59 +01:00
Howaner
683da71c0f Moved the IsDoor check before the meta get. 2014-05-31 11:48:54 +02:00
Howaner
0b7ed0f493 Add doxy-comment 2014-05-31 11:47:03 +02:00
Howaner
d8e16f8c1f Better SetOpen() and IsOpen() function from the doors. 2014-05-30 22:22:42 +02:00
Howaner
b4ba220934 Add SetOpen() and IsOpen() to BlockDoor.h and fix door redstone bug. 2014-05-29 19:21:56 +02:00
Tiger Wang
60a37c1370 Very minor code changes 2014-05-29 16:58:55 +01:00
Tiger Wang
cea3a8e7e8 Cauldrons fill 2014-05-29 16:58:40 +01:00
Tiger Wang
aa4477822a Suggestions 2014-05-29 16:03:41 +01:00
Tiger Wang
365c6f50bd Changed block send queue to use vectors 
As suggested by @worktycho.
 2014-05-29 11:57:06 +01:00
Howaner
142fa83124 Code improvements 2014-05-28 19:32:20 +02:00
Howaner
9f645b2c75 Fix hay place sound. 2014-05-28 17:05:13 +02:00
Howaner
421588d25d Fix fire break. 2014-05-28 16:59:51 +02:00
Howaner
d8072da61f Fix skull bugs. 2014-05-28 15:54:43 +02:00
Tiger Wang
ee929793f0 Hopefully fixed piston duplication issues 
* Fixes #879
* Fixes #714
 2014-05-25 13:46:34 +01:00
andrew
7aeb8ce993 Fixed cWither::KilledBy 2014-05-21 10:59:14 +03:00
andrew
07baf9bdd3 Cleaned up cPlayer::UpdateMovementStats; Wither achievements 2014-05-20 15:52:59 +03:00
STRWarrior
4ca178f24a Fixed compile problem. 2014-05-10 17:09:48 +02:00
STRWarrior
7f3683cfab A portal block now chooses a number between 2000 and 0 2014-05-10 17:03:02 +02:00
STRWarrior
3b1f11bd6a Each time a portal block receives a tick it has a 1 in 500 chance of spawning a zombie pigman. 2014-05-10 16:43:06 +02:00
Mattes D
fb58ef55be Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
Howaner
c96a27f4ae Superfluous method override. 2014-05-07 21:36:26 +02:00
Howaner
bc4a51781e Add lava and water check to block handlers. 2014-05-07 20:37:36 +02:00
Howaner
36a2aa2f21 Rename CanChangeDirtToGrass to CanDirtGrowGrass 2014-05-07 12:59:48 +02:00
Howaner
f5fe368220 Merge branch 'master' into Slabs 2014-05-07 12:54:58 +02:00
Howaner
7fe6e40bf7 Add clicks, exp subtraction, item check, ... 2014-05-05 17:34:29 +02:00
Howaner
3c102870f6 Add anvil window and slot area. 2014-05-05 17:34:17 +02:00
Tiger Wang
41f6643fd2 Fixed portal Z direction loop coding failure 
* Fixed portals created in the ZP/ZM direction eating its frame
* Changed return type of a function
 2014-05-04 00:38:06 +01:00
archshift
0e0c9d8248 Missed these CMakeLists. 2014-04-25 12:24:09 -07:00
STRWarrior
9660c4816f The new leaves don't decay anymore. 
Fixes #792
 2014-04-23 16:57:32 +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
jfhumann
013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00