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 |
|
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 |
|
Mattes D
|
112dd2c5ec
|
Merge pull request #888 from mc-server/Proto176
Protocol 1.7.6
|
2014-04-15 08:16:16 +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 |
|
madmaxoft
|
21e5690811
|
ProtoProxy: Fixed weird gcc compilation errors.
|
2014-04-14 18:50:44 +02:00 |
|
madmaxoft
|
449afa850e
|
ProtoProxy: Added 1.7.9 compatibility.
|
2014-04-14 18:24:44 +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 |
|
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 |
|
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 |
|
madmaxoft
|
8c7d0f5304
|
InfoReg uses cCompositeChat for subcommand lists.
Also fixed an issue with console commands.
|
2014-04-10 19:09:37 +02:00 |
|
Mattes D
|
b45e8a8bd9
|
Merge pull request #878 from mc-server/mobexp
@axisd Changes
|
2014-04-10 17:23:32 +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 |
|