1
0
Commit Graph

2349 Commits

Author SHA1 Message Date
Howaner
4ded58bfd1 Unnecessary return 2014-06-30 14:19:31 +02:00
Tiger Wang
b9d4431f6f Fixed respawning
* Fixes #1103
2014-06-29 22:44:16 +01:00
Tiger Wang
428cfb5c21 Suggestions 2014-06-29 22:41:31 +01:00
Mattes D
3c631fc0f9 Fixed offline UUID generator.
It generated invalid UUIDs, too many hex chars.
2014-06-29 18:27:41 +02:00
Tiger Wang
909e0ed95b Removed bad comment 2014-06-29 11:41:50 +01:00
Tiger Wang
dde641ce83 Properly implemented enderchests 2014-06-29 11:36:38 +01:00
Howaner
50e112788b Send statistics to the player, when he logged in. 2014-06-29 01:40:15 +02:00
Mattes D
1b89b997ff Merge pull request #1132 from mc-server/RemoveMD5
Removed the md5 library, obsoleted by PolarSSL.
2014-06-29 00:46:11 +02:00
Tiger Wang
536cb62f1c An unification of code style 2014-06-28 21:14:10 +01:00
Tiger Wang
35dc056f03 Likely fixed too quick food depletion
* Fixes FS427 properly, hopefully
2014-06-28 21:10:59 +01:00
STRWarrior
085cb4256e Fixed doxycomments 2014-06-28 21:55:21 +02:00
Tiger Wang
5e66d9aeab Fixed issue with breaking blocks at -1 coordinates 2014-06-28 20:45:05 +01:00
Tiger Wang
61cb08b546 Implemented tripwire(s) (hooks)
* Fixes #944
2014-06-28 20:44:34 +01:00
Mattes D
1495bba17c Fixed a silly path error in #include. 2014-06-28 18:20:46 +02:00
Mattes D
48639ee4d2 CMake: Added polarssl include dir as non-system. 2014-06-28 18:16:26 +02:00
Mattes D
3e104c25e9 Changed include folders to work for Bindings, too. 2014-06-28 12:49:08 +02: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
69befa9851 Fixed bad water/redstone simulator communication
* Fixes #713
2014-06-27 23:16:37 +01:00
Tiger Wang
b6df30831d Fixed server forcing players afloat
* Fixes #1131
2014-06-27 23:13:26 +01:00
Mattes D
9926abd4f5 Added generic entity-collecting.
Now any cEntity can be collected, not only cPickups.
This should help PR #1098.
2014-06-27 20:56:44 +02:00
Mattes D
d7bc5c5bd3 Added PolarSSL dependency to Bindings. 2014-06-27 20:23:05 +02:00
Mattes D
563f706422 Removed the md5 library, obsoleted by PolarSSL.
Fixes #1130.
2014-06-27 19:34:53 +02:00
Mattes D
e60b73ce69 Merged branch 'howaner/Bow'.
Removed the pickup collection broadcast due to bad code.
2014-06-26 18:42:28 +02:00
Mattes D
4826990ea0 Merged branch 'howaner/Pickups'. 2014-06-26 18:35:38 +02:00
Mattes D
0df644c9f7 FurnaceRecipe parsing: Fixed whitespace removing. 2014-06-26 18:28:10 +02:00
Mattes D
ec1015112c Fixed misformed trimming. 2014-06-26 18:20:12 +02:00
Mattes D
55bbdfa5d4 FurnaceRecipe: Moved the parsing into separate functions for clarity. 2014-06-26 18:18:41 +02:00
Mattes D
67e3c645d3 FurnaceRecipe parser: Made the parser more forgiving.
Errors don't cause a stop in the parsing, but rather just skip the offending line.
2014-06-26 17:52:37 +02:00
Mattes D
b90b0a1dff FurnaceRecipe parser: Added an else branch, changed to a switch. 2014-06-26 17:51:19 +02:00
Howaner
bf3229867b Add comment. 2014-06-26 17:26:47 +02:00
Howaner
cba273dc7e Fixed a comment and changed CombineCount to short. 2014-06-26 17:20:48 +02:00
Mattes D
3216fbabfd Merge remote-tracking branch 'origin/furnaceparsing' 2014-06-26 17:11:40 +02:00
Mattes D
7102e9edb0 Merged branch 'tonibm19/master'. 2014-06-26 17:09:28 +02:00
Howaner
9b7f1e3db8 Merge branch 'master' into Pickups 2014-06-26 15:56:44 +02:00
Howaner
f96955496f GameMode check 2014-06-26 15:56:03 +02:00
Howaner
eaf36766f6 Merge branch 'master' into Bow 2014-06-26 15:49:53 +02:00
Mattes D
af3779ab9a Merge pull request #1126 from mc-server/BlockInfoInit
BlockInfo is now a proper C++ singleton.
2014-06-25 22:23:57 +02:00
madmaxoft
e9aecfdf11 BlockInfo is now a proper C++ singleton.
It is properly initialized before it is ever used.
2014-06-25 08:07:06 +02:00
Howaner
dbcb7f819f Optimize combining. 2014-06-24 17:50:38 +02:00
Howaner
2dd7a0373b Better combining. 2014-06-24 16:19:22 +02:00
Howaner
d4e1277724 Add entity health saving. 2014-06-24 16:06:26 +02:00
Howaner
5ab01c4d42 Fix pickup combining over the maximum stack size. 2014-06-24 15:27:19 +02:00
madmaxoft
a1d2c114cf Fixed BlockInfo initialization.
Now cBlockInfo is initialized in the getter, instead of "at any time during startup", which included "after it was already needed".
2014-06-24 13:49:14 +02:00
Mattes D
1da39568a3 Added asserts for cChunk::GetBlockEntity() coords. 2014-06-24 09:46:38 +02:00
Mattes D
742370497a 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
2014-06-24 09:46:04 +02:00
Tiger Wang
7a23692131 Parenthesised comparison 2014-06-23 17:40:51 +01:00
madmaxoft
59270fd44d VoronoiMap: Added a missing initializer.
Fixes CID 68410.
2014-06-23 17:06:38 +02: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
madmaxoft
82dcc0b4db Prefabs don't draw into chunk if they don't intersect. 2014-06-23 00:15:55 +02:00
Tiger Wang
dc8817feee Merge remote-tracking branch 'origin/furnaceparsing' into furnaceparsing
Conflicts:
	src/FurnaceRecipe.cpp
