1
0
Commit Graph

2531 Commits

Author SHA1 Message Date
Sofapriester
173e8684a5 Update BlockID.cpp
Added g_BlockIsTorchPlaceable[E_BLOCK_STONE_BRICKS]          = true;
-> this should fix Issue #254
-> Please check if ok
Thx
2013-10-15 00:46:32 +02:00
Samuel Barney
02baff6629 Removed reading default values from settings.ini for worlds. 2013-10-14 15:32:40 -06:00
madmaxoft
d34fa4970a APIDump: Documented HOOK_PLAYER_ANIMATION. 2013-10-14 22:01:10 +02:00
madmaxoft
e4bb796c6b APIDump: Removed HOOK_MAX and HOOK_NUM_HOOKS from documentation.
They're not really hooks, just constants for the maximum.
2013-10-14 21:57:23 +02:00
madmaxoft
862397856d APIDump: Documented HOOK_LOGIN. 2013-10-14 21:46:25 +02:00
madmaxoft
a632f1d579 APIDump: Documented HOOK_KILLING. 2013-10-14 21:45:47 +02:00
madmaxoft
315af4450d APIDump: Documented HOOK_HOPPER_PUSHING_ITEM. 2013-10-14 21:45:08 +02:00
madmaxoft
9969c19060 APIDump: Documented HOOK_HOPPER_PULLING_ITEM. 2013-10-14 21:16:28 +02:00
Samuel Barney
210cd4eb50 General fixes to get the new Monster spawning code working.
Also wrote in some code to use the default settings for monsters located in settings.ini
2013-10-14 11:12:12 -06:00
Samuel Barney
318d552248 Merge branch 'MobSpawning' of https://github.com/mgueydan/MCServer into MobSpawning
Conflicts:
	source/Mobs/Bat.h
	source/Mobs/Monster.h
	source/World.cpp
