flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
9,672 Commits 1 Branch 0 Tags 92 MiB
9c3b88d663
Commit Graph

9672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mattes D
0b20d7ab96 Merge pull request #2861 from LogicParrot/hotfix 
Fixed crash introduced by #2821
 2016-01-12 14:25:40 +01:00
LogicParrot
41f2b6c99f Fixed crash introduced by #2821 2016-01-12 15:13:53 +02:00
LogicParrot
d4e99aedb1 Merge pull request #2859 from LogicParrot/attack2 
Fix mob attack interval
 2016-01-12 14:46:02 +02:00
LogicParrot
21df3cb0d8 Fix mob attack interval 2016-01-12 14:20:17 +02:00
LogicParrot
e64790db74 Merge pull request #2860 from LogicParrot/wolfChecks 
Friendly wolf attack safety checks
 2016-01-12 13:41:20 +02:00
LogicParrot
e0f13f9f26 Friendly wolf attack safety checks 2016-01-12 13:27:03 +02:00
LogicParrot
e2a053263f Merge pull request #2857 from LogicParrot/wolf 
AI: Tamed wolf defends owner
 2016-01-12 12:13:36 +02:00
LogicParrot
359e772dee Tamed wolf assists owner (attack / defence) 2016-01-12 11:47:59 +02:00
Mattes D
97ef08de84 Merge pull request #2853 from cuberite/DetailedBlockAreaLogging 
Added detailed logging to cBlockArea::Read() bad Y coords.
 2016-01-12 10:20:35 +01:00
Mattes D
e4adf2f9ae Added detailed logging to cBlockArea::Read() bad Y coords. 
Ref.: http://forum.mc-server.org/showthread.php?tid=2307
 2016-01-12 10:19:44 +01:00
Mattes D
f1ca68051f Merge pull request #2849 from cuberite/export_getseed 
Exported GetSeed to lua and added file extension opendb to .gitignore.
 2016-01-12 10:19:14 +01:00
Lukas Pioch
fe72eaaec2 Exported GetSeed to lua and added file extension opendb to .gitignore. 2016-01-12 10:18:24 +01:00
LogicParrot
a4a17a2953 Merge pull request #2821 from LogicParrot/world2 
Fix pre - #2815 default world linkage configs
 2016-01-12 10:24:44 +02:00
worktycho
7aa0b7299d Merge pull request #2855 from bibo38/mobheads 
Changed the format of the MobHead data
 2016-01-11 23:52:25 +00:00
Alexander Harkness
1f9908c712 Merge pull request #2848 from Nakkar/master 
Fix for issue #2218
 2016-01-11 19:09:23 +00:00
bibo38
657b0ed007 Changed the format of the MobHead data to allow MobHeads working on MInecraft 1.8 
The NBT format now carries the texture data and transmit it to the client.
See: http://minecraft.gamepedia.com/Head#Block_entity
Related to #2674
 2016-01-11 17:55:32 +01:00
Austin Martin
8c7cc3ffe9 Fixed issue #2218 2016-01-10 20:53:02 -05:00
Mattes D
725db4475c Added "core.help" permission to Default rank. 2016-01-10 17:40:25 +01:00
Mattes D
7111154160 Merge pull request #2851 from bibo38/decompressfix 
Fixed not working packet decompression
 2016-01-10 15:36:15 +01:00
bibo38
a45315ee74 Fixed not working packet decompression 
A compressed packed contains always the uncompressed size, but in the code this size was threatened as the compressed data size. This created a failure, when the client compressed a packet.
See: http://wiki.vg/Protocol#With_compression
Fixes #2841
Fixes #2467
 2016-01-10 15:16:29 +01:00
worktycho
5593db13eb Merge pull request #2847 from cuberite/FixClangWarnings 
Fixed Clang warnings.
 2016-01-07 01:31:27 +00:00
Mattes D
491dbda7d3 Fixed Clang warnings. 2016-01-06 16:20:12 +01:00
Mattes D
4823e78440 Merge pull request #2844 from mathias-github/silktouch 
Added blocks that can't be mined with silktouch
 2016-01-05 15:01:13 +01:00
