Masy98
741791ecfc
Added barrier block
2014-09-11 16:07:54 +02:00
Masy98
e34767b265
Fixed incorrect handlers
2014-09-11 15:39:37 +02:00
Masy98
214cc0f15d
Added stone slab in BlockSlab.h
2014-09-10 21:50:46 +02:00
Masy98
a9b4b60c80
Added new blocks to the BlockInfo
2014-09-10 21:44:04 +02:00
Masy98
f173cfe430
Added new blocks to the BlockHandler
2014-09-10 21:15:06 +02:00
Mattes D
76d5aa1d51
Merge pull request #1402 from Masy98/Sounds
...
Moved sound-configs into BlockID.h and fixed/ added loads of sounds
2014-09-10 08:36:33 +02:00
Masy98
65e6b1e50e
Removed old sound-configuration for SignPosts
2014-09-09 20:10:37 +02:00
Masy98
a171a6ce93
Removed old sound-configuration for Repeaters
2014-09-09 19:50:35 +02:00
Masy98
27edb7f0d0
Removed old sound-configuration for Trapdoors
2014-09-09 19:37:07 +02:00
Masy98
6cc4ac0bca
Removed old sound-configuration for doors
2014-09-09 16:28:08 +02:00
Masy98
acae3c9c65
Moved sound-configs into BlockID.h and fixed/ added loads of sounds
2014-09-09 16:00:26 +02:00
Tycho
2c945c8818
TimeOfDay does not need to be an Int64
2014-09-08 19:07:45 +01:00
madmaxoft
9a4e8bf83f
Merge remote-tracking branch 'Hircine/Enchantments'
2014-09-01 14:03:39 +02:00
worktycho
365d2447d0
Check range of y in HasNearLog
...
Fixes #803
2014-08-31 00:15:48 +01:00
Jaume Aloy
4900645b28
Added a_Digger check
2014-08-30 00:27:33 +02:00
Mattes D
97c4c057e4
Fixed conversion warning.
2014-08-29 11:20:33 +03:00
Hownaer
c2260addf4
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-08-28 18:58:58 +02:00
Hownaer
eaf33e22cf
Fixed anvil placing.
2014-08-28 18:57:56 +02:00
Mattes D
52a6b30f32
Merge remote-tracking branch 'origin/master' into CraftingFixes
2014-08-28 16:53:36 +03:00
Mattes D
49ac6fadfc
Fixed spaces after "template" keyword.
2014-08-28 16:44:36 +03:00
Jaume Aloy
7d771953c0
More Enchantments
...
- Added Thorns and Respiration enchantments
2014-08-22 11:49:49 +02:00
Jaume Aloy
19d1c976e7
Protection Enchantments, some fixes
...
- Protection echantments (fire, blast, feather falling, protection and
projectile). It isn't finished, add secondary effects and optimize the
code.
- Removed some brackets.
- Silk touch fixed.
2014-08-21 12:08:38 +02:00
Howaner
f7774ec336
Merge branch 'master' into Fire
2014-08-20 22:25:05 +02:00
Howaner
67fc19301e
Removed old classes from the CMakeLists.txt
2014-08-20 12:14:56 +02:00
Howaner
b5ffe06f88
Code formatting fixes.
2014-08-19 22:14:37 +02:00
Jaume Aloy
5008eb8c83
Changed if in BlockHandler
2014-08-19 18:40:42 +02:00
Jaume Aloy
596203e692
Fixes
...
- Changed m_TicksLeftBurning > 0 for IsOnFire()
- Tried to do the changes in BlockHandler.cpp
- Removed m_Creator in ArrowEntity
- Added m_Enchantments in ProjectileEntity CreatorData
- Added blank lines between functions
2014-08-19 17:57:32 +02:00
Jaume Aloy
07350de514
Changed if for switch
2014-08-19 16:47:33 +02:00
Jaume Aloy
1897f678f9
Added more enchantments and some fixes
...
- Removed Debug messages
- Added Punch enchantment effect
- Added Silk Touch enchantment
- Added Unbreaking enchantment effect
2014-08-19 16:08:17 +02:00
Howaner
74fabb079c
Moved the clicked-through block check to the top of the function.
2014-08-11 22:34:33 +02:00
Howaner
938bf1df69
Changed comment.
2014-08-10 17:12:08 +02:00
Howaner
ebfc0fdc67
Added comment.
2014-08-08 22:04:53 +02:00
Howaner
3d68466ab0
Send the old slab to the client when the interact cancelled.
2014-08-08 18:55:05 +02:00
Tiger Wang
0b9eb20b92
Fixed signs not staying on other signs
2014-08-04 21:22:08 +01:00
Mattes D
35cfbfd51a
Merge pull request #1269 from Howaner/BlockEntitys
...
Added beacon.
2014-08-01 17:43:02 +02:00
Howaner
87d195171a
Changed IsSolid to FullyOccupiesVoxel
2014-07-31 23:08:08 +02:00
Howaner
bffad50436
Fixed water from ice and removed packed ice drop.
2014-07-31 18:41:48 +02:00
Howaner
89b1bbdc5f
Added beacon.
2014-07-30 21:59:35 +02:00
Tiger Wang
8811837aea
Merge branch 'master' into portals
...
Conflicts:
src/World.h
2014-07-29 15:27:19 +01:00
Howaner
ba36e79bc5
Merge branch 'master' into Inventory2
...
Conflicts:
src/BlockInfo.cpp
2014-07-26 13:23:11 +02:00
Tiger Wang
d3012d6904
Merge remote-tracking branch 'origin/master'
2014-07-24 21:38:46 +01:00
Tiger Wang
3a6002de5b
Fixed block drops
...
* Fixes #1242 (the issue addressed within)
2014-07-24 21:38:25 +01:00
archshift
4191be7ddb
Removed redundant semicolons and re-added warning
2014-07-24 11:21:37 -07:00
Howaner
396739cc0f
Fix item durability.
...
Fixes #1181
2014-07-23 16:32:09 +02:00
madmaxoft
dfadcf7453
BlockLeaves: Fixed comment style.
2014-07-23 09:12:06 +02:00
Tiger Wang
bc5db3274f
Fix misguided comment on bits...
...
...obviously written by someone very confused, also known as me
2014-07-22 21:09:37 +01:00
Tiger Wang
18a0b60c12
Merge remote-tracking branch 'origin/master' into saplingsandleaves
...
Conflicts:
src/Defines.h
2014-07-22 18:30:31 +01:00
Tiger Wang
0a15e1f420
Suggestion and failed merge fix
2014-07-22 10:33:16 +01:00
Tiger Wang
3385ed56b8
Merge remote-tracking branch 'origin/master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Player.cpp
src/Root.cpp
src/World.cpp
2014-07-22 10:24:28 +01:00
madmaxoft
93d29555e5
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00