1
0
Commit Graph

5510 Commits

Author SHA1 Message Date
Tiger Wang
3397f9faec Fixed indent 2014-04-24 22:07:20 +01:00
Tiger Wang
c949c1e755 Implemented suggestions 2014-04-24 22:03:47 +01:00
Howaner
376dc880b3 Add armor to switch() in ItemHandler.cpp 2014-04-24 23:03:04 +02:00
Tiger Wang
acbd4e6503 Another small speed improvement? 2014-04-24 21:52:01 +01:00
Tiger Wang
ffce8d6907 Implemented suggestions 2014-04-24 21:49:56 +01:00
madmaxoft
4f49c978cf Replaced MSVC-specific decorators with our universal ones. 2014-04-24 22:43:20 +02:00
madmaxoft
616fb15508 cByteBuffer uses void * instead of char * in data interface.
This makes it compatible with any pointer type.
2014-04-24 22:42:33 +02:00
madmaxoft
a02e8e8021 Declared a SharedPtr that hopefully resolves on all platforms.
MSVC2008 has it in std::tr1, all the others in std.
2014-04-24 22:30:19 +02:00
madmaxoft
c7694687f5 Fixed filename case. 2014-04-24 22:15:21 +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
e33573ab59 Attempted CMake inclusion for PolarSSL++. 2014-04-24 21:53:42 +02:00
madmaxoft
c4b4447a3a Authenticator uses some C++ SSL objects. 2014-04-24 21:53:41 +02:00
madmaxoft
c701adbd24 Initial C++ SSL classes. 2014-04-24 21:53:41 +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
Tiger Wang
48904ae201 Merge branch 'master' into fixes
Conflicts:
	src/World.h
2014-04-24 18:57:25 +01: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
Tiger Wang
7f5cf417de Some change to Entity.cpp
* Added comments to BroadcastMovementUpdate() and the collision tracer
2014-04-23 21:06:46 +01:00
Tiger Wang
f763242e5c Small changes 2014-04-23 21:06:07 +01: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
r.ramazanov
a967313839 Mobs shouldn't burn when it's Raining #906 2014-04-21 13:13:25 +04:00
madmaxoft
e3ec857264 Added prefab hitboxes.
The nether forts should quite limit their bridge-to-floor overlaps. Cannot eliminate, but at least severely diminish.
2014-04-21 10:31:30 +02:00
madmaxoft
7c6ef26be9 Added enchantment combining into cEnchantments. 2014-04-21 10:31:30 +02:00
madmaxoft
bdd8b43b3e Replaced X.size() with X.empty(), where applicable. 2014-04-21 10:31:29 +02:00
Mattes D
4c7621ed16 Fixed a warning in CraftingRecipes. 2014-04-21 09:21:31 +02:00
Mattes D
9f58046b5b Allow 1.6.4 Forge clients to log in.
Fixes #913.
2014-04-21 08:22:25 +02:00
Mattes D
d7f88396e0 Fixed enchanting return values.
Items are enchanted in those cases, so return true.
Ref.: #914.
2014-04-21 06:41:11 +02:00
madmaxoft
d80c082def Updated the nightbuild script. 2014-04-20 14:14:16 +02:00
madmaxoft
7b246d9a8d Fixed MSVC compilation. 2014-04-20 13:50:37 +02:00
Mattes D
f99bdfb457 Merge pull request #890 from daniel0916/Enchanting
Enchanting
2014-04-20 13:34:38 +02:00