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

59 Commits

Author SHA1 Message Date
Alexander Harkness
cbb637187e Fixed typo. 2014-10-27 16:46:30 +00:00
Alexander Harkness
11a80b5d09 Pocess? 2014-10-27 16:46:17 +00:00
Mattes D
aff537e714 Added type to block type enum. 2014-10-26 10:13:43 +01:00
Alexander Harkness
93833069a8 Merge branch 'master' into issue850 
Conflicts:
	src/BlockID.h
 2014-10-11 18:32:21 +01:00
Alexander Harkness
68762747e0 Fixed typo and removed useless right side up slab meta. 2014-10-11 16:59:13 +01:00
madmaxoft
77c5b410e6 Fixed eMonsterType Lua API mismatch. 2014-10-05 22:09:19 +02:00
Alexander Harkness
2f945475f2 Fix spelling of PRISMRAINE 
Fixes #1497
 2014-10-02 07:22:12 +01:00
Masy98
0d2a041a69 Fixed Red Sandstone and Prismarine drops 2014-10-01 19:13:59 +02:00
Masy98
0f0763303e Fixed ":" 2014-10-01 18:00:51 +02:00
Masy98
cc9e598803 Added missing 1.8 blocks, E_METAs and sounds 2014-10-01 17:57:53 +02:00
Howaner
425df6b694 Fixed 1.8 dirt types 2014-09-30 20:31:27 +02:00
w00tc0d3
d5ae659da3 Tabs -> spaces 2014-09-29 17:35:30 +02:00
netchip
6127c21af9 BlockStone: drop the right cobblestone on onBreak(). 
Signed-off-by: netchip <w00tc0d3@outlook.com>
 2014-09-29 17:18:20 +02:00
Masy98
7f42ba9fc1 Fixed 1.8 Item stacking and block harvesting 2014-09-12 16:48:37 +02:00
Masy98
741791ecfc Added barrier block 2014-09-11 16:07:54 +02:00
Masy98
8c3cd18cdd Added 1.8 food to the food list 2014-09-11 15:57:36 +02:00
Masy98
a9b4b60c80 Added new blocks to the BlockInfo 2014-09-10 21:44:04 +02:00
Masy98
c967633d0a Added 1.8 Blocks and Items 2014-09-10 21:02:15 +02:00
madmaxoft
1cc65b6264 Fixed style and alpha-sorting. 2014-09-03 10:29:10 +02:00
archshift
34d6f0713e Added mutton, which sheep now drop when killed 2014-09-02 23:21:08 -07:00
archshift
12012d0c80 Renamed NEWLEAVES and NEWLOG to LEAVES and LOG. 2014-07-30 11:09:31 -07:00
archshift
a9b597087b Merge remote-tracking branch 'origin/master' into issue850 
Conflicts:
	src/Blocks/BlockLeaves.h
	src/Generating/Trees.cpp
 2014-07-29 13:04:00 -07:00
Tiger Wang
8050a5b98a Suggestions 2014-07-21 22:49:06 +01: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
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
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
madmaxoft
993fd14ddf Fixed basic whitespace problems. 
Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
 2014-07-17 16:33:09 +02:00
madmaxoft
64c8b0d51b Reformatted cItemPotionHandler. 2014-07-17 10:51:44 +02:00
narroo
0019d17a11 Spacing fixes and a few more BLOCK_META constants. 2014-07-02 16:35:03 -04:00
archshift
814cdca054 Added wither damage type, wither entity effect. 2014-06-17 11:39:21 -07: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
35b79e5d71 Portal improvements and suggestions 2014-06-10 20:43:27 +01:00
Mattes D
af4a21ea06 Fixed deadlock when moving players to other worlds. 
Fixes #1039, fixes #851
 2014-06-08 21:58:30 +02:00
narroo
6aa3c5ece8 Fixed E_META_...Typos in BlockID.h 2014-06-07 20:24:31 -04:00
narroo
a1b3e51aba Fixed some E_META_*** Names 2014-05-20 11:10:22 -04:00
narroo
f4fa3985b5 Fixed Formmating 2014-04-28 15:49:34 -04:00
narroo
ff18400535 Added some E_META_* values to BlockID.h 2014-04-28 15:35:26 -04:00
Tiger Wang
2151ee997c Implemented weighted pressure plates 2014-04-17 12:11:31 +01:00
Howaner
9c46112486 Change SpreadSource prefix to ss 2014-03-27 23:20:28 +01:00
Howaner
3774b1be64 Add SpreadSource 2014-03-27 23:20:28 +01:00
madmaxoft
b1ad3322e5 Fixed code style after recent merge. 2014-03-20 09:28:29 +01:00
Tiger Wang
0524d70774 ENUMified shrapnel level 2014-03-19 23:06:39 +00:00
andrew
cff4ee11f1 Removed g_BlockXXX arrays 2014-03-02 11:30:20 +02:00
Howaner
b3339a6617 Better Jukebox API 2014-02-21 22:26:04 +01:00
Howaner
16f3809ded Add BlockNewLeaves.h and rename Darkoac to Darkoak 2014-02-19 19:18:40 +01:00
Howaner
a5a52fe160 Add new Trees (without Generator) 2014-02-19 16:58:31 +01:00
Tiger Wang
320cc74f0a Implemented paintings, fixes #689 
+ Implemented paintings
 2014-02-18 00:16:03 +00:00
Mattes D
351e925e3d Merge pull request #633 from mc-server/More_Sideways_Blocks 
More sideways blocks.
 2014-02-03 14:01:22 -08:00
STRWarrior
70e48960ac Named the different quartz block. 2014-02-03 22:30:32 +01:00
Tiger Wang
e56d41175b TNT improvements 
+ Added entity damage
+ Added entity propulsion
* Fixed #67 and fixed #230
 2014-02-02 19:16:38 +00:00