1
0
Commit Graph

5153 Commits

Author SHA1 Message Date
Howaner
49f6819829 Fixes 2014-04-26 16:44:15 +02: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
madmaxoft
087210302f Updated MSVC side of CMake files after recent changes. 2014-04-25 23:45:16 +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
Mattes D
20e0465fd1 Merge pull request #938 from archshift/xcode-oops
Oops, forgot some CMakeLists in #937
2014-04-25 23:38:45 +02:00
archshift
0e0c9d8248 Missed these CMakeLists. 2014-04-25 12:24:09 -07:00
worktycho
e2718418bb Merge pull request #937 from archshift/xcode-headers
Cmake generated projects for IDEs include headers in project files.
2014-04-25 18:33:30 +01: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
Mattes D
a40108da90 Merge pull request #932 from Howaner/Inventory
Fix armor in survival mode.
2014-04-25 08:11:49 +02: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
r.ramazanov
1c26eb715b Merge branch 'master' of https://github.com/mc-server/MCServer 2014-04-25 10:06:12 +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
Howaner
ccd9023202 Add commit what the code is doing. 2014-04-25 00:10:52 +02:00
Howaner
cee70390fa Add unkown armor warning and fix armor stacks. 2014-04-25 00:09:22 +02:00
Howaner
376dc880b3 Add armor to switch() in ItemHandler.cpp 2014-04-24 23:03:04 +02:00
Mattes D
85e0b0eae9 Merge pull request #929 from archshift/master
Renamed mob source files to better fit the CamelCase naming style.
2014-04-24 22:12:28 +02:00
madmaxoft
449cf77420 Changed cByteBuffer constructor to take a size_t instead of int. 2014-04-24 21:52:24 +02:00
archshift
8fc45c5730 Fixed class capitalization for the cave spider. 2014-04-24 12:18:17 -07:00
Howaner
9cbb3a339f Fix armor in survival mode. 2014-04-24 20:41:25 +02:00
r.ramazanov
d126adc124 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-04-24 10:32:26 +04:00
archshift
06819595b0 Fixed references to renamed files. 2014-04-23 15:25:10 -07:00
archshift
c2f2ef7cb4 Rename mob source files to fit CamelCase.
Rename Cavespider.cpp to CaveSpider.cpp

Rename Cavespider.h to CaveSpider.h

Rename Magmacube.cpp to MagmaCube.cpp

Rename Magmacube.h to MagmaCube.h

Rename Zombiepigman.cpp to ZombiePigman.cpp

Rename Zombiepigman.h to ZombiePigman.h
2014-04-23 15:22:49 -07:00
madmaxoft
695baed226 Updated docs for StringToEnchantmentID.
Ref.: mc-server/Core#67
2014-04-23 23:06:29 +02:00
madmaxoft
6d7da6b15d Updated NetherFort prefabs to latest Gallery content. 2014-04-23 23:03:09 +02:00
STRWarrior
9660c4816f The new leaves don't decay anymore.
Fixes #792
2014-04-23 16:57:32 +02: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
fe08a903fc Declaration that a mob is not fireproof is implicit.
Removed explicitly declaring mobs as not fireproof.
2014-04-22 15:45:52 -10:00
archshift
e1476ebb26 Added IsFireproof hook for monsters.ini 2014-04-22 13:17:42 -10:00
archshift
a37b36adab Fireproof status getter and setter. 2014-04-22 12:59:31 -10:00
madmaxoft
2533842ca4 Updated NetherFort prefabs from the Gallery server. 2014-04-22 22:26:01 +02: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
1cf396c814 Fixed capitalization issues
Wasn't parsing correctly before, as some items were not capitalized correctly.
2014-04-22 02:18:41 -10:00
worktycho
10cba6cf58 Revert moving gcc to g++11 in 18c3b1 2014-04-22 13:05:23 +01: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
6492aa000b Merge pull request #909 from jfhumann/fixes
Bug fixes and optimizations.

We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp
2014-04-22 13:34:32 +02:00
jfhumann
865e8e22e5 reverted the revert of the minecart collision detection fix. 2014-04-21 14:04:36 +02:00