Commit Graph
6482 Commits
Author SHA1 Message Date
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
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
Alexander Harkness 5f5bdaca65 Merge pull request #870 from wiseoldman95/patch-1
Comments: Inverted Z axis.
2014-04-08 16:09:11 +01: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
Alexander Harkness c388b84267 Merge pull request #869 from wiseoldman95/patch-1
Added comments regarding latching and orientation
2014-04-08 15:15:39 +01: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
Alexander Harkness 20a12beec3 Merge pull request #865 from wiseoldman95/patch-2
Redstone simulator - cleaning up repeater lock code
2014-04-07 19:20:37 +01: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 176deb4b5b Added the generated ZBS API file to ignore list. 2014-04-06 22:30:34 +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
madmaxoft d40ab2b788 Merge remote-tracking branch 'worktycho/override' 2014-04-06 22:03:09 +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