Commit Graph

7915 Commits (6cd7e52eb760c3c58e647e8ec588f2b60e1c92e4)

Author SHA1 Message Date
Mattes D bfd1a9601a APIDump: Added docs for a few projectiles. 2014-10-22 16:06:31 +02:00
Alexander Harkness 7cda6f9346 Clearer version indication. 2014-10-22 13:55:21 +01:00
Mattes D 1cd45e770d Added inheritance information to Lua docs for projectiles. 2014-10-21 23:11:45 +02:00
Mattes D b979cad893 cItemFrame: Fixed a forgotten rename. 2014-10-21 22:32:17 +02:00
Mattes D 814e4404bb Merge pull request #1515 from mc-server/BlockFixes
Block fixes
2014-10-21 22:04:51 +02:00
Mattes D a42fa071bc Properly exported cItemFrame and cHangingEntity to Lua. 2014-10-21 22:02:30 +02:00
Mattes D 881bc66233 Fixed trailing whitespace. 2014-10-21 22:00:31 +02:00
Mattes D 0c0c762412 Exported individual projectile classes to Lua API.
They used to be exported, but then they were moved to separate files and those werent' added to the ToLua processing list.
2014-10-21 21:25:52 +02:00
Howaner 6f99615ceb Merge branch 'master' into ChunkLoader
Conflicts:
	src/World.h
2014-10-21 21:16:04 +02:00
Howaner 4fe41839cc Reverted hook move. 2014-10-21 21:13:35 +02:00
Howaner 2d63967551 style. 2014-10-21 18:32:02 +02:00
Howaner 5d3b6c212f Reverted plugin remove 2014-10-21 18:30:59 +02:00
Howaner 690e89001e Fixed submodule downgrades 2014-10-21 18:13:14 +02:00
Mattes D bcb839d07b Merged branch 'master' of git://github.com/sriehl/MCServer 2014-10-21 18:12:40 +02:00
Howaner f800f3c998 Moved tall grass pickups handle. 2014-10-21 18:06:44 +02:00
Howaner 283eda3c4e Merge branch 'master' into BlockFixes 2014-10-21 17:37:03 +02:00
Howaner b0988e65aa Use two lists and 2 chunk send prioritys. 2014-10-21 17:35:23 +02:00
Howaner a07456d712 New c++11 stuff. 2014-10-21 17:00:41 +02:00
Howaner 44514e53fc Merge branch 'master' into ChunkLoader
Conflicts:
	src/ClientHandle.cpp
2014-10-21 16:55:22 +02:00
Tiger Wang 6a9f8a7615 Compile fix? 2014-10-21 14:40:00 +01:00
Alexander Harkness d0766fcea8 Missing EOL. 2014-10-21 14:21:08 +01:00
Alexander Harkness 8299b0920f Alignment. 2014-10-21 14:19:58 +01:00
Alexander Harkness 3e0f7c2b1c Missing space. 2014-10-21 14:17:36 +01:00
Alexander Harkness 8ddc40e44b Missing space fix. 2014-10-21 14:17:04 +01:00
Tiger Wang 2b920f9e21 Compile fix? 2014-10-21 13:49:53 +01:00
Tiger Wang bc97399b01 Updated ProtectionAreas 2014-10-21 13:44:33 +01:00
Tiger Wang 014ebb7fe6 Windows close handlers handles more closes 2014-10-21 13:41:08 +01:00
Tiger Wang 5089f04cf6 Replace &*[0] accesses with .data() 2014-10-21 13:20:06 +01:00
Mattes D dc4185fb86 cLuaState: cEntity is pushed with specific type. 2014-10-21 12:43:06 +02:00
Tiger Wang 987f79afdd En masse NULL -> nullptr replace 2014-10-20 21:55:07 +01:00
Tiger Wang a324333c11 Use std::recusive_mutex 2014-10-20 21:26:18 +01:00
Mattes D ac80f62650 Updated the Core. 2014-10-20 20:23:38 +02:00
Mattes D d79d5945e3 InfoDump: Do not crash if one plugin fails to load.
If there's a syntax error in one plugin's Info.lua file, report the error and continue processing.
2014-10-20 20:14:00 +02:00
Tiger Wang 2334c8dd9d Merge branch 'master' of https://github.com/mc-server/MCServer 2014-10-20 19:01:53 +01:00
Tiger Wang bde99d684e Migrated cSleep and cTimer to std::chrono 2014-10-20 18:59:40 +01:00
Alexander Harkness b025bb63c2 Merge pull request #1554 from SphinxC0re/master
Fixed #1550
2014-10-20 18:49:16 +01:00
Julian Laubstein 48470c858b Fixed #1550 2014-10-20 19:36:16 +02:00
Mattes D b78078a3a6 Fixed a potential crash in cEntity bindings. 2014-10-20 17:32:09 +02:00
Alexander Harkness 1f301d7560 Merge pull request #1553 from SphinxC0re/work
Fix for fix #1552
2014-10-20 15:15:59 +01:00
Julian Laubstein 4a58ce1df6 Found it! 2014-10-20 16:00:33 +02:00
Julian Laubstein d2cc1e0cd3 Fix for fix #1552 2014-10-20 15:58:08 +02:00
Alexander Harkness bf8de85fd6 Merge pull request #1552 from SphinxC0re/master
Added error handling to load <plugin> command
2014-10-20 14:34:19 +01:00
Julian Laubstein c2560cc1be Added error message 2014-10-20 15:08:48 +02:00
Julian Laubstein 1a46feda43 Added error handling to load <plugin> command 2014-10-20 14:46:24 +02:00
Mattes D 8fbd65e775 Merge pull request #1549 from SphinxC0re/master
Added mechanics placeable on halfslabs
2014-10-19 19:13:48 +02:00
Mattes D ee23fd5b9e Removed obsolete tr1::shared_ptr. 2014-10-19 18:52:24 +02:00
Mattes D cf73fee7e3 Fixed minor style issues. 2014-10-19 18:45:42 +02:00
Mattes D 262e6d06aa TwoLevel BioGen: fixed swapped inside and outside biomes. 2014-10-19 16:07:29 +02:00
Julian Laubstein 3082f0d046 Fixed error with non-const function 2014-10-19 15:11:53 +02:00
Tiger Wang aa19a3afb0 Migrated random generators to std::random 2014-10-19 14:10:18 +01:00