1
0
Commit Graph

5037 Commits

Author SHA1 Message Date
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
jfhumann
013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
madmaxoft
6d3bde5221 Added performance test of the nether fort generator. 2014-04-18 14:35:33 +02: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
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
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
madmaxoft
99e4225269 Attempted fix for the client crash with the new protocols. 2014-04-15 23:40:06 +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
madmaxoft
d12d7b6715 Implemented the 1.7.6 protocol and authenticator.
Server works both in online and offline modes with 1.7.9.
2014-04-14 22:52:59 +02:00
madmaxoft
d505ffc704 A client UUID is generated when the server is in offline mode.
1.7.9 client works with these changes in offline mode.
2014-04-14 20:21:00 +02:00
madmaxoft
ffe65b6a18 Merge remote-tracking branch 'daniel0916/YggdrasilAuthentication' into Proto176 2014-04-14 18:53:56 +02:00
madmaxoft
0f55dcf036 Initial 1.7.6 protocol support.
Doesn't work yet because of missing UUIDs.
2014-04-14 18:52:21 +02:00
madmaxoft
21e5690811 ProtoProxy: Fixed weird gcc compilation errors. 2014-04-14 18:50:44 +02:00
madmaxoft
449afa850e ProtoProxy: Added 1.7.9 compatibility. 2014-04-14 18:24:44 +02:00
daniel0916
2618569e01 Fixed mistake 2014-04-13 17:09:18 +02:00
daniel0916
d258be678a Fixed Error? 2014-04-13 16:15:57 +02:00
daniel0916
3733ee2c0e Code Update 2014-04-13 15:32:15 +02:00
daniel0916
b506a74076 Added Yggdrasil Authentication System
Code by Howaner.  Fixes/Changes by me.
2014-04-13 13:04:56 +02:00
madmaxoft
34cf058b02 ChunkStay must be disabled while being deleted.
Fixes #758.
2014-04-12 22:35:04 +02:00
madmaxoft
75b7244f05 Fixed chunkstays not being removed on auto-delete.
Fixes #837.
2014-04-12 22:15:09 +02:00
madmaxoft
83b25d085c Updated the NetherFort prefabs to current Gallery contents.
Code exported from the Gallery server by the GalExport plugin.
2014-04-12 19:36:50 +02:00
Tiger Wang
c0c47d33c5 Entities handle chunks properly again
* Entities properly handle chunks
* Changed EntityStatus enums to be less shouty
2014-04-12 13:16:48 +01:00
Tiger Wang
b3f6afefe9 Simplified pickup speed randomisation 2014-04-12 13:14:35 +01:00
madmaxoft
f44a291da8 Fixed issues with 64-bit MSVC compilation. 2014-04-11 13:09:19 +02:00
madmaxoft
22d56d1a3f Fixed enchantment parsing.
Fixes #880. Enchantment parsing now reports in detail which value failed to parse
2014-04-10 19:09:37 +02:00
madmaxoft
8c7d0f5304 InfoReg uses cCompositeChat for subcommand lists.
Also fixed an issue with console commands.
2014-04-10 19:09:37 +02:00
Mattes D
b45e8a8bd9 Merge pull request #878 from mc-server/mobexp
@axisd Changes
2014-04-10 17:23:32 +02:00
Alexander Harkness
9ad87f670b Fixed GitHuB WebEdit fail. 2014-04-10 15:52:00 +01:00
Alexander Harkness
2d02ff1df8 Update Monster.cpp 2014-04-10 15:50:43 +01:00
Mattes D
e08a31daf5 Merge pull request #871 from worktycho/worldstorage
Removed check for enqueuing a chunk that is already enqueued to be loaded
2014-04-08 19:55:50 +02:00
Tiger Wang
c3fcc5b132 cRedstoneSimulator.cpp style improvements 2014-04-08 18:49:53 +01:00
Alexander Harkness
ea17441e8a Merge pull request #872 from worktycho/bugfix
Fixed missing - that caused all neighbour lookups to go to the chunkmap
2014-04-08 17:03:20 +01:00
Tycho
18793ca568 Fixed missing - that caused all neighbour lookups to go to the chunkmap 2014-04-08 08:59:50 -07:00
Tycho
10e72a122c Removed check for enqueuing a chunk that is already enqueued to be loaded
This remaval is safe as cWorldStorage checks for duplicate chunks when dequeuing
and removes an expensive iteration whilst holding the queue lock
2014-04-08 08:43:28 -07:00
Alexander Harkness
5f5bdaca65 Merge pull request #870 from wiseoldman95/patch-1
Comments: Inverted Z axis.
2014-04-08 16:09:11 +01:00
wiseoldman95
6a0c122dfb Uppercased Z
Minor, no code changed.
2014-04-08 17:59:42 +03:00
wiseoldman95
fb90afd651 Comments: Inverted Z axis.
-Comments fix, No code has been changed.
-Inverted the Z axis in the comments and changed all dependent comments accordingly.
-Added NORTH/SOUTH/EAST/WEST in addition to LEFT/RIGHT/UP/DOWN.
2014-04-08 17:55:03 +03:00