flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
11,300 Commits 1 Branch 0 Tags
028a5735c5f98aa10718c94de07d2f4b4c1fa6b3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
worktychoandLukas Pioch 832298e7aa Add command line argument for disabling the logfile 2017-06-03 21:40:35 +02:00
worktycho 4495dd62b9 Merge pull request #3026 from iam10K/master 
Stop Tamed Wolf from following player when he is flying
 2016-02-19 22:08:41 +00:00
worktycho 7ca191baf6 Merge pull request #2871 from cuberite/seadragon91-patch1 
Fixed race conditions
 2016-01-17 19:42:05 +00:00
worktycho 3805431ddd Merge pull request #2883 from jammet/patch-8 
Update crafting.txt
 2016-01-17 02:05:37 +00: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
worktycho 5593db13eb Merge pull request #2847 from cuberite/FixClangWarnings 
Fixed Clang warnings.
 2016-01-07 01:31:27 +00: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
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
worktycho 1221f80d98 Merge pull request #2808 from cuberite/freebsd32fix 
Fixed builds on FreeBSD 32bit
 2015-12-23 16:34:23 +00:00
worktycho 10c2d84198 Merge pull request #2807 from cuberite/UpdateLibEvent 
Updated LibEvent.
 2015-12-23 16:05:17 +00:00
worktycho 76cd723867 Added GeoTrust Root Certificate 2015-12-22 16:08:02 +00:00
worktycho ecb94e0dc6 Ignore == if followed by \ 
Ignore the space before == rule if immediately followed by a \. If it is imediatly followed by a \, then this is likely the base64 padding at the end of a certificate, which is followed by \n.
 2015-12-22 16:08:02 +00:00
tychoandMattes D 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
tychoandMattes D d01562cb7d Use atomic bool for isthread terminate 2015-12-19 19:29:06 +01:00
worktycho 1ee61c4f23 Fix off by two error in ReadString 2015-12-18 15:53:41 +00:00
tychoandMattes D 456253c651 Check for invalid tags when reading a compound tag 2015-12-18 15:20:24 +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
tychoandMattes D 91d0abae4c Working coverage build 2015-12-18 11:19:21 +01: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
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
worktycho 5ca4c5272e Merge pull request #2749 from cuberite/wrng 
Fixed warning regarding an uninitialized value
 2015-12-15 16:17:16 +00: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
worktycho afb9ea126c Merge pull request #2721 from bmintz/patch-1 
Put the entire "automatic compile" script in a code block for security
 2015-12-11 00:22:20 +00:00
worktycho a5ff59d6b6 Merge pull request #2694 from SafwatHalaby/documentation 
Update COMPILING.md
 2015-12-04 12:40:02 +00:00
worktycho 5f2c226e1a Merge pull request #2687 from Gargaj/signfix 
Fix escaped characters in signs
 2015-11-24 21:15:13 +00:00
worktycho 2d408e8647 Merge pull request #2645 from Gargaj/followedarray 
Allow multiple followable items
 2015-11-23 22:57:59 +00:00
worktycho dd7572925b Merge pull request #2661 from tboerger/musl-fixes 
Musl fixes
 2015-11-19 22:42:16 +00:00
worktycho 98d4695e58 Fix musl + clang 3.6 compile error 2015-11-19 21:32:13 +00:00
worktycho 3955742e2f Merge pull request #2451 from cuberite/mobchartoint 
Changed mob age from char to int
 2015-11-17 10:35:03 +00:00
worktycho 09fe9ab6a9 Merge pull request #2642 from SamOatesPlugins/master 
Improved spawn location calculations.
 2015-11-15 14:34:50 +00:00
worktycho 5f34097ab3 Blocks outside the world are never solid 
Fixes #2539
 2015-11-13 11:50:21 +00:00
worktycho c001a99a68 Merge pull request #2632 from Gargaj/patch-1 
Avoid reading out of bounds
 2015-11-11 11:20:36 +00:00
worktycho 951569faaa Merge pull request #2634 from cuberite/vh 
Added cChunkDef::IsValidHeight()
 2015-11-10 21:19:57 +00:00
worktycho ef1b82a33d Merge pull request #2631 from Gargaj/divby0 
Avoid division by zero
 2015-11-10 17:33:04 +00:00
