0258213d24
Merge branch 'htmlescape'.
2013-10-20 09:14:30 +02:00
3272b45bc5
Added a string reserve.
2013-10-19 21:30:54 +01:00
5ba998174a
Fixed compile error. silly parentheses creeping in.
2013-10-19 21:21:44 +01:00
0677872d88
Changed the code according to xoft's suggestions.
2013-10-19 21:13:47 +01:00
f7c9230106
Fixed general failings with everything. Fixes #211 .
...
My editor fixed some extra tabs in globals.
2013-10-19 17:37:47 +01:00
9701a7fb84
Added a HTML escaping function to cWebAdmin.
...
Apparently my editor fixed some failed tabs too.
2013-10-19 17:17:33 +01:00
ca538d5323
Adapted code style.
2013-10-18 20:02:53 +02:00
24aad485b9
StringToItem() recognizes "ItemName:Dmg" strings.
...
This allows commands such as "/i woodenshovel:40"
2013-10-18 18:13:20 +02:00
546dbf3c53
Fixed item-breaking.
...
This fixes #232 .
2013-10-18 18:01:19 +02:00
5d4fa298d3
Fixed indentation and re-styled conditions.
2013-10-18 16:34:01 +02:00
2a9997881c
Merge pull request #259 from tonibm19/patch-2
...
Fixed horse saddle
2013-10-18 07:29:23 -07:00
e6bb025a9f
Fixed webadmin logging.
...
This fixes #262 .
2013-10-18 12:50:50 +02:00
8bba2b02a1
Merge pull request #253 from SamJBarney/master
...
Merge of Mob Spawning code by mgueydan
2013-10-18 03:41:43 -07:00
2c187e53b7
Moved lines
...
don't know if I did well
2013-10-17 21:28:45 +02:00
90c39c55a9
More fixes
...
- You can only tame horses with nothing at hand
- Fixed rearing
2013-10-17 18:41:52 +02:00
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
6a1149cf46
Fixed compilation errors.
2013-10-16 15:15:51 +02:00
2f8a0a8a3a
Added extra line
2013-10-15 21:26:43 +02:00
4ee2632d4f
Fixed saddle horse
2013-10-15 21:25:33 +02:00
400cab0b86
Fixed a big fail.I did
2013-10-15 18:17:17 +02:00
06b7e09e70
Added extra line (yes, again)
2013-10-15 17:32:15 +02:00
fbba2e79eb
Added basic milk code.
2013-10-15 17:31:26 +02:00
7d4c0582a8
Added extra line
2013-10-15 17:11:42 +02:00
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
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
02baff6629
Removed reading default values from settings.ini for worlds.
2013-10-14 15:32:40 -06:00
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
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
5df5176f8d
Merge branch 'master' of https://github.com/mc-server/MCServer
2013-10-14 09:42:43 -06:00
369b4abff8
Mobs no longer spawn up in the air.
2013-10-14 08:12:23 -06:00
18bbe82f30
WebAdmin honors the [WebAdmin].Enable setting.
...
This fixes #234 .
2013-10-13 22:19:13 +02:00
efb7d4fd3e
Fixed WebAdmin's request parameters.
...
Also added doxycomments on what they really contain.
2013-10-13 20:29:57 +02:00
e62cac07c0
Merge branch 'metadata' of git://github.com/tigerw/MCServer into tigerw-metadata.
2013-10-13 18:26:45 +02:00
790f25a9ac
Merge pull request #226 from SamJBarney/master
...
Crop blocks now respect light.
2013-10-13 07:10:49 -07:00
455d33963f
Re-added the cWorld:GetSignLines() to the API.
...
Somehow this got lost somewhere.
2013-10-13 14:13:15 +02:00
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
277a18626d
Removed faulty code dealing with water.
2013-10-12 16:38:07 -06:00
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
33e1ba4240
Added 1.7 biome constants.
2013-10-12 23:49:55 +02:00
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
25c5df0e05
Fix: Wrong arg name
2013-10-12 14:52:51 -06:00
3f09294e93
Merge pull request #224 from tonibm19/patch-7
...
Added Horses, Blazes and EnderDragons spawning.
2013-10-12 13:33:31 -07:00
0352e45898
Fixed and exported cWorld:QueueTask().
...
This implements #220 .
2013-10-12 22:24:59 +02:00
bfbc381e1d
Added more ghast spawning probability
2013-10-12 20:26:57 +02:00
c28d3d7771
Added extra line
2013-10-12 20:21:28 +02:00
d86facc2bf
Mob spawning changes
...
Added EnderDragon, Blaze and Horse spawning.
2013-10-12 20:18:35 +02:00
420e164ea6
Fixed second logger constructor.
2013-10-12 11:26:42 +02:00
327abdd10d
Sixth round of fixes
...
* Made horse rearing time fixed instead of random
2013-10-11 21:33:56 +01:00
e2aaf202ab
Fifth round of fixes
...
* Enumerated Villager spawning
2013-10-11 20:57:22 +01:00
a9e70c84b5
CompoGen and HeiGen read their settings in their respective Initialize() functions.
2013-10-11 10:18:01 +02:00
madmaxoft
Alexander Harkness
tonibm19
Sofapriester
Samuel Barney
Tiger Wang