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

9630 Commits

Author SHA1 Message Date
tycho d4289eee3c Fix race condition 2015-12-20 00:56:55 +01:00
worktycho bb79b5f436 Merge pull request #2779 from cuberite/seadragon91-patch-clang-3.7 
Fixes for clang-3.7
 2015-12-19 22:17:31 +00:00
Lukas Pioch 50a908fdc9 Fixes for clang-3.7 2015-12-19 22:43:37 +01:00
Alexander Harkness 01bd614b86 HTTPS Newsletter 2015-12-19 21:29:00 +00:00
Tiger Wang b8752bb26e Merge pull request #2542 from Haxi52/pinkstone 
Reorganised the redstone simulator
 2015-12-19 21:20:56 +00:00
Lukas Pioch 60dec884e4 Merge pull request #2776 from cuberite/AtomicBoolIsthread 
Use atomic bool for isthread terminate
 2015-12-19 20:17:29 +01:00
tycho d01562cb7d Use atomic bool for isthread terminate 2015-12-19 19:29:06 +01:00
Alexander Harkness f764df1a3a Merge pull request #2778 from cuberite/httpschanges 
Added HTTPS links wherever they are supported.
 2015-12-19 14:51:20 +00:00
Alexander Harkness 8b851d5048 Added HTTPS links wherever they are supported. 2015-12-19 14:30:32 +00:00
Lukas Pioch a99c82323e Merge pull request #2774 from cuberite/worktycho-patch-1 
Fix off by two error in ReadString
 2015-12-18 17:08:29 +01:00
worktycho 1ee61c4f23 Fix off by two error in ReadString 2015-12-18 15:53:41 +00:00
Alexander Harkness 05e39b249b Merge pull request #2769 from cuberite/FastNBTAsserts 
Check for invalid tags when reading a compound tag
 2015-12-18 14:40:23 +00:00
tycho 456253c651 Check for invalid tags when reading a compound tag 2015-12-18 15:20:24 +01:00
Mattes D 749274aa43 Merge pull request #2759 from cuberite/ExplosionAPI 
Revised the explosion-related Lua API and docs.
 2015-12-18 14:32:01 +01:00
Tiger Wang 5b62c4c314 Reorganised the redstone simulator 
-> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan!
* Uses classes and inheritance now
* Speed should be improved
 2015-12-18 13:17:38 +00:00
Mattes D 086c8b1834 Revised the explosion-related Lua API and docs. 
Fixes #2746.
 2015-12-18 12:40:34 +01:00
Mattes D dae27fa9ec Merge pull request #2770 from cuberite/RemoveChunkDataCollector 
Removed unused class cChunkDataCollector.
 2015-12-18 12:39:52 +01:00
Mattes D d135e49451 Removed unused class cChunkDataCollector. 2015-12-18 12:24:47 +01:00
Mattes D c8de191e4d Merge pull request #2758 from cuberite/FastNBTFix 
Fixed String Parsing crash bug
 2015-12-18 12:24:05 +01:00
tycho 9e6161305d Fixed String Parsing crash bug 
Check string length against actual remaining data, not an abitary constant
 2015-12-18 12:08:55 +01:00
Mattes D eb87214f6d Merge pull request #2755 from cuberite/coverage 
Working coverage build
 2015-12-18 12:03:29 +01:00
tycho 91d0abae4c Working coverage build 2015-12-18 11:19:21 +01:00
Mattes D a7d0abcdc1 Merge pull request #2751 from cuberite/PieceStructuresFix 
PieceStructures generator: Fixed wrong merge conflict resolution.
 2015-12-17 19:33:28 +01:00
Mattes D f060d9f9b0 PieceStructures generator: Fixed wrong merge conflict resolution. 
Also improved reporting messages.
Ref.: http://forum.mc-server.org/showthread.php?tid=2256
 2015-12-17 19:33:12 +01:00
Lukas Pioch 1395ff3ca4 Merge pull request #2761 from cuberite/fixed_warnings 
Moved variables into scope, removed unused variables and fixed variables
 2015-12-17 11:37:20 +01:00
