Commit Graph
330 Commits
Author SHA1 Message Date
archshift 9b0cb3fd97 Fixed projectile source filenames, indentations 2014-04-27 17:05:18 -07:00
madmaxoft 9dc9713a9c Fixed warnings. 2014-04-27 23:12:52 +02:00
archshift 15324f3bbd Fixed ToLua errors, added newlines 2014-04-27 09:42:31 -07:00
Tiger Wang bbc5faa723 Redstone simulator now directly accesses cChunk
* Redstone simulator performance improvements
* Added return values to some functions
* Minor fixes
2014-04-27 17:35:41 +01:00
Tycho 57b8ee9163 Merge branch 'master' into chunksparsing/structs
Conflicts:
	src/Chunk.cpp
	src/Chunk.h
2014-04-27 06:35:27 -07:00
archshift cc39d314ae Fixed ToLua issues 2014-04-26 17:58:06 -07:00
archshift e3c3795aa4 Moved cFireworkEntity out of ProjectileEntity.h 2014-04-26 17:50:05 -07:00
archshift cb93a57963 Moved cGhastFireballEntity out of ProjectileEntity.h 2014-04-26 17:41:07 -07:00
archshift de7eaa5735 Moved cFireChargeEntity out of ProjectileEntity.h 2014-04-26 17:35:31 -07:00
archshift 08b77f4880 Moved cThrownSnowballEntity out of ProjectileEntity.h 2014-04-26 17:24:44 -07:00
archshift 2f9580ad65 Moved cExpBottleEntity out of ProjectileEntity.h 2014-04-26 17:19:45 -07:00
archshift bc5c28a0be Moved cThrownEnderPearl out of ProjectileEntity.h 2014-04-26 17:08:39 -07:00
archshift de23a115a5 Moved cThrownEggEntity out of ProjectileEntity.h 2014-04-26 17:02:47 -07:00
archshift 477b3e7861 Moved cArrowEntity out of ProjectileEntity.h 2014-04-26 16:45:39 -07:00
Tiger Wang 15767badac A tiny speed improvement in ApplyFoodExhaustion() 2014-04-26 23:52:18 +01: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 7841bad27a More small fixes. 2014-04-26 14:05:00 -07:00
Tycho e40f9d6e5b Implemented Chunk Sparsing with segments 2014-04-26 10:50:23 -07: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
archshift 73edd2b961 Fixed a couple more warnings. 2014-04-25 17:15:12 -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 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
Mattes D a4f21908b2 Merge pull request #920 from axisd/master
Mobs shouldn't burn when it's Raining
2014-04-25 23:48:00 +02:00
Mattes D 43cca14763 Merge pull request #935 from archshift/projectile-fixes
Chicken eggs and ender pearls can hit entities.
2014-04-25 23:41:04 +02:00
archshift e47dab84f3 Cmake generated projects for IDEs include headers in project files. 2014-04-25 09:56:15 -07:00
archshift 8aa82d048d Creator not user. 2014-04-25 06:26:08 -07:00
archshift 256691461b Comments for TrySpawnChicken() and TeleportUser(). 2014-04-25 05:49:18 -07:00
archshift cb7f1ee4bb Rename spawn chicken method, Initialize m_HasTeleported. 2014-04-25 05:39:35 -07: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
archshift ec9787bae2 Chicken eggs and ender pearls can hit entities.
Fixed warning by adding dedicated m_HasTeleported for fired arrows.
2014-04-24 19:16:16 -07: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
Mattes D 0d0e0af2d8 Merge pull request #925 from archshift/master
Added monsters.ini rule for fireproof mobs.
2014-04-23 09:46:06 +02: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
Mattes D b3a9b73278 Merge pull request #923 from archshift/master
Added flag for fireproof entities.
2014-04-22 15:04:04 +02: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