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
Alexander Harkness
4fd9ac60e0
Merge pull request #1204 from Howaner/Blocks
...
Fix sapling drop.
2014-07-17 20:40:14 +01:00
Howaner
68cc9c6f91
Fix sapling drop.
2014-07-17 21:35: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
Tiger Wang
3dd9649665
Fixed mob knockback
...
* Fixes #901
2014-07-17 14:32:52 +01:00
Tiger Wang
db36f1a9fa
Fixed crash with entities in unloaded chunks
...
* Fixes #1190
2014-07-17 13:54:28 +01:00
Tiger Wang
c3b4b70a73
Merge pull request #1183 from Howaner/Sounds
...
Reset meta to zero when the blocks explode
2014-07-17 10:39:38 +01:00
Mattes D
ec77cf1b06
Merge pull request #1079 from mc-server/potions
...
Added potions and entity effect accessors
2014-07-17 11:23:09 +02:00
madmaxoft
70f304a96b
Fixed 3 MSVC warnings in SplashPotionEntity.
2014-07-17 11:07:33 +02:00
madmaxoft
430d8b42a5
Updated cPawn::KilledBy signature for custom death messages.
2014-07-17 11:07:10 +02:00
madmaxoft
7d0fc85d00
Merge branch 'master' into potions
2014-07-17 11:01:26 +02:00
madmaxoft
64c8b0d51b
Reformatted cItemPotionHandler.
2014-07-17 10:51:44 +02:00
madmaxoft
cd1e6f8ef0
Fixed formatting for cWitherSkullEntity
2014-07-17 10:24:29 +02:00
Mattes D
98244e96d1
Merge pull request #1193 from mc-server/deathmessages
...
Death messages
2014-07-17 10:12:22 +02:00
madmaxoft
e66b81b395
Merge remote-tracking branch 'origin/master' into potions
2014-07-17 10:06:13 +02:00
Tiger Wang
174906efca
Another fix for excessive food drain
2014-07-16 22:22:45 +01:00
Tiger Wang
960fcaa90c
Fixed a bug with buckets
...
* Additionally fixed cLineBlockTracer's EntryFace parameter when a block
was hit on the first iteration along the projected line
2014-07-16 22:22:00 +01:00
Tiger Wang
9194438fb5
Fixed another redstone simulator crash
2014-07-16 22:21:00 +01:00
Mattes D
e444106d09
Merge pull request #1192 from mc-server/skinuuid
...
Skins
2014-07-16 13:30:57 +02:00
Tiger Wang
c5d00f3ec5
Suggestions
2014-07-16 12:05:09 +01:00
Tiger Wang
2189f37c20
Resolved backwards compatibility issues
2014-07-16 11:38:52 +01:00
Tiger Wang
ad247735fd
Function rename
2014-07-16 11:23:26 +01:00
Tiger Wang
f2c4f56ccd
Unified functions
...
Thanks @Howaner!
2014-07-16 11:21:02 +01:00
Tiger Wang
1f6854792c
Store properties as Json::Value
2014-07-16 00:03:47 +01:00
Tiger Wang
1df5a1f237
Fixed a DropSpenser AddFace bug
2014-07-15 22:53:44 +01:00
madmaxoft
3f8ec7699f
Merge remote-tracking branch 'origin/master' into potions
2014-07-15 22:42:00 +02:00
madmaxoft
cc452f51c8
Restructured cSplashPotionEntity code.
...
The callback doesn't need declaration in the header.
Renamed PotionName to PotionParticleType.
2014-07-15 22:41:42 +02:00
Tiger Wang
74155f947c
Merge pull request #1191 from Masy98/Blocks
...
Removed stairs and carpet from IsSolid
2014-07-15 21:09:41 +01:00
Masy98
b579451731
Removed Stairs and carpet from the "isSolid" list to prevent mobs falling through them.
2014-07-15 20:34:49 +02:00
Masy98
d272e46821
Removed Stairs and carpet from the "isSolid" list to prevent mobs falling through them.
2014-07-15 20:32:49 +02:00
Howaner
74b6bf01a9
Derp.
2014-07-15 18:33:28 +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
Mattes D
090cbad667
Merge pull request #1188 from mc-server/FindClosestPlayerFix
...
Fixed FindClosestPlayer
2014-07-15 14:12:17 +02:00
Masy98
7f4029f8f4
Added Brick fence to m_Transparent
2014-07-15 14:06:03 +02:00
Tycho
57f4e871bb
Fixed FindClosestPlayer
2014-07-15 12:52:02 +01: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
madmaxoft
f5259d7651
Only the cEntityEffect::effXXX constants are Lua-exported.
...
The rest of the classes don't need exporting, there's no interface using them anyway.
2014-07-15 11:24:48 +02:00
madmaxoft
5193335efa
Reformatted EntityEffect code.
2014-07-15 09:48:11 +02:00
madmaxoft
d274851578
Fixed a MSVC warning in cEntityEffect::CreateEntityEffect().
2014-07-15 09:43:45 +02:00
madmaxoft
8e946da8ac
Merge branch 'master' into potions
2014-07-15 09:01:32 +02:00
madmaxoft
e2a1118f88
Pass cItem by reference.
...
Fixes CID 66445.
2014-07-15 08:48:12 +02:00
madmaxoft
7195c7dfe2
Added missing member initialization to cGridStructGen.
...
Fixes CID 68228.
2014-07-15 08:28:31 +02: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
82fe5c05f0
Fixed redstone simulator crash
...
* Fixes #1176
* Fixed #1186
2014-07-14 23:03:30 +01:00
Tiger Wang
5b1552435f
Fixed some meta resetting bugs
...
* Fixes #1174
* Fixes #1171
2014-07-14 21:57:44 +01:00
