1
0
Commit Graph

5357 Commits

Author SHA1 Message Date
Howaner
f5fe368220 Merge branch 'master' into Slabs 2014-05-07 12:54:58 +02:00
Tiger Wang
e5b42b9f16 Fixed wires powering wires diagonally below them 2014-05-06 23:05:14 +01:00
Mattes D
66c5c81e02 Merge pull request #985 from Howaner/Anvil
Add anvil inventory.
2014-05-06 21:46:50 +02:00
Mattes D
e400b1acd8 Merge pull request #927 from mc-server/fixes
Small fixes
2014-05-06 21:44:55 +02:00
Tiger Wang
696a7bc52e Merge branch 'master' into fixes
Conflicts:
	src/Vector3.h
2014-05-06 20:15:19 +01:00
Tiger Wang
cca8376a01 Suggestions'd #2 2014-05-06 19:38:01 +01:00
Howaner
954b59d6f4 Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count() 2014-05-06 19:38:09 +02:00
Howaner
27f95454a9 Simplified the HandleAnvilItemName() code. 2014-05-06 17:31:02 +02:00
Tiger Wang
1df7dbe7c9 Suggestions'd 2014-05-05 23:45:35 +01:00
madmaxoft
9542b0b875 Changed cPieceGenerator to support pairings.
Fixes #982.
2014-05-05 23:05:30 +02:00
madmaxoft
e4af9a21af Prefabs can specify that they don't want flooring.
Previously the flag was ignored.
2014-05-05 22:28:54 +02:00
Howaner
dca3af1f0f Change int to size_t return. 2014-05-05 22:11:48 +02:00
madmaxoft
b69a0c914e Fixed a flipped condition in cBlockArea::Merge(). 2014-05-05 20:33:50 +02:00
Howaner
a138671e0e Fix SetRepairedItemName() in SlotArea.cpp 2014-05-05 17:36:22 +02:00
Howaner
f2617d0683 Add comments to CanTakeResultItem() 2014-05-05 17:34:44 +02:00
Howaner
c162d69e7b Add doxycomments to cSlotAreaAnvil functions. 2014-05-05 17:34:41 +02:00
Howaner
8a6119437d Changed HandleAnvilItemName() length to size_t in ClientHandle.h 2014-05-05 17:34:38 +02:00
Howaner
ecc62dbb9c Add anvil shift click. 2014-05-05 17:34:35 +02:00
Howaner
ca3c9ce84d This isn't a enchantment table :D 2014-05-05 17:34:32 +02:00
Howaner
7fe6e40bf7 Add clicks, exp subtraction, item check, ... 2014-05-05 17:34:29 +02:00
Howaner
6ac332cd06 Add MC|ItemName plugin message. 2014-05-05 17:34:24 +02:00
Howaner
3c102870f6 Add anvil window and slot area. 2014-05-05 17:34:17 +02:00
Mattes D
3c40544336 Merge pull request #978 from mc-server/VectorAssignmentOperator
Vector3 warning fixes
2014-05-05 17:19:55 +02:00
worktycho
ef85bef978 Fixed crash on creating a world during plugin initialisation 2014-05-05 16:06:45 +01:00
Tiger Wang
bde40af406 Fixed formatting 2014-05-05 15:43:45 +01:00
Tiger Wang
213a96e6d6 Merge pull request #956 from mc-server/redstoneimprovements
Redstone simulator performance and functionality improvements.
2014-05-04 20:25:54 +01:00
Tiger Wang
a94546a047 Fixed 027efe09ea 2014-05-04 14:42:12 +01:00
Tiger Wang
0d1804e439 Merge branch 'master' into redstoneimprovements
Conflicts:
	src/ClientHandle.cpp
	src/Entities/FallingBlock.cpp
	src/Mobs/AggressiveMonster.cpp
	src/Simulator/IncrementalRedstoneSimulator.cpp
2014-05-04 14:15:10 +01:00
Tiger Wang
027efe09ea Fixed lever and button powering direction 2014-05-04 14:00:59 +01:00
madmaxoft
e88811e589 Fixed ProtoProxy compilation in MSVC2013.
Fixes #983.
2014-05-04 14:39:21 +02:00
madmaxoft
136aeb1f64 Removed convert-assign operator.
We want all conversions to be explicit, not hidden.
2014-05-04 13:29:32 +02:00
Tiger Wang
bcd8f727b4 Fixed pressure plate oversights
* Fixed stone pressure plates not checking for the correct distance for
players
* Fixed pressure plates in general not link powering the blocks beneath
them
2014-05-04 00:39:03 +01: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
madmaxoft
383fe0cc1e Hotfixed Chunked transfer encoding in Yggdrasil.
By using HTTP/1.0, we're disabling the support for the Chunked encoding on the server. This is a hotfix for #979, a proper parser implementation is still needed.
2014-05-03 23:59:45 +02:00
madmaxoft
eaf3dcb9f7 Fixed connection encryption.
Fixes #975.
2014-05-03 23:46:04 +02:00
madmaxoft
b4496278a5 Removed the controversial Vector3::operator <.
It hasn't been used in any C++ code and Lua doesn't need it.
2014-05-03 20:17:47 +02:00
madmaxoft
d4ae00434c Fixed float comparison warnings in Vector3.
There's a bitwise comparison (Equals), and there's Eps-based comparison (EqualsEps).
2014-05-03 19:57:34 +02:00
madmaxoft
ee79bd10c2 Implemented a true assignment operator for Vector3. 2014-05-03 19:34:46 +02:00
madmaxoft
4377a5c31e Fixed vanilla fluid simulator.
Fixes #919.
2014-05-03 19:23:59 +02:00
archshift
ba079038af Seperate instructions for OSX and Linux 2014-05-02 15:47:40 -07:00
madmaxoft
cbf4a17e05 Attempted fix for CLang warnings in Vector3.h.
C++11 seems to have deprecated classes that have custom copy-constructor but not a custom assignment operator.
2014-05-02 23:50:22 +02:00
madmaxoft
58224863c0 Fixed vanilla fluid simulator.
Fixes #919.
2014-05-02 22:07:30 +02:00
madmaxoft
8ff7cf9262 Fixed a buffer overflow in cChunk:SetLight().
There are only half as many bytes for light than there are blocktypes.
2014-05-02 20:56:42 +02:00
madmaxoft
92c022c140 Open files in shared mode on windows, so that other tools may read them.
This was the behavior before fopen_s() was used for implementation; unlike fopen(), fopen_s() opens the file in exclusive mode.
2014-05-02 20:55:50 +02:00
madmaxoft
5082d55e85 A bit of reformatting. 2014-05-02 19:40:12 +02:00
madmaxoft
839447f0bb Merge branch 'master' into fixes. 2014-05-02 19:34:28 +02:00
madmaxoft
202ce3e737 Fixed MagmaCube spawning.
Fixes #928.
2014-05-02 19:17:22 +02:00
madmaxoft
5c7876c2dd Added a sanitizer for Spawn egg damage value.
This disallows spawning unknown mobs from unknown spawn eggs. Ref.: #928.
2014-05-02 19:13:57 +02:00
madmaxoft
13452d3ab9 APIDump: Updated the OnDisconnect hook docs.
Ref.: #655.
2014-05-02 12:35:35 +02:00
madmaxoft
0cfa0c4561 APIDump: Improved error handling in API file loader. 2014-05-02 12:35:35 +02:00