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
8050a5b98a
Suggestions
2014-07-21 22:49:06 +01:00
93d29555e5
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00
6ab9afd0fd
Bug and crash fixes
...
* Fixes end portals' solidity
* Fixed crashes to do with multithreading and removing an entity from
the wrong world
* Fixed crashes due to bad merge
* Fixed crashes due to an object being deleted twice
* Simplified cWorld::Start() and added comments to configuration files
2014-07-20 10:46:45 +01:00
726312602d
Added m_TicksAlive to entities, allows projectiles to hit their creators
2014-07-20 01:43:07 -07:00
041bfd5860
Fixed clamping issues
2014-07-19 01:40:29 -07:00
44a4a83292
Merge branch 'Entities'
2014-07-18 23:21:04 +02:00
719551c31f
Fix failed merge and other issues
2014-07-18 20:12:27 +01:00
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
c03161f75d
Fixed tabs used for alignment.
2014-07-17 23:16:55 +02:00
d0cc9aedb3
More trailing whitespace fixes.
2014-07-17 23:16:54 +02:00
5e198c6730
Basic style fixes.
2014-07-17 22:50:58 +02:00
52d4c49d5c
Fixed many slime bugs.
...
- Fixed slime hurt/death sound
- Added slime spawning on death.
- Fixed the max health.
- Fixed the attack damage.
- Little slimes should not attack players.
2014-07-17 22:32:23 +02:00
7a9f9ab744
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-07-17 22:23:08 +02:00
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
3dd9649665
Fixed mob knockback
...
* Fixes #901
2014-07-17 14:32:52 +01:00
7d0fc85d00
Merge branch 'master' into potions
2014-07-17 11:01:26 +02:00
98244e96d1
Merge pull request #1193 from mc-server/deathmessages
...
Death messages
2014-07-17 10:12:22 +02:00
2189f37c20
Resolved backwards compatibility issues
2014-07-16 11:38:52 +01:00
061010288a
Readability and clarity changes
2014-07-14 13:46:43 -07:00
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
372dbbb994
Merge pull request #1135 from mc-server/fixes
...
Fixes to projectiles and the undead
2014-07-09 09:50:38 +01:00
a0d2df9327
Tailored death messages
2014-07-04 10:55:09 +01:00
428cfb5c21
Suggestions
2014-06-29 22:41:31 +01:00
b6df30831d
Fixed server forcing players afloat
...
* Fixes #1131
2014-06-27 23:13:26 +01:00
4238b0ebe8
Some Entity.cpp style improvements
2014-06-22 20:44:18 +01:00
e709652257
Conforms to standards
2014-06-22 00:21:39 +01:00
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
6e681269d9
Fixed invalid iterators
2014-06-21 22:07:38 +01:00
1296c5dce7
More suggestions
2014-06-21 20:42:29 +01:00
814cdca054
Added wither damage type, wither entity effect.
2014-06-17 11:39:21 -07:00
5803094d7d
Entity: only fire critical hit if damage type is physical
2014-06-17 11:39:20 -07:00
ee50790398
Merge branch 'master' of github.com:mc-server/MCServer
2014-06-16 15:12:50 +01:00
8a80843ddf
Reverted portal creation code
...
It wasn't really working and needs more development
2014-06-14 10:18:16 +01:00
e10940d57c
Fixed compile
2014-06-12 17:24:14 +01:00
29567c5610
Portals animate and delay correctly
2014-06-12 15:21:07 +01:00
bfa8aaf41b
Merge branch 'master' into portals
...
Conflicts:
src/ClientHandle.cpp
src/Entities/Player.cpp
src/Entities/Player.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol17x.cpp
2014-06-10 20:51:22 +01:00
35b79e5d71
Portal improvements and suggestions
2014-06-10 20:43:27 +01:00
af4a21ea06
Fixed deadlock when moving players to other worlds.
...
Fixes #1039 , fixes #851
2014-06-08 21:58:30 +02:00
873043c8e4
Suggestions
2014-06-04 21:51:19 +01:00
ccbf6cc446
Configurable portals
2014-06-04 20:00:55 +01:00
01f38d8836
Added checks for no downfall biomes
2014-06-04 13:22:50 +01:00
576f89c1d5
Implemented bed homes
...
+ Implemented bed home positions
* Fixed some inventory and health server/client mismatches after world
change
2014-06-01 18:46:59 +01:00
8bff3e5af2
Implemented end and nether portals
2014-05-31 22:28:51 +01:00
f55f5ec47f
Merge branch 'master' into achievementtranslate
...
Conflicts:
src/Entities/Player.cpp
2014-05-24 23:21:39 +01:00
941cb88ae4
Fixed datatype conversion warning.
2014-05-23 12:33:30 +02:00
2bfe962e28
Fixed a cactus Y position issue
2014-05-19 22:15:39 +01:00
4008af6925
Simplified cacti conditions
2014-05-19 21:17:28 +01:00
1de4408a18
Merge pull request #1010 from mc-server/cactidamage
...
Implemented cacti damage
2014-05-19 14:01:50 +01:00
6de0257bbe
Derp
2014-05-19 13:31:19 +01:00
Tiger Wang
madmaxoft
archshift
Howaner
Tycho
worktycho
Alexander Harkness