Tiger Wang
4a01fba3aa
Suggestions
2014-06-22 00:06:58 +01:00
Tiger Wang
7615ed90c0
Merge branch 'master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Entity.h
src/Entities/Player.h
2014-06-21 22:14:23 +01:00
Tiger Wang
6e681269d9
Fixed invalid iterators
2014-06-21 22:07:38 +01:00
madmaxoft
08fed2a213
Added cClientHandle::IsUUIDOnline function.
...
Ref.: #771
2014-06-21 22:13:35 +02:00
Alexander Harkness
d33881d752
Restored style continuity.
2014-06-21 21:07:31 +01:00
Tiger Wang
1296c5dce7
More suggestions
2014-06-21 20:42:29 +01:00
Tiger Wang
537467fe25
Removed debugging code
2014-06-21 20:35:28 +01:00
Tiger Wang
a908f39dde
Rewrote furnace recipe parser
...
* Fixes #110
2014-06-21 20:33:23 +01:00
STRWarrior
ede0f13b51
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-06-21 20:27:11 +02:00
STRWarrior
1da1b513e6
Updated CONTRIBUTORS file
2014-06-21 20:26:40 +02:00
madmaxoft
0a95d04ab3
Added a TestRails generator.
...
This is for debugging purposes only.
2014-06-21 20:19:44 +02:00
madmaxoft
9a57c590cd
Fixed a caching bug in GridStructGen.
...
The elements in cache were queried wrong, so sometimes they wouldn't be used even if they were the ones to use.
2014-06-21 20:17:17 +02:00
madmaxoft
0e8c4ca5ab
Updated prefabs to the latest Gallery content.
2014-06-21 15:02:40 +02:00
madmaxoft
b4ba86d758
Updated all prefabs to current Gallery content.
2014-06-20 22:45:08 +02:00
madmaxoft
79c1966290
MCA saver marks chunks as populated.
...
Fixes #140 .
2014-06-20 21:30:11 +02:00
madmaxoft
6e78a2f7d9
Fixed the BiomeVisualiser project.
...
Compiles under MSVC2008 again, was missing some shared files.
2014-06-20 21:22:20 +02:00
madmaxoft
9db9445e9f
Optimized Voronoi calculation.
...
Fixes #818 .
2014-06-20 17:10:18 +02:00
tonibm19
3e15c92d18
Added pig riding.
...
Now you can ride a pig using a carrot on a stick.
2014-06-20 10:50:21 +02:00
Mattes D
4c7545a82a
Merge pull request #1112 from mc-server/danglingptrs
...
Nullify deleted pointers.
2014-06-19 11:03:40 +02:00
archshift
e8143de01b
Nullify deleted pointers.
2014-06-19 01:49:56 -07:00
archshift
f5529e544c
EntityEffects.x -> EntityEffect.x, Object-Oriented effects
...
Changed effect map to take a pointer of the effect as a result.
2014-06-18 22:54:14 -07:00
Alexander Harkness
35a4aa419c
Merge pull request #1096 from mc-server/redstonerefactor
...
Moved delayed repeaters to be handled in a seperate pass
2014-06-18 21:22:53 +01:00
Mattes D
c30b7b8735
Merge pull request #1045 from Howaner/GlobalFixes
...
Little fixes
2014-06-18 18:23:18 +02:00
STRWarrior
e0a9f37d90
(Force)ExecuteCommand returns the CommandResult enums
...
Exported and documented the CommandResult enums
2014-06-18 12:13:01 +02:00
archshift
21b9253ee6
Merge pull request #1100 from Howaner/Slabs
2014-06-18 00:47:08 -07:00
archshift
68c30790db
Entity effects: changed User to Creator, removed pawn pass-by-value
2014-06-17 11:39:22 -07:00
madmaxoft
a37d5410b4
APIDump: Added OnEntityAddEffect hook documentation.
2014-06-17 11:39:22 -07:00
madmaxoft
fa1d85feca
Added the OnEntityAddEffect hook.
2014-06-17 11:39:22 -07:00
archshift
9e8361976b
Entity Effects: Clarified user, added it to AddEntityEffect
...
Added second AddEntityEffect with a pass-by-value of the class.
2014-06-17 11:39:22 -07:00
madmaxoft
e289fe4dd7
Changed the AddEntityEffect() params for easier calls.
2014-06-17 11:39:21 -07:00
archshift
22761bb6ad
Entity Effect: Separates total duration and ticks of activity
...
Changed HandleEntityEffect to use cEntityEffect's ticks instead of a static counter
2014-06-17 11:39:21 -07:00
madmaxoft
045ae2ef2c
Fixed MSVC compilation.
2014-06-17 11:39:21 -07:00
archshift
5b2b6e0615
Pawn: renamed HandleEntityEffects to HandleEntityEffect
...
Exported entity effect functions for ToLua and documented them in APIDesc.lua
2014-06-17 11:39:21 -07:00
archshift
71b4c49490
Cave spider now poisons its victim, added IsPawn function to Entity
2014-06-17 11:39:21 -07:00
archshift
814cdca054
Added wither damage type, wither entity effect.
2014-06-17 11:39:21 -07:00
archshift
2574573c88
Monster: added IsUndead(), undead-specific entity effects
2014-06-17 11:39:20 -07:00
archshift
52abd90a28
Applies splash potion effects to mobs as well as players
2014-06-17 11:39:20 -07:00
archshift
68011a004a
Removed long function wrapping
2014-06-17 11:39:20 -07:00
archshift
3766ac96d7
ItemHandler: changed IsDrinkable() to take a short argument
2014-06-17 11:39:20 -07:00
archshift
a1a8b7c0ee
Splash potion: Adjusted speed, fixed spawn position
2014-06-17 11:39:20 -07:00
archshift
73cea7065d
Entity effect type: use 'eff' as a prefix instead of 'ef'
2014-06-17 11:39:20 -07:00
archshift
58f35af6e7
Added splash potion functionality
2014-06-17 11:39:20 -07:00
archshift
5803094d7d
Entity: only fire critical hit if damage type is physical
2014-06-17 11:39:20 -07:00
archshift
8eceaf9b0c
Player: made healing instantaneous
2014-06-17 11:39:20 -07:00
archshift
2185c72c2c
Implemented drinkable potions, noeffect entity effect,
...
Clears entity effects on death
2014-06-17 11:39:20 -07:00
archshift
1eb04a48ee
Implemented milk, added documentation to Pawn.h
2014-06-17 11:39:19 -07:00
archshift
615152eb8c
Pawn.cpp: fixed effect iterator BAD_ACCESS
...
Erasure was occurring before the iterator increased, causing a bad access. Solved by storing map pairs in variables and manually updating iterator before erasure.
Fixed mix-up in function arguments on food poisoning
2014-06-17 11:39:19 -07:00
archshift
e98ffccd80
Pawn: Enabled entity effect broadcast, added typedef
...
Typedef'd std::map<cEntityEffect::eType, cEntityEffect> to tEffectMap
2014-06-17 11:39:19 -07:00
archshift
a9a4c9c6b2
EntityEffect: read-only getters, added user and distance modifier fields
...
User: the pawn that uses or produces the entity effect (drinks/throws a potion)
Distance modifier: the potency modifier from splash potion effectivity radius
2014-06-17 11:39:19 -07:00
archshift
2123173202
Player: Removed food-poisoning-specific code, set duration to 30 seconds
...
http://minecraft.gamepedia.com/Hunger#Behavior
2014-06-17 11:39:19 -07:00
