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
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
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
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
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
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
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
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
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 8825d30aabfixes #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
Mattes D
2e789b63d3
Merge pull request #840 from Howaner/NewBlocks
...
Add tall flower handler.
2014-04-04 15:06:54 +02: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
0fb40da877
Change CanBeAt() from big flower
2014-04-03 21:53:18 +02:00
madmaxoft
e304bd08a2
Documented the units and range for entity rotations.
2014-04-03 21:44:03 +02: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
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
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
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
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
