flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
9,843 Commits 1 Branch 0 Tags
87a7d3ec64552f7ab63715656e8ba2b519994d76
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Julian Laubstein 1683179080 Added Server OS section pr template (#3254) 2016-07-06 23:37:49 +03:00
Julian Laubstein cc1e53f7eb Added needed information to Issue template (#3188) 2016-05-15 16:12:44 +03:00
Julian Laubstein 72f8b51cdd Merge pull request #3144 from cuberite/issue-template 
Create ISSUE_TEMPLATE
 2016-04-16 02:12:56 +02:00
Julian Laubstein 43dadad09f Create ISSUE_TEMPLATE 2016-04-16 02:11:55 +02:00
Julian Laubstein 666f3883da Merge pull request #3096 from mathias-github/icons 
Updated icons and logo
 2016-03-29 00:31:58 +02:00
Julian Laubstein a9cfa66e84 Merge pull request #3076 from cuberite/FixHttpAuthFlag 
HTTP: Added missing HasAuth flag initialization.
 2016-03-11 14:30:01 +01:00
Julian Laubstein 50866be74b Merge pull request #3068 from cuberite/FinishHttpResponse 
WebAdmin: Finish HTTP responses.
 2016-03-03 15:59:18 +01:00
Julian Laubstein 1a4f3efabb Merge pull request #3027 from LogicParrot/readmes 
Added testing instructions
 2016-02-19 18:30:20 +01:00
Julian Laubstein 4f05556028 Merge pull request #3020 from cuberite/ice_block 
Don't remove water after ice block has been destroyed
 2016-02-18 08:45:20 +01:00
Julian Laubstein 6fdd7194c8 Merge pull request #2974 from LogicParrot/perl 
Bulk clearing of whitespace
 2016-02-06 11:37:34 +01:00
Julian Laubstein cb28aaface Merge pull request #2960 from LogicParrot/interspecies 
Prevent interspecies breeding
 2016-02-04 20:51:44 +01:00
Julian Laubstein 59e6f2b775 Merge pull request #2942 from mathias-github/master 
Minor update
 2016-02-04 13:48:02 +01:00
Julian Laubstein 57e6fd654b Merge pull request #2936 from mathias-github/master 
Updated old forum links
 2016-01-31 01:54:23 +01:00
Julian Laubstein 1491130a6e Merge pull request #2909 from mathias-github/readme 
Front-end update
 2016-01-28 19:48:34 +01:00
Julian Laubstein b093e8e813 Merge pull request #2901 from birkett/servicefix 
Fix running as a service.
 2016-01-22 09:42:37 +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
Julian Laubstein 2440b9bea1 Merge pull request #2837 from cuberite/FixMonsterBurn 
Fixed the monster burn code.
 2015-12-30 02:40:23 +01:00
Julian Laubstein df9825ac09 Merge pull request #2829 from LogicParrot/fences2 
Deleted cPath::BlockTypeIsFence
 2015-12-27 15:53:05 +01:00
Julian Laubstein c0732cc666 Added ProtoProxy and MCADefrag binaries to .gitignore 2015-12-26 00:19:25 +01:00
Julian Laubstein d319c9dd58 Added IsBlockFence method to defines 2015-12-24 00:05:49 +01:00
Julian Laubstein 2713577dbf Fixed builds on FreeBSD 32bit 2015-12-23 17:13:47 +01:00
Julian Laubstein 3389b234ae Merge pull request #2800 from cuberite/rconbuild-fix 
Removed offending tr1 references.
 2015-12-22 21:19:13 +01:00
Julian Laubstein 5af10b8cd3 Fixed warning regarding an uninitialized value 2015-12-15 17:20:34 +01:00
Julian Laubstein 8d5f4f2160 Fixed warning regarding an uninitialized value 2015-12-15 17:06:32 +01:00
Julian Laubstein 378b2b8ca6 Strip meta from hopper on converting to pickup 2015-12-13 15:46:43 +01:00
Julian Laubstein 2b2e0f3b2c Merge pull request #2720 from cuberite/OreNestsFix 
Fixed opposite condition in OreNests finisher.
 2015-12-09 14:02:50 +01:00
Julian Laubstein d75ab544f4 Small spelling issues fixed 2015-12-08 21:58:53 +01:00
Julian Laubstein f35e5e1d75 Merge pull request #2711 from cuberite/FixFreeBSDBuild 
Use C++11 auto instead of per-platform types.
 2015-12-03 14:58:01 +01:00
Julian Laubstein d6ad5245b3 Merge pull request #2670 from cuberite/OrePockets 
Added OrePockets and DirtPockets finish gens.
 2015-11-25 16:52:32 +01:00
Julian Laubstein 412e5155a2 Merge pull request #2685 from dave-tucker/fxenum 
Add enum for Sound and Particle Effects
 2015-11-24 15:43:05 +01:00
Julian Laubstein 5d5f5c9fba Fixed display of helpmessage 2015-11-23 18:20:37 +01:00
Julian Laubstein 9d07be62d3 Changed static_cast to FloorC 2015-11-23 18:10:58 +01:00
Julian Laubstein b87e0b6b15 Adjusted height validation using cChunkDef::IsValidHeight() 2015-11-23 03:17:32 +01:00
Julian Laubstein 07adddb810 Merge pull request #2678 from cuberite/ln 
Adjusted in help messages for consistency
 2015-11-23 02:48:35 +01:00
Julian Laubstein 2d8b265133 Added dash to helpstring output 2015-11-23 02:12:19 +01:00
Julian Laubstein c32b5fcaa9 Removed dashes in help messages for consistency 2015-11-23 02:12:19 +01:00
Julian Laubstein 0bedfc58b2 Merge pull request #2679 from cuberite/vh 
Added cChunkDef::IsValidWidth()
 2015-11-23 02:09:55 +01:00
Julian Laubstein 62b41c351c Added cChunkDef::IsValidWidth() 2015-11-23 01:30:48 +01:00
Julian Laubstein 2dcc55b6b6 Merge pull request #2663 from SafwatHalaby/minor 
Changed server description to "Cuberite - Minecraft in C++!"
 2015-11-20 09:32:26 +01:00
Julian Laubstein 48f84cc3e9 changed mob age from char to int 2015-11-16 14:13:44 +01:00
Julian Laubstein 62b1d0b772 Merge pull request #2641 from cuberite/worktycho-patch-1 
Blocks outside the world are never solid
 2015-11-13 13:39:16 +01:00
Julian Laubstein 98bac62c07 Added cChunkDef::IsValidHeight() 2015-11-10 19:44:30 +01:00
Julian Laubstein 13f0cfbb3d Merge pull request #2633 from cuberite/IncludeBrewingRecipes 
Added brewing.txt to list of files packed with the windows build.
 2015-11-10 16:26:02 +01:00
Julian Laubstein ec61c918db Merge pull request #2630 from Gargaj/shallowwater 
Fix damage in shallow water (fixes #2622)
 2015-11-10 01:10:34 +01:00
Julian Laubstein cfbb7360cd Merge pull request #2626 from cuberite/worktycho-patch-1 
Fix memory leak
 2015-11-08 23:41:18 +01:00
Julian Laubstein 70f5892056 Merge pull request #2616 from Gargaj/patch-1 
Fix chicken flying
 2015-11-08 22:52:19 +01:00
Julian Laubstein fbd1eb2f44 Merge pull request #2620 from Gargaj/pressureplatesnd 
Add sound to stone pressure plates
 2015-11-08 22:03:42 +01:00
Julian Laubstein da20a8a09b Merge pull request #2611 from Gargaj/chickenfall 
Chickens shouldn't take fall damage [re-pull]
 2015-11-06 11:26:58 +01:00
Julian Laubstein ff7f0afc5f Added ignore=dirty to new submodules 2015-11-05 19:35:42 +01:00
Julian Laubstein 056822845d Merge pull request #2593 from cuberite/enderegg 
Destroy an ender crystal when hit by an egg.
 2015-11-05 18:10:19 +01:00
Julian Laubstein 51e5e6e9a8 Merge pull request #2605 from cuberite/SubmoduleChange 
Outsourced all libraries
 2015-11-05 10:56:20 +01:00
Julian Laubstein 9a7dd0a077 Outsourced all libraries into submodules 2015-11-04 23:25:00 +01:00
Julian Laubstein 235023d3b5 Changed server favicon to more commonly used one 2015-11-03 23:13:17 +01:00
Julian Laubstein 1bc145ff44 Merge pull request #2497 from Seadragon91/brewing 
Implemented brewing
 2015-11-03 22:06:43 +01:00
Julian Laubstein 979ab11044 ReTyped block ids 2015-10-15 10:53:32 +02:00
Julian Laubstein baca82cce7 Merge pull request #2515 from Seadragon91/compiling_file 
Update COMPILING.md
 2015-10-01 10:16:08 +02:00
Julian Laubstein dd5201c29e Some warning fixes 2015-08-18 08:49:00 +02:00
Julian Laubstein d0f1eb1018 Merge pull request #2436 from cuberite/UpdateCompileScript 
Updated compile.sh to use new naming
 2015-08-16 22:55:35 +02:00
Julian Laubstein d06f7f19ce Updated compile.sh 2015-08-16 22:41:31 +02:00
Julian Laubstein 4231dcf7e1 Merge pull request #2435 from artur9010/patch-3 
Update app.yml
 2015-08-16 10:26:59 +02:00
Julian Laubstein 78f869d310 Merge pull request #2430 from cuberite/APIDumpFix 
Readded plugin article
 2015-08-14 10:18:39 +02:00
Julian Laubstein d501dcb70d Readded plugin article 2015-08-14 09:40:44 +02:00
Julian Laubstein 8438cc0611 Merge pull request #2426 from cuberite/APIDumpNameChangeFix 
Fixed a few missing MCServers in APIDump
 2015-08-13 10:35:27 +02:00
Julian Laubstein 24e8edb19c Fixed a few missing MCServers in APIDump 2015-08-13 10:19:24 +02:00
Julian Laubstein cdcc5fe9a7 Merge pull request #2417 from mjhanninen/fix-clang-warnings 
Fix compilation warnings related to implicit and old-style casts
 2015-08-12 17:40:51 +02:00
Julian Laubstein 0958e167e8 Updated APIDump to follow the namechange 2015-08-11 22:48:55 +02:00
Julian Laubstein 171e754a6e Merge pull request #2420 from cuberite/FlushLog 
Flush log file when a warning or error message is output.
 2015-08-08 11:15:48 +02:00
Julian Laubstein d19cde93fa Merge pull request #2412 from cuberite/UnifyComments 
Unified the doxy-comment format.
 2015-07-31 19:26:33 +02:00
Julian Laubstein 41d7119a38 Merge pull request #2400 from cuberite/OffloadBadChunks 
Offload bad chunks
 2015-07-31 14:18:43 +02:00
Julian Laubstein 735d590abf Merge pull request #2371 from SamJBarney/WarningFix 
Warning fixes
 2015-07-29 18:45:36 +02:00
Julian Laubstein 7cb981443e Merge pull request #2383 from cuberite/GoogleTestFix 
Fixed cNetworkSingleton's HasTerminated flag.
 2015-07-23 21:18:16 +02:00
Julian Laubstein 9fba48533f Merge pull request #2295 from bibo38/rabbitcolors 
Added Rabbit Metadata values.
 2015-07-17 17:12:27 +02:00
Julian Laubstein 29d1f37258 Merge pull request #2360 from bibo38/waterfix 
Now Water sources will also be created on top of existing water sources.
 2015-07-16 23:07:24 +02:00
Julian Laubstein 8b74adcfab Merge pull request #2353 from SamJBarney/DyedArmor 
Implements Dyed Leather Armor
 2015-07-15 22:31:48 +02:00
Julian Laubstein 01f90ef97d Merge pull request #2350 from SamJBarney/PeonySnowFix 
Fixed Tall Grass placement
 2015-07-15 19:31:41 +02:00
Julian Laubstein d7b10607d4 Merge pull request #2356 from LO1ZB/ImproveHunger 
Fix food drain on movement.
 2015-07-14 23:16:36 +02:00
Julian Laubstein e92335b669 Merge pull request #2346 from SamJBarney/TreeGrowthUpdate 
Sapling Growth Update
 2015-07-14 16:36:53 +02:00
Julian Laubstein 118aec1198 Merge pull request #2347 from SamJBarney/ClampFix 
Replace min-max combo with Clamp in BioGen
 2015-07-14 00:14:12 +02:00
Julian Laubstein f6f27a139e Merge pull request #2344 from bibo38/make_ptr 
Changed allocation of smart pointers via make_xxx
 2015-07-13 00:54:58 +02:00
Julian Laubstein 9b3b047004 Merge pull request #2330 from cuberite/libraryupdate 
Library update
 2015-07-12 14:46:33 +02:00
Julian Laubstein 5953e0f1c6 Merge pull request #2319 from SamJBarney/master 
Squashed Bonemeal Plant Growth Update
 2015-07-06 23:47:40 +02:00
Julian Laubstein 87a8df7cde Merge pull request #2221 from mc-server/AreaCountBlocks 
cBlockArea: Added CountSpecificBlocks() API function.
 2015-06-08 23:05:49 +02:00
Julian Laubstein 1e6f02437e Merge pull request #2070 from mc-server/PreventNewWarnings 
Fixed a lot of warnings
 2015-05-29 11:08:32 +02:00
Julian Laubstein 4c01fc70ab Merge pull request #2139 from mathias-github/patch-3 
Adding myself to contributors
 2015-05-26 00:26:47 +02:00
Julian Laubstein a6740a335d Merge pull request #2085 from mc-server/EquifaxCerts 
Added Equifax root CA.
 2015-05-21 11:22:55 +02:00
Julian Laubstein 48b7874099 Added missing fencetypes to torchhandler 2015-05-20 23:18:21 +02:00
Julian Laubstein f6cb0e4cb2 Added itemblacklist to gitignore 2014-12-17 23:18:10 +01:00
Julian Laubstein 48470c858b Fixed #1550 2014-10-20 19:36:16 +02:00
Julian Laubstein 4a58ce1df6 Found it! 2014-10-20 16:00:33 +02:00
Julian Laubstein d2cc1e0cd3 Fix for fix #1552 2014-10-20 15:58:08 +02:00
Julian Laubstein c2560cc1be Added error message 2014-10-20 15:08:48 +02:00
Julian Laubstein 1a46feda43 Added error handling to load <plugin> command 2014-10-20 14:46:24 +02:00
Julian Laubstein 3082f0d046 Fixed error with non-const function 2014-10-19 15:11:53 +02:00
Julian Laubstein 403f8581cf Added mechanics placeable on halfslabs 2014-10-19 15:01:01 +02:00
Julian Laubstein b77480b4ef Indentation 2014-09-30 14:05:23 +02:00
Julian Laubstein b2cf4004f8 Set right indentation 2014-09-30 12:45:44 +02:00
Julian Laubstein d731ad37b1 actual solving of the halfslap+torch problem 2014-09-30 12:43:48 +02:00
Julian Laubstein f014d8764b Update BlockTorch.h 2014-09-29 13:17:24 +02:00
Julian Laubstein 0b438b5fe8 Added torches placeable on upside-down-halfslaps 2014-09-29 13:12:50 +02:00
Julian Laubstein 8604dedfdf Update IncrementalRedstoneSimulator.cpp 2014-06-04 10:20:20 +02:00