1
0
Commit Graph

1791 Commits

Author SHA1 Message Date
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
Tiger Wang
7401fc000d Initial round of fixes
* Fixed intentional misspelling of baby! :D
* Better chested horse bool name
* Fixed some weird continuity issues with my recent changes not being
pushed up initially
* Fixed derpy hexadecimal values
2013-10-08 22:21:55 +01:00
Tiger Wang
5db6213f34 Initial Metadata Commit [SEE DESC]
+ Pigs, Minecarts, Sheep, Skeletons, Slimes, Villagers, Wolves, and
Horses have metadata
+ Base code on taming wolves, shearing sheep, and taming horses
+ Sheep and horses have different colours when spawned
2013-10-08 19:20:49 +01:00
madmaxoft
a120507be0 Implemented the two memory-statistics functions in cRoot.
This fixes #185. cWebAdmin::GetMemoryUsage() is accessible but deprecated (with a warning output to the screen).
2013-10-08 20:12:34 +02:00
madmaxoft
a4cbe9fbb1 Cleaned up cEntity's enums.
Several were obsoleted and unused, others weren't supposed to be exported to the Lua API.
2013-10-08 19:49:33 +02:00
Mattes D
e3ba3b8f97 Merge pull request #208 from mc-server/NewWebServer
New web server
2013-10-07 13:19:14 -07:00
madmaxoft
68605b6dce Fixed startup timings on server restart. 2013-10-07 10:46:35 +02:00
madmaxoft
4c4475f3b5 Fixed authenticator thread restart.
This fixes #209.
2013-10-07 10:46:34 +02:00
madmaxoft
d8dfa8cd88 Plugin folders now check for "." and "..".
This fixes #207.
2013-10-06 16:58:19 +02:00
madmaxoft
f55b77a98a Fixed memory leaks in the HTTP framework 2013-10-06 16:40:28 +02:00
madmaxoft
4bf596a586 cListenThread: Fixed thread termination. 2013-10-06 16:18:15 +02:00
madmaxoft
d147935853 Added proper shutdown to HTTPServer. 2013-10-06 15:44:40 +02:00
madmaxoft
dabbf24f58 Merge branch 'master' into NewWebServer
This should simplify merging
2013-10-06 15:44:14 +02:00
madmaxoft
fe582b69d5 Removed remnants of the old webserver. 2013-10-06 14:38:10 +02:00
madmaxoft
b5c90d7b20 WebAdmin uses the new HTTP functionality.
This is a partial implementation of #183.
2013-10-05 23:08:16 +02:00
madmaxoft
20d07a683f Fixed Base64Decode() returning wrong value. 2013-10-05 21:52:45 +02:00
madmaxoft
2b8bddbdc3 cHTTPConnection sends Content-Length with HTTP errors, too. 2013-10-05 21:52:14 +02:00
madmaxoft
db3d83b38d Added Basic auth support to cHTTPRequest. 2013-10-04 20:28:30 +02:00