Mattes D
e7b8e17746
Merge pull request #849 from mc-server/minorfixes
...
Minor fixes
2014-04-02 21:26:45 +02:00
Tycho
b449ad8613
Merge branch 'MacFixes'
...
Conflicts:
src/DeadlockDetect.cpp
src/World.cpp
2014-04-02 06:54:57 -07:00
Tiger Wang
ef48b30baa
Final realisation of suggestions
2014-03-31 22:37:05 +01:00
Tiger Wang
0836fe9a84
Fixed a few Y too high/low asserts
2014-03-31 20:33:33 +01:00
Samuel Barney
eb3cc729d4
More fixes to get it to compile for me on Mac 10.9. Mostly just newline additions, but some of the unused variables were causing errors, so I wrapped them in #ifndef __APPLE__ calls, since I didn't know if they were going to be used in the future.
...
Also had to undefine TOLUA_TEMPLATE_BIND a couple of times.
2014-03-25 11:15:05 -06:00
andrew
c8445cd934
Fixed clang compilation
2014-03-25 11:40:54 +02:00
andrew
ba42166411
Fixed wither summoning
2014-03-25 11:13:27 +02:00
andrew
0fe1e50ffc
Protocol: Wither metadata
2014-03-25 10:32:58 +02:00
andrew
4f3377bbbf
Minor fixes
2014-03-25 09:10:55 +02:00
andrew
6b77dc74ad
Wither invulnerability
2014-03-24 12:29:19 +02:00
madmaxoft
89027cb675
Fixed double to float conversions.
2014-03-16 22:00:28 +01:00
andrew
b4bf13aa4f
Unified Vector classes
2014-03-11 16:02:25 +02:00
Tiger Wang
c2978a3457
Merge branch 'master' into ballisticmissiles
...
Conflicts:
src/ClientHandle.cpp
2014-03-09 12:53:50 +00:00
andrew
070d483236
cBlockInfo now manages the respective cBlockHandler
2014-03-02 21:25:05 +02:00
Mattes D
b17d04737d
Merge pull request #738 from xdot/master
...
Refactored global block property arrays
2014-03-02 16:13:43 +01:00
tonibm19
10fdc51b0a
Creeper fixes
...
- Fixed explosion time (1.5s, according to minecraftwiki)
- Creeper explodes if right clicked with flint and steel
2014-03-02 14:35:03 +01:00
andrew
d73cdba1f6
g_BlockXXX => cBlockInfo::XXX
2014-03-01 21:34:19 +02:00
tonibm19
1de2c23d64
added mooshroom to cow conversion
2014-02-27 22:04:48 +01:00
Tiger Wang
a97f28939f
Fixed sheep ASSERTing sometimes
2014-02-26 23:33:54 +00:00
Mattes D
23093fd4d1
Merge pull request #710 from TheJumper/master
...
Fixed Mob Drops, Add Rare, Uncommon and Gear Drops, Looting inflicts Drops
2014-02-24 18:30:44 +01:00
TheJumper
0b6aa7b370
Fixed Formatting, added compiler warning suppressing methods, fixed comments
2014-02-24 15:38:38 +01:00
TheJumper
2cc597372a
Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters
2014-02-23 19:50:51 +01:00
Howaner
5e7f2ba6d6
Add Wolf Heal with Food
2014-02-20 20:41:53 +01:00
Alexander Harkness
72d312ac9b
Merge pull request #690 from tonibm19/master
...
Now mobs can't escape from fences.
2014-02-17 16:12:59 +00:00
tonibm19
8707f7ddc8
Improved formatting
2014-02-17 17:01:22 +01:00
Alexander Harkness
d47e0b055b
Merge pull request #692 from mc-server/wolfcleanup
...
Wolf cleanup
2014-02-17 10:21:38 +00:00
tonibm19
60bcf2807a
Now mobs can't escape from fences.
2014-02-16 18:18:07 +01:00
Tiger Wang
2350b77bb5
Fixes to previous commit
2014-02-16 17:08:49 +00:00
Tiger Wang
1a84102b10
Slight cleanup of wolf code
2014-02-16 13:47:55 +00:00
Tiger Wang
8fbb936b63
Fixed TNT fizzing everywhere
2014-02-15 15:53:02 +00:00
Tiger Wang
7ced2f290f
Simplified Attack() tracing
2014-02-12 21:53:21 +00:00
Tiger Wang
06239c8336
Fixed #627
...
- Attack() is now called from cAggressive instead of cMonster
* Monsters can no longer attack through walls
* Should fix last remnants of player damage after teleporting (that both
STR and bearbin contributed fixes to :P)
2014-02-11 22:09:56 +00:00
Tiger Wang
9d1c9097e3
Merge remote-tracking branch 'origin/master' into playerimprovements
...
Conflicts:
src/Root.cpp
src/Root.h
src/World.cpp
2014-02-09 00:14:42 +00:00
Tiger Wang
f86f066615
Merge branch 'master' into playerimprovements
...
Conflicts:
MCServer/Plugins/APIDump/APIDesc.lua
2014-02-09 00:04:42 +00:00
Alexander Harkness
b9aa0420a3
Merge pull request #646 from worktycho/warningfixes
...
Fixed most of the reordering warnings
2014-02-05 18:24:08 +00:00
Tycho
8ba6f73169
Fixed most of the reordering warnings
2014-02-05 09:43:49 -08:00
Tiger Wang
630507fd5b
Fixed a bunch of MSVS warnings
...
* Possibly also fixed some bugs with pathfinding and TNT, though
unlikely
2014-02-04 23:07:22 +00:00
Mattes D
0ceb0ef607
Merge pull request #635 from tonibm19/master
...
Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API
2014-02-04 09:23:03 -08:00
tonibm19
a845b9abbb
Blank lines and indentation.
...
Also removed GetClosestPlayer documentation
2014-02-04 17:29:36 +01:00
Tycho
80807eec2c
Increased Type safety of Biomes
...
Changed a number of funcictions from using integers to store biomes to using EMCSBiome
Note that switching from an int to an Enum is a non-breaking chang to the lua bindings
2014-02-03 12:26:17 -08:00
tonibm19
c2e7dd34d9
Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API
2014-02-03 20:52:11 +01:00
Tycho
0b0aa5554f
Merge branch 'master' into GeneratingBenchmark2
...
Conflicts:
src/Blocks/BlockTorch.h
2014-02-02 06:56:07 -08:00
Tycho
b82fc394dd
Changed Signiture of OnUpdate
2014-02-02 06:49:37 -08:00
Kirill Kirilenko
2a52b390c0
Monster's nominal speed was increased.
2014-02-01 20:38:53 +04:00
Kirill Kirilenko
0d33f2d11d
Fixed teleport to air, if owner is flying.
2014-02-01 20:22:12 +04:00
tonibm19
e9c1d1ea9c
Did what xoft said
2014-01-29 20:02:41 +01:00
tonibm19
1c1832b6ce
Rewritten code.
...
Implemented xoft suggestion.
Using MoveToPosition as tigerw suggested.
2014-01-29 19:15:26 +01:00
tonibm19
ba4865f7ee
Fixed sheep
2014-01-29 18:32:46 +01:00
tonibm19
73d9a285d5
Fixed a copypasta error...
2014-01-29 18:25:10 +01:00
tonibm19
ebe0f9372f
Now mobs follow you when holding their breed item
2014-01-29 18:08:33 +01:00
