ryansnewell
/
mcserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,105 Commits
1 Branch
0 Tags
70 MiB
Commit Graph

5105 Commits (10cba6cf58d772a63da9d9fc1c3c3a7a33904b88)

Author SHA1 Message Date
worktycho 10cba6cf58 Revert moving gcc to g++11 in 18c3b1 2014-04-22 13:05:23 +01: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
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
Mattes D b7e074b10b Merge pull request #891 from mc-server/fixes 
Fixes to redstone & general
 2014-04-17 22:37:00 +02:00
madmaxoft 6779010242 Added area flooring. 
Fixes #743.
 2014-04-17 22:03:30 +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
daniel0916 0086fcfef1 Fixed some Errors (not all) 2014-04-17 19:31:43 +02:00
madmaxoft afb20132fe Added Prefab initializers to SELFTEST code. 2014-04-17 17:50:52 +02:00
madmaxoft be091800f8 Prefabs can have per-piece per-placement weights. 
Fixes #753.
Also upgraded NetherFortPrefabs to lates Gallery contents.
 2014-04-17 17:32:08 +02:00
Tiger Wang 18c3b18a3f Compile fix? 2014-04-17 13:02:20 +01:00
daniel0916 f9343a8490 Modified many things 2014-04-17 13:15:35 +02:00
Tiger Wang 2151ee997c Implemented weighted pressure plates 2014-04-17 12:11:31 +01:00
Mattes D 35e847d2f5 Merge pull request #896 from axisd/master 
Mobs rotation
 2014-04-17 08:45:14 +02:00
r.ramazanov 7bcc920662 Mobs rotation 2014-04-17 09:35:26 +04:00
madmaxoft 09866bb382 Added asserts for proper game state. 
This is to help hunt #889.
 2014-04-16 18:10:48 +02:00
daniel0916 a0725747af Fixed conflicting enchantments checking 2014-04-16 14:52:09 +02:00
daniel0916 a12a9117c2 Added deletions from merge conflict 2014-04-16 14:33:03 +02:00
daniel0916 5a9acb7eb6 Merge branch 'master' into Enchanting 2014-04-16 14:31:02 +02:00
daniel0916 8d67562238 Fixed merge conflict 2014-04-16 14:30:55 +02:00