madmaxoft
7a9f9ab744
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-07-17 22:23:08 +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
Tiger Wang
3dd9649665
Fixed mob knockback
...
* Fixes #901
2014-07-17 14:32:52 +01: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
Tiger Wang
2189f37c20
Resolved backwards compatibility issues
2014-07-16 11:38:52 +01:00
archshift
061010288a
Readability and clarity changes
2014-07-14 13:46:43 -07: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
Tiger Wang
372dbbb994
Merge pull request #1135 from mc-server/fixes
...
Fixes to projectiles and the undead
2014-07-09 09:50:38 +01:00
Tiger Wang
a0d2df9327
Tailored death messages
2014-07-04 10:55:09 +01:00
Tiger Wang
428cfb5c21
Suggestions
2014-06-29 22:41:31 +01:00
Tiger Wang
b6df30831d
Fixed server forcing players afloat
...
* Fixes #1131
2014-06-27 23:13:26 +01:00
Tiger Wang
4238b0ebe8
Some Entity.cpp style improvements
2014-06-22 20:44:18 +01:00
archshift
814cdca054
Added wither damage type, wither entity effect.
2014-06-17 11:39:21 -07:00
archshift
5803094d7d
Entity: only fire critical hit if damage type is physical
2014-06-17 11:39:20 -07:00
Tycho
ee50790398
Merge branch 'master' of github.com:mc-server/MCServer
2014-06-16 15:12:50 +01:00
Mattes D
af4a21ea06
Fixed deadlock when moving players to other worlds.
...
Fixes #1039 , fixes #851
2014-06-08 21:58:30 +02:00
Tiger Wang
f55f5ec47f
Merge branch 'master' into achievementtranslate
...
Conflicts:
src/Entities/Player.cpp
2014-05-24 23:21:39 +01:00
Mattes D
941cb88ae4
Fixed datatype conversion warning.
2014-05-23 12:33:30 +02:00
Tiger Wang
2bfe962e28
Fixed a cactus Y position issue
2014-05-19 22:15:39 +01:00
Tiger Wang
4008af6925
Simplified cacti conditions
2014-05-19 21:17:28 +01:00
Alexander Harkness
1de4408a18
Merge pull request #1010 from mc-server/cactidamage
...
Implemented cacti damage
2014-05-19 14:01:50 +01:00
Alexander Harkness
6de0257bbe
Derp
2014-05-19 13:31:19 +01:00
Alexander Harkness
dc39d88d3f
Should have fixed assumptions about entity width.
...
@madmaxoft can you comment?
2014-05-19 10:35:21 +01:00
Alexander Harkness
70cf4a5eaf
Fixed clanging errors.
...
Please @tigerw make sure this is correct.
2014-05-19 07:31:53 +01:00
Tiger Wang
6167c79e7a
Implemented cacti damage
...
+ Implemented cacti damage
* Fixed pickup tossing (PR #994 bug)
2014-05-18 22:41:42 +01:00
madmaxoft
a651c865e4
There's no "round" function in MSVC2008.
2014-05-18 22:49:27 +02:00
andrew
aea866f5b1
Movement Statistics
2014-05-12 21:38:52 +03:00
andrew
b3d2b5b2c9
cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement()
2014-05-12 17:05:09 +03:00
Tiger Wang
1df7dbe7c9
Suggestions'd
2014-05-05 23:45:35 +01:00
madmaxoft
839447f0bb
Merge branch 'master' into fixes.
2014-05-02 19:34:28 +02:00
Mattes D
709015369d
Merge pull request #940 from Howaner/GlobalFixes
...
Add entity invulnerable
2014-04-28 20:58:15 +02:00
madmaxoft
9dc9713a9c
Fixed warnings.
2014-04-27 23:12:52 +02:00
Tiger Wang
b4b3b5ce64
More comments!
...
* Also fixed a potential issue with position sending - if someone moved
slowly enough, their position would never be updated.
2014-04-26 23:50:24 +01:00
archshift
e2194e6e90
Added static const, initialized fields.
2014-04-26 15:32:14 -07:00
Mattes D
da931da603
Merge pull request #941 from archshift/master
...
Fixed lots of warnings, and other small changes.
2014-04-26 23:26:59 +02:00
archshift
aef2c8ec62
Further refactored, Reverted Minecart change
...
Other small changes.
2014-04-26 09:25:30 -07:00
Howaner
49f6819829
Fixes
2014-04-26 16:44:15 +02:00
archshift
acff6148b6
Moved switch{} out of GetArmorCoverAgainst().
2014-04-25 19:49:08 -07:00
Howaner
7fd9fe9d5f
Merge branch 'master' into GlobalFixes
2014-04-26 00:34:42 +02:00
Howaner
7e76f030aa
Add entity invulnerable
2014-04-26 00:32:30 +02:00
r.ramazanov
4cd2d57c64
Fix formatting
2014-04-25 12:06:22 +04:00
r.ramazanov
827c3760db
Fix for clang
2014-04-25 10:58:48 +04:00
r.ramazanov
a72744f5c3
Mobs shouldn't burn when it's Raining & Mob Knockback is far too much
2014-04-25 10:08:36 +04:00
Tiger Wang
c949c1e755
Implemented suggestions
2014-04-24 22:03:47 +01:00
Tiger Wang
48904ae201
Merge branch 'master' into fixes
...
Conflicts:
src/World.h
2014-04-24 18:57:25 +01:00
Tiger Wang
7f5cf417de
Some change to Entity.cpp
...
* Added comments to BroadcastMovementUpdate() and the collision tracer
2014-04-23 21:06:46 +01:00
r.ramazanov
103c867f1f
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-04-23 18:15:28 +04:00
r.ramazanov
5deb35c5cf
Mobs shouldn't burn when it's Raining #906
...
Mob Knockback is far too much #776
2014-04-23 18:15:04 +04:00
archshift
8768669428
Renamed getter and setter for IsFireproof.
2014-04-23 00:12:37 -07:00
