Commit Graph
6520 Commits
Author SHA1 Message Date
Mattes D d2744713bb Merge pull request #1272 from Howaner/Food
Fixed hunger bugs, Implemented golden apple, added jump statistic, added...
2014-08-01 17:43:18 +02:00
Mattes D 35cfbfd51a Merge pull request #1269 from Howaner/BlockEntitys
Added beacon.
2014-08-01 17:43:02 +02:00
Howaner 86d84bcb73 Compile fix. 2014-08-01 17:29:17 +02:00
Howaner 160fa3a9a9 Import Statistics.h 2014-07-31 23:56:49 +02:00
Mattes D a9317ac372 Merge pull request #1270 from Howaner/Options
Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator
2014-07-31 23:45:01 +02:00
Mattes D bc1cfd5942 Merge pull request #1271 from Howaner/GlobalFixes
Fixed water from ice and removed packed ice drop.
2014-07-31 23:37:37 +02:00
Tiger Wang 1094d91fba Merge pull request #1047 from mc-server/Enderman
Enderman attacks a player if he's looking at him
2014-07-31 22:20:05 +01:00
Howaner 09b63565bc Use "default:" in switch. 2014-07-31 23:19:05 +02:00
Howaner cfaef0de38 Capitalised "incremental" 2014-07-31 23:11:51 +02:00
Howaner 87d195171a Changed IsSolid to FullyOccupiesVoxel 2014-07-31 23:08:08 +02:00
Howaner 84462ba8b2 Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects. 2014-07-31 23:04:00 +02:00
Tiger Wang ffd6797fe1 Comment suggestions 2014-07-31 18:17:21 +01:00
Howaner bffad50436 Fixed water from ice and removed packed ice drop. 2014-07-31 18:41:48 +02:00
Howaner f47765dcbd Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator. 2014-07-31 18:21:45 +02:00
Howaner c138d19c31 Updated documentation again. 2014-07-31 18:16:52 +02:00
Howaner 6b1f7e7a45 Renamed "select..." methods to "set..." and better IsValidEffect() function. 2014-07-31 18:15:39 +02:00
Tiger Wang 5a1f9e5044 Merge pull request #1267 from mc-server/RoofedForest
Added RoofedForest trees.
2014-07-31 13:23:50 +01:00
Howaner c49d4fd215 Updated documentation. 2014-07-31 12:15:18 +02:00
Howaner 556fc908ae Renamed functions and added beacon json saving. 2014-07-31 12:13:11 +02:00
Howaner e6ca5a5ece Added window update. 2014-07-30 22:54:19 +02:00
Howaner dcd226d904 Added beacon load/save. 2014-07-30 22:50:34 +02:00
STRWarrior 7821326370 Suggestions 2014-07-30 22:43:59 +02:00
Howaner 66d34b83d2 Added beacon documentation. 2014-07-30 22:31:43 +02:00
Howaner ad4fa6eba8 Changed return type from GetPrimaryPotion() and GetSecondaryPotion() 2014-07-30 22:22:06 +02:00
Howaner 81e095adda Exported the beacon. 2014-07-30 22:19:51 +02:00
Howaner 89b1bbdc5f Added beacon. 2014-07-30 21:59:35 +02:00
STRWarrior 6e0a8d393b Moved GetRoofedForestTreeImage content to GetDarkoakTreeImage 2014-07-30 21:56:33 +02:00
STRWarrior f232ef5cd6 Fixed doxy comment 2014-07-30 21:50:02 +02:00
STRWarrior fd2d338a25 Fixed comment at the end of a for-loop 2014-07-30 21:42:48 +02:00
STRWarrior c4e6a14235 Added lighting code and added comments 2014-07-30 19:18:11 +02:00
STRWarrior 17b679f355 Fixed compiling using Clang 2014-07-30 17:09:00 +02:00
STRWarrior 5249f574bd Added RoofedForest trees.
Could still be improved allot.
2014-07-30 15:55:50 +02:00
STRWarrior 5daeba7e88 Removed lighting code in cEnderman::CheckEventSeePlayer 2014-07-30 13:59:47 +02:00
Mattes D a899dfc26e Merge pull request #1266 from mc-server/PreSimulatorConfig
PreSimulator: Added configurations.
2014-07-30 13:41:02 +02:00
STRWarrior 75b7c37755 PreSimulator: Added configurations.
You can now choose if it should pregenerate something or not
2014-07-30 13:06:48 +02:00
madmaxoft f095e770b8 Merged branch 'howaner/Options'. 2014-07-30 10:06:18 +02:00
archshift 1d68469718 Fixed "Dependency" typos 2014-07-29 22:43:25 -07:00
Mattes D b41c8b5de7 Merge pull request #1262 from mc-server/CanBeTerraformed
Added cBlockInfo::CanBeTerraformed and made finishers use it
2014-07-30 07:09:33 +02:00
madmaxoft 7022ae7988 Fixed FinishGen.h types. 2014-07-30 07:08:29 +02:00
archshift 487c572429 Entity.h: Moved constants out of some unnamed enum 2014-07-29 19:14:56 -07:00
archshift cb9408a52d Merge pull request #1263 from Howaner/GlobalFixes
Fixed compile error with clang.
2014-07-29 19:05:40 -07:00
Howaner 438e4088d6 Changed size_t to 'unsigned long' 2014-07-30 01:22:51 +02:00
Howaner 9a4d80fc3b Fixed compile error with clang. 2014-07-30 00:45:03 +02:00
STRWarrior 931443ac67 Added soulsand to the terraformed list. 2014-07-29 22:40:40 +02:00
STRWarrior adae2b70b1 Added cBlockInfo::CanBeTerraformed and made finishers use it
I might have forgotten some of them though
2014-07-29 22:31:31 +02:00
Tiger Wang 4f5d73b770 Slight cleanup after portals 2014-07-29 20:50:30 +01:00
Mattes D 30e64ed4d8 Merge pull request #1061 from mc-server/portals
Portals and others
2014-07-29 17:48:56 +02:00
Mattes D d715eb7f5e Merge pull request #1254 from mc-server/SingleTopBlockFinisher
Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock
2014-07-29 17:47:40 +02:00
Mattes D 8287f2d933 Merge pull request #1252 from mc-server/RoughRavinesGen
Rough ravines gen
2014-07-29 17:46:57 +02:00
Tiger Wang cb77b39dc6 Detrailed whitespace 2014-07-29 16:36:24 +01:00