2014-06-22 21:51:21 +01:00
Tiger Wang
c476fc3cf5 Suggestions 2014-06-22 21:49:37 +01:00
Tiger Wang
dad0037f98 Bettered zombie and skeleton AI
* Fixed potential issues with skylight detection
2014-06-22 20:44:55 +01:00
Tiger Wang
4238b0ebe8 Some Entity.cpp style improvements 2014-06-22 20:44:18 +01:00
Tiger Wang
33cc1f2a50 Fixed multiple issues with projectiles
* Fixed arrows not being collectable/not truly hitting a block/not
lodging into blocks/not going in far enough
* Fixed projectiles not playing their block hit animation owning to
being destroyed too quickly
2014-06-22 20:44:01 +01: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
Howaner
bebfb230da Changed 0xFFFFFFFB to ~0x04 2014-06-22 17:29:02 +02:00
Tiger Wang
c13cffcd30 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-06-22 15:05:02 +01:00
Tiger Wang
3ec8b33b76 Fixed another daylight sensor bug
Additionally fixed unpowering across chunks.
2014-06-22 15:04:23 +01:00
Tiger Wang
b2bf466122 Chests don't open if obstructed
* Fixes FS383
2014-06-22 14:47:05 +01:00
worktycho
3c0452ebef Fixed missing break
Fixes CID 68409
2014-06-22 14:17:07 +01:00
worktycho
119ba562d5 Fixed invalid iterator
Fixes CID 60408
2014-06-22 14:15:41 +01:00
worktycho
63ce2e8b37 Fixed compile errors 2014-06-22 12:30:37 +01:00
Tiger Wang
4a01fba3aa Suggestions 2014-06-22 00:06:58 +01:00
madmaxoft
08fed2a213 Added cClientHandle::IsUUIDOnline function.
Ref.: #771
2014-06-21 22:13:35 +02:00
Tiger Wang
537467fe25 Removed debugging code 2014-06-21 20:35:28 +01:00
Tiger Wang
a908f39dde Rewrote furnace recipe parser
* Fixes #110
2014-06-21 20:33:23 +01:00
madmaxoft
0a95d04ab3 Added a TestRails generator.
This is for debugging purposes only.
2014-06-21 20:19:44 +02:00
madmaxoft
9a57c590cd Fixed a caching bug in GridStructGen.
The elements in cache were queried wrong, so sometimes they wouldn't be used even if they were the ones to use.
2014-06-21 20:17:17 +02:00
madmaxoft
0e8c4ca5ab Updated prefabs to the latest Gallery content. 2014-06-21 15:02:40 +02:00
madmaxoft
b4ba86d758 Updated all prefabs to current Gallery content. 2014-06-20 22:45:08 +02:00
madmaxoft
79c1966290 MCA saver marks chunks as populated.
Fixes #140.
2014-06-20 21:30:11 +02:00
madmaxoft
9db9445e9f Optimized Voronoi calculation.
Fixes #818.
2014-06-20 17:10:18 +02:00
tonibm19
3e15c92d18 Added pig riding.
Now you can ride a pig using a carrot on a stick.
2014-06-20 10:50:21 +02:00
archshift
e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
Alexander Harkness
35a4aa419c Merge pull request #1096 from mc-server/redstonerefactor
Moved delayed repeaters to be handled in a seperate pass
2014-06-18 21:22:53 +01:00
Mattes D
c30b7b8735 Merge pull request #1045 from Howaner/GlobalFixes
Little fixes
2014-06-18 18:23:18 +02:00
STRWarrior
e0a9f37d90 (Force)ExecuteCommand returns the CommandResult enums
Exported and documented the CommandResult enums
2014-06-18 12:13:01 +02:00
archshift
21b9253ee6 Merge pull request #1100 from Howaner/Slabs 2014-06-18 00:47:08 -07:00
Howaner
2da7768298 Merge branch 'master' into Blocks 2014-06-17 19:50:26 +02:00
Howaner
bcf798f260 Fix fence gate sound (Redstone simulator). 2014-06-17 19:47:32 +02:00
worktycho
2f2071afc1 Merge pull request #1101 from Howaner/FenceGate
Fix fence gate redstone simulator.
2014-06-17 18:39:21 +01: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
STRWarrior
008a6ce311 Added crBlocked and crNoPermission 2014-06-17 16:19:31 +02:00
STRWarrior
15ae4ce233 HandleCommand now returns an CommandResult enum. 2014-06-17 14:55:15 +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
7e985f3c7d Add more documentation. 2014-06-17 13:44:07 +02:00
Howaner
ce06ec1632 derp 2014-06-17 13:33:41 +02:00
STRWarrior
8928310fd8 Fixed possible confusion.
If a command handler gets an error then the player will receive an unknown command error. This can be confusing for players.
2014-06-17 13:27:04 +02:00
Howaner
da88c98034 Add comment. 2014-06-17 13:25:36 +02:00
Howaner
a4d4621fbe Add parenthesis 2014-06-17 12:47:18 +02:00
Howaner
37de63895f The same: Float, not Double 2014-06-17 12:45:12 +02:00
Howaner
d89f03b90c Float, not Double 2014-06-17 12:43:45 +02:00
Howaner
1086b8ba05 Revert "Fix right click bugs."
This reverts commit 61b6fdde75.
2014-06-17 01:18:09 +02:00