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
daniel0916
8c33b3c415
Fixed double enchanting items
2014-04-16 13:31:37 +02:00
madmaxoft
99e4225269
Attempted fix for the client crash with the new protocols.
2014-04-15 23:40:06 +02:00
daniel0916
2cb8538e2e
Code Optimization
2014-04-15 22:03:15 +02:00
daniel0916
36f747d674
Added Book Enchanting
2014-04-15 21:43:52 +02:00
Howaner
e81fc2779e
Add more checks to cSlotAreaEnchanting
2014-04-15 21:12:59 +02:00
daniel0916
fb3c755c0a
Modified names
2014-04-15 20:55:37 +02:00
Howaner
8df922e3e0
Add linux compatibility
2014-04-15 20:42:39 +02:00
Tiger Wang
82b3d543e7
Rewrote redstone powering to use power levels
2014-04-15 13:15:56 +01:00
madmaxoft
b5ea5fbf90
Added support for per-piece per-placement weights in cPieceGenerator.
...
Ref.: #753 .
2014-04-15 12:57:52 +02:00
madmaxoft
146824cb68
NetherFortPrefabs: Fixed a connector in MidStaircase.
2014-04-15 12:57:52 +02:00
Mattes D
112dd2c5ec
Merge pull request #888 from mc-server/Proto176
...
Protocol 1.7.6
2014-04-15 08:16:16 +02:00
