flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
9,055 Commits 1 Branch 0 Tags 92 MiB
12fb95ba2f
Commit Graph

169 Commits

Author SHA1 Message Date
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
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
r.ramazanov
a967313839 Mobs shouldn't burn when it's Raining #906 2014-04-21 13:13:25 +04:00
Tiger Wang
6cb63a768d Fixed #906 2014-04-18 12:59:14 +01: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
143a5e61fc Fixed Endiannes conversion routines for floats and doubles. 
This bug has been introduced in 8825d30aab.
This change fixes #854.
 2014-04-05 22:34:05 +02:00
Tiger Wang
a0720a65d6 Minor Entity.cpp cleanup 2014-03-19 23:07:16 +00:00
Tiger Wang
b8fe024f9d Merge branch 'master' into awesometnt 
Conflicts:
	src/ChunkMap.cpp
 2014-03-18 20:49:08 +00:00
andrew
9810d57a39 Unified Matrix4 code 2014-03-11 18:33:31 +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
andrew
d73cdba1f6 g_BlockXXX => cBlockInfo::XXX 2014-03-01 21:34:19 +02:00
Tycho
8ba6f73169 Fixed most of the reordering warnings 2014-02-05 09:43:49 -08:00
Tiger Wang
b89419f603 Creative players take Plugin damage 2014-02-02 12:47:17 +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
b02940209d Fixed crash with failed entity-loading. 
This should fix issues reported in:
http://forum.mc-server.org/showthread.php?tid=1328
http://forum.mc-server.org/showthread.php?tid=1308
 2014-01-24 09:57:12 +01:00
madmaxoft
ed1d336614 Merge remote-tracking branch 'origin/customnames' 2014-01-17 10:44:23 +01:00
madmaxoft
de4ac55398 Disabled excessive entity-related logging in Debug mode. 2014-01-16 20:31:06 +01:00
Tiger Wang
74645fdfaa Removed obsoleted functions 2014-01-16 19:00:49 +00:00
Tiger Wang
a66e154b90 Final improvements to Minecarts 
* Fixed curved rails being a little broken
+ Implemented detector rails
+ Implemented block collisions on rails
* Fixed snapping to rail
- Removed minecart physics conditions in Entity.cpp as minecarts use
their own simulator when on rails

Fixes #148 and #217; partially implemented #215.

This is Cave Johnson, and we're done here.
 2014-01-13 22:37:09 +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
Tiger Wang
ec6c510bd4 Multiple enhancements and fixes to minecarts 
+ They are destroyed instantly by creative mode
* Physics is much improved
+ Basic implementation of powered rails
 2014-01-12 13:28:37 +00:00
Tiger Wang
89f87f66a5 Improved knockback animation 
* Critical hits now actually increase damage
* Looking down at an entity and hitting them still produces upwards
motion (as per Vanilla experience)
* Reduced force to be more realistic
 2013-12-24 15:02:35 +00:00
Tiger Wang
d8221854d2 Fixed a comment in Entity.cpp 2013-12-23 09:41:45 +00:00
Tiger Wang
b02a81678c Implemented knockback and critical hit 2013-12-22 20:04:17 +00:00
madmaxoft
8570d08eb4 More reordering fixes. 2013-12-20 17:11:51 +01:00
madmaxoft
d6de11da07 Sorted a few constructors to remove warnings. 2013-12-20 16:39:20 +01:00
madmaxoft
8610d45ef1 Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). 2013-12-20 16:01:34 +01:00
STRWarrior
459d636948 Added HandleSpeedFromAttachee so an entity can override the function. 2013-12-16 18:02:33 +01:00
madmaxoft
3712ee7b11 Fixed angle normalization typo. 2013-12-08 18:54:04 +01:00
madmaxoft
6785bb7c16 Fixed normalizing large angles. 2013-12-08 13:08:56 +01:00
madmaxoft
044fd237b6 Moved bindings-related to a Bindings subfolder. 
Ref.: #407
 2013-12-08 12:17:54 +01:00
Alexander Harkness
675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00