Commit Graph
3298 Commits
Author SHA1 Message Date
Tycho Bickerstaff fbb47cd2ae Merge branch 'master' into cmake 2013-12-19 17:14:52 +00: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
Tycho Bickerstaff 0e6107bfdd Merge branch 'master' into cmake 2013-12-19 16:16:35 +00: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
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