1
0
Commit Graph

3410 Commits

Author SHA1 Message Date
Mattes D
1eae7d0ece Fixed style. 2014-10-13 10:34:33 +02:00
Mattes D
120b347fb5 CheckBasicStyle ignores the Bindings.h generated file. 2014-10-13 10:33:08 +02:00
Mattes D
53410a9271 Merge pull request #1529 from mc-server/unique_ptr
Moved a few objects to unique_ptr
2014-10-12 22:08:28 +02:00
worktycho
fff9e50109 Aligned simulators 2014-10-12 12:44:59 +01:00
worktycho
daadde2077 Fix style 2014-10-12 12:18:52 +01:00
worktycho
6a448be88c Fix spaces 2014-10-12 12:17:29 +01:00
worktycho
8dfeb6e324 Update World.cpp 2014-10-12 12:15:52 +01:00
Alexander Harkness
6af9d5ba01 Fixed compilation. 2014-10-11 18:39:46 +01:00
Alexander Harkness
93833069a8 Merge branch 'master' into issue850
Conflicts:
	src/BlockID.h
2014-10-11 18:32:21 +01:00
Alexander Harkness
68762747e0 Fixed typo and removed useless right side up slab meta. 2014-10-11 16:59:13 +01:00
worktycho
1a07dc897d Fix lambda capture 2014-10-11 14:43:06 +01:00
tycho
473c0425d3 Moved a few objects to unique_ptr 2014-10-10 15:33:19 +01:00
Mattes D
a47d9e5334 Fixed MSVC compilation. 2014-10-10 09:58:54 +02:00
archshift
76b37acb42 Float/Ciel: If it's going to use C++11, it might as well take advantage of it 2014-10-09 14:57:57 -07:00
archshift
f8d1e96ae7 Use static casts instead of C casts, add floor-cast functions 2014-10-09 14:57:40 -07:00
Mattes D
f91aa6f1d3 DistortedHeightmap: Fixed crash on number rounding.
Fixes #1521.
2014-10-09 12:33:42 +02:00
STRWarrior
e95ee55974 Added comments to the GetAcaciaTreeImage function 2014-10-08 21:32:09 +02:00
STRWarrior
36fa1c5c73 Using array with possible directions. 2014-10-08 21:25:59 +02:00
STRWarrior
68a54c90c9 Added AcaciaTrees for the savanna biomes 2014-10-08 20:31:16 +02:00
Howaner
fec509935d Removed BlockHaybale.h from CMakeLists.txt 2014-10-07 15:39:24 +02:00
Howaner
e3a69a527d Removed unused cBlockHayBaleHandler. 2014-10-07 15:02:51 +02:00
Mattes D
2a32dd2740 Merge pull request #1513 from mc-server/MojangAPIRefresh
cMojangAPI: Added periodical refreshes.
2014-10-07 11:23:49 +02:00
madmaxoft
4e82a58060 Fixed crash in ForEachEntityInBox API.
Fixes #1511.
2014-10-06 13:48:44 +02:00
Mattes D
3d2d8a096b cMojangAPI: Added periodical refreshes. 2014-10-06 10:05:02 +02:00
Mattes D
89713e23e4 Merge pull request #1510 from mc-server/TimedEvent
Added a cEvent::Wait() with timeout.
2014-10-06 09:24:51 +02:00
worktycho
a20bd0dbbd Update CMakeLists.txt 2014-10-05 23:44:55 +01:00
madmaxoft
c94e82980e Fixed a missed value. 2014-10-05 22:56:56 +02:00
madmaxoft
112fac5798 Removed obsolete cMonster::eType.
Has been replaced with global eMonsterType.
2014-10-05 22:12:25 +02:00
madmaxoft
77c5b410e6 Fixed eMonsterType Lua API mismatch. 2014-10-05 22:09:19 +02:00
Mattes D
a8aeceab9d cClientHandle: Added protocol version knowledge. 2014-10-05 20:19:21 +02:00
Mattes D
ec71ffcc80 Added a cEvent::Wait() with timeout. 2014-10-05 19:04:30 +02:00
win32re
f8c1da4a71 Fixes #1503 - No gravel is being generated 2014-10-04 14:02:40 +02:00
Mattes D
db98820aa9 Merge pull request #1489 from mc-server/fixes
Improved torch handler
2014-10-04 10:02:10 +02:00
Tiger Wang
79e9de8d67 Comment suggestions 2014-10-03 21:38:23 +01:00
Alexander Harkness
2f945475f2 Fix spelling of PRISMRAINE
Fixes #1497
2014-10-02 07:22:12 +01:00
Masy98
3591edd47e Fixed sorting 2014-10-01 19:26:36 +02:00
Masy98
d37b047ebe Merge branch 'master' into blocks 2014-10-01 19:23:43 +02:00
Masy98
0d2a041a69 Fixed Red Sandstone and Prismarine drops 2014-10-01 19:13:59 +02:00
Mattes D
ecef85574d Merge pull request #1493 from Masy98/blocks
Added missing 1.8 blocks, E_METAs and sounds
2014-10-01 18:28:07 +02:00
Masy98
1d875d0bc8 Added Daylight Sensors to the "can't push" list 2014-10-01 18:08:31 +02:00
Masy98
0f0763303e Fixed ":" 2014-10-01 18:00:51 +02:00
Masy98
cc9e598803 Added missing 1.8 blocks, E_METAs and sounds 2014-10-01 17:57:53 +02:00
madmaxoft
4789db5c28 cRoot: Removed useless variable from Lua API. 2014-10-01 17:28:45 +02:00
madmaxoft
fd11b574bd cPlayer: Removed useless functions from the Lua API. 2014-10-01 17:24:02 +02:00
madmaxoft
886a7d7bbb Bindings: Fixed binding for cPlayer::PermissionMatches(). 2014-10-01 12:59:31 +02:00
madmaxoft
901bed3989 Unified cRoot broadcast chat documentation. 2014-10-01 12:44:28 +02:00
madmaxoft
e65e0f1795 cClientHandle: Alpha-sorted the sending functions. 2014-10-01 12:14:38 +02:00
Mattes D
3ccda572b3 Merge pull request #1490 from mc-server/removecompact
Removed WSSCompact
2014-10-01 07:47:17 +02:00
Tiger Wang
9e4a5f824a Removed WSSCompact 2014-09-30 22:20:21 +01:00
Tiger Wang
48c99dcd2e Improved torch handler 2014-09-30 22:00:33 +01:00