flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
5,332 Commits 1 Branch 0 Tags 92 MiB
27f95454a9
Commit Graph

5332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
daniel0916
098be1c7fc Fixed Code 2014-04-19 22:37:29 +02:00
daniel0916
cb90029f72 Merge branch 'master' into Enchanting 2014-04-19 20:56:29 +02:00
jfhumann
f48d43f050 Fixed Flint and Steel, reverted Minecart change, renamed a parameter name 2014-04-19 20:51:52 +02:00
jfhumann
4dd7610381 Declared one mutex as mutable in order to allow for const correct get accessors. 2014-04-19 17:53:02 +02:00
madmaxoft
62991d46fe APIDump: Added a ChunkStay article. 
Fixes #772.
 2014-04-19 16:15:57 +02:00
daniel0916
11ff36c683 Fixed Code (2) 2014-04-19 16:10:05 +02:00
daniel0916
a6de7bf1cd Fixed Code 2014-04-19 15:10:50 +02:00
madmaxoft
6eac586794 Fixed formatting, made function static. 2014-04-19 13:05:58 +02:00
madmaxoft
5f3df1445f Merge remote-tracking branch 'origin/Beacons' 2014-04-19 13:01:28 +02:00
jfhumann
5bed1c09bc Fixed clang compilation errors. Apparently gcc and MSVC do not care about the order of initializer lists, but clang does. 2014-04-18 22:47:59 +02:00
jfhumann
fde1555352 Small style changes 2014-04-18 22:20:24 +02:00
jfhumann
67344a3782 Merge remote-tracking branch 'origin/master' into fixes 
Conflicts:
	src/Authenticator.cpp
	src/ClientHandle.cpp
	src/Entities/Minecart.cpp
	src/Protocol/Protocol17x.cpp
 2014-04-18 21:44:58 +02:00
Tiger Wang
19358fc7d5 Compilation fix 2014-04-18 20:20:00 +01:00
Tiger Wang
598719d7ab Merge branch 'master' of https://github.com/mc-server/MCServer 2014-04-18 20:17:52 +01:00
jfhumann
013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
daniel0916
b239de66db Merge branch 'master' into Enchanting 2014-04-18 15:04:32 +02:00
madmaxoft
6d3bde5221 Added performance test of the nether fort generator. 2014-04-18 14:35:33 +02:00
daniel0916
56613d2b22 Fixed Errors 2014-04-18 14:34:29 +02:00
daniel0916
3efd232829 Removed old include 2014-04-18 14:10:31 +02:00
Tiger Wang
6cb63a768d Fixed #906 2014-04-18 12:59:14 +01:00
Tiger Wang
200ea6254c Fixed #904 2014-04-18 12:54:17 +01:00
madmaxoft
193dcca1e3 Removed unsupported C++11 features. 2014-04-18 09:36:11 +02:00