1
0
Commit Graph

3422 Commits

Author SHA1 Message Date
STRWarrior
0bdd2768ff Fixed possible crash
It could crash if MinAmount - MaxAmount was 0 because it would execute (Number % 0)
2014-10-15 19:46:43 +02:00
Mattes D
06b466471f Merge pull request #1536 from mc-server/MineshaftBooks
Mineshaft books
2014-10-15 19:23:53 +02:00
Mattes D
eeb580a74e Functions in cPluginManager get references instead of pointers. 2014-10-15 19:09:09 +02:00
STRWarrior
4038e1cb42 Using C++11 loops 2014-10-15 18:11:28 +02:00
STRWarrior
fa6f8fb38e The code now prevents conflicting enchantments. 2014-10-15 15:44:52 +02:00
STRWarrior
0cdd2b64ed IntNoise1DInt result gets devided by 7 first
suggestion by xoft
2014-10-15 15:42:45 +02:00
STRWarrior
57f8d2a55e Adding enchantments directly instead of first getting the name of it. 2014-10-15 15:31:06 +02:00
STRWarrior
e4ee71868e Renamed the counter to 'j' 2014-10-15 15:25:48 +02:00
STRWarrior
ff5f57514e Returned cFastRandom and cEnchantment:GetRandomEnchantmentFromVector to before
Added cEnchantment:GenerateEnchantmentFromVector that allows to get the same enchantments over and over.
2014-10-15 14:44:07 +02:00
STRWarrior
e3aa6e4857 Enchanted books generate in MineShafts chests 2014-10-15 14:08:45 +02:00
Mattes D
c6725f8d28 Usernames are lowercased before generating offline UUID.
This breaks previous offline UUIDs, but it guarantees that future offline UUIDs will be the same even for usernames with wrong capitalization.
2014-10-15 13:41:23 +02:00
Mattes D
7f8118e0cb cWorld: Fixed scheduler.
Fixes #1534.
Added a test case into the Debuggers plugin.
2014-10-13 14:49:18 +02:00
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