1
0
Commit Graph

5109 Commits

Author SHA1 Message Date
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
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
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
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
Tycho
f5cb81eb1b Added support for redstone latching
fixes #856
2014-04-06 11:09:33 -07:00
Tiger Wang
c7f8c7eb21 Updated cWorld::CreateProjectile() documentation 2014-04-06 17:47:27 +01:00
Tycho
c89f7902df Added forgoten lua file 2014-04-06 05:56:43 -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
43e3a55a70 Added more API documentation to cCompositeChat. 2014-04-05 12:09:30 +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