Lukas Pioch d620dcdd08 Moved variables into scope, removed unused variables and fixed variables 2015-12-17 10:48:36 +01:00
Safwat Halaby 3c1f9e8a3a Merge pull request #2753 from cuberite/pathFix 
Path fix
 2015-12-16 18:39:23 +02:00
tycho 2c0ca0b4c3 Changed cPath to have a reset method. 
Also reverts "Changed raw cPath to an unique_ptr, fixes memory leak"

This reverts commit 1515d37684.
 2015-12-16 10:49:42 +00:00
worktycho 83418e1d7a Merge pull request #2754 from Gargaj/horsefix 
Allow horse control
 2015-12-15 21:53:23 +00:00
Gargaj 68ff0edfde allow horse control (still quite buggy) 2015-12-15 21:14:27 +01:00
tycho 0fb8646198 Delete copy and move constructors from cPath 
cPath is not safe to copy or move due to pointers into the std::map m_Map.
 2015-12-15 19:18:58 +00:00
Lukas Pioch 2a218b06c2 Merge pull request #2750 from cuberite/wrng 
Fixed warning regarding an uninitialized value
 2015-12-15 18:21:46 +01:00
Julian Laubstein 5af10b8cd3 Fixed warning regarding an uninitialized value 2015-12-15 17:20:34 +01:00
worktycho 5ca4c5272e Merge pull request #2749 from cuberite/wrng 
Fixed warning regarding an uninitialized value
 2015-12-15 16:17:16 +00:00
Julian Laubstein 8d5f4f2160 Fixed warning regarding an uninitialized value 2015-12-15 17:06:32 +01:00
Safwat Halaby a632f39546 Merge pull request #2748 from cuberite/fix_memory_leak 
Changed raw cPath to an unique_ptr, fixes memory leak (Fixes #2745)
 2015-12-15 10:50:40 +02:00
Lukas Pioch 1515d37684 Changed raw cPath to an unique_ptr, fixes memory leak 2015-12-15 01:16:36 +01:00
worktycho 1e5ba8a1bb Merge pull request #2638 from Gargaj/master 
Implement block heights + adapt ground checks
 2015-12-14 20:31:33 +00:00
worktycho 68105777fa Merge pull request #2744 from cuberite/HopperMetaStrip 
Strip meta from hopper on converting to pickup
 2015-12-13 15:59:58 +00:00
Julian Laubstein 378b2b8ca6 Strip meta from hopper on converting to pickup 2015-12-13 15:46:43 +01:00
Gargaj 66e6589883 blockheight mechanism 2015-12-13 15:16:15 +01:00
Safwat Halaby fec522aa03 Merge pull request #2743 from SafwatHalaby/wart 
Set overgrown wart age to 3
 2015-12-13 16:12:39 +02:00
Safwat Halaby 1540867cb5 Set overgrown wart age to 3 2015-12-13 15:55:09 +02:00
Safwat Halaby 417a646d7d Merge pull request #2708 from Gargaj/onuse 
Allow use failures to propagate from the entity/block to the player
 2015-12-13 14:43:53 +02:00
Gargaj f9008a4860 allow use failures to propagate from the entity/block to the player 2015-12-13 13:27:38 +01:00
Safwat Halaby e7fd308ffa Merge pull request #2737 from Gargaj/snowgolem 
Snow golems are supposed to be "neutral"
 2015-12-13 14:27:02 +02:00
Gargaj e31676fe50 snow golems are "neutral" 2015-12-13 13:13:37 +01:00
Safwat Halaby 4a212777cb Merge pull request #2738 from Gargaj/mobinheritance 
Sheep color inheritance
 2015-12-13 14:12:25 +02:00
Gargaj 0eb519b35a sheep color inheritance 2015-12-13 13:04:18 +01:00
Safwat Halaby 2214fdcede Merge pull request #2741 from SafwatHalaby/mTarget2 
Remove stray "return"
 2015-12-13 08:30:18 +02:00