flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity
11,213 Commits 1 Branch 0 Tags 92 MiB
Commit Graph

157 Commits

Author SHA1 Message Date
archshift 71b4c49490 Cave spider now poisons its victim, added IsPawn function to Entity 2014-06-17 11:39:21 -07:00
archshift 8eceaf9b0c Player: made healing instantaneous 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
archshift b2fbcaf1bf Implemented PR suggestions 
Furnace.txt: newline
BlockID: removed extraneous dimension mapping
cEntity: fixed typo
cPlayer: WorldPtr typedef
 2014-06-15 20:27:27 -07:00
Tiger Wang 8a80843ddf Reverted portal creation code 
It wasn't really working and needs more development
 2014-06-14 10:18:16 +01:00
Tiger Wang 29567c5610 Portals animate and delay correctly 2014-06-12 15:21:07 +01:00
Tiger Wang 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
Tiger Wang 35b79e5d71 Portal improvements and suggestions 2014-06-10 20:43:27 +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
Mattes D b904223b9d Added queue for adding entities to cWorld. 
This alone doesn't work properly yet, further changes to cPlayer are needed.
 2014-06-08 21:58:29 +02:00
Tiger Wang 8bff3e5af2 Implemented end and nether portals 2014-05-31 22:28:51 +01:00
Alexander Harkness 1de4408a18 Merge pull request #1010 from mc-server/cactidamage 
Implemented cacti damage
 2014-05-19 14:01:50 +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
andrew b3d2b5b2c9 cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement() 2014-05-12 17:05:09 +03:00
madmaxoft 5082d55e85 A bit of reformatting. 2014-05-02 19:40:12 +02: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
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 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 e5683ede63 Change m_InvulnerableTicks description again again :D 2014-04-26 00:41:00 +02:00
Howaner ed1aa02d0c Change m_InvulnerableTicks description again. 2014-04-26 00:37:40 +02:00
Howaner ad1410f46e Change m_InvulnerableTicks description 2014-04-26 00:37:09 +02:00
Howaner 7e76f030aa Add entity invulnerable 2014-04-26 00:32:30 +02: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
archshift 8768669428 Renamed getter and setter for IsFireproof. 2014-04-23 00:12:37 -07:00
archshift a37b36adab Fireproof status getter and setter. 2014-04-22 12:59:31 -10:00
archshift 06f41699af Fixed indentation and changed m_Fireproof to m_IsFireproof. 2014-04-22 02:36:39 -10:00
archshift bca7f29490 Lay foundation for fireproof entities. 
Prevent any entities with the m_Fireproof flag from taking fire or lava damage.
 2014-04-22 01:59:34 -10:00
Mattes D b7e074b10b Merge pull request #891 from mc-server/fixes 
Fixes to redstone & general
 2014-04-17 22:37:00 +02:00
Tiger Wang bdea8706d8 Added new AI rules 
+ Added new AI rules handling cacti and large heights
* Fixed cIniFile not recognising comments in cIniFile::ReadFile()
* Fixed users.ini not being properly generated
* Changed all instances of (int)floor(GetPosXXX()) to POSXXX_TOINT
 2014-04-17 18:50:25 +01:00
Tiger Wang c0c47d33c5 Entities handle chunks properly again 
* Entities properly handle chunks
* Changed EntityStatus enums to be less shouty
 2014-04-12 13:16:48 +01:00
madmaxoft e304bd08a2 Documented the units and range for entity rotations. 2014-04-03 21:44:03 +02:00
andrew 2e28c09770 Ender crystals 2014-03-25 20:59:33 +02:00
Tiger Wang b8fe024f9d Merge branch 'master' into awesometnt 
Conflicts:
	src/ChunkMap.cpp
 2014-03-18 20:49:08 +00:00
andrew b4bf13aa4f Unified Vector classes 2014-03-11 16:02:25 +02:00
Tiger Wang 53231bebd6 Added extra awesomeness to TNT 
+ TNT now has a chance of flinging FallingBlock entities around
* Improved TNT damage
* Improved TNT spawning visuals
* Possible fix for 'SetSwimState failure' messages in debug
 2014-03-05 22:12:48 +00:00
Tiger Wang a686656253 Merge branch 'master' into itemframes 
Conflicts:
	src/Entities/Entity.h
	src/WorldStorage/NBTChunkSerializer.cpp
 2014-02-18 22:13:44 +00:00
Tiger Wang 320cc74f0a Implemented paintings, fixes #689 
+ Implemented paintings
 2014-02-18 00:16:03 +00:00
Tiger Wang 464ec47eb7 Implemented item frames, a part of #689 
+ Implemented Item Frames
* Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!)
 2014-02-17 23:00:03 +00:00
Tiger Wang 7468ba0f10 Implemented fall damage for mobs 
+ Implemented mobile fall damage
* Formatting fixes
+ Defined new Position->Integer macros
 2014-01-25 19:02:13 +00:00
Tiger Wang fd7fc7e59e All mobs now drown (fixes #54) 
* Implemented mob drowning
* Iron Golems and squids are excluded
 2014-01-24 23:58:51 +00:00
Tiger Wang 2ce26574ef Removed unused ReferenceManager 2014-01-24 19:46:45 +00:00
madmaxoft aec5200893 Removed internal cEntity::GetRot() usage. 2014-01-17 11:11:17 +01:00
Tiger Wang 74645fdfaa Removed obsoleted functions 2014-01-16 19:00:49 +00:00
Tiger Wang f3baf31563 OBSOLETE'd obsolete functions 2014-01-15 22:38:15 +00:00
Tiger Wang edefa27a48 Detaching improvements 
* Players now search for an area around themselves to teleport to when
detaching from something
 2014-01-12 23:23:36 +00:00
madmaxoft ee15d4e08e Fixed compilation in VC2008. 
Also removed an unused inline header file (yuck).
 2013-12-30 17:41:59 +01:00
Tycho Bickerstaff d724241407 converted commneted paramater names to the unused macro 2013-12-22 13:46:55 +00:00
Tycho Bickerstaff 38f808ac3d ChunkSender is now warnings clean 2013-12-21 15:00:31 +00:00
madmaxoft d6de11da07 Sorted a few constructors to remove warnings. 2013-12-20 16:39:20 +01:00
STRWarrior 86bfed735e Added cFloater class. 2013-12-19 17:32:06 +01:00
STRWarrior 459d636948 Added HandleSpeedFromAttachee so an entity can override the function. 2013-12-16 18:02:33 +01:00
Alexander Harkness 0de95a215f Merge remote-tracking branch 'origin/master' into foldermove2 
Conflicts:
	VC2008/MCServer.vcproj
 2013-11-26 17:21:06 +00:00
Alexander Harkness 675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00