1
0
Commit Graph

1808 Commits

Author SHA1 Message Date
Mattes D
2a9997881c Merge pull request #259 from tonibm19/patch-2
Fixed horse saddle
2013-10-18 07:29:23 -07:00
madmaxoft
e6bb025a9f Fixed webadmin logging.
This fixes #262.
2013-10-18 12:50:50 +02:00
Mattes D
8bba2b02a1 Merge pull request #253 from SamJBarney/master
Merge of Mob Spawning code by mgueydan
2013-10-18 03:41:43 -07:00
tonibm19
2c187e53b7 Moved lines
don't know if I did well
2013-10-17 21:28:45 +02:00
tonibm19
90c39c55a9 More fixes
- You can only tame horses with nothing at hand
- Fixed rearing
2013-10-17 18:41:52 +02:00
tonibm19
137ed5a556 Improved horse saddling [SEE DESC]
Now it checks if horse is already saddled, and if it's, you don't lose the saddle. Also, if the horse isn't tammed, you can't saddle it.
2013-10-16 19:50:59 +02:00
madmaxoft
6a1149cf46 Fixed compilation errors. 2013-10-16 15:15:51 +02:00
tonibm19
2f8a0a8a3a Added extra line 2013-10-15 21:26:43 +02:00
tonibm19
4ee2632d4f Fixed saddle horse 2013-10-15 21:25:33 +02:00
tonibm19
400cab0b86 Fixed a big fail.I did 2013-10-15 18:17:17 +02:00
tonibm19
06b7e09e70 Added extra line (yes, again) 2013-10-15 17:32:15 +02:00
tonibm19
fbba2e79eb Added basic milk code. 2013-10-15 17:31:26 +02:00
tonibm19
7d4c0582a8 Added extra line 2013-10-15 17:11:42 +02:00
tonibm19
8147ccd13b Added horse saddling
It uses pig code, sorry if it don't works, i'm a noob, but it should work.
2013-10-15 17:09:43 +02:00
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
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
Samuel Barney
5df5176f8d Merge branch 'master' of https://github.com/mc-server/MCServer 2013-10-14 09:42:43 -06:00
Samuel Barney
369b4abff8 Mobs no longer spawn up in the air. 2013-10-14 08:12:23 -06: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
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
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
tonibm19
d86facc2bf Mob spawning changes
Added EnderDragon, Blaze and Horse spawning.
2013-10-12 20:18:35 +02:00
madmaxoft
420e164ea6 Fixed second logger constructor. 2013-10-12 11:26:42 +02:00
Tiger Wang
327abdd10d Sixth round of fixes
* Made horse rearing time fixed instead of random
2013-10-11 21:33:56 +01:00
Tiger Wang
e2aaf202ab Fifth round of fixes
* Enumerated Villager spawning
2013-10-11 20:57:22 +01:00
madmaxoft
a9e70c84b5 CompoGen and HeiGen read their settings in their respective Initialize() functions. 2013-10-11 10:18:01 +02:00
madmaxoft
47b64b63fa Added GetIniItemSet() function.
It reads a block / item description from the specified INI file value and returns as cItem; stores and uses the default if value doesn't exist.
2013-10-11 10:12:36 +02:00
Tiger Wang
ee2df34d03 Fourth round of fixes
* Switchified WriteMobMetadata
* Renamed Horse functions to be better
2013-10-11 01:00:16 +01:00
Tiger Wang
d7b2c534fd Third round of fixes
* Split WriteMetadata into three functions for common, entity, and mob
* Edited a few mob sizes to Vanilla values
2013-10-11 00:41:54 +01:00
madmaxoft
85eb85dbf9 Generator: Renamed cBiomeGenerator's Initialize() to InitializeBiomeGen().
This will allow initializing generators that implement both cBiomeGenerator and other generators.
2013-10-10 15:49:24 +02:00
Tiger Wang
fe6fa23a97 Second round of fixes
* Implemented suggestions
2013-10-09 21:02:59 +01:00
madmaxoft
76d056e5f7 Fixed cFile::CopyFile Linux compilation. 2013-10-09 14:19:14 +02:00
madmaxoft
9fc35514e6 APIDump: Documented the new cFile API functions. 2013-10-09 11:31:38 +02:00
madmaxoft
55999ee118 Moved cMakeDir::MakeDir to cFile::CreateFolder.
And exported to Lua.
2013-10-09 09:57:48 +02:00
madmaxoft
2ff882f239 Added static cFile functions to Lua API. 2013-10-09 09:38:47 +02:00
madmaxoft
36f24e30b7 Fixed warning in cFireSimulator.
All code paths now have a return value.
2013-10-09 09:09:47 +02:00