1
0
Commit Graph

3263 Commits

Author SHA1 Message Date
madmaxoft
8610d45ef1 Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). 2013-12-20 16:01:34 +01:00
madmaxoft
b19d765666 Fixed melon and pumpkin growing. 2013-12-20 15:50:46 +01:00
madmaxoft
00911c5f94 Fixed missing parenthesis. 2013-12-20 15:44:56 +01:00
madmaxoft
ea65243119 Fixed clang warnings in Noise.cpp.
Fix-a-random-warning-per-day :)
2013-12-20 10:11:33 +01:00
Alexander Harkness
bf31e80280 Merge pull request #451 from mc-server/dirtupdatefix
Fixed assertion during dirt block OnUpdate()
2013-12-19 23:05:27 -08:00
Tiger Wang
c08910d4af Fixed assertion during dirt block OnUpdate() 2013-12-19 23:06:26 +00:00
Mattes D
39251bccd3 Merge pull request #450 from mc-server/redstonefixes
Multiple fixes
2013-12-19 13:58:49 -08:00
Mattes D
03ec64aee1 Merge pull request #449 from mc-server/Fishing_Rod
Fishing rod
2013-12-19 13:51:21 -08:00
STRWarrior
a1ce0a6d73 Fixed #include in Floater.cpp. 2013-12-19 22:44:10 +01:00
STRWarrior
32d117a498 The floater now actualy dives under water. 2013-12-19 22:18:05 +01:00
STRWarrior
018c65b4e3 You can get fish from fishing :D. Only one type of fish though. 2013-12-19 22:16:15 +01:00
Alexander Harkness
e37e8d2707 Merge pull request #448 from mc-server/testbranch
travis ci pr test
2013-12-19 13:10:02 -08:00
Alexander Harkness
5a97d831de take advantage of 1.5 cores given by travis with parallelization! 2013-12-19 20:56:07 +00:00
Tiger Wang
03a8dfc4a8 Fixed PlayerAbilities and creative 2013-12-19 20:53:47 +00:00
Alexander Harkness
296a421e8a just a little change for travis ci test 2013-12-19 20:49:35 +00:00
Alexander Harkness
3f496db5a9 explicitly defined email notifications 2013-12-19 20:42:40 +00:00
Alexander Harkness
4df5bbb3f3 update readme with travis info 2013-12-19 20:35:45 +00:00
Alexander Harkness
9f986a808c Update submodule URLs so people without SSH can get them. 2013-12-19 20:15:59 +00:00
Alexander Harkness
11e50df209 Create .travis.yml 2013-12-19 20:07:58 +00:00
Alexander Harkness
78c5908237 Test commit. 2013-12-19 20:04:40 +00:00
STRWarrior
4a02898683 Added the Floater files to MCServer.vcproj 2013-12-19 17:46:12 +01:00
STRWarrior
d9c8ae37cf Implented cItemFishingRodHandler. 2013-12-19 17:34:03 +01:00
STRWarrior
3d70d7198d Implented IsFishing, SetIsFishing and GetFloaterID(). 2013-12-19 17:33:21 +01:00
STRWarrior
86bfed735e Added cFloater class. 2013-12-19 17:32:06 +01:00
Tiger Wang
53e8c067ea Fixed 1.7 arm swing animation 2013-12-19 16:03:43 +00:00
Tiger Wang
53ff372624 Fixed dust from being placed on nonsolids 2013-12-19 15:57:35 +00:00
Tiger Wang
b083979cb2 Fixed repeaters not updating power 2013-12-19 15:57:15 +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
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
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