mborland
3710d423ac
Merge remote-tracking branch 'upstream/master'
2013-11-10 18:33:58 -05:00
Tiger Wang
f713780db3
Bundled fixes [SEE DESC]
...
* Fixed compiler warning in Monster.cpp
* Future proofed particle effects
* Improved pickups, made less jittery
2013-11-10 22:20:25 +00:00
madmaxoft
09e4f041dd
Fixed cRoot::FindAndDoWithPlayer().
...
Now /kick and /ban work.
2013-11-10 22:58:39 +01:00
madmaxoft
480ff3789b
Protocol 1.7: Fixed crashes and d/c with bad packets.
...
Fixes #332 .
2013-11-10 22:58:39 +01:00
madmaxoft
f0aab7c580
ProtoProxy: Added dblquotes.
2013-11-10 22:58:39 +01:00
Mattes D
3a692d53e8
Merge pull request #330 from tonibm19/patch-1
...
Added sheep dyeing
2013-11-10 13:04:27 -08:00
STRWarrior
165f68b8d9
Removed #include "../Root.h" since it isn't needed.
2013-11-10 21:59:38 +01:00
STRWarrior
1682c61b59
Removed #include "../Root.h" since it isn't needed.
2013-11-10 21:56:37 +01:00
madmaxoft
dadae874f2
Small code-style fixes.
2013-11-10 21:55:32 +01:00
Tiger Wang
71abbb2f56
Bundled fixes [SEE DESC]
...
* Fixed pickups spawning in an incorrect position from a JukeBox
* Pickups make a popping sound in Prtcl1.7
* Arrows make a *what sort of sound does an arrow make anyway‽* when
hitting a block, and a popping sound when fired
* Mobs again have metadata
* Fixed Prtcl1.7 not using valid JSON to kick a client
* Minecarts and arrows again have metadata
2013-11-10 20:48:12 +00:00
madmaxoft
dde491ee0e
Merge branch 'master' into WolfUpdate
2013-11-10 21:42:56 +01:00
STRWarrior
2ccf9b2b32
Renamed variables in cWolf.
2013-11-10 21:24:36 +01:00
STRWarrior
e62858ec3d
Using DoWithPlayer instead of FindAndDoWithPlayer for callbacks.
...
You are able to dye the collar.
2013-11-10 20:12:30 +01:00
madmaxoft
bd664e0a90
Implemented inventory dblclick.
...
Implements #229 .
2013-11-10 18:42:46 +01:00
madmaxoft
fe07012952
Added cItem::GetMaxStackSize()
2013-11-10 18:41:26 +01:00
STRWarrior
4f11cd2f8a
The owner object isn't stored anymore. Instead we use the name of the player.
...
This means only players can now have a wolf, but it fixes the bug where when you log out the wolf isn't your wolf anymore.
2013-11-10 18:03:19 +01:00
tonibm19
4af5868322
Fixes (SEE DESC)
...
Entity metadata is broadcasted.
If player is in survival, his equipped item is removed.
If you have green dye, and sheep is green, your equipped item won't be removed.
2013-11-10 17:05:19 +01:00
tonibm19
da5bd81836
STR_Warrior was right.
...
Simplified code.
2013-11-10 16:48:22 +01:00
tonibm19
e2b4745bbf
Fixed compilation
2013-11-10 16:43:47 +01:00
tonibm19
9da4011a7f
You can no longer color with wood
2013-11-10 16:42:38 +01:00
tonibm19
e919496025
Added sheep dyeing
2013-11-10 16:03:00 +01:00
STRWarrior
0980567912
Using cMonster::Tick instead of super::cMonster::Tick
2013-11-10 15:51:32 +01:00
STRWarrior
38f6fff3fb
Wolves can now be owned by an entity.
...
They only sit when right clicked by their owner.
They beg if the closest player has meat or bones in his hand.
They follow their owner.
They teleport to their owner if they are more then 30 blocks away.
They don't attack players if they are not angry anymore.
They don't move if they are sitting.
2013-11-10 15:16:43 +01:00
madmaxoft
fb3a175b28
Protocol 1.7: Attempt at fixing SoundParticleEffect packet.
2013-11-10 14:19:02 +01:00
madmaxoft
3fd7124435
Fixed Player animation packet.
...
Fixes #329 .
2013-11-10 13:40:38 +01:00
mborland
5dfce5568e
VC2013
...
3rd times a charm?
2013-11-10 02:33:34 -05:00
madmaxoft
0762893ee1
APIDump: Documented cServer:IsHardCore()
2013-11-09 21:18:03 +01:00
madmaxoft
b6ca98f380
Removed cStringMap.
...
It wasn't used for anything anymore.
2013-11-09 19:54:52 +01:00
madmaxoft
73cd2216a7
Fixed cTracer's tolua markup.
...
Cleaned up unneeded member variables.
2013-11-09 19:49:36 +01:00
madmaxoft
148f723632
APIDump: Documented TakeDamageInfo.
2013-11-09 19:25:03 +01:00
madmaxoft
d74b0dbd5b
APIDump: Documented the relevant tolua functions.
2013-11-09 19:16:44 +01:00
madmaxoft
157bd150fd
APIDump: Added logging to see what takes so long.
2013-11-09 18:55:24 +01:00
madmaxoft
359fb9af39
Prepared the VC2013 folder.
2013-11-09 14:31:58 +01:00
mborland
d2c530ec33
Removed redundant qualifier
...
Removes compiler warning C4114
2013-11-09 14:26:54 +01:00
mborland
54fa4db793
Hard Reset
2013-11-09 14:26:46 +01:00
madmaxoft
9e38c00b5e
Updated Core and ProtectionAreas.
2013-11-09 14:22:59 +01:00
madmaxoft
404034d230
Fixed sprinting in 1.7 protocol.
...
Fixes #324
2013-11-08 22:40:31 +01:00
madmaxoft
efbc4a9b78
Declaring 1.7.2 compatibility.
2013-11-08 22:09:39 +01:00
madmaxoft
24428a9768
MobSpawner: Added skeleton and wolf conditions.
...
This fixes the flood of warnings in the server console in Debug mode.
2013-11-08 22:06:08 +01:00
madmaxoft
07fa8313b1
cProtocol::SendWindowOpen() signature changed.
...
This implements #313 .
2013-11-08 21:32:14 +01:00
madmaxoft
b24bdff308
Fixed code style.
2013-11-08 21:06:31 +01:00
madmaxoft
4707784929
Protocol 1.7: Fixed using entities.
...
The mouse buttons were swapped.
2013-11-08 21:03:51 +01:00
madmaxoft
64412c1fe3
Protocol 1.7: Copied Mob Metadata code from 1.2.5.
2013-11-08 20:56:19 +01:00
Mattes D
d33112b6b1
Merge pull request #321 from mc-server/1.7pickupsfix
...
Fix for entity spawning in general
2013-11-08 08:41:46 -08:00
Mattes D
71461dccbc
Merge pull request #322 from tonibm19/master
...
Now chicken drop eggs
2013-11-08 08:33:14 -08:00
tonibm19
705e6c1301
Changed variable name
2013-11-08 17:16:36 +01:00
tonibm19
2cf93b8e25
Changed variable name
2013-11-08 17:15:28 +01:00
tonibm19
20d9886847
Now chicken drop eggs
2013-11-08 14:04:41 +01:00
tonibm19
4d7695549a
Now chickens can drop eggs.
...
They drop an egg every 5 or 10 minutes.
2013-11-08 14:04:00 +01:00
Tiger Wang
41451100c1
Added hardcore client effect
...
Also fixed multiple world comments issue.
2013-11-07 22:33:46 +00:00
