Howaner
7bd414e9ed
Merge branch 'master' into Monster
2014-08-04 12:11:38 +02:00
madmaxoft
1fa210c7f9
Refactored case-conversion functions.
...
StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place.
2014-08-04 11:30:20 +02:00
Howaner
e70077361d
Changed /** to /*
2014-08-04 11:23:35 +02:00
Howaner
7bea90d6ca
Fixed warnings
2014-08-04 01:35:25 +02:00
Howaner
0911072d27
Attempt to fix knockback and swimming.
2014-08-04 01:34:12 +02:00
Tiger Wang
c865fc8ca5
Improved endermen code a little
2014-08-01 22:15:32 +01:00
Tiger Wang
3385ed56b8
Merge remote-tracking branch 'origin/master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Player.cpp
src/Root.cpp
src/World.cpp
2014-07-22 10:24:28 +01:00
madmaxoft
6be79575fd
Style: Normalized spaces after if, for and while.
2014-07-21 17:38:50 +02:00
archshift
ada88a5805
Monsters: Made IsUndead overridable by the respective mob classes
2014-07-19 14:35:35 -07:00
madmaxoft
00c524519e
Fixed style: spaces after commas.
2014-07-19 14:53:41 +02:00
archshift
041bfd5860
Fixed clamping issues
2014-07-19 01:40:29 -07:00
madmaxoft
44a4a83292
Merge branch 'Entities'
2014-07-18 23:21:04 +02:00
madmaxoft
19d012c96e
Fixed slime-related comments.
2014-07-18 23:20:42 +02:00
Tiger Wang
37140ae578
Merge branch 'master' into portals
...
Conflicts:
src/Blocks/WorldInterface.h
src/ClientHandle.cpp
src/ClientHandle.h
src/Entities/Player.cpp
src/Entities/Player.h
src/Generating/FinishGen.cpp
src/Protocol/Protocol.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol125.h
src/Protocol/Protocol16x.cpp
src/Protocol/Protocol16x.h
src/Protocol/Protocol17x.cpp
src/Protocol/Protocol17x.h
src/Protocol/ProtocolRecognizer.cpp
src/Protocol/ProtocolRecognizer.h
src/Root.h
src/World.cpp
2014-07-18 20:10:51 +01:00
Howaner
509d3d3b62
Slime sizes are 1, 2 or 4 and not 1, 2 or 3.
2014-07-18 16:55:28 +02:00
Tiger Wang
f1be1eb674
Monster fixes
...
* Fixes #1203
* Fixes #627
2014-07-18 10:47:00 +01:00
madmaxoft
c03161f75d
Fixed tabs used for alignment.
2014-07-17 23:16:55 +02:00
madmaxoft
5e198c6730
Basic style fixes.
2014-07-17 22:50:58 +02:00
madmaxoft
2423fbf2ef
Normalized comments.
...
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
2014-07-17 22:15:34 +02:00
madmaxoft
7d0fc85d00
Merge branch 'master' into potions
2014-07-17 11:01:26 +02:00
Mattes D
98244e96d1
Merge pull request #1193 from mc-server/deathmessages
...
Death messages
2014-07-17 10:12:22 +02:00
madmaxoft
8e946da8ac
Merge branch 'master' into potions
2014-07-15 09:01:32 +02:00
Howaner
e48d172f49
Merge branch 'master' into Sounds
2014-07-13 11:09:19 +02:00
Howaner
d529971e27
Changed BroadcastSoundEffect function to take floating pos.
2014-07-13 02:08:02 +02:00
Howaner
4b093972ea
Merge branch 'master' into Sheep
2014-07-13 00:54:11 +02:00
archshift
e824cd09b3
Merge remote-tracking branch 'origin/master' into potions
...
Conflicts:
src/Entities/Player.cpp
src/Entities/ProjectileEntity.cpp
2014-07-09 23:28:27 -07:00
madmaxoft
66fa015534
Fixed slime handling in cMonster::StringToMobType().
2014-07-06 13:37:28 +02:00
Tiger Wang
a0d2df9327
Tailored death messages
2014-07-04 10:55:09 +01:00
Howaner
bef84b4821
Fix sheep color's, add shear sound.
2014-06-28 12:59:09 +02:00
Tiger Wang
1296c5dce7
More suggestions
2014-06-21 20:42:29 +01: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
archshift
68c30790db
Entity effects: changed User to Creator, removed pawn pass-by-value
2014-06-17 11:39:22 -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
2574573c88
Monster: added IsUndead(), undead-specific entity effects
2014-06-17 11:39:20 -07:00
Tiger Wang
b73bf1a1e3
Fixed decision failure
2014-06-05 08:28:01 +01:00
Tiger Wang
01f38d8836
Added checks for no downfall biomes
2014-06-04 13:22:50 +01:00
Tiger Wang
86e5273cd1
Merge remote-tracking branch 'origin/master' into portals
2014-06-04 13:14:38 +01:00
STRWarrior
b9ca7bd120
Small tweak for mobs
...
Mobs move a bit smoother and aren't able to move allot when in air.
2014-06-02 14:16:36 +02:00
Tiger Wang
60a37c1370
Very minor code changes
2014-05-29 16:58:55 +01:00
Mattes D
ac00568183
Merge pull request #998 from mc-server/StatManager
...
Statistic Manager
2014-05-18 22:30:34 +02:00
andrew
466ff2204f
Fixes
2014-05-13 14:53:15 +03:00
andrew
aea866f5b1
Movement Statistics
2014-05-12 21:38:52 +03:00
archshift
3f9e00a3f3
Fixed a few more switch warnings.
2014-05-11 16:28:48 -07:00
madmaxoft
202ce3e737
Fixed MagmaCube spawning.
...
Fixes #928 .
2014-05-02 19:17:22 +02:00
Mattes D
709015369d
Merge pull request #940 from Howaner/GlobalFixes
...
Add entity invulnerable
2014-04-28 20:58:15 +02:00
archshift
80b97fd9dd
Fixed mobs that don't naturally spawn.
2014-04-25 20:49:55 -07:00
Howaner
7e76f030aa
Add entity invulnerable
2014-04-26 00:32:30 +02:00
archshift
624deea6c4
Giants!
...
Changed mfMaxplusone to mfUnhandled for readability, and fixed a default case warning.
2014-04-24 18:11:11 -07:00
archshift
8fc45c5730
Fixed class capitalization for the cave spider.
2014-04-24 12:18:17 -07:00