2013-10-14 10:03:47 -06:00
Alexander Harkness
bf5f4603d9 Add the first line back. 2013-10-14 16:57:57 +01:00
Alexander Harkness
71f53cbaef Merge pull request #251 from tonibm19/patch-1
Stairs crafting fixes
2013-10-14 08:57:30 -07:00
Samuel Barney
5df5176f8d Merge branch 'master' of https://github.com/mc-server/MCServer 2013-10-14 09:42:43 -06:00
tonibm19
626c52929c Stairs crafting fixes
Fixes #233
Added Stone Brick Stairs crafting recipe and added alternative crafting recipes for Nether Brick Stairs and Quartz Stairs
2013-10-14 17:02:11 +02:00
madmaxoft
5c24d5acd7 APIDump: Documented HOOK_HANDSHAKE. 2013-10-14 16:59:45 +02:00
madmaxoft
c360849fa0 APIDump: Documented HOOK_EXPLODING. 2013-10-14 16:53:13 +02:00
madmaxoft
211b03a870 APIDump: Documented HOOK_EXPLODED. 2013-10-14 16:43:39 +02:00
madmaxoft
112e96ae9b APIDump: Documented HOOK_EXECUTE_COMMAND. 2013-10-14 16:20:32 +02:00
madmaxoft
66d8c1b306 APIDump: Updated the template for undocumented hooks. 2013-10-14 16:13:39 +02:00
madmaxoft
56bc94139d APIDump: Documented HOOK_DISCONNECT. 2013-10-14 16:12:32 +02:00
Samuel Barney
369b4abff8 Mobs no longer spawn up in the air. 2013-10-14 08:12:23 -06:00
madmaxoft
ca285563d9 APIDump: Fixed info missing from cCraftingRecipe. 2013-10-14 16:04:43 +02:00
madmaxoft
f546a0e180 APIDump: Documented HOOK_CRAFTING_NO_RECIPE. 2013-10-14 16:02:32 +02:00
madmaxoft
c8702e15bb APIDump: Documented HOOK_COLLECTING_PICKUP. 2013-10-14 15:53:41 +02:00
madmaxoft
0b71b3bd14 APIDump: Documented HOOK_CHUNK_UNLOADING. 2013-10-14 15:50:11 +02:00
madmaxoft
37ea7ec0c1 APIDump: Documented HOOK_CHUNK_UNLOADED. 2013-10-14 15:46:01 +02:00
madmaxoft
fb209757f0 APIDump: Documented HOOK_CHUNK_GENERATING. 2013-10-14 09:41:06 +02:00
madmaxoft
42b65c164d APIDump: Fixed undocumented hook param generator. 2013-10-14 09:32:55 +02:00
madmaxoft
8f5ed6511a APIDump: Added example to HOOK_CHUNK_GENERATED. 2013-10-14 09:30:13 +02:00
madmaxoft
23b4aa4820 APIDump: Documented HOOK_CHUNK_GENERATED. 2013-10-14 09:10:33 +02:00
madmaxoft
26fbefdcbf APIDump: The undocumented hooks template now has 8 params.
This allows for easier copypasting, hooks with less than 9 params don't need an extra copy-paste for a new param entry.
2013-10-14 09:03:54 +02:00
madmaxoft
9d7e638aa2 APIDump: Documented HOOK_CHUNK_AVAILABLE. 2013-10-14 09:00:28 +02:00
madmaxoft
18bbe82f30 WebAdmin honors the [WebAdmin].Enable setting.
This fixes #234.
2013-10-13 22:19:13 +02:00
madmaxoft
efb7d4fd3e Fixed WebAdmin's request parameters.
Also added doxycomments on what they really contain.
2013-10-13 20:29:57 +02:00
Tiger Wang
9faf4ef178 Merge submodule changes 2013-10-13 17:36:57 +01:00
madmaxoft
e62cac07c0 Merge branch 'metadata' of git://github.com/tigerw/MCServer into tigerw-metadata. 2013-10-13 18:26:45 +02:00
Mattes D
790f25a9ac Merge pull request #226 from SamJBarney/master
Crop blocks now respect light.
2013-10-13 07:10:49 -07:00
madmaxoft
455d33963f Re-added the cWorld:GetSignLines() to the API.
Somehow this got lost somewhere.
2013-10-13 14:13:15 +02:00
Tiger Wang
d8d2f35e9d Eight round of fixes
* Changed IsA() to *long if statement*
- Removed deprecated values in Entity.h - to blazes with the plugins!
* Renamed villager type enumerations to be LESS SHOUTY and more vt-y
+ Use vtMax for World.cpp testificate spawning
2013-10-13 12:47:55 +01:00
Samuel Barney
277a18626d Removed faulty code dealing with water. 2013-10-12 16:38:07 -06:00
Tiger Wang
d0acb37aed Seventh round of fixes
* Fixed arrows not critical-effecting because they were in MOBS! (derp)
* Used cMonster::mtXX as per xoft's suggestions
2013-10-12 23:05:15 +01:00
madmaxoft
33e1ba4240 Added 1.7 biome constants. 2013-10-12 23:49:55 +02:00
Samuel Barney
c74d1ffb91 Crop blocks now respect water and light. Currently a block has to be "watered" or the crop has a chance of breaking anyways. 2013-10-12 15:25:47 -06:00
madmaxoft
058faa74d2 APIDump: Documented the webserver vs world threads.
This fixes #12.
2013-10-12 23:13:26 +02:00
Mattes D
b400a9122e Merge pull request #225 from SamJBarney/master
Fix: Wrong arg name
2013-10-12 13:55:26 -07:00
Samuel Barney
25c5df0e05 Fix: Wrong arg name 2013-10-12 14:52:51 -06:00
Mattes D
3f09294e93 Merge pull request #224 from tonibm19/patch-7
Added Horses, Blazes and EnderDragons spawning.
2013-10-12 13:33:31 -07:00
madmaxoft
0352e45898 Fixed and exported cWorld:QueueTask().
This implements #220.
2013-10-12 22:24:59 +02:00
tonibm19
bfbc381e1d Added more ghast spawning probability 2013-10-12 20:26:57 +02:00
tonibm19
c28d3d7771 Added extra line 2013-10-12 20:21:28 +02:00