worktycho 0a1751d2d8 Merge pull request #2629 from Gargaj/slabfix 
Remove slab from inventory when using it on another slab (fixes #2610)
 2015-11-09 21:37:40 +00:00
worktycho 1e93d2f73c Merge pull request #2625 from Gargaj/chilloutyo 
Neutral mobs should be neutral
 2015-11-09 10:37:26 +00:00
worktycho 171867009e Fix memory leak 
Fixes CID 132249
 2015-11-08 22:34:52 +00:00
worktycho a1926ca16e Merge pull request #2615 from Gargaj/cavespider-attack 
Fix cavespider poisoning even if attack is in cooldown
 2015-11-08 22:08:40 +00:00
worktycho 059f6ec1e5 Use .travis.yml to whitelist coverity_scan for push builds. 2015-11-08 21:20:55 +00:00
worktycho f3d3c9adca Merge pull request #2624 from Gargaj/patch-2 
Only send creeper metadata updates on change
 2015-11-07 21:29:41 +00:00
worktycho e85082d2f1 Merge pull request #2609 from bibo38/slimeblock 
Slimeblock implementation
 2015-11-07 18:45:59 +00:00
worktycho 74b6ff8f90 Merge pull request #2621 from Gargaj/pressureplatepower 
Fix pressure plate power levels
 2015-11-07 18:42:40 +00:00
worktycho 7dae50fc14 Merge pull request #2618 from Gargaj/deadmeansdead 
Fix mobs firing when already dead
 2015-11-07 13:26:31 +00:00
worktycho 4a01e486e3 Merge pull request #2617 from Gargaj/pushcomestoshove 
Implement pushing/shoving
 2015-11-07 13:26:11 +00:00
worktycho 47604cd914 Merge pull request #2591 from cuberite/chunkprepare-deadlock 
Fix deadlock, resolves #2521
 2015-11-03 00:23:45 +00:00
worktycho 2c5c4fa03d Merge pull request #2586 from bibo38/drownpotion 
Implemented the Water Breathing Potion functionality.
 2015-11-01 14:20:13 +00:00
worktycho 183284a2a4 Removed unused typedef 2015-10-12 15:02:25 +01:00
worktycho 1a572e6611 Merge pull request #2535 from cuberite/FixGitQueries 
Added WORKING_DIRECTORY specification to git queries used in CMake.
 2015-10-09 10:38:23 +01:00
tycho d8c860ae58 Improved the data structure for storing loaded chunks 
Should significantly increase the performance of deciding which chunks to stream
 2015-10-05 16:20:07 +01:00
worktycho 0786fda18b Merge pull request #2522 from cuberite/FixLoaderGenRaceCondition 
Fixed a race condition between chunk loader and generator.
 2015-10-04 14:55:42 +01:00
tychoandMattes D e1d5e5e165 Improved types of utf 16 strings 2015-10-02 17:26:53 +02:00
tychoandMattes D 899955f9e3 Remove a pair of unused broken functions 2015-10-02 17:26:53 +02:00
worktycho 9889664ffa Merge pull request #2511 from cuberite/BottomLayerSpawn 
The bottom layer cannot hold a valid spawn point
 2015-10-01 15:23:49 +01:00
worktycho dacab890cc The bottom layer cannot hold a valid spawn point 
Fixes #2510
 2015-10-01 14:49:26 +01:00
worktycho b035a7fd95 Merge pull request #2512 from cuberite/AppveyorFix 
Let appveyor decide what OS to use
 2015-09-29 20:08:15 +01:00
worktycho c76a89fbec Merge pull request #2508 from cuberite/LogLuaMemoryStats 
Added LuaState tracker and memory stats logging.
 2015-09-29 13:32:30 +01:00
worktycho a59800ca0c Merge pull request #2507 from cuberite/LuaStrictStrings 
Made Lua API check strings strictly.
 2015-09-28 14:15:06 +01:00
worktycho 30849b056f Merge pull request #2505 from cuberite/SettableWeather 
Added weather intervals to world.ini settings.
 2015-09-28 00:20:19 +01:00
worktycho 11c1686092 Merge pull request #2465 from electromatter/master 
Added BungeeCord support for Protocol18x
 2015-09-27 14:24:15 +01:00
worktycho 335374376b Merge pull request #2495 from Seadragon91/clang-3.7 
Maked it compileable for clang-3.7
 2015-09-25 16:45:11 +01:00
tycho b4f934b808 fixed cast 2015-09-24 15:54:32 +01:00
tycho 6e86d20f73 Add new "ForEach" function: ForEachLoadedChunk. 2015-09-24 15:54:32 +01:00
worktycho 87489dc308 Merge pull request #2488 from cuberite/ChatFlag 
Refactored cProtocol Chat handling
 2015-09-21 13:30:17 +01:00
tycho fd7b87741a Refactored cProtocol Chat handling 2015-09-21 12:32:56 +01:00
tychoandMattes D 3c5ba56aba Ignore Sigpipe 2015-09-19 21:37:07 +02:00
tycho a0519a487a Fixed wrong assumtion regarding RemoveClient 
Remove client can be called with a client that is not present in the chunk
 2015-09-19 19:34:20 +01:00
worktycho 553c695fd2 Merge pull request #2484 from cuberite/clientPerformance 
Fixed erase
 2015-09-19 02:37:12 +01:00
tycho 49724cd427 Fixed erase 2015-09-19 00:32:08 +01:00
tycho dd168b0e8b Removed a significant performance issue. 
Iterating through the list of clients in chunks was taking up a significant
amount of time with larger numbers of clients due to processor stalls.
Changing the data structure to a vector fixed the issue.
 2015-09-18 16:27:32 +01:00
worktycho 2598f3158f Merge pull request #2480 from cuberite/CircleCiCheckBasicStyle 
Added CircleCI for stylechecking.
 2015-09-17 13:32:01 +01:00
tycho 3187dbf0aa Increase robustness of the logging subsystem 2015-09-15 16:19:49 +01:00
worktycho 63b65c19ef Merge pull request #2424 from cuberite/CompileMSVC2015 
Compile MSVC2015
 2015-08-10 20:12:06 +01:00
worktycho c638b76828 Merge pull request #2351 from SamJBarney/TorchStairFix 
Torches can now be placed on top of upside down stairs.
 2015-07-14 07:55:36 +01:00
worktycho 106e06617a Merge pull request #2224 from cuberite/ChunkQueueCollapsing 
Chunk queue collapsing: MK II
 2015-07-04 14:43:00 +01:00
worktycho fa100d9345 Merge pull request #2312 from SamJBarney/master 
Fixes grass dying at night
 2015-07-03 20:44:03 +01:00
worktycho 11cf88b872 Merge pull request #2306 from cuberite/FixNeighborChangedLoop 
Added neighbor specification in the OnNeighborChanged() block callback.
 2015-07-01 10:39:46 +01:00
worktycho 49d88ae790 Merge pull request #2303 from cuberite/RemoveObsoleteScript 
Removed the MakeLuaAPI script.
 2015-06-30 14:05:05 +01:00
worktycho 351110fa3c Merge pull request #2304 from cuberite/FixBlockAreaHeight 
BlockArea: Fixed a crash with areas higher than chunk height.
 2015-06-30 14:04:31 +01:00
tycho 257011b440 use atomic for state, to avoid torn reads 2015-06-27 12:10:24 +01:00
worktycho acec8c5a83 Merge pull request #2294 from bibo38/horsefix 
Now Horses spawn with correct data values.
 2015-06-26 19:16:14 +01:00
worktycho 0a7c54261f Merge pull request #2241 from lkolbly/master 
Work on NetherPortalScanner. Setup portal scanner to reset PortalCool…
 2015-06-26 14:12:29 +01:00
worktycho 7187c00342 Merge pull request #2282 from Haxi52/button-fixes 
Button fixes
 2015-06-25 15:46:33 +01:00
worktycho fc2834e74b Merge pull request #2291 from bibo38/doorfix 
Doors now get placed on the server-side.
 2015-06-25 14:33:13 +01:00
worktycho 744513f604 Merge pull request #2289 from cuberite/HangingFix 
Added a forgotten break in cHangingEntity constructor.
 2015-06-24 13:01:46 +01:00
tycho b02b262a7c Call Neighbour changed handlers when a melon is created 
Should prevent cascading farmland updates on breaking melons
 2015-06-23 21:27:37 +01:00
worktycho c0d8a4933e Merge pull request #2284 from cuberite/FixBiomeGen 
Generate biomes when pregenerating heights through CompositedHeiGen.
 2015-06-23 17:26:39 +01:00
worktycho ccd290bc72 Merge pull request #2285 from cuberite/MelonFix 
Melon fix
 2015-06-23 17:10:49 +01:00
worktycho 532c80b6db Merge pull request #2280 from SamJBarney/master 
Rebased version of Code for Grass Growth Fix
 2015-06-22 19:53:13 +01:00
worktycho 0096327c4f Merge pull request #2269 from cuberite/CustomVillages 
Added basic support for loading village prefabs from files.
 2015-06-21 12:08:34 +01:00
worktycho 33d68572a6 Merge pull request #2255 from cuberite/LoadablePieces 
Loadable pieces
 2015-06-19 19:41:28 +01:00
tycho 6687ed03a1 Removed version 29 serilization 
This has been unused since support for <1.7 has been dropped.
 2015-06-16 10:24:06 +01:00
tycho b259ab53fb Fixed override 
This was causing a compile error in clang 3.6
 2015-06-15 18:03:54 +01:00
worktycho 0cd64ab90b Fixed tigers format string 2015-06-14 13:18:01 +01:00
worktycho d961693020 Merge pull request #2237 from lkolbly/master 
Fixing how village doors are generated in 1.8.
 2015-06-13 21:55:36 +01:00
worktycho adfbc42c02 Revert "Chunk queue collapsing" 2015-06-07 20:45:47 +01:00
tycho 74e7f8fb53 Disable column metadata 2015-06-06 13:22:56 +01:00
worktycho 54c1926a3a Merge pull request #2205 from birkett/master 
Daemon support on Linux
 2015-06-05 22:33:49 +01:00