Mathias
d17c8fa349 Fixed typo 2016-01-03 16:29:04 +02:00
Mathias
8e2b2e7a18 More blocks that can't be mined with silktouch 2016-01-03 16:27:02 +02:00
Mattes D
c57bf8e538 Merge pull request #2842 from ameuret/typo-ammount 
Typo [ammount]
 2016-01-03 00:42:14 +01:00
Arnaud Meuret
e19109465d Fix typo (ammount) 2016-01-02 22:02:02 +01:00
Julian Laubstein
5c004e375a Merge pull request #2840 from cuberite/RenameToCuberite 
Renamed leftover strings to Cuberite / Server, as needed.
 2016-01-02 00:47:42 +01:00
Mattes D
14e7213f58 Updated plugins with the rename to Cuberite. 2016-01-01 21:40:18 +01:00
Mattes D
80e1eb37dd Renamed leftover strings to Cuberite / Server, as needed. 
Also upgraded the user setting file for MSVC to 2013.
 2016-01-01 21:05:09 +01:00
worktycho
2b38b4e66e Merge pull request #2838 from cuberite/clang-3.8-ignore-flag 
Clang-3.8: Added ignore flag for double promotion
 2015-12-30 20:40:40 +00:00
Lukas Pioch
26f4b00960 Clang-3.8: Added ignore flag for double promotion 2015-12-30 15:39:00 +01:00
Mattes D
4976190516 Merge pull request #2836 from cuberite/FixDefaultWorldGenParams 
Fixed default Nether generator params.
 2015-12-30 13:37:50 +01:00
Mattes D
6c9be8df4b Fixed default Nether generator params. 
The prefab file is "NetherFort"
 2015-12-30 13:37:28 +01:00
Mattes D
1210eb1316 Merge pull request #2831 from cuberite/BlockingSslClientSocketFix 
Changed m_IsConnected to an atomic bool, added logging.
 2015-12-30 13:36:17 +01:00
Mattes D
0054104017 Fixed problems in cBlockingSslClientSocket. 2015-12-30 13:00:02 +01:00
Julian Laubstein
2440b9bea1 Merge pull request #2837 from cuberite/FixMonsterBurn 
Fixed the monster burn code.
 2015-12-30 02:40:23 +01:00
Mattes D
902f428342 Fixed the monster burn code. 
The old code failed when the monster was out of Y range.
 2015-12-30 01:15:13 +01:00
Mattes D
7a778e2911 Debuggers plugin: Added "uuid" console command. 2015-12-28 11:08:46 +01:00
Mattes D
78eb4c8ed8 Removed excessive logging in redstone simulator. 2015-12-28 11:06:41 +01:00
Julian Laubstein
df9825ac09 Merge pull request #2829 from LogicParrot/fences2 
Deleted cPath::BlockTypeIsFence
 2015-12-27 15:53:05 +01:00
LogicParrot
fc8a117a0c Deleted cPath::BlockTypeIsFence 2015-12-27 16:13:44 +02:00
Alexander Harkness
831270f74c Merge pull request #2825 from Gargaj/snowlayers 
fix crafting recipe for snow layers
 2015-12-27 14:02:38 +00:00
LogicParrot
7ed8c47d2b Merge pull request #2828 from LogicParrot/contrib 
Update CONTRIBUTORS
 2015-12-27 13:47:36 +02:00
LogicParrot
eb70550d4f Update CONTRIBUTORS 2015-12-27 13:47:04 +02:00
Safwat Halaby
bfafc39576 Merge pull request #2814 from SafwatHalaby/chunk2 
Freeze player until chunk is loaded
 2015-12-26 21:08:12 +02:00
worktycho
b99b60720a Merge pull request #2820 from cuberite/UrlParser 
Added the cUrlParser class, exported to Lua API.
 2015-12-26 19:01:37 +00:00
Gargaj
fb69688fe9 fix crafting recipe for snow layers 2015-12-26 16:49:40 +01:00
Mattes D
5c8a8f322f Merge pull request #2789 from cuberite/apidump-analytics 
Added analytics to APIDump
 2015-12-26 16:47:43 +01:00
Alexander Harkness
23e2bc5042 Added analytics to APIDump 2015-12-26 14:10:53 +00:00