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
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
