madmaxoft
e09a04a23a
Fixed datatype truncation in Diff() template.
2014-05-18 22:36:31 +02:00
Mattes D
ac00568183
Merge pull request #998 from mc-server/StatManager
...
Statistic Manager
2014-05-18 22:30:34 +02:00
Julian Laubstein
40ce737a7e
removed the <list> include
2014-05-18 17:30:21 +02:00
Julian Laubstein
cfd3c33dfa
Added unload <pluginname> command
2014-05-18 17:16:02 +02:00
Tycho
8a0d3f7921
Fixed issue with types not being defined for an unused parameter
2014-05-18 15:37:17 +01:00
madmaxoft
a7e52e51dc
Village roads are drawn properly.
2014-05-17 22:26:09 +02:00
madmaxoft
7004043c61
Village houses are height-adjusted onto the terrain.
2014-05-17 21:54:04 +02:00
Julian Laubstein
19f4cd0547
Added load cmd
2014-05-17 19:39:16 +02:00
Julian Laubstein
6951b68aaf
Added load command in the cServer class
2014-05-17 18:38:33 +02:00
Tycho
f451075c1f
derp
2014-05-17 15:32:28 +01:00
Tycho
1f98f21dd1
fixed assignment bugs and Skylight bug
2014-05-17 15:11:58 +01:00
worktycho
4e841146b8
Fix assignment ops 2
2014-05-17 14:29:15 +01:00
worktycho
7777da379d
Fix assignment operators
2014-05-17 14:04:44 +01:00
madmaxoft
fc5c3abcba
Updated PlainsVillage prefabs to the latest Gallery contents.
2014-05-17 02:26:44 +02:00
Howaner
989312c4e7
Add more move checks
...
- Invalid X/Y/Z/Stance check (std::isnan)
- Illegal stance
- Illegal position (32.000.000 is the world size)
2014-05-16 22:04:19 +02:00
tonibm19
5724dcc2c1
Fixed anvil exp removing
2014-05-16 19:33:57 +02:00
Mattes D
0e43f88668
Merge pull request #994 from Howaner/GlobalFixes
...
Add place/break radius, add dig cancel packet and add item resend on break/place cancel.
2014-05-15 21:16:04 +02:00
Howaner
28a9c16db2
Fix compile error.
2014-05-15 19:59:52 +02:00
Howaner
6c5ff597bb
Move radius check.
2014-05-15 19:58:48 +02:00
madmaxoft
70b0547499
Fixed a NULL ptr failure in GridStructGen.
...
When the descendant generator returned a NULL structure, the generator would crash. Now it uses a special cEmptyStructure class instead.
2014-05-15 16:03:45 +02:00
madmaxoft
56f7ad2cd9
Changed village generator defaults to more reasonable values.
2014-05-15 10:44:08 +02:00
madmaxoft
34e5f0c164
Changed village road generation to use multiple prefabs.
2014-05-15 10:43:54 +02:00
madmaxoft
f5fdbdaf29
VillageGen rewritten using BFSPieceGenerator.
...
Piece composition is not good yet, the buildings aren't height-adjusted and the road pieces will need special processing. This is mainly for adjusting the per-piece params.
2014-05-15 00:14:06 +02:00
madmaxoft
3660ce6834
cPrefab can be constructed in code.
2014-05-15 00:12:01 +02:00
andrew
466ff2204f
Fixes
2014-05-13 14:53:15 +03:00
madmaxoft
9c8e8ef7ae
VillageGen: Added well placement and the general algorithm description.
2014-05-12 22:43:59 +02:00
andrew
aea866f5b1
Movement Statistics
2014-05-12 21:38:52 +03:00
andrew
b3d2b5b2c9
cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement()
2014-05-12 17:05:09 +03:00
archshift
3a5e04d118
More switch warnings.
2014-05-11 16:54:42 -07:00
archshift
3f9e00a3f3
Fixed a few more switch warnings.
2014-05-11 16:28:48 -07:00
archshift
6c57b38b74
Fixed a warning and a complaint about a never-read variable.
2014-05-11 13:44:30 -07:00
madmaxoft
c0727c4265
Initial VillageGen implementation.
...
WIP, doesn't generate anything yet.
Ref.: 740.
2014-05-11 22:35:41 +02:00
andrew
6cb3483954
Fixed compilation
2014-05-11 21:41:25 +03:00
Tycho
c46f240d81
Added several more testsfor arrays and coordinates
2014-05-11 19:24:09 +01:00
Tycho
5d39ecc64b
Fixed bug that caused Array Setters to always create segments
2014-05-11 18:42:38 +01:00
andrew
e3c6c8f3dd
Fixed stat serialization
2014-05-11 20:30:54 +03:00
Tycho
9568c223ff
SkyLight defaults to 0xFF
2014-05-11 18:24:21 +01:00
Tycho
9278bb732d
Fixed a bug in writting zeros to a non-allocated section
2014-05-11 15:52:02 +01:00
andrew
c7c3724a3e
Statistic Manager
2014-05-11 14:57:06 +03:00
Howaner
5c9f89526a
Rename HandleBlockDigCancel to FinishDigAnimtion.
2014-05-11 11:56:15 +02:00
Mattes D
28815252e6
Merge branch 'master' into SslWebAdmin
2014-05-10 21:27:57 +02:00
Mattes D
7e71f1f7dc
Merge pull request #993 from mc-server/GridStructGen
...
Grid struct gen
2014-05-10 21:21:44 +02:00
Tycho
7ca33bd832
Fixed stupid error
2014-05-10 17:56:59 +01:00
Tycho
43fc1471a1
Merge branch 'master' into chunksparsing/structs
2014-05-10 17:55:43 +01:00
Tycho
0adb5c94b8
Fixed stupid buffer overflow in array setblocks
2014-05-10 17:46:49 +01:00
STRWarrior
079f8cd535
Fixed the console saying no plugins are loaded.
2014-05-10 17:55:39 +02:00
STRWarrior
4ca178f24a
Fixed compile problem.
2014-05-10 17:09:48 +02:00
STRWarrior
7f3683cfab
A portal block now chooses a number between 2000 and 0
2014-05-10 17:03:02 +02:00
STRWarrior
3b1f11bd6a
Each time a portal block receives a tick it has a 1 in 500 chance of spawning a zombie pigman.
2014-05-10 16:43:06 +02:00
Tycho
cb6200345c
Fixed bug in setting metas
2014-05-10 15:19:06 +01:00
Tycho
d478e3cfb1
Merge branch 'master' into chunksparsing/structs
...
Conflicts:
src/Chunk.h
2014-05-10 05:05:44 -07:00
Mattes D
683b839e2b
Client cert is not requested.
2014-05-10 09:21:29 +02:00
Howaner
eb0f713b6a
Add block place/break distance check.
2014-05-09 23:43:00 +02:00
Howaner
c8631d9a9b
Add DIG_STATUS_CANCELLED packet and add item resend, when a block can't place/break.
2014-05-09 23:10:02 +02:00
Mattes D
a38d8b6513
Merge pull request #992 from mc-server/coverity_fixes
...
Coverity fixes
2014-05-09 21:20:27 +02:00
Mattes D
839cff62ad
Merged branch 'master' into GridStructGen.
2014-05-09 20:59:59 +02:00
Mattes D
a2e18f0e01
Fixed size_t in FireworksSerializer.
2014-05-09 20:32:27 +02:00
Mattes D
1a5a123301
Fixed message formatting.
2014-05-09 20:16:29 +02:00
Mattes D
a936736acd
Removed unused constants from MineShafts and Ravines.
2014-05-09 20:13:20 +02:00
Mattes D
294b7ca24a
Even more size_t fixes.
2014-05-09 20:05:00 +02:00
Mattes D
d67ea97a26
More size_t fixes.
2014-05-09 19:57:59 +02:00
Mattes D
0fc60edaeb
Removed an unused NetherFortGen variable.
2014-05-09 19:53:57 +02:00
Mattes D
b997fbaf45
Removed an unused macro.
2014-05-09 19:35:35 +02:00
Mattes D
5b54dc3eac
Build fixes after the last size_t batch.
2014-05-09 19:33:22 +02:00
worktycho
c4cd201f18
Range Check on schematic size
...
Fixes CID 55830
2014-05-09 17:39:13 +01:00
Mattes D
dd350bc1f3
World pre-generation distance is settable in world.ini.
2014-05-09 18:32:04 +02:00
Mattes D
56ad2c2124
Lighting thread disabled its chunkstays before deleting them.
2014-05-09 18:32:03 +02:00
Mattes D
fb58ef55be
Fixed MSVC 64-bit build warnings.
2014-05-09 18:32:03 +02:00
worktycho
99af4453ef
Check the height and width values read.
...
Fixes CID 55831
2014-05-09 17:30:47 +01:00
Mattes D
ea593dcaad
Ravines rewritten using cGridStructGen.
...
Ref.: #987 .
2014-05-09 18:30:39 +02:00
worktycho
17c7c31130
Initialise m_HasTeleported in both constructors
2014-05-09 16:56:29 +01:00
Mattes D
95ead1128f
cWormNestCaves rewritten using cGridStructGen.
...
Ref.: #987 .
2014-05-09 11:16:13 +02:00
Mattes D
14543aa3fc
Mineshafts generator rewritten to use GridStructGen.
2014-05-09 10:59:33 +02:00
Mattes D
ee680990ba
Fixed cGridStructGen.
...
Now cNetherFortGen works with the new architecture.
2014-05-08 21:10:55 +02:00
Mattes D
ccf44f18d1
Merge branch 'master' into GridStructGen
2014-05-08 20:17:31 +02:00
Mattes D
c4ea25e136
Fixed MSVC 64-bit build warnings.
2014-05-08 20:16:35 +02:00
madmaxoft
564261cfd9
cNetherFortGen uses cGridStructGen.
...
WIP, this doesn't work properly yet.
2014-05-07 22:34:06 +02:00
Mattes D
d1b719885d
Merge pull request #989 from Howaner/Anvil
...
Add repair cost to cItem, add custom name to NBTChunkSerializer and fix ...
2014-05-07 22:18:53 +02:00
Mattes D
d9cdd4441e
Merge pull request #853 from Howaner/Slabs
...
Grass now grows under up-side-down slabs
2014-05-07 22:18:23 +02:00
Howaner
c96a27f4ae
Superfluous method override.
2014-05-07 21:36:26 +02:00
Howaner
df71cc931b
Missing comma
2014-05-07 21:32:52 +02:00
Howaner
10e3c262db
Send item back to the client when the item get damage.
2014-05-07 21:00:21 +02:00
Howaner
fbb6404cc8
Change m_RepairCost to int.
2014-05-07 20:43:37 +02:00
Howaner
bc4a51781e
Add lava and water check to block handlers.
2014-05-07 20:37:36 +02:00
Howaner
36a2aa2f21
Rename CanChangeDirtToGrass to CanDirtGrowGrass
2014-05-07 12:59:48 +02:00
Howaner
f5fe368220
Merge branch 'master' into Slabs
2014-05-07 12:54:58 +02:00
Howaner
e86bf64867
Where is the problem with clang?
2014-05-07 12:45:20 +02:00
Howaner
80bcc43c7b
Fix MagmaCube save.
2014-05-07 12:43:21 +02:00
Howaner
d6cb6e0423
Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs.
2014-05-07 12:30:30 +02:00
madmaxoft
da5db2ddf9
Initial cPrefabPiecePool refactoring.
...
Ref.: #986 .
2014-05-07 11:01:30 +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
madmaxoft
ac1c3ba5d9
Fixed an extra space.
2014-05-06 21:43:31 +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
madmaxoft
8f262d8a9d
Initial cGridStructGen refactoring.
...
Ref.: #987 .
2014-05-06 16:41:55 +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
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
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
Tycho
ec407dd27d
Merge branch 'master' into chunksparsing/structs
...
Conflicts:
src/Chunk.cpp
2014-05-03 06:07:56 -07:00
Tycho
616ddf5ca5
cCHunkBuffer that compiles with TestGlobals.h
2014-05-03 06:02:51 -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
3942ebdcb6
WebAdmin outputs a log message about HTTP / HTTPS status.
2014-05-02 23:46:32 +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
4d704255de
HOOK_DISCONNECT has cClientHandle as its first parameter.
...
Ref.: #655 .
2014-05-02 12:35:34 +02:00
madmaxoft
06da2c86b4
Fixed warnings in ManualBindings.
2014-05-01 23:43:11 +02:00
madmaxoft
d950c8346f
Fixed warnings in Lua helpers.
2014-05-01 23:38:35 +02:00
madmaxoft
6bdd3ee35e
Merged branch 'master' into SslWebAdmin.
2014-05-01 23:20:00 +02:00
madmaxoft
cb07541029
Fixed a warning in Noise.
2014-05-01 23:10:37 +02:00
madmaxoft
e24bdc9328
More ClientHandle fixes.
2014-05-01 23:03:23 +02:00
madmaxoft
ed75d3a836
Fixed warnings in ClientHandle.
2014-05-01 22:58:58 +02:00
madmaxoft
fb173a756c
Fixed warnings in cByteBuffer.
2014-05-01 22:54:22 +02:00
madmaxoft
a4d8c6d656
Fixed warning in BlockID.
2014-05-01 22:47:02 +02:00
madmaxoft
a91129af4a
Fixed warnings in cBlockArea.
2014-05-01 22:44:52 +02:00
madmaxoft
b6b86b7270
Fixed warnings in FastNBT.
2014-05-01 22:43:37 +02:00
madmaxoft
a6eba4ff8b
Fixed warning in cCallbackSslContext::cDataCallbacks.
2014-05-01 22:41:41 +02:00
madmaxoft
e175ae551c
Fixed warning in cBlockArea.
2014-05-01 22:41:18 +02:00
madmaxoft
4a95271790
Merge branch 'master' into SslWebAdmin
2014-05-01 22:16:29 +02:00
madmaxoft
30e81156eb
Added a missing return statement.
2014-05-01 22:02:45 +02:00
madmaxoft
b0056cdcf8
Removed the explicit copy constructor for cItem.
...
The compiler generates an implicit one with the same contents and warns about it. The function left in for ToLua to generate the binding for it.
2014-05-01 22:02:25 +02:00
madmaxoft
9221b45898
cSslContext has virtual destructor now.
2014-05-01 21:23:37 +02:00
Tycho
8780b324ff
Merge branch 'master' into chunksparsing/structs
2014-05-01 11:50:40 -07:00
Mattes D
a2cffb0363
Fixed MSVC2013 compilation.
2014-05-01 20:22:23 +02:00
Mattes D
d9e5dbf165
Renamed PublicKey to CryptoKey in CMakeLists.txt
2014-05-01 18:06:23 +02:00
madmaxoft
772b57ca04
Anvil saver pads data to 4K boundaries.
...
Fixes #524 .
2014-05-01 18:00:10 +02:00
madmaxoft
1587b21edd
Renamed cPublicKey to cCryptoKey.
...
The class can hold both the private key and the public key, bad naming on PolarSSL's part.
Also somewhat fixed the cert and key loading in cHTTPServer.
2014-05-01 15:21:41 +02:00
madmaxoft
60850fe3e8
Fixed crashes in the SSL HTTP connection.
2014-05-01 15:08:15 +02:00
madmaxoft
272c232efb
Implemented SSL connection for WebAdmin.
...
Fixes FS-319.
2014-05-01 11:48:03 +02:00
madmaxoft
a04cb6d146
Fixed HTTP message parsing, prepared for SSL.
2014-05-01 11:34:15 +02:00
madmaxoft
e1b6a16945
Added a (disabled) test of low-security ciphersuites.
...
Enabling this allows the connection to be sniffed and decoded using Wireshark, when given the SSL private key.
2014-05-01 11:33:29 +02:00
madmaxoft
e2bf3783e8
Fixed BufferedSslContext's buffer reading and writing.
2014-05-01 11:32:25 +02:00
madmaxoft
47feb91e57
cSslContext supports setting own cert / privkey.
2014-05-01 00:28:27 +02:00
madmaxoft
e6786074d5
Added cBufferedSslContext implementation.
2014-05-01 00:27:42 +02:00
madmaxoft
ab2dfb44fa
If webadmin.ini doesn't exist, example one is written immediately.
2014-04-30 17:37:25 +02:00
madmaxoft
f2b5790776
Fixed a warning when an empty item is being created.
2014-04-30 17:36:51 +02:00
madmaxoft
ae2d18daee
Ladders set as transparent.
2014-04-30 17:13:56 +02:00
madmaxoft
58929a9948
Removed the unused cBlockingTCPLink class.
2014-04-30 17:06:46 +02:00
Mattes D
014fab58e6
Merge pull request #965 from mc-server/SslWrappers
...
Ssl wrappers
2014-04-30 17:05:13 +02:00
madmaxoft
1dbdb8ed91
Delayed sending the KeepAlive packet for 3 seconds after login.
...
This should alleviate #889 .
2014-04-29 23:10:50 +02:00
madmaxoft
c045bb3f4c
Removed unneeded #includes.
2014-04-29 17:45:20 +02:00
madmaxoft
6cb2d2461f
Moved the rest of the Crypto objects into their own respective files.
2014-04-29 17:37:15 +02:00
madmaxoft
d9f7ae6a4d
Moved cPublicKey to its separate file in PolarSSL++.
2014-04-29 17:13:08 +02:00
madmaxoft
7e972f6a5d
Merge branch 'master' into SslWrappers
2014-04-29 15:41:24 +02:00
madmaxoft
015bf244b5
Added BiomeToString() API function.
2014-04-29 15:36:29 +02:00
madmaxoft
5d33ce226f
Added BiomeToString() API function.
2014-04-29 15:36:05 +02:00
madmaxoft
79ec770d77
Added missing initialization.
2014-04-29 11:17:47 +02:00
madmaxoft
ec33bbe294
Moved cRsaPrivateKey to PolarSSL++, rewritten using existing objects.
2014-04-29 11:04:54 +02:00
madmaxoft
709ae320e0
Disabled MSVC warnings about constant bool expressions.
2014-04-28 22:30:07 +02:00
madmaxoft
55a7f392cc
Hopefully fixed repeated clang warnings.
2014-04-28 22:22:07 +02:00
madmaxoft
dffd38e53b
Fixed a MSVC warning.
2014-04-28 22:21:49 +02:00
madmaxoft
0b16e6821f
Merged branch 'master' into SslWrappers.
2014-04-28 22:05:02 +02:00
madmaxoft
bab3a3cd31
Added the G1 root cert.
...
Now the authenticator finally works.
2014-04-28 21:16:52 +02:00
madmaxoft
16b3eae862
Added a debug cert printing function.
2014-04-28 21:16:32 +02:00
Mattes D
709015369d
Merge pull request #940 from Howaner/GlobalFixes
...
Add entity invulnerable
2014-04-28 20:58:15 +02:00
madmaxoft
8ab8fb344f
Fixed braces.
2014-04-28 20:37:22 +02:00
madmaxoft
f04957321d
Fixed missing return value warning in MSVC.
2014-04-28 20:37:12 +02:00
madmaxoft
8ae472df86
Merge remote-tracking branch 'worktycho/master'
2014-04-28 20:16:37 +02:00
Tycho
ad5cdf9f2d
Removed static from combinators.
...
THis allows us to use the functions in template params at the cost of polluting the global namespace.
2014-04-28 11:07:06 -07:00
Tycho
6d520e398b
Fixed unbraced ifs
2014-04-28 11:00:43 -07:00
Tycho
05fe6d6c58
Removed inlines from combinators
...
gcc requires external linkage for functions provided to template parameters
2014-04-28 10:52:48 -07:00
Tycho
a42480cf82
Template Magic
...
Removed need to allocate a fake meta block by using templates to provide a version
of the code that does not use metas. Also changed the function to a template
argument to make sure that the compilier is able to inline it.
2014-04-28 10:31:07 -07:00
Howaner
acd2804f31
Revert "Withers now use the new invulnerable."
...
This reverts commit 619592b5a0
.
2014-04-28 13:51:40 +02:00
Howaner
26e935cb20
Revert "Changed the old invulnerable methods from the wither to the new."
...
This reverts commit d50f8f6f11
.
2014-04-28 13:51:22 +02:00
Mattes D
c063051645
Merge pull request #954 from mc-server/projectiles-split
...
Totally refactored ProjectileEntity.h, splitting up into several files.
2014-04-28 12:32:02 +02:00
archshift
9b0cb3fd97
Fixed projectile source filenames, indentations
2014-04-27 17:05:18 -07:00
madmaxoft
ef57133f9b
Reordered constructors.
2014-04-27 23:35:17 +02:00
madmaxoft
bb73af6843
Fixed a late-night typo.
2014-04-27 23:31:26 +02:00
madmaxoft
9dc9713a9c
Fixed warnings.
2014-04-27 23:12:52 +02:00
madmaxoft
4c165f8a6d
Fixed player spawning #953 .
2014-04-27 23:11:36 +02:00
Tycho
744e00c904
Worked around const pointer
2014-04-27 13:43:59 -07:00
Mattes D
051bb8cfbd
Merge pull request #958 from worktycho/bugfix
...
Bugfix
2014-04-27 22:42:22 +02:00
madmaxoft
dd52719c2d
Rewritten cAuthenticator to use the new PolarSSL++ wrapper classes.
2014-04-27 22:28:14 +02:00
madmaxoft
0bdc49221b
PolarSSL wrappers for the SSL context.
2014-04-27 22:27:53 +02:00
worktycho
c7260b2f63
Merge pull request #959 from mc-server/fixes-2
...
Coverity fixes
2014-04-27 13:24:51 -07:00
madmaxoft
f301d052cf
cSocket creates the socket in Connect if no socket is present yet.
2014-04-27 22:20:49 +02:00
Tycho
077179277c
Fixes to uninitallsed array access in Noise.cpp
...
CID 43634, 43634
2014-04-27 13:20:00 -07:00
Tycho
71c51783f3
Initalize counter in fastrandom
...
Fixes CID 43622
2014-04-27 13:15:19 -07:00
Tycho
a2b1fa6520
Initialised MetaArrays in BlockArea
...
Fixes CID 43621
2014-04-27 13:12:36 -07:00
Tycho
25d933883a
Removed unneeded assert
...
Fixed CID 43610
2014-04-27 13:07:21 -07:00
Tycho
35dc88e4ff
Removed Old Asserts
...
Removed asserts about non-negative numbers on what are now unsigned types
Fixes CID 43608
2014-04-27 12:42:29 -07:00
Tycho
d15743df1c
Removed old unused code
2014-04-27 12:41:22 -07:00
Tycho
ee354a405b
Fixed OnPluginMessage hook not exiting early.
...
OnPluginMessage hook would call all plugins even after one returned true.
Fixes CID 43512
2014-04-27 12:37:08 -07:00
Mattes D
5c46f9dd39
Merge pull request #864 from mc-server/Stat
...
Statistic/Achievement defs
2014-04-27 19:37:45 +02:00
andrew
bef3c6d47d
Added some comments
2014-04-27 20:26:50 +03:00
archshift
cd38e792b7
Revert "Creative players cannot throw ender pearls."
...
This reverts commit 75bb36574b
.
2014-04-27 10:24:39 -07:00
archshift
75bb36574b
Creative players cannot throw ender pearls.
2014-04-27 10:01:50 -07:00
archshift
15324f3bbd
Fixed ToLua errors, added newlines
2014-04-27 09:42:31 -07:00
Tiger Wang
bbc5faa723
Redstone simulator now directly accesses cChunk
...
* Redstone simulator performance improvements
* Added return values to some functions
* Minor fixes
2014-04-27 17:35:41 +01:00
madmaxoft
fdac27c63d
Another attempt at #889 .
...
The packet was being sent after the state was adjusted, so another thread *may* have sent another packet in the meantime.
2014-04-27 17:31:58 +02:00
Tycho
6f1fea759e
Fixed bad comment
2014-04-27 08:14:56 -07:00
Tycho
d412630904
Fixed a couple of segfaults and made Free a seperate function
2014-04-27 08:11:56 -07:00
Mattes D
a0f6149d05
Merge pull request #948 from jfhumann/staticFixes
...
Fixes motivated by Coverity #1
2014-04-27 17:00:37 +02:00
Tycho
48a2488477
Added other half of implementation
2014-04-27 07:38:16 -07:00
Tycho
2730a41946
Fixed issues with gcc
2014-04-27 07:10:30 -07:00
Tycho
e3bdc81ca0
Fixed MobProximity Counter to remove chunk copys
2014-04-27 06:46:13 -07:00
Tycho
dcb2a590e3
Fixed bad merge
2014-04-27 06:45:33 -07:00
Tycho
57b8ee9163
Merge branch 'master' into chunksparsing/structs
...
Conflicts:
src/Chunk.cpp
src/Chunk.h
2014-04-27 06:35:27 -07:00
archshift
cc39d314ae
Fixed ToLua issues
2014-04-26 17:58:06 -07:00
archshift
e3c3795aa4
Moved cFireworkEntity out of ProjectileEntity.h
2014-04-26 17:50:05 -07:00
archshift
cb93a57963
Moved cGhastFireballEntity out of ProjectileEntity.h
2014-04-26 17:41:07 -07:00
archshift
de7eaa5735
Moved cFireChargeEntity out of ProjectileEntity.h
2014-04-26 17:35:31 -07:00
archshift
08b77f4880
Moved cThrownSnowballEntity out of ProjectileEntity.h
2014-04-26 17:24:44 -07:00
archshift
2f9580ad65
Moved cExpBottleEntity out of ProjectileEntity.h
2014-04-26 17:19:45 -07:00
archshift
bc5c28a0be
Moved cThrownEnderPearl out of ProjectileEntity.h
2014-04-26 17:08:39 -07:00
archshift
de23a115a5
Moved cThrownEggEntity out of ProjectileEntity.h
2014-04-26 17:02:47 -07:00
archshift
477b3e7861
Moved cArrowEntity out of ProjectileEntity.h
2014-04-26 16:45:39 -07:00
Tiger Wang
15767badac
A tiny speed improvement in ApplyFoodExhaustion()
2014-04-26 23:52:18 +01:00
Tiger Wang
b4b3b5ce64
More comments!
...
* Also fixed a potential issue with position sending - if someone moved
slowly enough, their position would never be updated.
2014-04-26 23:50:24 +01:00
archshift
e2194e6e90
Added static const, initialized fields.
2014-04-26 15:32:14 -07:00
Mattes D
da931da603
Merge pull request #941 from archshift/master
...
Fixed lots of warnings, and other small changes.
2014-04-26 23:26:59 +02:00
archshift
7841bad27a
More small fixes.
2014-04-26 14:05:00 -07:00
archshift
5a0625eccc
Moar alignment.
2014-04-26 11:00:59 -07:00
Tycho
e40f9d6e5b
Implemented Chunk Sparsing with segments
2014-04-26 10:50:23 -07:00
archshift
aef2c8ec62
Further refactored, Reverted Minecart change
...
Other small changes.
2014-04-26 09:25:30 -07:00
Howaner
d50f8f6f11
Changed the old invulnerable methods from the wither to the new.
2014-04-26 17:47:25 +02:00
Howaner
619592b5a0
Withers now use the new invulnerable.
2014-04-26 17:37:35 +02:00
Howaner
49f6819829
Fixes
2014-04-26 16:44:15 +02:00
Mattes D
1139b117c4
Merge pull request #863 from mc-server/chunkysparsing
...
Chunky sparsing
2014-04-26 15:12:10 +02:00
jfhumann
a1765a2896
Fixed unitialized member in gZipFile (CID 43673)
2014-04-26 14:23:53 +02:00
archshift
80b97fd9dd
Fixed mobs that don't naturally spawn.
2014-04-25 20:49:55 -07:00
archshift
acff6148b6
Moved switch{} out of GetArmorCoverAgainst().
2014-04-25 19:49:08 -07:00
archshift
b2f40a7a11
Removed unused assignments.
2014-04-25 18:18:46 -07:00
archshift
73edd2b961
Fixed a couple more warnings.
2014-04-25 17:15:12 -07:00
archshift
2c0bb7b717
Moved the weather picker out of TickWeather(), squashing a warning and improving readability.
2014-04-25 16:55:38 -07:00
jfhumann
26568a852e
Fixed a memory leak in tolua_cWorld_ChunkStay. (CID 43618)
2014-04-26 01:35:25 +02:00
archshift
c124fc39d4
Removed impossible default case.
...
Squashed a warning.
2014-04-25 16:32:34 -07:00
archshift
083cec5a09
Removed extraneous switch{} in Start()
...
Squashed a warning.
2014-04-25 16:27:15 -07:00
jfhumann
f2b7cb138f
Fixes resource leaks in the yggdrasil authenticator. (CID 43617)
2014-04-26 01:21:06 +02:00
archshift
5ffdaa8142
Moved huge conditional out of InStateChasing(), improving readability
...
Squashed a warning.
2014-04-25 15:49:11 -07:00
jfhumann
c8d5fcfffa
Fix for minor resource leak (CID 43616)
2014-04-26 00:43:01 +02:00
Howaner
e5683ede63
Change m_InvulnerableTicks description again again :D
2014-04-26 00:41:00 +02:00
Howaner
ed1aa02d0c
Change m_InvulnerableTicks description again.
2014-04-26 00:37:40 +02:00
Howaner
ad1410f46e
Change m_InvulnerableTicks description
2014-04-26 00:37:09 +02:00
Howaner
7fd9fe9d5f
Merge branch 'master' into GlobalFixes
2014-04-26 00:34:42 +02:00
Howaner
7e76f030aa
Add entity invulnerable
2014-04-26 00:32:30 +02:00
Mattes D
a4f21908b2
Merge pull request #920 from axisd/master
...
Mobs shouldn't burn when it's Raining
2014-04-25 23:48:00 +02:00
Mattes D
43cca14763
Merge pull request #935 from archshift/projectile-fixes
...
Chicken eggs and ender pearls can hit entities.
2014-04-25 23:41:04 +02:00
jfhumann
03402efc49
Should fix CIDs 43631, 43632 and 43633
2014-04-25 23:39:10 +02:00
Tiger Wang
05f52192c9
Implemented comments
2014-04-25 21:22:43 +01:00
archshift
0e0c9d8248
Missed these CMakeLists.
2014-04-25 12:24:09 -07:00
archshift
d64e46186f
Merge remote-tracking branch 'upstream/master'
2014-04-25 10:50:10 -07:00
archshift
e47dab84f3
Cmake generated projects for IDEs include headers in project files.
2014-04-25 09:56:15 -07:00
madmaxoft
6d167b370e
Fixed C++11 check for SharedPtr.
2014-04-25 16:05:24 +02:00
archshift
8aa82d048d
Creator not user.
2014-04-25 06:26:08 -07:00
archshift
256691461b
Comments for TrySpawnChicken() and TeleportUser().
2014-04-25 05:49:18 -07:00
archshift
cb7f1ee4bb
Rename spawn chicken method, Initialize m_HasTeleported.
2014-04-25 05:39:35 -07:00
r.ramazanov
4cd2d57c64
Fix formatting
2014-04-25 12:06:22 +04:00
madmaxoft
f3dfc0349d
Added shared_ptr handling for C++03 mode.
2014-04-25 09:48:52 +02:00
r.ramazanov
827c3760db
Fix for clang
2014-04-25 10:58:48 +04:00
Mattes D
a40108da90
Merge pull request #932 from Howaner/Inventory
...
Fix armor in survival mode.
2014-04-25 08:11:49 +02:00
r.ramazanov
a72744f5c3
Mobs shouldn't burn when it's Raining & Mob Knockback is far too much
2014-04-25 10:08:36 +04:00
r.ramazanov
1c26eb715b
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-04-25 10:06:12 +04:00
archshift
62e5234535
Small changes; warning fixing.
2014-04-24 20:25:03 -07:00
archshift
ec9787bae2
Chicken eggs and ender pearls can hit entities.
...
Fixed warning by adding dedicated m_HasTeleported for fired arrows.
2014-04-24 19:16:16 -07:00
archshift
0f7bd9fc77
Oops, fixed that.
2014-04-24 19:14:00 -07:00
archshift
624deea6c4
Giants!
...
Changed mfMaxplusone to mfUnhandled for readability, and fixed a default case warning.
2014-04-24 18:11:11 -07:00
archshift
b008ba5d98
Refactored SendChat(), placing the message-type formatting into its own function.
...
Removed default case warning in the process.
2014-04-24 18:03:49 -07:00
Howaner
ccd9023202
Add commit what the code is doing.
2014-04-25 00:10:52 +02:00
Howaner
cee70390fa
Add unkown armor warning and fix armor stacks.
2014-04-25 00:09:22 +02:00
Tiger Wang
3397f9faec
Fixed indent
2014-04-24 22:07:20 +01:00
Tiger Wang
c949c1e755
Implemented suggestions
2014-04-24 22:03:47 +01:00
Howaner
376dc880b3
Add armor to switch() in ItemHandler.cpp
2014-04-24 23:03:04 +02:00
Tiger Wang
acbd4e6503
Another small speed improvement?
2014-04-24 21:52:01 +01:00
Tiger Wang
ffce8d6907
Implemented suggestions
2014-04-24 21:49:56 +01:00
madmaxoft
4f49c978cf
Replaced MSVC-specific decorators with our universal ones.
2014-04-24 22:43:20 +02:00
madmaxoft
616fb15508
cByteBuffer uses void * instead of char * in data interface.
...
This makes it compatible with any pointer type.
2014-04-24 22:42:33 +02:00
madmaxoft
a02e8e8021
Declared a SharedPtr that hopefully resolves on all platforms.
...
MSVC2008 has it in std::tr1, all the others in std.
2014-04-24 22:30:19 +02:00
madmaxoft
c7694687f5
Fixed filename case.
2014-04-24 22:15:21 +02:00
Mattes D
85e0b0eae9
Merge pull request #929 from archshift/master
...
Renamed mob source files to better fit the CamelCase naming style.
2014-04-24 22:12:28 +02:00
madmaxoft
e33573ab59
Attempted CMake inclusion for PolarSSL++.
2014-04-24 21:53:42 +02:00
madmaxoft
c4b4447a3a
Authenticator uses some C++ SSL objects.
2014-04-24 21:53:41 +02:00
madmaxoft
c701adbd24
Initial C++ SSL classes.
2014-04-24 21:53:41 +02:00
madmaxoft
449cf77420
Changed cByteBuffer constructor to take a size_t instead of int.
2014-04-24 21:52:24 +02:00
archshift
8fc45c5730
Fixed class capitalization for the cave spider.
2014-04-24 12:18:17 -07:00
Howaner
9cbb3a339f
Fix armor in survival mode.
2014-04-24 20:41:25 +02:00
Tiger Wang
48904ae201
Merge branch 'master' into fixes
...
Conflicts:
src/World.h
2014-04-24 18:57:25 +01:00
r.ramazanov
d126adc124
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-04-24 10:32:26 +04:00
archshift
06819595b0
Fixed references to renamed files.
2014-04-23 15:25:10 -07:00
archshift
c2f2ef7cb4
Rename mob source files to fit CamelCase.
...
Rename Cavespider.cpp to CaveSpider.cpp
Rename Cavespider.h to CaveSpider.h
Rename Magmacube.cpp to MagmaCube.cpp
Rename Magmacube.h to MagmaCube.h
Rename Zombiepigman.cpp to ZombiePigman.cpp
Rename Zombiepigman.h to ZombiePigman.h
2014-04-23 15:22:49 -07:00
madmaxoft
695baed226
Updated docs for StringToEnchantmentID.
...
Ref.: mc-server/Core#67
2014-04-23 23:06:29 +02:00
madmaxoft
6d7da6b15d
Updated NetherFort prefabs to latest Gallery content.
2014-04-23 23:03:09 +02:00
Tiger Wang
7f5cf417de
Some change to Entity.cpp
...
* Added comments to BroadcastMovementUpdate() and the collision tracer
2014-04-23 21:06:46 +01:00
Tiger Wang
f763242e5c
Small changes
2014-04-23 21:06:07 +01:00
STRWarrior
9660c4816f
The new leaves don't decay anymore.
...
Fixes #792
2014-04-23 16:57:32 +02:00
r.ramazanov
103c867f1f
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-04-23 18:15:28 +04:00
r.ramazanov
5deb35c5cf
Mobs shouldn't burn when it's Raining #906
...
Mob Knockback is far too much #776
2014-04-23 18:15:04 +04:00
Mattes D
0d0e0af2d8
Merge pull request #925 from archshift/master
...
Added monsters.ini rule for fireproof mobs.
2014-04-23 09:46:06 +02:00
archshift
8768669428
Renamed getter and setter for IsFireproof.
2014-04-23 00:12:37 -07:00
archshift
e1476ebb26
Added IsFireproof hook for monsters.ini
2014-04-22 13:17:42 -10:00
archshift
a37b36adab
Fireproof status getter and setter.
2014-04-22 12:59:31 -10:00
madmaxoft
2533842ca4
Updated NetherFort prefabs from the Gallery server.
2014-04-22 22:26:01 +02:00
Mattes D
b3a9b73278
Merge pull request #923 from archshift/master
...
Added flag for fireproof entities.
2014-04-22 15:04:04 +02:00
archshift
06f41699af
Fixed indentation and changed m_Fireproof to m_IsFireproof.
2014-04-22 02:36:39 -10:00
archshift
bca7f29490
Lay foundation for fireproof entities.
...
Prevent any entities with the m_Fireproof flag from taking fire or lava damage.
2014-04-22 01:59:34 -10:00
Mattes D
6492aa000b
Merge pull request #909 from jfhumann/fixes
...
Bug fixes and optimizations.
We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp
2014-04-22 13:34:32 +02:00
jfhumann
865e8e22e5
reverted the revert of the minecart collision detection fix.
2014-04-21 14:04:36 +02:00
r.ramazanov
a967313839
Mobs shouldn't burn when it's Raining #906
2014-04-21 13:13:25 +04:00
madmaxoft
e3ec857264
Added prefab hitboxes.
...
The nether forts should quite limit their bridge-to-floor overlaps. Cannot eliminate, but at least severely diminish.
2014-04-21 10:31:30 +02:00
madmaxoft
7c6ef26be9
Added enchantment combining into cEnchantments.
2014-04-21 10:31:30 +02:00
madmaxoft
bdd8b43b3e
Replaced X.size() with X.empty(), where applicable.
2014-04-21 10:31:29 +02:00
Mattes D
4c7621ed16
Fixed a warning in CraftingRecipes.
2014-04-21 09:21:31 +02:00
Mattes D
9f58046b5b
Allow 1.6.4 Forge clients to log in.
...
Fixes #913 .
2014-04-21 08:22:25 +02:00
Mattes D
d7f88396e0
Fixed enchanting return values.
...
Items are enchanted in those cases, so return true.
Ref.: #914 .
2014-04-21 06:41:11 +02:00
madmaxoft
7b246d9a8d
Fixed MSVC compilation.
2014-04-20 13:50:37 +02:00
daniel0916
098be1c7fc
Fixed Code
2014-04-19 22:37:29 +02:00
daniel0916
cb90029f72
Merge branch 'master' into Enchanting
2014-04-19 20:56:29 +02:00
jfhumann
f48d43f050
Fixed Flint and Steel, reverted Minecart change, renamed a parameter name
2014-04-19 20:51:52 +02:00
jfhumann
4dd7610381
Declared one mutex as mutable in order to allow for const correct get accessors.
2014-04-19 17:53:02 +02:00
daniel0916
11ff36c683
Fixed Code (2)
2014-04-19 16:10:05 +02:00
daniel0916
a6de7bf1cd
Fixed Code
2014-04-19 15:10:50 +02:00
madmaxoft
6eac586794
Fixed formatting, made function static.
2014-04-19 13:05:58 +02:00
madmaxoft
5f3df1445f
Merge remote-tracking branch 'origin/Beacons'
2014-04-19 13:01:28 +02:00
jfhumann
5bed1c09bc
Fixed clang compilation errors. Apparently gcc and MSVC do not care about the order of initializer lists, but clang does.
2014-04-18 22:47:59 +02:00
jfhumann
fde1555352
Small style changes
2014-04-18 22:20:24 +02:00
jfhumann
67344a3782
Merge remote-tracking branch 'origin/master' into fixes
...
Conflicts:
src/Authenticator.cpp
src/ClientHandle.cpp
src/Entities/Minecart.cpp
src/Protocol/Protocol17x.cpp
2014-04-18 21:44:58 +02:00
Tiger Wang
19358fc7d5
Compilation fix
2014-04-18 20:20:00 +01:00
Tiger Wang
598719d7ab
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-04-18 20:17:52 +01:00
jfhumann
013da806ec
Did some static analysis, fixed some bugs and optimized a lot of code
2014-04-18 21:09:44 +02:00
daniel0916
b239de66db
Merge branch 'master' into Enchanting
2014-04-18 15:04:32 +02:00
madmaxoft
6d3bde5221
Added performance test of the nether fort generator.
2014-04-18 14:35:33 +02:00
daniel0916
56613d2b22
Fixed Errors
2014-04-18 14:34:29 +02:00
daniel0916
3efd232829
Removed old include
2014-04-18 14:10:31 +02:00
Tiger Wang
6cb63a768d
Fixed #906
2014-04-18 12:59:14 +01:00
Tiger Wang
200ea6254c
Fixed #904
2014-04-18 12:54:17 +01:00
madmaxoft
193dcca1e3
Removed unsupported C++11 features.
2014-04-18 09:36:11 +02:00
Mattes D
b7e074b10b
Merge pull request #891 from mc-server/fixes
...
Fixes to redstone & general
2014-04-17 22:37:00 +02:00
madmaxoft
6779010242
Added area flooring.
...
Fixes #743 .
2014-04-17 22:03:30 +02:00
Tiger Wang
bdea8706d8
Added new AI rules
...
+ Added new AI rules handling cacti and large heights
* Fixed cIniFile not recognising comments in cIniFile::ReadFile()
* Fixed users.ini not being properly generated
* Changed all instances of (int)floor(GetPosXXX()) to POSXXX_TOINT
2014-04-17 18:50:25 +01:00
daniel0916
0086fcfef1
Fixed some Errors (not all)
2014-04-17 19:31:43 +02:00
madmaxoft
afb20132fe
Added Prefab initializers to SELFTEST code.
2014-04-17 17:50:52 +02:00
madmaxoft
be091800f8
Prefabs can have per-piece per-placement weights.
...
Fixes #753 .
Also upgraded NetherFortPrefabs to lates Gallery contents.
2014-04-17 17:32:08 +02:00
Tiger Wang
18c3b18a3f
Compile fix?
2014-04-17 13:02:20 +01:00
daniel0916
f9343a8490
Modified many things
2014-04-17 13:15:35 +02:00
Tiger Wang
2151ee997c
Implemented weighted pressure plates
2014-04-17 12:11:31 +01:00
Mattes D
35e847d2f5
Merge pull request #896 from axisd/master
...
Mobs rotation
2014-04-17 08:45:14 +02:00
r.ramazanov
7bcc920662
Mobs rotation
2014-04-17 09:35:26 +04:00
madmaxoft
09866bb382
Added asserts for proper game state.
...
This is to help hunt #889 .
2014-04-16 18:10:48 +02:00
daniel0916
a0725747af
Fixed conflicting enchantments checking
2014-04-16 14:52:09 +02:00
daniel0916
a12a9117c2
Added deletions from merge conflict
2014-04-16 14:33:03 +02:00
daniel0916
5a9acb7eb6
Merge branch 'master' into Enchanting
2014-04-16 14:31:02 +02:00
daniel0916
8d67562238
Fixed merge conflict
2014-04-16 14:30:55 +02:00
daniel0916
8c33b3c415
Fixed double enchanting items
2014-04-16 13:31:37 +02:00
madmaxoft
99e4225269
Attempted fix for the client crash with the new protocols.
2014-04-15 23:40:06 +02:00
daniel0916
2cb8538e2e
Code Optimization
2014-04-15 22:03:15 +02:00
daniel0916
36f747d674
Added Book Enchanting
2014-04-15 21:43:52 +02:00
Howaner
e81fc2779e
Add more checks to cSlotAreaEnchanting
2014-04-15 21:12:59 +02:00
daniel0916
fb3c755c0a
Modified names
2014-04-15 20:55:37 +02:00
Howaner
8df922e3e0
Add linux compatibility
2014-04-15 20:42:39 +02:00
Tiger Wang
82b3d543e7
Rewrote redstone powering to use power levels
2014-04-15 13:15:56 +01:00
madmaxoft
b5ea5fbf90
Added support for per-piece per-placement weights in cPieceGenerator.
...
Ref.: #753 .
2014-04-15 12:57:52 +02:00
madmaxoft
146824cb68
NetherFortPrefabs: Fixed a connector in MidStaircase.
2014-04-15 12:57:52 +02:00
madmaxoft
d12d7b6715
Implemented the 1.7.6 protocol and authenticator.
...
Server works both in online and offline modes with 1.7.9.
2014-04-14 22:52:59 +02:00
daniel0916
b5401ec03a
Added ItemPlaceCount in SlotArea
...
Thanks to Howaner for helping
2014-04-14 22:05:04 +02:00
madmaxoft
d505ffc704
A client UUID is generated when the server is in offline mode.
...
1.7.9 client works with these changes in offline mode.
2014-04-14 20:21:00 +02:00
madmaxoft
ffe65b6a18
Merge remote-tracking branch 'daniel0916/YggdrasilAuthentication' into Proto176
2014-04-14 18:53:56 +02:00
madmaxoft
0f55dcf036
Initial 1.7.6 protocol support.
...
Doesn't work yet because of missing UUIDs.
2014-04-14 18:52:21 +02:00
daniel0916
55224d25ef
Removed Debug Message
2014-04-14 16:48:14 +02:00
daniel0916
0ba0e39db4
Added/Modified last things for Enchanting System
2014-04-14 16:46:59 +02:00
daniel0916
a51a099c81
Blocked enchanting a item twice
2014-04-14 13:39:44 +02:00
daniel0916
fb26d2ba87
Fixed Bookshelf Checking
...
Code by LO1ZB
2014-04-14 11:56:50 +02:00
daniel0916
856e900bf8
Bug fixes
2014-04-14 11:48:12 +02:00
daniel0916
fce9ea65c3
Fixed invisibility enchantments
2014-04-13 22:15:10 +02:00
daniel0916
2618569e01
Fixed mistake
2014-04-13 17:09:18 +02:00
daniel0916
d258be678a
Fixed Error?
2014-04-13 16:15:57 +02:00
daniel0916
3733ee2c0e
Code Update
2014-04-13 15:32:15 +02:00
daniel0916
9dc4617e8d
Fixed mistake
2014-04-13 13:53:10 +02:00
daniel0916
c88464e62a
Fixed Server Crash
2014-04-13 13:36:03 +02:00
daniel0916
1429d2f1b1
Some Fixes
2014-04-13 13:33:47 +02:00
daniel0916
b506a74076
Added Yggdrasil Authentication System
...
Code by Howaner. Fixes/Changes by me.
2014-04-13 13:04:56 +02:00
madmaxoft
34cf058b02
ChunkStay must be disabled while being deleted.
...
Fixes #758 .
2014-04-12 22:35:04 +02:00
madmaxoft
75b7244f05
Fixed chunkstays not being removed on auto-delete.
...
Fixes #837 .
2014-04-12 22:15:09 +02:00
daniel0916
2689a63e9c
Merge remote-tracking branch 'upstream/master' into Enchanting
2014-04-12 19:55:37 +02:00
Tycho
b0dd3dca3d
Fixed link errors
2014-04-12 10:44:31 -07:00
madmaxoft
83b25d085c
Updated the NetherFort prefabs to current Gallery contents.
...
Code exported from the Gallery server by the GalExport plugin.
2014-04-12 19:36:50 +02:00
daniel0916
dd1f8fb1f5
Fixed Bookshelves Checking (not completly)
2014-04-12 18:52:17 +02:00
daniel0916
e6e702e7fd
Added complete Enchanting System
...
http://minecraft.gamepedia.com/Enchantment_mechanics
2014-04-12 14:58:46 +02:00
Tiger Wang
c0c47d33c5
Entities handle chunks properly again
...
* Entities properly handle chunks
* Changed EntityStatus enums to be less shouty
2014-04-12 13:16:48 +01:00
Tiger Wang
b3f6afefe9
Simplified pickup speed randomisation
2014-04-12 13:14:35 +01:00
STRWarrior
433bd530f3
Some tweaks
...
GetPyramidLevel returns 0 when no layers were found, 1 for one layer etc.
Auto adjust the minY and/or maxY to 0 if the beacon is low.
2014-04-12 00:35:13 +02:00
madmaxoft
5bc5272a4e
Fixed member construction order.
2014-04-12 00:24:35 +02:00
STRWarrior
eb4dd23775
Removed debug message.
2014-04-12 00:21:37 +02:00
STRWarrior
e19556ebf6
Simplefied GetPyramidLevel
2014-04-12 00:13:16 +02:00
madmaxoft
8bcb176a19
Lighting reads blocktypes only for blocks under heightmap.
...
This should theoretically speed it up, since less data is copied back and forth.
Also implemented a possibly more cache-friendly blocklight starter algorithm (PrepareBlockLight2()), is disabled by default, needs perf testing.
2014-04-12 00:04:50 +02:00
STRWarrior
875c2557c3
Implemented the skeleton code for the beacon.
...
There is no handling for the GUI. It can now check how big the pyramid is under the beacon.
2014-04-12 00:01:15 +02:00
madmaxoft
f44a291da8
Fixed issues with 64-bit MSVC compilation.
2014-04-11 13:09:19 +02:00
Tycho
01546020fc
Replaced all the .data() calls so the code compiles in VS2008
2014-04-10 12:12:36 -07:00
madmaxoft
22d56d1a3f
Fixed enchantment parsing.
...
Fixes #880 . Enchantment parsing now reports in detail which value failed to parse
2014-04-10 19:09:37 +02:00
Alexander Harkness
9ad87f670b
Fixed GitHuB WebEdit fail.
2014-04-10 15:52:00 +01:00
Alexander Harkness
2d02ff1df8
Update Monster.cpp
2014-04-10 15:50:43 +01:00
Mattes D
e08a31daf5
Merge pull request #871 from worktycho/worldstorage
...
Removed check for enqueuing a chunk that is already enqueued to be loaded
2014-04-08 19:55:50 +02:00
Tiger Wang
c3fcc5b132
cRedstoneSimulator.cpp style improvements
2014-04-08 18:49:53 +01:00
Alexander Harkness
ea17441e8a
Merge pull request #872 from worktycho/bugfix
...
Fixed missing - that caused all neighbour lookups to go to the chunkmap
2014-04-08 17:03:20 +01:00
Tycho
18793ca568
Fixed missing - that caused all neighbour lookups to go to the chunkmap
2014-04-08 08:59:50 -07:00
Tycho
10e72a122c
Removed check for enqueuing a chunk that is already enqueued to be loaded
...
This remaval is safe as cWorldStorage checks for duplicate chunks when dequeuing
and removes an expensive iteration whilst holding the queue lock
2014-04-08 08:43:28 -07:00
wiseoldman95
6a0c122dfb
Uppercased Z
...
Minor, no code changed.
2014-04-08 17:59:42 +03:00
wiseoldman95
fb90afd651
Comments: Inverted Z axis.
...
-Comments fix, No code has been changed.
-Inverted the Z axis in the comments and changed all dependent comments accordingly.
-Added NORTH/SOUTH/EAST/WEST in addition to LEFT/RIGHT/UP/DOWN.
2014-04-08 17:55:03 +03:00
wiseoldman95
506f5def04
Added comments regarding latching and orientation
...
No real code was changed.
2014-04-08 17:14:23 +03:00
Alexander Harkness
4d32f41b8b
Fixed the thing properly.
2014-04-08 14:48:24 +01:00
Alexander Harkness
8d251601cf
Merge pull request #862 from mc-server/redstonefix
...
Fixed #859
2014-04-08 07:37:26 +01:00
Tiger Wang
f13cf1a021
Maybe speed improvements?
...
* Use a single index to determine from when to begin copying data
* Use heightmap to determine first nonair block
2014-04-07 20:57:14 +01:00
daniel0916
427924fbb0
Modified comment
2014-04-07 20:41:47 +02:00
daniel0916
1dfd2b1c5f
Fixed Errors
2014-04-07 20:25:30 +02:00
daniel0916
296d0acbff
Added deleted things for merging
2014-04-07 20:13:45 +02:00
daniel0916
2e9754ac1c
Merge remote-tracking branch 'upstream/master' into Enchanting
2014-04-07 20:12:17 +02:00
daniel0916
93a7494e4b
Fixed merge conflict
2014-04-07 20:11:43 +02:00
wiseoldman95
dab01b27c6
Fixed IsOn
2014-04-07 21:04:06 +03:00
daniel0916
af566d5a79
Added Enchantment-Slot-Level generating
2014-04-07 19:52:35 +02:00
wiseoldman95
011123726b
Removed stray IsLocked
2014-04-07 20:26:23 +03:00
wiseoldman95
45eb539a17
Removed unneeded spacings
2014-04-07 20:00:38 +03:00
wiseoldman95
4f8f686292
Slight cleanup
...
It is more efficient and readable if we do nothing unless we're not locked.
2014-04-07 19:55:17 +03:00
Alexander Harkness
57a474ba01
Fixed some more minor issues with the redstone simulator.
2014-04-07 17:37:53 +01:00
Alexander Harkness
5374730753
Improved the speed a little more.
2014-04-07 17:28:16 +01:00
Alexander Harkness
634c4d6770
Fixed the redstone simulator.
2014-04-07 17:12:06 +01:00
andrew
c79ba3494c
Statistic/Achievement defs
2014-04-07 16:31:15 +03:00
Tiger Wang
74c4789c6f
Attempt to fix errors
2014-04-07 12:43:43 +01:00
Tiger Wang
440b74af6c
Fixed #859
2014-04-07 12:02:41 +01:00
Alexander Harkness
4082adbbad
Fix some of the comments in the PR tycho just did.
2014-04-07 11:35:37 +01:00
Alexander Harkness
76b321a0f4
Merge pull request #861 from worktycho/simulator
...
Added support for redstone latching
2014-04-07 11:32:57 +01:00
madmaxoft
f9b2c2956e
Fixed HTTP chunked encoding.
...
Fixes #858 .
2014-04-07 08:11:56 +02:00
Tiger Wang
a42d1f8517
Blocklight and skylight now compressed
2014-04-06 23:30:21 +01:00
madmaxoft
95fb90eaa6
Fixed 1.6.4 client crash on composite chat messages.
2014-04-06 22:28:41 +02:00
madmaxoft
de3df0a71f
Fixed crash in protocols sending 64-bit ints.
...
Fixes #855 .
2014-04-06 22:15:49 +02:00
madmaxoft
7119dd293a
Updated the tolua executable for Windows.
2014-04-06 22:05:44 +02:00
Howaner
4d7b250a50
Remove old import
2014-04-06 21:45:55 +02:00
Howaner
7da308a7e1
Merge branch 'master' into Slabs
2014-04-06 21:43:23 +02:00
Howaner
039191499c
Add CanChangeDirtToGrass function to Block Handlers.
2014-04-06 21:41:01 +02:00
Tycho
f5cb81eb1b
Added support for redstone latching
...
fixes #856
2014-04-06 11:09:33 -07:00
Tycho
23395a5ce1
Merge branch 'master' into override
...
Conflicts:
lib/tolua++/CMakeLists.txt
2014-04-05 14:12:17 -07:00
madmaxoft
143a5e61fc
Fixed Endiannes conversion routines for floats and doubles.
...
This bug has been introduced in 8825d30aab
.
This change fixes #854 .
2014-04-05 22:34:05 +02:00
madmaxoft
22794e7208
Fixed double projectile spawning.
...
Two spawn packets were sent per projectile.
2014-04-05 22:26:10 +02:00
madmaxoft
d43c5a9c47
Removed debugging log from entity physics handling.
2014-04-05 22:25:40 +02:00
madmaxoft
1cab52f867
Added cPlayer:SendRotation() API function.
2014-04-05 12:09:30 +02:00
Tiger Wang
3201d1bf16
Nibbletypes are compressed
...
+ Added nibble compression
* Fixed an off by one
2014-04-04 23:16:52 +01:00
Mattes D
2e789b63d3
Merge pull request #840 from Howaner/NewBlocks
...
Add tall flower handler.
2014-04-04 15:06:54 +02:00
Tiger Wang
15a0ceec26
Speed and memory improvements
...
* Changed array to be continuous, so no more layer splitting
2014-04-04 13:01:05 +01:00
madmaxoft
d77ca77086
Merge branch 'master' into HTTPSizeT
2014-04-04 13:29:48 +02:00
madmaxoft
87f39e9e28
Explicit change record size.
2014-04-04 13:19:25 +02:00
madmaxoft
4b4c3f2a20
Changed cNoise seed to signed.
2014-04-04 12:28:38 +02:00
madmaxoft
bc227299d0
Fixed format string mismatch.
2014-04-04 12:08:14 +02:00
madmaxoft
4be894f060
More Clang warning fixes in the protocols.
2014-04-04 11:47:46 +02:00
madmaxoft
3590f97e00
Fixed CreateHexDump's format string.
2014-04-04 11:19:57 +02:00
madmaxoft
e1f75ab6d0
Fixed CreateHexDump's signedness.
2014-04-04 10:42:17 +02:00
madmaxoft
5dee19648d
More Clang warning fixes in the protocols.
2014-04-04 10:31:50 +02:00
madmaxoft
396abb5db6
Fixed silly Clang's warnings in FastNBT.
2014-04-04 10:19:21 +02:00
madmaxoft
8825d30aab
Fixed some Clang warnings in protocols.
2014-04-04 10:13:25 +02:00
madmaxoft
402d85d896
Fixed Clang warnings in itemhandlers.
2014-04-04 09:56:57 +02:00
Howaner
32d054e8fd
Merge branch 'master' into Slabs
...
Conflicts:
src/Blocks/BlockDirt.h
2014-04-03 22:03:18 +02:00
Howaner
0fb40da877
Change CanBeAt() from big flower
2014-04-03 21:53:18 +02:00
Howaner
cbb0352e51
Remove old function
2014-04-03 21:44:23 +02:00
madmaxoft
e304bd08a2
Documented the units and range for entity rotations.
2014-04-03 21:44:03 +02:00
Howaner
ca08a44c98
Grass now grows under up-side-down slabs
2014-04-03 21:43:40 +02:00
Tiger Wang
e1ba51e6ca
Merge remote-tracking branch 'origin/master' into chunkysparsing
2014-04-03 19:18:34 +01:00
Tiger Wang
d5faf5a38e
Fixed some bugs
...
* Fixed undefined behaviour
* Fixed compression failure
2014-04-03 19:17:04 +01:00
madmaxoft
1b78bef4b3
Removed unneeded asserts.
2014-04-03 09:38:29 +02:00
Mattes D
25529ba62f
Fixed a few MSVC type warnings.
2014-04-03 09:27:17 +02:00
Mattes D
12b82de502
Removed the bindings to set old g_BlockXXX arrays.
...
Those were supposed to be read-only; there's no point in writing to them anyway.
Also fixed MSVC type warnings in the code.
2014-04-03 09:26:44 +02:00
Tiger Wang
357411a489
Performance improvements and chunk flipping fixed
2014-04-02 22:53:03 +01:00
Mattes D
e7b8e17746
Merge pull request #849 from mc-server/minorfixes
...
Minor fixes
2014-04-02 21:26:45 +02:00
Tiger Wang
da267649a1
With eXtra line!
2014-04-02 20:04:41 +01:00
Tiger Wang
43af11ee38
Removed extra brackets
2014-04-02 20:03:42 +01:00
Tycho
0075b2f72e
Merge branch 'master' into HTTPSizeT
...
Conflicts:
src/HTTPServer/EnvelopeParser.h
src/HTTPServer/HTTPFormParser.h
src/HTTPServer/MultipartParser.h
2014-04-02 07:51:48 -07:00
madmaxoft
5c6d474599
Fixed boat placement code.
2014-04-02 16:40:28 +02:00
madmaxoft
26c3bc4076
Fixed more virtual destructors for interfaces.
2014-04-02 16:40:27 +02:00
Tycho
b449ad8613
Merge branch 'MacFixes'
...
Conflicts:
src/DeadlockDetect.cpp
src/World.cpp
2014-04-02 06:54:57 -07:00
Tycho
741a64c250
Merge branch 'master' into HTTPSizeT
2014-04-02 06:37:24 -07:00
Tycho
1f5a4a39f2
Fixed All signedness warnings in HTTPServer.cpp
2014-04-02 06:36:25 -07:00
Tycho
7ece0cc836
Fixed format string in HTTPConnection
2014-04-02 05:10:08 -07:00
Tycho
93bb5369a8
Fixed Comparison to -1 in HTTPMessage.h
2014-04-02 05:06:38 -07:00
Mattes D
01c38505fd
Merge pull request #831 from mc-server/Wither
...
Wither
2014-04-02 12:00:26 +02:00
madmaxoft
bcd7f9669b
Added schematic string serializer self-test.
2014-04-02 11:56:27 +02:00
madmaxoft
3301c5be1f
Fixed StringCompression's GZIP handling for larger strings.
2014-04-02 11:56:10 +02:00
madmaxoft
bcf5021feb
Exported the Base64 encoding and decoding functions to Lua API.
2014-04-01 22:47:39 +02:00
madmaxoft
e7e65b5005
Merged branch 'msDifference'.
2014-04-01 21:21:11 +02:00
madmaxoft
1229795ff0
cBlockArea: Added the msMask merge strategy.
2014-04-01 20:50:10 +02:00
madmaxoft
1795cca552
Rewritten HTTPServer to use size_t for data lengths.
2014-04-01 16:36:00 +02:00
madmaxoft
2672b14c03
More cFile warning fixes.
2014-04-01 16:00:20 +02:00
madmaxoft
b9a090d835
Fixed clang warnings in cGZipFile.
2014-04-01 15:00:30 +02:00
madmaxoft
42e30b6513
Fixed clang warnings in BlockHandlers.
2014-04-01 14:58:17 +02:00
madmaxoft
45150e9754
Fixed clang warnings in cFile.
...
We only support 32-bit filesizes (files < 2 GiB).
2014-04-01 14:58:05 +02:00
madmaxoft
aa7552309a
Simplified the anvil placement code.
2014-04-01 14:23:11 +02:00
madmaxoft
7cc322332b
Removed an unneeded code branch.
2014-04-01 13:38:40 +02:00
madmaxoft
7aa6a3b866
LOG() API reads the LogLevel from the cCompositeChat's MessageType.
2014-04-01 09:32:14 +02:00
Tiger Wang
ef48b30baa
Final realisation of suggestions
2014-03-31 22:37:05 +01:00
madmaxoft
8126d9e66e
Console logging supports cCompositeChat as its parameters.
2014-03-31 22:51:14 +02:00
Tiger Wang
fc940b6da4
Realised suggestions
2014-03-31 21:36:19 +01:00
Tiger Wang
ee07b7ae3e
Simplified and fixed slabs, fixes #835
2014-03-31 20:34:11 +01:00
Tiger Wang
0836fe9a84
Fixed a few Y too high/low asserts
2014-03-31 20:33:33 +01:00
STRWarrior
c4e07631c8
Added new merge strategy "msDifference"
2014-03-31 19:47:18 +02:00
madmaxoft
43844fc0f0
cCompositeChat has a MessageType param in the constructor.
...
This should make it easier to use.
2014-03-31 13:28:38 +02:00
madmaxoft
8288e53c0b
Fixed a few Clang warnings in BlockHandlers.
2014-03-30 23:13:13 +02:00
madmaxoft
a5c0600e6c
Fixed a few clang warnings.
2014-03-30 20:02:30 +02:00
madmaxoft
1bda9b0424
Merge branch 'NetherFortGen'.
2014-03-30 19:17:33 +02:00
STRWarrior
36e1e57d03
Using recommendations (I think)
2014-03-30 17:21:13 +02:00
Mattes D
e474f40ac9
Merge pull request #834 from narroo/issue503
...
Issue503 pull Request
2014-03-30 16:58:42 +02:00
worktycho
5260146f3c
Merge pull request #838 from mc-server/lilypads
...
Lilypads
2014-03-30 15:17:35 +01:00
Tiger Wang
a87bd5788f
Another curly
2014-03-30 13:07:28 +01:00
STRWarrior
66f1bb7b67
Added a BlockHitPos parameter to OnProjectileHitBlock
2014-03-30 14:04:44 +02:00
STRWarrior
47d5395d24
Added a blockface parameter to the OnProjectileHitBlock hook.
2014-03-30 13:44:28 +02:00
madmaxoft
ceabb372f0
Added all current NetherFort prefabs.
2014-03-30 00:33:59 +01:00
madmaxoft
3eb531a8c8
Added asserts for critical data in cPrefab.
2014-03-30 00:20:28 +01:00
madmaxoft
6b29edc158
Re-fixed nether fort piece count check.
2014-03-30 00:20:06 +01:00
madmaxoft
475fc4b1ab
Fixed chest rotator.
2014-03-30 00:12:54 +01:00
madmaxoft
597bdd9f80
NetherForts have a minimum number of pieces.
...
The fort will generate a different image if it has less than the minimum; the max depth affects the minimum number of pieces.
2014-03-30 00:12:19 +01:00
madmaxoft
47a427d3dc
Merge branch 'master' into NetherFortGen
2014-03-29 23:05:17 +01:00
madmaxoft
d64d9145d1
cPrefab now uses a struct for block type definition in CharMap.
...
As suggested by worktycho in 7b585290fc
, instead of packing the two values into a single int, they're packed into a struct.
Also added a test code for the prefab parsing in SELF_TEST.
2014-03-29 22:56:48 +01:00
Mattes D
37812813d3
Merge pull request #842 from mc-server/ProjectileHooks
...
Projectile hooks
2014-03-29 22:32:50 +01:00
madmaxoft
782c111b81
Renamed lua dll for tolua++.exe.
...
Fixes #843 .
2014-03-29 22:29:34 +01:00
STRWarrior
98a12127ce
Fixed the OnProjectileHitBlock hook not stopping projectiles.
2014-03-29 17:05:24 +01:00
STRWarrior
ec4638a228
Added HOOK_PROJECTILE_HIT_BLOCK.
2014-03-29 16:00:45 +01:00
STRWarrior
a6ef40cb6e
Fixed error when the hook gets called.
2014-03-29 15:43:03 +01:00
STRWarrior
339d555111
Added HOOK_PROJECTILE_HIT_ENTITY
2014-03-29 15:26:41 +01:00
narroo
4492bd58f1
Added in MetaMirrorXY and MetaMirrorYZ to cBlockSignHandler.
2014-03-29 10:00:44 -04:00
Tiger Wang
515e4bdb13
Compare for inequality in FACE_NONE checks
2014-03-29 13:18:26 +00:00
Howaner
736c7950a2
Add "a_RelY < cChunkDef::Height" to BlockBigFlower
2014-03-29 13:11:49 +01:00
Tiger Wang
aefabfcafa
Removed leftover clienthandle code
2014-03-29 10:25:40 +00:00
Tiger Wang
fb16554322
Fixed players not updating after world change
...
Addendum to 6dea7993f2
2014-03-29 01:21:56 +00:00
Tiger Wang
519bd0b989
Curly brackets
2014-03-28 23:51:52 +00:00
Tiger Wang
6dea7993f2
Fixed #721 and FS439
2014-03-28 23:25:11 +00:00
Tiger Wang
6eacf1aa92
Fixed a minor ini key duplication bug
2014-03-28 23:07:50 +00:00
Tiger Wang
79aa082b04
Fixed infinite minecart items
2014-03-28 22:52:23 +00:00
Tiger Wang
aee1f8f9d1
Fixed block interaction rate check
2014-03-28 22:52:04 +00:00
Tiger Wang
8ece214920
Fixed a potential crash
2014-03-28 22:51:39 +00:00
Tiger Wang
283a66bcae
Some fixes to lilypads
...
* Fixed placement on lava
* Fixed placement on side of blocks
* Fixed placement through blocks
+ Added washing-away of pads
+ Added ice as a block that fully occupies its voxel
2014-03-28 22:51:30 +00:00
madmaxoft
76f0d167b1
NetherFortGen: Added several more prefabs.
...
Also extended the defauls MaxDepth value to 12.
2014-03-28 23:39:40 +01:00
Howaner
a78bacac3c
Add tallgrass drop to big flowers.
...
Add tallgrass drop, when a players break a tallgrass with the shear.
2014-03-28 23:14:58 +01:00
Howaner
f2f6096ee5
door -> flower
2014-03-28 22:24:54 +01:00
Howaner
efc89b2c43
Add tall flower handler.
2014-03-28 22:22:29 +01:00
madmaxoft
0f1087b7d5
Added Prefabs to *nix builds.
2014-03-28 22:04:59 +01:00
madmaxoft
18dad36189
Merge branch 'master' into NetherFortGen
2014-03-28 21:37:31 +01:00
madmaxoft
773ce7fde6
Fixed non-virtual destructors warnings.
2014-03-28 21:35:45 +01:00
madmaxoft
8557549cfa
Implemented the msSpongePrint merge strategy.
...
Similar to msImprint, but allows prefabs to carve out air pockets, too. The sponge block is used as the NOP block.
2014-03-28 18:03:37 +01:00
madmaxoft
113343d336
NetherFort: Added BalconyTee2 prefab.
2014-03-28 17:35:05 +01:00
madmaxoft
3c84a995a9
Fixed a memory leak in NetherFortGen.
2014-03-28 17:09:47 +01:00
madmaxoft
ae0954f1d4
Sponged the netherfort balcony prefab.
...
This is a preparation for the msSpongePrint merge strategy, used for imprinting most prefabs. It will carve out even air, but will ignore sponge blocks.
2014-03-28 17:05:43 +01:00
madmaxoft
d032f7ac1a
Merge branch 'master' into NetherFortGen
2014-03-28 16:46:10 +01:00
madmaxoft
1802234b4a
Fixed compilation after last PR merge.
2014-03-28 16:44:12 +01:00
madmaxoft
5b7215ec24
Initial NetherFortGen import.
...
Simple fortresses of 2 different rooms will generate.
2014-03-28 16:42:32 +01:00
madmaxoft
173fd0dd92
Merge branch 'howaner/GlobalFixes'.
2014-03-28 16:39:32 +01:00
madmaxoft
910e770a18
Fixed Prefab's rotations.
2014-03-28 16:36:33 +01:00
Howaner
a2c4def518
Add missing ChunkDesc import.
2014-03-28 14:59:40 +01:00
Howaner
8301f479bb
Fix merge conflicts
2014-03-27 23:21:04 +01:00
Howaner
9c46112486
Change SpreadSource prefix to ss
2014-03-27 23:20:28 +01:00
Howaner
09794e65bb
Wrong if in BlockLeaves
2014-03-27 23:20:28 +01:00
Howaner
3774b1be64
Add SpreadSource
2014-03-27 23:20:28 +01:00
Howaner
c4a8336e84
Add HOOK_BLOCK_SPREAD
2014-03-27 23:20:28 +01:00
Howaner
7089c5e267
Add new leaves to all classes.
2014-03-27 23:20:28 +01:00
madmaxoft
7b585290fc
cPrefab can draw itself into a cChunkDesc.
2014-03-27 23:03:57 +01:00
madmaxoft
bbebb3a2cd
Fixed chunk neighbor-getting for long distances.
...
This fixes a server hang when teleporting to coords too far away.
2014-03-27 18:13:52 +01:00
madmaxoft
8c2c4f2463
Prefabs support connectors, rotations and merge strategy.
2014-03-26 22:01:01 +01:00
narroo
6553c8ff44
Altered the rotates for cBlockSignHandler. The functions as a whole is still unfinished though; no wall sign or mirroring support yet.
2014-03-26 13:25:10 -04:00
narroo
90415ff798
Fixed Minor typos.
2014-03-26 08:54:17 -04:00
madmaxoft
9032ff96c7
Removed unused constants.
...
DeadlockDetect reads the value from the ini file, and world lighting has a separate queue now.
2014-03-25 23:35:50 +01:00
narroo
d5c7fc6bd6
Added a comment about the behavior of doors under mirros. Simply put, the current implementation of MetaMirror causes glitchy behavior. The door class itself needs to be edited. (I've got an idea on that....)
2014-03-25 17:35:48 -04:00
narroo
3df4f8609d
Fixed spelling; Rotater to Rotator.
2014-03-25 17:26:13 -04:00
narroo
e1285eb84f
Changed Rotater to Rotator. Added partial sign post rotation support.
2014-03-25 17:17:05 -04:00
madmaxoft
37778e5f82
Added a basic cPrefab class.
...
Can be defined in the source by GalExport's cpp output.
2014-03-25 22:10:53 +01:00
madmaxoft
87de596078
BlockArea: Create() can take the size as Vector3i, too.
2014-03-25 22:05:45 +01:00
madmaxoft
87e0bd54b4
BlockArea: Switched internal coords to Vector3i.
2014-03-25 21:59:41 +01:00
madmaxoft
0984cf9deb
Added Vector3::Move(const Vector3 &).
2014-03-25 21:59:41 +01:00
Mattes D
cac5149974
Merge pull request #833 from mc-server/EnderCrystal
...
Ender crystals
2014-03-25 21:02:23 +01:00
andrew
2e28c09770
Ender crystals
2014-03-25 20:59:33 +02:00
Samuel Barney
eb3cc729d4
More fixes to get it to compile for me on Mac 10.9. Mostly just newline additions, but some of the unused variables were causing errors, so I wrapped them in #ifndef __APPLE__ calls, since I didn't know if they were going to be used in the future.
...
Also had to undefine TOLUA_TEMPLATE_BIND a couple of times.
2014-03-25 11:15:05 -06:00
Samuel Barney
71e9133e49
Added one more missing newline.
2014-03-25 10:34:31 -06:00
Samuel Barney
d77a6417f6
Added newlines. Without them, the files would not compile.
2014-03-25 10:33:52 -06:00
andrew
c8445cd934
Fixed clang compilation
2014-03-25 11:40:54 +02:00
andrew
ba42166411
Fixed wither summoning
2014-03-25 11:13:27 +02:00
andrew
0fe1e50ffc
Protocol: Wither metadata
2014-03-25 10:32:58 +02:00
Mattes D
c6186acf58
Merge pull request #828 from mc-server/Wither
...
Wither invulnerability
2014-03-25 08:54:13 +01:00
andrew
4f3377bbbf
Minor fixes
2014-03-25 09:10:55 +02:00
Mattes D
9226b8480e
Merge pull request #829 from Howaner/Cake
...
Add log pickups.
2014-03-24 22:13:25 +01:00
Howaner
a6414d3348
Add log pickups.
2014-03-24 19:52:35 +01:00
andrew
6b77dc74ad
Wither invulnerability
2014-03-24 12:29:19 +02:00
narroo
2343b0dfbe
Added MetaRotate/Mirror Support for a number of classes.
2014-03-23 22:11:01 -04:00
Tiger Wang
f622f4317c
Implemented lilypad placement
2014-03-23 22:32:45 +00:00
madmaxoft
fd8e5bf551
Updated the ToLua windows executable.
2014-03-23 20:54:37 +01:00
Tiger Wang
945631ba06
Sort of implementation of chunk sparsing
...
Issues:
* Chunks are flipped
* Slow/inefficient/badly coded
* Only blocktypes are 'compressed'
2014-03-23 14:34:19 +00:00
Tycho
5653997bcc
Added override specifier to functions declared in cWorld
2014-03-22 08:43:54 -07:00
madmaxoft
c9163d39f7
Implemented faster upscaling using templates.
...
Fixes #819 .
2014-03-21 22:53:46 +01:00
madmaxoft
20fc7d6aea
Updated the tolua++ executable for Win builds.
2014-03-20 22:41:12 +01:00
madmaxoft
62f84d968a
Merge branch 'unreachable'
2014-03-20 22:36:24 +01:00
madmaxoft
b370cacf0c
Plugins can set flying speed.
2014-03-20 16:14:40 +01:00
madmaxoft
64d9390069
Rewritten player speeds to be relative unit-less.
...
Value of 1 means "default speed", 2 means "double the speed", 0.5 means "half the speed". This allows for easier plugins and is more future-proof.
2014-03-20 15:45:42 +01:00
madmaxoft
b1ad3322e5
Fixed code style after recent merge.
2014-03-20 09:28:29 +01:00
madmaxoft
964647a900
Made pushing plain pointer to Lua a valid operation, with a warning.
...
This is used for exotic explosions, and the NORETURNDEBUG macro caused MSVC warnings across the entire cLuaState class (MSVC marked ALL Push() function overloads as non-returning)
2014-03-20 09:16:47 +01:00
Mattes D
fe6c03595f
Merge pull request #790 from mc-server/awesometnt
...
TNT Shrapnel
2014-03-20 09:05:53 +01:00
Tiger Wang
3e49cada80
Added braces
2014-03-19 23:07:58 +00:00
Tiger Wang
a0720a65d6
Minor Entity.cpp cleanup
2014-03-19 23:07:16 +00:00
Tiger Wang
0524d70774
ENUMified shrapnel level
2014-03-19 23:06:39 +00:00
madmaxoft
74b7f51b89
Errors in Lua don't include the error handler in the stack trace.
...
Fixes #817 .
2014-03-19 22:55:47 +01:00
Tycho
1635c696de
Merge branch 'master' into unreachable
2014-03-19 12:13:05 -07:00
Tycho
363c92ed53
Added unreachable lines backit prtected by preprocessor guards
2014-03-19 12:06:12 -07:00
madmaxoft
4a67114f56
LuaChunkStay: Removed a debugging output.
2014-03-19 13:57:06 +01:00
Tiger Wang
b8fe024f9d
Merge branch 'master' into awesometnt
...
Conflicts:
src/ChunkMap.cpp
2014-03-18 20:49:08 +00:00
Tiger Wang
23ffaa19b7
Added levels of shrapnel
2014-03-18 20:45:10 +00:00
madmaxoft
91f64da2a6
Fixed chunkmap tree block replacing.
2014-03-18 15:45:16 +01:00
madmaxoft
4dc5650023
Fixed cGZipFile::ReadRestOfFile returning incorrect value.
2014-03-18 13:54:17 +01:00
madmaxoft
9447cd20f3
Fixed a crash in firework rockets.
...
Fixes #816 .
2014-03-17 22:12:02 +01:00
Tycho
90ab055eab
Merge branch 'master' into unreachable
2014-03-17 09:44:34 -07:00
madmaxoft
89027cb675
Fixed double to float conversions.
2014-03-16 22:00:28 +01:00
madmaxoft
260d13c7a4
Added override specifier where appropriate in cWorld.
2014-03-16 21:56:27 +01:00
Mattes D
4ec402e6f9
Merge pull request #782 from mc-server/beds
...
Beds now work properly, fixes #707
2014-03-16 21:47:34 +01:00
Mattes D
dc77cbfdc4
Merge pull request #809 from Howaner/BlockEntitys
...
More entity saving.
2014-03-16 21:43:33 +01:00
Howaner
c5740c27a9
Wrong if in BlockLeaves
2014-03-16 21:39:01 +01:00
Howaner
b9fce71bf6
Add new leaves to all classes.
2014-03-16 21:38:57 +01:00
madmaxoft
ef50e73a9c
Added common eMessageType aliases.
2014-03-16 21:37:33 +01:00
Howaner
96d80f981e
Change if-clause in BlockCake.h
2014-03-16 20:57:23 +01:00
Howaner
4ec5a95a7a
Add cake
2014-03-16 20:26:13 +01:00
Howaner
568038ab52
Fix anvil pickups.
2014-03-16 19:25:00 +01:00
Howaner
4e0edc9fa7
Add anvil direction.
2014-03-16 17:42:23 +01:00
Tycho
04f1d58561
Fixed unessicary return
2014-03-15 07:08:09 -07:00
Tycho
fbd4d53dac
Merge branch 'master' into unreachable
...
Conflicts:
SetFlags.cmake
2014-03-15 06:47:56 -07:00
Tycho
2e9fe777e4
Patched tolua to emit range checks for enums
2014-03-15 06:45:26 -07:00
Howaner
d6edd5f24e
Remove old debug messages.
2014-03-15 11:53:55 +01:00
Mattes D
50b53ff3e8
Merge pull request #800 from mc-server/EntireCommandError
...
The entire unknown command is echoed back to the user on error.
2014-03-15 07:52:37 +01:00
madmaxoft
0442c41c87
Added cCuboid:Assign(OtherCuboid) API function.
2014-03-15 07:50:39 +01:00
Howaner
8316ae330e
Merge branch 'master' into BlockEntitys
2014-03-15 02:46:18 +01:00
Howaner
7ac7304c91
Add item frame saving.
2014-03-15 02:45:25 +01:00
Howaner
cf13739288
Add health and age load to pickup's.
2014-03-15 00:43:38 +01:00
Howaner
28898f710b
Add ExpOrb saving.
2014-03-15 00:32:49 +01:00
Howaner
ccc29c7c6c
Add fireball interact
2014-03-14 23:52:51 +01:00
Tycho
693e59c6a4
Merge branch 'master' into noreturn
...
Conflicts:
SetFlags.cmake
2014-03-14 08:04:48 -07:00
Tycho
8e11c270fc
Added Noreturn attribtes to a couple of functions and made a missing noreturn an error
2014-03-14 07:59:25 -07:00
Tycho
c51a9b5fc2
Merge branch 'master' into unreachable
...
Conflicts:
SetFlags.cmake
2014-03-14 07:46:33 -07:00
Mattes D
adf5a60746
Merge pull request #805 from worktycho/undef
...
Fixed a couple of missing defs
2014-03-14 15:37:01 +01:00
Tycho
2f81c1d7fb
Added NORETURN macro
2014-03-14 07:33:47 -07:00
Tycho
b829c9b14e
Fixed a few unneeded breaks
2014-03-14 07:12:00 -07:00
Tycho
58fa8b40bf
Removed missiterperatable malfunctioning error handling code
2014-03-14 07:02:57 -07:00
Tycho
e61810e1bf
Removed invalid block face handling code
...
The code for handling invalid block faces is removed by gcc and clang as it is undefined behavior for a enum
to contain a value that is not part of the enum. Since the only way that the line can be executed is through
undefined behavior clang and gcc remove it so the function fits in the caches better.
2014-03-14 06:52:49 -07:00
Tycho
8b83c1a653
Merge branch 'master' into warnings
2014-03-14 06:46:20 -07:00
Tycho
22cdbe99b4
Fixed a couple of missing defs
2014-03-14 06:44:04 -07:00
madmaxoft
9b63156447
cPlugin:BindConsoleCommand can be called statically.
...
This has been documented before it was written.
2014-03-14 14:37:39 +01:00
madmaxoft
35fe96b07d
Fixed a warning.
2014-03-14 14:36:44 +01:00
Tycho
cd6ab5617c
Fixed xofts issues
2014-03-14 06:11:49 -07:00
Tycho
692cf5bb70
Merge branch 'master' into warnings
2014-03-14 06:01:45 -07:00
Mattes D
1259844084
Merge pull request #793 from xdot/master
...
Unified Vector classes
2014-03-14 11:52:15 +01:00
madmaxoft
bba090ebdd
cPluginManager:Bind[Console]Command returns true on success.
...
Fixes #801 .
2014-03-14 11:18:14 +01:00
Tycho
9a28d1bbe1
Fixed comma
2014-03-12 11:56:24 -07:00
Tycho
862e219443
Added additional macros to support the MSVC size_t format and changed all formats to use the macros
2014-03-12 10:34:50 -07:00
Tycho
d904e89712
Merge branch 'Werror' into warnings
...
Conflicts:
src/Globals.h
2014-03-12 10:12:13 -07:00
Tycho
a584b7b3bc
Fixed printf format compatabilty
2014-03-12 10:09:08 -07:00
Tycho
3caa4a38b9
Merge branch 'master' into Werror
...
Conflicts:
src/Generating/PieceGenerator.cpp
2014-03-12 09:59:10 -07:00
Tycho
ef58b0eb54
Fixed comments an assert
2014-03-12 09:49:37 -07:00
madmaxoft
d545be9614
Fixed missing comment terminator.
2014-03-12 15:33:28 +01:00
andrew
4a883be428
Vector3: More casts
2014-03-12 16:30:57 +02:00
madmaxoft
ec23e2591e
Merge remote-tracking branch 'xdot/master'
2014-03-12 15:20:33 +01:00
andrew
6f2bb0ad44
M_PI MSVC Fix
2014-03-12 16:13:03 +02:00
madmaxoft
f2df33f746
Merge remote-tracking branch 'xdot/master'
2014-03-12 14:42:04 +01:00
andrew
a3a94436dc
Vector3: Length() should always return a float
2014-03-12 15:13:19 +02:00
madmaxoft
5d7df54e35
Fixed Lua string return values.
...
Fixes #773 .
2014-03-12 14:11:28 +01:00
madmaxoft
a7f9df24d4
The entire unknown command is echoed back to the user on error.
2014-03-12 13:11:34 +01:00
madmaxoft
0c15fdf7b0
Moved Lua API registering into a separate function.
...
This will allow us to use Lua as lite-config files as well, should we want to.
2014-03-12 13:05:28 +01:00
madmaxoft
392fb7923b
Merge remote-tracking branch 'origin/SnowBall'
2014-03-12 08:41:33 +01:00
Tycho
7e6ee7ef81
Fixed more Format issues
2014-03-11 14:43:14 -07:00
Tycho
16b27c4b7a
Fixed a load of format string errors
2014-03-11 14:16:08 -07:00
Tycho
a19f5fc484
Move Format issues
2014-03-11 13:51:56 -07:00
Tycho
f64f879027
Fixed format errors in protocol
2014-03-11 13:46:32 -07:00
Tycho
53faac10c5
Added macros to follow format string checking through wrappers
2014-03-11 13:41:15 -07:00
andrew
abf4effaaf
Matrix4: Removed enum
2014-03-11 21:58:50 +02:00
Tycho
80cc824c0c
Fixed Chunkdef warnings
2014-03-11 12:41:18 -07:00
Tycho
728870ed9d
Fixed Warnings in PieceGenerator
2014-03-11 12:35:44 -07:00
Tycho
80d7c88e00
Merge branch 'master' into Werror
...
Conflicts:
src/ChunkDef.h
2014-03-11 12:33:26 -07:00
andrew
9810d57a39
Unified Matrix4 code
2014-03-11 18:33:31 +02:00
andrew
d64db443c2
LineCoeff Doc
2014-03-11 18:10:15 +02:00
STRWarrior
ef3c5a97a4
TakeDamage now has the cThrownSnowballEntity instead of the creator's object.
2014-03-11 16:24:05 +01:00
STRWarrior
deafec874d
Snowballs now actualy hurt other entities.
...
3 damage for blazes and 1 for the ender dragon. Otherwise 0
2014-03-11 15:14:47 +01:00
andrew
b4bf13aa4f
Unified Vector classes
2014-03-11 16:02:25 +02:00
STRWarrior
541175d8a0
Using ``const Vector3i &
``
2014-03-11 14:44:21 +01:00
madmaxoft
950614da7e
Renamed cBlockArea Offset to WEOffset.
...
Even in getters / setters.
2014-03-12 07:46:14 +01:00
madmaxoft
3e9f265a36
Merge branch 'master' into cBlockArea_Offset
2014-03-12 07:39:39 +01:00
STRWarrior
e213e5f9fc
Renamed m_Offset to m_WEOffset
2014-03-11 18:23:21 +01:00
Mattes D
b72661681c
Merge pull request #791 from mc-server/PieceGenerator
...
Piece generator
2014-03-10 23:13:08 +01:00
Tycho
f5f7c6b38b
Merge branch 'master' into Werror
2014-03-10 13:56:16 -07:00
Mattes D
b3d0e878b3
Merge pull request #767 from worktycho/envmatrix
...
Added support to control build type with env vars
2014-03-10 21:54:17 +01:00
Tycho
98e15a34a4
Fixed xofts issues
2014-03-10 13:18:53 -07:00
madmaxoft
26d7ed6612
Removed debugging output.
...
Kept it commented-out for later revisions, if needed.
2014-03-10 21:16:13 +01:00
Tycho
e9e2852ce1
Fixed test asserts
2014-03-10 13:12:43 -07:00
madmaxoft
4ed68916d8
Revert "Fixed some warnings"
...
This reverts commit 4cb0b82d1d
.
2014-03-10 20:52:53 +01:00
Tycho
bb28f0d1e3
Fixed assert
2014-03-10 12:36:01 -07:00
Tiger Wang
e672988577
Merge remote-tracking branch 'origin/master' into awesometnt
...
Conflicts:
src/Items/ItemLighter.h
src/Simulator/IncrementalRedstoneSimulator.cpp
2014-03-10 18:59:11 +00:00
Tycho
d6050275fb
Merge branch 'master' into Werror
2014-03-10 11:58:32 -07:00
Alexander Harkness
411c4ddd79
Merge pull request #779 from mc-server/tntburnexplode
...
TNT explodes when consumed by fire
2014-03-10 18:57:12 +00:00
Tycho
b78c729880
Fixed Alignment issue in ByteBuffer
2014-03-10 11:56:23 -07:00
Tiger Wang
cc2d805238
Merge branch 'master' into awesometnt
2014-03-10 18:36:55 +00:00
Tiger Wang
462829e23d
Shrapnel now configurable
2014-03-10 18:35:02 +00:00
Tycho
2eca30aebc
Removed Some unnessicary macros
2014-03-10 11:34:20 -07:00
Tycho
8947f80294
Use string.reserve to avoid the need to do inplace byteswap
2014-03-10 11:24:12 -07:00
Tiger Wang
b2733fad22
Fixed compile
2014-03-10 18:23:12 +00:00
Tycho
cff6631513
Removed unused macro from WSSCompact
2014-03-10 11:14:34 -07:00
Tycho
8864e7d8ca
Fixed alignment issues in Fireworks Serializer
2014-03-10 11:13:07 -07:00
Tycho
7c974b27b1
Removed unused macro
2014-03-10 10:49:03 -07:00
Tycho
e2e7f2184f
Fixed cast to type with different alignment in BlockingTCPLink
2014-03-10 10:48:50 -07:00
Alexander Harkness
61b68bd519
Merge pull request #788 from worktycho/warnings
...
Fixed some warnings
2014-03-10 17:44:08 +00:00
Tycho
8665233522
Fixed cast between types of different alignment in cSocket
2014-03-10 10:32:51 -07:00
Tycho
30353cd228
Fixed MTRand warnings
2014-03-10 10:24:44 -07:00
Tycho
0a509ab85e
Merge branch 'master' into Werror
2014-03-10 10:17:28 -07:00
STRWarrior
0cce0478d8
This allows a blockarea to have an Offset.
2014-03-10 17:07:46 +01:00
madmaxoft
6c48075561
POCPieces: Added height.
...
Now the pieces connect in different heights, too, creating a true 3D maze.
2014-03-10 08:38:40 +01:00
madmaxoft
0b9763fc5a
Fixed MSVC2008 compilation.
2014-03-10 07:55:47 +01:00
Tiger Wang
0f412a0a02
Removed uneeded meta obtain
2014-03-09 21:48:18 +00:00
Tiger Wang
09c5542123
Merge pull request #768 from Howaner/BlockEntitys
...
Add TNT load/save
2014-03-09 21:44:32 +00:00
Tiger Wang
1985a9c33e
Merge pull request #731 from mc-server/ballisticmissiles
...
Ballistic firework missiles
2014-03-09 21:43:15 +00:00
madmaxoft
0e985293b5
A working POCPiece generator.
2014-03-09 22:04:29 +01:00
madmaxoft
dacb6cef1d
Hardened cCuboid with asserts for its assumptions.
2014-03-09 22:02:08 +01:00
madmaxoft
81bf846e64
ChunkDef: Replaced enums with static const ints.
...
This makes them easier to use in std::min et al.
2014-03-09 21:58:12 +01:00
madmaxoft
8889d3b733
Added cCuboid::Engulf().
2014-03-09 19:54:27 +01:00
Tycho
1bf99b5fd2
Be more parinoid about int sizes
2014-03-09 11:47:22 -07:00
madmaxoft
1fdeabcf78
cPieceGenerator: New connectors are added to the free pool.
2014-03-09 19:30:38 +01:00
Tycho
9825dbfd34
Fixed Mesannine twister to use UInt32
2014-03-09 11:21:42 -07:00
Tycho
b5e33c5424
Merge branch 'master' into Werror
2014-03-09 11:02:30 -07:00
Tycho
e5fc3c63f2
Fix IsThread destructor
2014-03-09 10:52:12 -07:00
Tiger Wang
3aff0b44bc
Fixed #778 - stack overflow.com
2014-03-09 17:51:02 +00:00
Tycho
676dcfd1c7
Globals.h is now warnings free again.
...
Also turned off Wpadded as it is indicates potental performance issues rather than potential bugs
2014-03-09 10:32:56 -07:00
Tycho
430aba9f1d
Its a const not a macro
2014-03-09 10:10:36 -07:00
Tycho
02afa78b68
Take 5
2014-03-09 10:04:07 -07:00
madmaxoft
e214bd7666
Merge branch 'master' into PieceGenerator
2014-03-09 17:58:38 +01:00
madmaxoft
5c4c147e48
Silenced useless MSVC warnings in cMetaRotater.
2014-03-09 17:58:01 +01:00
Tycho
167ef3b7a1
Take 4
2014-03-09 09:52:49 -07:00
madmaxoft
dd39a677c7
Merge branch 'master' into PieceGenerator
2014-03-09 17:50:05 +01:00
madmaxoft
b8cd0b0897
Hotfix for MSVC compilation.
2014-03-09 17:48:17 +01:00
Tycho
ebf163b77a
Unsigned types take 3
2014-03-09 09:45:59 -07:00
Tycho
e73caf30f0
Fix gcc error attempt 2
2014-03-09 09:33:40 -07:00
Tycho
f4201e0b82
Fixed gcc error
2014-03-09 09:25:16 -07:00
Tiger Wang
888c3f1af7
Fixed VERIFY
2014-03-09 15:53:03 +00:00
Tiger Wang
b64e9fb7f5
Beds now work properly fixes #707
...
Also fixes FS392
Conflicts:
src/Blocks/WorldInterface.h
src/ClientHandle.cpp
2014-03-09 15:32:34 +00:00
Tiger Wang
77787fb719
!= FACE_NONE
2014-03-09 14:55:47 +00:00
madmaxoft
b9190fc04e
PieceGenerator can connect two connectors of the same type.
...
Also added extensive debugging output and a test.
2014-03-09 15:24:12 +01:00
madmaxoft
5be983e775
Added BlockFaceToString() translation function.
2014-03-09 15:24:11 +01:00
madmaxoft
93f0de521a
Added Vector3i::Move().
2014-03-09 15:24:11 +01:00
madmaxoft
e6305d29a5
Added the first skeleton code for PieceGenerator.
...
This is a WIP and won't work / isn't used at all.
2014-03-09 15:24:11 +01:00
Mattes D
d3c38c40e4
Merge pull request #777 from jfhumann/issue317
...
Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions
2014-03-09 15:13:27 +01:00
Mattes D
8a715db41f
Merge pull request #775 from worktycho/warnings
...
Fixed a few warnings
2014-03-09 15:04:12 +01:00
Tiger Wang
c2978a3457
Merge branch 'master' into ballisticmissiles
...
Conflicts:
src/ClientHandle.cpp
2014-03-09 12:53:50 +00:00
Tiger Wang
76bf7ad813
Hexified colours
2014-03-09 12:49:00 +00:00
Tiger Wang
a2fb28dd08
Fixed data length issues
2014-03-09 12:48:59 +00:00
Tiger Wang
124fc8bc66
Demonstrated issues with GetDataLength()
2014-03-09 12:48:58 +00:00
Tiger Wang
8f134adb6d
Improved formatting of username tabcomplete
2014-03-09 12:48:55 +00:00
Tiger Wang
217aaca699
Moved firework handler to separate function
...
* Also simplified and improved readability of code
2014-03-09 12:48:53 +00:00
Tiger Wang
c05a1db88d
CheckBlockInteractionsRate() fixed & enabled
2014-03-09 12:48:52 +00:00
Tiger Wang
e2cbebe522
Fix Linux compile
2014-03-09 12:48:49 +00:00
Tycho
4cb0b82d1d
Fixed some warnings
2014-03-09 05:05:37 -07:00
Tycho
14c2f620d1
FIxed int in test
2014-03-09 04:43:22 -07:00
Jan-Fabian Humann
f74ee8fb51
Adjusted style of switch/case
2014-03-09 10:55:06 +01:00
Tiger Wang
ff186f9735
TNT explodes when consumed by fire
...
Fixed FS#406
2014-03-09 01:23:55 +00:00
Tiger Wang
8d2ebf8e19
Slight plugin messaging changes
...
- Clients are not allowed to register duplicate channels
- Clients are not allowed to use channels that were not registered
2014-03-09 00:36:02 +00:00
Tycho
6b530bde75
Added static
2014-03-08 11:53:37 -08:00
Tycho
a6ed75c1fb
Added tons more asserts to bytebuffer
2014-03-08 11:18:51 -08:00
Tycho
27fa2b72ba
Enabled self test of bytebuffer
2014-03-08 11:05:37 -08:00
Jan-Fabian Humann
72f9c8b069
Changed if-else to switch-case
2014-03-08 19:26:32 +01:00
Mattes D
3a6499b192
Merge pull request #729 from worktycho/MetaRotate
...
Alternitive solution to #503
2014-03-08 18:27:24 +01:00
Jan-Fabian Humann
66970fe943
Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting.
2014-03-08 17:55:53 +01:00
Tycho
307fad0f25
Fixed issues with int vs size_t and a few other warnings
2014-03-08 08:33:38 -08:00
Tycho
9b47366d03
Actually Fixed ByteBuffer
2014-03-08 07:36:52 -08:00
Tycho
c3758112cc
Merge branch 'master' into warnings
2014-03-08 07:13:45 -08:00
worktycho
16ebbca35b
Moved returns
2014-03-08 14:23:00 +00:00
Howaner
527f358510
Merge branch 'master' into BlockEntitys
2014-03-08 12:29:45 +01:00
Howaner
b37966fd21
Change TNT Fuse to ticks
2014-03-08 12:24:33 +01:00
andrew
6679641b9e
cBlockInfo-related changes from #723
2014-03-08 12:53:15 +02:00
Howaner
f5e374be41
Add TNT Save/Load and add Netbeans projects to .gitignore
2014-03-08 10:25:46 +01:00
Mattes D
ae84cdf242
Merge pull request #764 from xdot/master
...
Fixed water/lava interaction
2014-03-07 21:33:22 +01:00
madmaxoft
ffdf5f2022
Fixed cBlockArea schematic string saving signature.
2014-03-07 21:28:52 +01:00
worktycho
6b153a5014
Move env code part 1
2014-03-07 19:59:49 +00:00
Tycho
72697cfb4f
Added support to overide CMake build type with env vars
2014-03-07 11:23:28 -08:00
Tycho
21e85b0745
Warnings
2014-03-07 11:15:04 -08:00
Tycho
d33d72f0dc
Warnings
2014-03-07 11:04:25 -08:00
andrew
d86fc1af06
Added some comments
2014-03-07 20:49:40 +02:00
Tycho
7f389522ef
Fixed warnings
2014-03-07 10:42:13 -08:00
Tycho
b480148116
Fixed warnings
2014-03-07 10:26:07 -08:00
Mattes D
f72c747b50
Merge pull request #763 from Howaner/BlockEntitys
...
Add Flower Pots
2014-03-07 17:54:10 +01:00
madmaxoft
fd4eda7d24
Fixed a typo.
2014-03-07 17:43:19 +01:00
Mattes D
c1977035cf
Merge pull request #760 from Howaner/GlobalFixes
...
Add data backsending, when the Client interacts a Block and the Interact...
2014-03-07 14:45:45 +01:00
andrew
8808523942
Fixed water/lava interaction
2014-03-07 15:42:03 +02:00
Howaner
c2090c0d11
Add Lua Bindings for FlowerPotEntity.h and add documentation.
2014-03-07 11:44:16 +01:00
madmaxoft
97d803e34f
Added cBlockArea serialization to string.
...
Fixes #665 .
2014-03-07 09:17:13 +01:00
Howaner
787a71929c
Add Flower Pots
2014-03-07 01:30:34 +01:00
Howaner
1c7a580e52
Fix comment
2014-03-06 13:35:53 +01:00
madmaxoft
3e80e63665
Merge remote-tracking branch 'xdot/master'
2014-03-06 13:24:28 +01:00
Howaner
99b9e6dce5
Broadcast the Equipped Item, if the Slot is changed.
2014-03-06 11:08:47 +01:00
Tiger Wang
53231bebd6
Added extra awesomeness to TNT
...
+ TNT now has a chance of flinging FallingBlock entities around
* Improved TNT damage
* Improved TNT spawning visuals
* Possible fix for 'SetSwimState failure' messages in debug
2014-03-05 22:12:48 +00:00
Howaner
594ddd86a0
Add SendBlockTo to cWorldInterface
2014-03-05 19:33:43 +01:00
Howaner
ee1ba3e0b0
Set tnt step sound to step.grass
2014-03-05 15:14:20 +01:00
Howaner
d4a5b16c52
Add data backsending, when the Client interacts a Block and the Interact is cancelled.
2014-03-05 15:10:20 +01:00
andrew
1ea17c0a75
Implemented vanilla-like fluid simulator
2014-03-05 15:54:38 +02:00
madmaxoft
a845c051b8
Fixed some gcc warnings in Defines.h.
2014-03-04 22:25:31 +01:00
madmaxoft
8f78288564
Manually exported cCompositeChat modifiers.
...
This adds chaining support to them. Fixes #755 .
2014-03-04 22:17:23 +01:00
madmaxoft
ecfe17b096
cLuaState: Made public the GetStackValue() functions.
2014-03-04 21:55:24 +01:00
madmaxoft
e50ffba1ad
Fixed an assert in map-loading.
...
The maps were loaded too soon, the world wasn't initialized yet.
2014-03-04 18:40:55 +01:00
madmaxoft
442c1d96fc
Fixed previous weather changes.
...
cWorld::GetDefaultWeatherInterval() returns -1 for unknown weather.
2014-03-03 20:55:04 +01:00
Mattes D
71ae689eb7
Merge pull request #746 from Howaner/Slabs
...
Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs
2014-03-03 20:52:08 +01:00
andrew
36fd78af35
Removed if condition
2014-03-02 22:55:14 +02:00
Tycho
a38be148ba
Reformatted
2014-03-02 12:33:08 -08:00
Tycho
6536233f4d
Reformated MetaRotater
2014-03-02 12:29:20 -08:00
Howaner
1d67345989
Add cancelling to WeatherChanging event.
2014-03-02 21:04:01 +01:00
andrew
070d483236
cBlockInfo now manages the respective cBlockHandler
2014-03-02 21:25:05 +02:00
madmaxoft
7fb354e8f0
Fixed MSVC warnings in DeprecatedBindings.
2014-03-02 16:34:16 +01:00
Howaner
5e427ee825
More documentation (thanks to madmaxoft) and use GetBlockTypeMeta
2014-03-02 16:16:22 +01:00
madmaxoft
274d2bcb17
Added blockface mirroring and rotating.
2014-03-02 16:14:00 +01:00
Mattes D
b17d04737d
Merge pull request #738 from xdot/master
...
Refactored global block property arrays
2014-03-02 16:13:43 +01:00
Howaner
e4b2502896
Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs
2014-03-02 16:01:37 +01:00
andrew
0c87341631
GetById => Get
2014-03-02 16:24:09 +02:00
tonibm19
10fdc51b0a
Creeper fixes
...
- Fixed explosion time (1.5s, according to minecraftwiki)
- Creeper explodes if right clicked with flint and steel
2014-03-02 14:35:03 +01:00
worktycho
8990410f18
Reverted BlockVine
2014-03-02 12:02:29 +00:00
andrew
cff4ee11f1
Removed g_BlockXXX arrays
2014-03-02 11:30:20 +02:00
Mattes D
0f2d9bc35f
Merge pull request #733 from Howaner/Slabs
...
Fix Double Slabs, fix Slab Meta and add more things to burnable
2014-03-02 10:22:40 +01:00
andrew
68b75f7b7a
Manually exported g_Block tables
2014-03-02 11:12:29 +02:00
andrew
3ca56b39bc
Exported cBlockInfo
2014-03-02 10:50:24 +02:00
madmaxoft
2998228e85
Added more documentation for FastNBT parser.
2014-03-02 08:22:27 +01:00
madmaxoft
2325a1a162
ChunkDesc warns about StructureGen's deprecation.
2014-03-01 20:59:41 +01:00
madmaxoft
2f85c9648b
Unified StructureGens and FinisherGens.
...
Now they are all Finishers. Fixes #398 .
2014-03-01 20:59:41 +01:00
andrew
d73cdba1f6
g_BlockXXX => cBlockInfo::XXX
2014-03-01 21:34:19 +02:00
Tycho
1e1d89fd20
Fixed errors
2014-03-01 10:17:55 -08:00
Tycho
5093b75ef1
Revesed typedef
2014-03-01 10:14:24 -08:00
Tycho
65edffd5b0
Implemented Rotations
2014-03-01 10:04:50 -08:00
Tycho
0d26e81ab5
Merge branch 'master' into MetaRotate
2014-03-01 09:48:44 -08:00
Tycho
0acfbdd912
Final implementation of MetaRotater
2014-03-01 09:47:27 -08:00
andrew
5c5502be9e
Refactored global block property arrays
2014-03-01 17:04:17 +02:00
andrew
39c8e68ef0
Exported cScoreboard::ForEachTeam
2014-03-01 14:27:55 +02:00
andrew
692a84af31
Shortened enums
2014-03-01 14:20:29 +02:00
andrew
a28e5eca18
Exported cScoreboard::ForEachObjective
2014-03-01 14:03:16 +02:00
andrew
5c44945287
Exported and documented cScoreboard
2014-03-01 12:08:40 +02:00
madmaxoft
c18748648d
Forgotten changes to cChunkInterface.
2014-03-01 02:54:46 +01:00
madmaxoft
aecbf77293
Removed cBlockHandler forward declaration from cChunkInterface.
...
Wasn't needed. Also reformatted the code.
2014-03-01 02:46:50 +01:00
madmaxoft
3991c04d47
Improved comments in float size check.
2014-03-01 02:43:35 +01:00
Howaner
0274db0e14
Use switch in GetStepSound
2014-02-28 22:32:10 +01:00
madmaxoft
1826461884
Fixed multiple gcc warnings about unused params.
2014-02-28 16:26:23 +01:00
madmaxoft
d97363a1b3
Documented the changes in cJukeboxEntity.
2014-02-28 15:41:46 +01:00
madmaxoft
35def963f0
Moved common cGroupManager code to a separate function.
...
This fixes my concerns in PR #709 .
2014-02-28 15:31:20 +01:00
Howaner
27b98dec2b
Merge branch 'master' into Slabs
2014-02-28 15:29:50 +01:00
Howaner
66c8425041
Fix Double Slabs, fix Slab Meta and add more things to burnable
2014-02-28 15:26:32 +01:00
Mattes D
6ad4b78a7b
Merge pull request #709 from Howaner/GlobalFixes
...
Add 'Group not found', when the Server load the users.ini and add auto g...
2014-02-28 14:28:50 +01:00
madmaxoft
0aac17874c
Better fix for the 32-bit float reading.
2014-02-28 08:31:35 +01:00
Tiger Wang
9ac9249aca
Removed unneeded includes in Player.cpp
2014-02-27 21:49:10 +00:00
Tiger Wang
528467bc5c
Fixed compile
2014-02-27 21:48:49 +00:00
Alexander Harkness
03624f33a7
Merge pull request #730 from tonibm19/master
...
added mooshroom to cow conversion
2014-02-27 21:15:47 +00:00
tonibm19
1de2c23d64
added mooshroom to cow conversion
2014-02-27 22:04:48 +01:00
Tycho
84913299f4
Added some Metadate rotaters using templated Mixin
2014-02-27 11:33:35 -08:00
madmaxoft
a23b5d13bd
Added a "nooutbuf" cmdline param.
...
This forces that the stdout stream uses no buffer, even when not a TTY. Used for running MCServer under ZeroBraneStudio.
2014-02-27 15:17:42 +01:00
madmaxoft
9c6d72a023
Fixed crash and some warnings in map handling.
...
Fixes #728 .
2014-02-27 09:06:25 +01:00
Tiger Wang
a97f28939f
Fixed sheep ASSERTing sometimes
2014-02-26 23:33:54 +00:00
Tiger Wang
baf2d88921
Implemented ballistic missiles (fireworks)
...
+ Added fireworks
2014-02-26 23:33:52 +00:00
madmaxoft
cb40d114ab
Fixed a gcc warning in FastNBT.h.
2014-02-26 22:17:28 +01:00
madmaxoft
aaddc98b46
Attempted fix for several GCC warnings.
2014-02-26 21:37:38 +01:00
madmaxoft
5cceca7fbc
Added more utility functions to cCuboid.
...
GetVolume(), Expand(), ClampX(), ClampY(), ClampZ()
2014-02-26 20:22:34 +01:00
madmaxoft
9ab766189d
Added useful parameter overloads to cBlockArea Lua API.
2014-02-24 23:17:12 +01:00
madmaxoft
f96801290e
Fixed tolua export for Byte.
...
No longer treated as an unknown class.
2014-02-24 22:52:55 +01:00
madmaxoft
46f6cef99f
Fixed compilation in MSVC (forward class definitions).
2014-02-24 22:47:58 +01:00
Tycho
df193c8f6f
BlockEntities is warnings free
2014-02-24 11:29:59 -08:00
Mattes D
23093fd4d1
Merge pull request #710 from TheJumper/master
...
Fixed Mob Drops, Add Rare, Uncommon and Gear Drops, Looting inflicts Drops
2014-02-24 18:30:44 +01:00
TheJumper
0b6aa7b370
Fixed Formatting, added compiler warning suppressing methods, fixed comments
2014-02-24 15:38:38 +01:00
STRWarrior
9440b61c8c
Fixed MCServer not compiling with C++03 compilers
2014-02-24 14:43:46 +01:00
STRWarrior
145b3492e7
Small improvements to boats.
2014-02-24 12:58:57 +01:00
Tiger Wang
f77720c43f
Merge pull request #669 from xdot/master
...
Implementation of in-game maps :D
2014-02-24 10:28:34 +00:00
madmaxoft
31d15f8654
Removed an unused member variable from cChunk.
2014-02-24 09:34:37 +01:00
madmaxoft
0aa8f765f9
Fixed crash in cBlockArea rotation.
...
Fixes #720 .
2014-02-24 09:34:37 +01:00
madmaxoft
728e3c68b6
Fixed a possible crash in cWorld::WakeUpSimulatorsInArea().
...
The Y coords weren't checked.
2014-02-24 09:34:37 +01:00
Mattes D
f8586b8e9d
Merge pull request #716 from Howaner/BreakFix
...
No Sword Block Destroying in Creative Mode
2014-02-23 23:06:50 +01:00
Tycho
462e0bcf46
fixed globals.h warnings
2014-02-23 12:23:35 -08:00
Howaner
084971424f
Use the ItemCategorie::IsSword() Method.
2014-02-23 20:31:58 +01:00
Howaner
cc34898e45
No Sword Block Destroying in Creative Mode
2014-02-23 20:02:44 +01:00
TheJumper
2cc597372a
Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters
2014-02-23 19:50:51 +01:00
TheJumper
8716263238
BlockBed.cpp: Fixed Multiple people in one bed.
...
OnUse in BlockBed.cpp now checks whether bit flag 0x4 in the Data values of the bed is set before somebody can try to sleep in the bed.
2014-02-23 19:50:51 +01:00
madmaxoft
fd4af0f992
Fixed bindings for cBlockArea:Get(Rel)BlockTypeMeta().
...
They no longer require the ghost output params.
2014-02-23 19:50:51 +01:00
Howaner
1f726b7d9d
Rename SkullEntity to MobHeadEntity
2014-02-23 19:50:50 +01:00
Howaner
a71e8be4d2
Add break to Protocol17x.cpp and use new comment delimiter
2014-02-23 19:50:50 +01:00
Howaner
7bc5946883
Add Heads completely
2014-02-23 19:50:50 +01:00
Howaner
ab2eba17ec
Add Skulls/Heads
2014-02-23 19:50:50 +01:00
madmaxoft
ea84f8cf89
Added cBlockArea::GetVolume, exported to Lua API.
2014-02-23 14:08:05 +01:00
andrew
f471873945
Maps: Improvements
2014-02-23 15:05:03 +02:00
madmaxoft
3af235b9bb
Added cBlockArea:GetSize() and :GetOrigin() to Lua API.
...
These don't have a direct C++ equivalent, but are rather useful for the plugins.
2014-02-23 14:03:24 +01:00
andrew
30b22e9f59
Manually exported DoWithMap
2014-02-23 13:25:02 +02:00
andrew
9fa4fa1cc7
Documented and exported cMapManager
2014-02-23 12:55:55 +02:00
andrew
866fde81ca
Documented and exported cMap
2014-02-22 13:59:49 +02:00
andrew
a96eea5e66
Semi-working implementation of cMap::UpdatePixel
2014-02-22 12:50:30 +02:00
Howaner
b3339a6617
Better Jukebox API
2014-02-21 22:26:04 +01:00
Howaner
3777873f22
Remove users.ini generation in Player.cpp and use the CheckUsers() Function
2014-02-21 15:10:31 +01:00
Howaner
5b39572334
Remove old Output Finish
2014-02-21 14:56:33 +01:00
Howaner
a755758553
Unicode :-(
2014-02-21 14:55:28 +01:00
Howaner
21febaf4b3
Add 'Group not found', when the Server load the users.ini and add auto generate from users.ini
2014-02-21 14:53:46 +01:00
andrew
8bf5d116fe
Split cMap::UpdateClient
2014-02-21 15:26:33 +02:00
madmaxoft
27e77a28fa
cClientHandle manages the client-registered plugin channels.
...
Fixes #706 .
2014-02-20 23:24:39 +01:00
madmaxoft
ffc4691f48
Removed problematic utf8.
2014-02-20 22:17:01 +01:00
Mattes D
6c9779630e
Merge pull request #704 from Howaner/GlobalFixes
...
Global fixes
2014-02-20 22:14:16 +01:00
Howaner
337c4e5cd4
Bad UTF-8 o.O
2014-02-20 22:02:14 +01:00
Mattes D
eabf25ddbd
Merge pull request #702 from TheJumper/master
...
BlockBed.cpp: Fixed Multiple people in one bed.
2014-02-20 21:33:54 +01:00
Howaner
d47f421e2d
Remove typeinfo import in IncrementalRedstoneSimulator
2014-02-20 21:00:16 +01:00
Howaner
1016922012
Fix Cauldron
2014-02-20 20:58:23 +01:00
Howaner
5e7f2ba6d6
Add Wolf Heal with Food
2014-02-20 20:41:53 +01:00
madmaxoft
50bebd2dbd
Disabled the leak finder.
2014-02-20 20:13:06 +01:00
Howaner
4dd39f8cd6
Add Pressure Plate Sound
2014-02-20 19:21:04 +01:00
Howaner
69961fc4df
Add Light weighted pressure plates
2014-02-20 19:07:32 +01:00
Howaner
4b7891f290
Add Hay Bale to Burnable
2014-02-20 17:56:35 +01:00
Howaner
01c01bac37
Add 'Meta < 3' to Cauldron
2014-02-20 17:45:18 +01:00
TheJumper
1b081a0fbb
BlockBed.cpp: Fixed space at if statement
...
Added a space after an if statement and before the first bracket to keep up code conventions.
2014-02-20 17:31:38 +01:00
TheJumper
c2277c6fee
BlockBed.cpp: Fixed Multiple people in one bed.
...
OnUse in BlockBed.cpp now checks whether bit flag 0x4 in the Data values of the bed is set before somebody can try to sleep in the bed.
2014-02-20 16:26:50 +01:00
Mattes D
191a08fc32
Merge pull request #700 from Howaner/GlobalFixes
...
Add new Trees (without Generator)
2014-02-20 16:24:52 +01:00
andrew
f201f4f176
Thread safe cMap manager
2014-02-20 16:38:37 +02:00
andrew
83d3a2eedf
Manual merge (Fixed conflicts)
2014-02-20 15:37:15 +02:00
madmaxoft
a3fa52ec73
Fixed bindings for cBlockArea:Get(Rel)BlockTypeMeta().
...
They no longer require the ghost output params.
2014-02-20 11:06:14 +01:00
Mattes D
87db4b6a90
Merge pull request #697 from Howaner/Skull
...
Add Skulls/Heads to MCServer
2014-02-19 22:12:38 +01:00
andrew
58a708825f
cMapDecorator: Implemented random rotations
2014-02-19 20:57:14 +02: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
Howaner
d63ce62f3b
Rename SkullEntity to MobHeadEntity
2014-02-19 14:45:09 +01:00
andrew
4a1ac57408
Documented cMap
2014-02-19 15:28:48 +02:00
Howaner
823ee3a125
Add break to Protocol17x.cpp and use new comment delimiter
2014-02-19 14:12:34 +01:00
Tiger Wang
a686656253
Merge branch 'master' into itemframes
...
Conflicts:
src/Entities/Entity.h
src/WorldStorage/NBTChunkSerializer.cpp
2014-02-18 22:13:44 +00:00
Mattes D
98332c5b76
Merge pull request #696 from mc-server/paintings
...
Implemented paintings, fixes #689
2014-02-18 23:08:12 +01:00
Tiger Wang
08229956ff
Merge branch 'itemframes' of https://github.com/mc-server/MCServer into itemframes
2014-02-18 22:07:30 +00:00
Tiger Wang
8b2153ba97
De-breaked stuff
2014-02-18 22:07:21 +00:00
Tiger Wang
5b961453d1
Fixed possible ASSERT failure
2014-02-18 21:54:53 +00:00
Tiger Wang
05789f9e66
Changed BlockFace type to eBlockFace
2014-02-18 21:33:33 +00:00
Howaner
52c41f8869
Add Heads completely
2014-02-18 21:40:02 +01:00
andrew
393ca0221d
Map decorators; Map clients
2014-02-18 20:50:08 +02:00
madmaxoft
b1c6b4f584
The cuboid for cWorld::SetAreaBiome() doesn't need sorting.
2014-02-18 13:49:24 +01:00
madmaxoft
803ea41236
Added cWorld:SetAreaBiome() API function.
...
Fixes #675 .
2014-02-18 13:49:23 +01:00
madmaxoft
fc8743df96
Added a bit more documentation to cForEachChunkProvider.
2014-02-18 13:49:23 +01:00