1
0
Commit Graph

3494 Commits

Author SHA1 Message Date
Mattes D
27687cfcd4 Added FastRandom.* back to CMakeLists.txt. 2014-10-23 08:41:57 +02:00
Mattes D
f8c54f4243 Merged branch 'master' into c++11. 2014-10-23 08:40:39 +02:00
Tiger Wang
a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Mattes D
2ac3a807b7 ComposableGenerator: Removed nullptr initializers. 2014-10-22 22:58:36 +02:00
Mattes D
7ed27c6b80 LuaState: Projectiles are pushed using their full class. 2014-10-22 16:06:32 +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
4fe41839cc Reverted hook move. 2014-10-21 21:13:35 +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
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
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
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
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
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
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
Julian Laubstein
403f8581cf Added mechanics placeable on halfslabs 2014-10-19 15:01:01 +02:00
Mattes D
3ee47df118 Mountain height gen: Added ditches. 2014-10-19 14:35:49 +02:00
Mattes D
e0cfbc4d85 Generator: Rewritten to use SharedPtrs. 2014-10-19 14:01:59 +02:00
Tiger Wang
cc600de51f Merge branch 'master' of https://github.com/mc-server/MCServer 2014-10-19 12:34:05 +01:00
Mattes D
d50bbf3899 cLuaState: cMonster descendants don't push their specific type.
The individual mob types aren't exported to Lua, so pushing them would crash the server.
2014-10-19 12:49:54 +02:00
Mattes D
b0a59927fb cLuaState: cBlockEntity descendants are pushed with proper class type. 2014-10-19 12:46:25 +02:00
Mattes D
ebd31ff132 LuaState: Pushing a cEntity pushes the correct class name.
This makes Lua scripts easier, as they don't need to cast values from cEntity to the specific descendant.
2014-10-19 11:46:38 +02:00
Mattes D
fe153cc763 Bindings: Removed obsolete codegen files.
LuaState_Call.inc is no longer needed, it was replaced with variadic templates.
2014-10-19 11:32:17 +02:00
Tiger Wang
6d5a8892f3 Use std::thread 2014-10-19 00:29:34 +01:00
Tiger Wang
2874bf73be Merge pull request #1502 from mc-server/furnaces
Improved furnaces
2014-10-18 21:33:55 +01:00
Tiger Wang
eb821ff240 Fixed failure for cRankManager to restart 2014-10-18 19:55:01 +01:00
Tiger Wang
6a22b63473 Furnaces now update their block entity type
Therefore improving cChunk's variable boundary checking.
2014-10-18 19:54:34 +01:00