1
0
Commit Graph

3322 Commits

Author SHA1 Message Date
tycho
0c027927c4 fixed visual studio compile flags 2013-12-19 15:29:23 +00:00
tycho
7d096c41f7 fixed a number of windows issues 2013-12-19 15:07:45 +00:00
Alexander Harkness
56076c3baa Update Contributing.md
Fixes #351
2013-12-19 11:30:24 +00:00
Alexander Harkness
9a29af7151 Merge pull request #443 from mc-server/messages
In-game message revision and fixes
2013-12-19 00:02:49 -08:00
Tycho Bickerstaff
95c7407dd3 added md5 as a dependency for bindings 2013-12-19 00:55:01 +00:00
Tycho Bickerstaff
e2549dfcb2 added expat as lua bindings dependincy 2013-12-19 00:52:52 +00:00
Tycho Bickerstaff
aa53fe6761 compiling sqlite 2013-12-19 00:28:48 +00:00
Tycho Bickerstaff
afa259e530 added all cpp files to bindings 2013-12-19 00:24:47 +00:00
Tycho Bickerstaff
d2f29cb866 moved HTTPServer to globs 2013-12-19 00:16:44 +00:00
Tycho Bickerstaff
e02fbd37ab added pthread linking code to OSSupport 2013-12-19 00:15:30 +00:00
Tycho Bickerstaff
0a96bf1c03 moved protocol to glob 2013-12-19 00:11:04 +00:00
Tycho Bickerstaff
3585f93fc9 added blocks and blockentities 2013-12-19 00:06:24 +00:00
Tycho Bickerstaff
9515ece2bd linked in lua 2013-12-19 00:02:15 +00:00
Tycho Bickerstaff
cdca5a3eac Merge branch 'master' into cmake 2013-12-19 00:00:14 +00:00
Tycho Bickerstaff
7dd1561a88 fixed bindings generation 2013-12-18 23:59:07 +00:00
Tycho Bickerstaff
1149ab216c Revert "Removed unused ToLua files." to allow the new cmake system to build on tolua++ on linux
This reverts commit 906fd50343.
2013-12-18 23:14:31 +00:00
Tycho Bickerstaff
0dbd55614b bindings regenration logic 2013-12-18 23:14:11 +00:00
Tiger Wang
2dd823da09 Disconnection message no longer shown if ping 2013-12-18 22:06:36 +00:00
Tiger Wang
b4ac4a14fa Prettified command error messages
Using the magic of overlords (overloads) and standards compliance.
2013-12-18 22:05:41 +00:00
Tycho Bickerstaff
95ebc37faa added zlib and UI 2013-12-18 19:10:47 +00:00
Tycho Bickerstaff
93d14b0af9 removed make file 2013-12-18 19:09:24 +00:00
Tycho Bickerstaff
e627f2f98c Merge branch 'master' into cmake 2013-12-18 19:06:11 +00:00
Tiger Wang
aaaa53ce9d The "<>" of a player name is now coloured 2013-12-18 18:18:06 +00:00
Tiger Wang
26632bbb8a Fixed 1.7 player disconnection not calling hook
This fixes #357
2013-12-18 18:17:17 +00:00
Mattes D
acf90a2c1a Merge pull request #440 from mc-server/repeaterfixes
Fixed redstone wire and certain repeater scenarios
2013-12-18 09:59:31 -08:00
Mattes D
b6e1f62df7 Merge pull request #442 from mc-server/Nether_Wart
Implented Nether Wart.
2013-12-18 09:58:41 -08:00
Mattes D
d6d42c36ea Merge pull request #441 from mc-server/hookentityanimation
Renamed back EntityAnimation to PlayerAnimation
2013-12-18 09:57:35 -08:00
STRWarrior
ffca4f94c1 Implented Nether Wart. 2013-12-18 18:33:18 +01:00
Tiger Wang
db5d7963e2 Renamed back EntityAnimation to PlayerAnimation
This fixes #411 and partially reverts
30ead79049
2013-12-18 16:11:15 +00:00
madmaxoft
4402725c61 Removed offending tr1/memory header inclusion.
We already use <memory> at line 160, this was a double include, additionally causing problems (#424).
2013-12-18 12:04:31 +01:00
Tiger Wang
13a22918e5 Fixed wire powering blocks beneath 2013-12-17 23:05:42 +00:00
Tiger Wang
09c47fabd2 Fixed bad repeater power queuing in corner case
Repeaters remain queued to power even if their original source has since
unpowered. Also functionised and cleaned up code.
2013-12-17 23:05:27 +00:00
madmaxoft
f8f4ab88f6 Fixed player falling through the floor on spawn.
The 1.7 client seems to have math issues with exact coords. Adding 0.001 to the Y coord fixed the problem.
2013-12-17 20:16:06 +01:00
madmaxoft
bd568ed089 cBlockArea: origin is initialized in the constructor and the loader. 2013-12-17 20:16:06 +01:00
Mattes D
3a32a1e902 Merge pull request #439 from mc-server/Buckets
Made buckets work when the player does not 'look' at a block.
2013-12-17 11:15:07 -08:00
madmaxoft
a4f4ba534e Fixed naming and initialization. 2013-12-17 20:10:03 +01:00
STRWarrior
a74fdd9023 Forgot to change one Vector3d to Vector3i. 2013-12-17 20:04:39 +01:00
STRWarrior
a1bfc89118 Renamed Pos to m_Pos. 2013-12-17 20:02:44 +01:00
STRWarrior
f1a1d6fa5c Using Recommendations. 2013-12-17 19:42:06 +01:00
STRWarrior
d28142ff71 Made buckets work when the player does not 'look' at a block. This fixes #265 2013-12-17 17:33:48 +01:00
Tiger Wang
ed80ff9fc8 Merge pull request #438 from mc-server/Boats
Implemented boating functionality.
2013-12-16 14:14:44 -08:00
madmaxoft
5d4e1725d4 APIDump: Ignoring the multi-inheritance members.
We may get to documenting them one day, but for now they are unused anyway, so there's no point in documenting them. They are a by-product of multiple inheritance, re-introduced due to #422.
2013-12-16 22:13:46 +01:00
madmaxoft
daade8ddee Fixed multiple inheritance in ToLua++.
This fixes #422.
2013-12-16 22:13:46 +01:00
STRWarrior
59165dcba5 Boats spawn on top of a block. not between 4 blocks. 2013-12-16 21:50:57 +01:00
STRWarrior
6b21dc6d11 Using suggestions for Boat placing. 2013-12-16 20:53:43 +01:00
Tiger Wang
3e6fd5c6e5 Removed some old cRedstone remnants 2013-12-16 17:35:20 +00:00
STRWarrior
199123d4f2 Boats drop a boat pickup when destroyed by hand. You can now actualy use boats. 2013-12-16 18:03:39 +01:00
STRWarrior
459d636948 Added HandleSpeedFromAttachee so an entity can override the function. 2013-12-16 18:02:33 +01:00
STRWarrior
324fa55bf0 You can spawn boats on water. 2013-12-16 18:01:33 +01:00
madmaxoft
f521cbeb31 Fixed cClientHandle::Tick() being called from two threads.
When the player was initialized, the Tick() function continued to stream chunk, while the cWorld called Tick() from its tick thread.
Final fix for #187.
2013-12-16 10:41:51 +01:00