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

9593 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LogicParrot
ca6ef58b1e Bulk clearing of whitespace 2016-02-05 23:50:18 +02:00
LogicParrot
87a31e3a2d Merge pull request #2972 from marvinkopf/PlayerAutoComplete 
Tab completion for player names now case insensitive.
 2016-02-05 22:42:20 +02:00
LogicParrot
e3fe15ca59 Merge pull request #2954 from kevinr/implement-acacia-block-height 
Implement acacia block height
 2016-02-05 22:32:44 +02:00
Marvin Kopf
0b826b0e52 Tab completion for player names now case insensitive. 2016-02-05 21:27:31 +01:00
Alexander Harkness
ac5170c7c4 Correct typo in documentation. 2016-02-05 16:45:55 +00:00
Julian Laubstein
cb28aaface Merge pull request #2960 from LogicParrot/interspecies 
Prevent interspecies breeding
 2016-02-04 20:51:44 +01:00
LogicParrot
6661e5d27f Prevent interspecies breeding 2016-02-04 20:44:55 +02:00
Julian Laubstein
59e6f2b775 Merge pull request #2942 from mathias-github/master 
Minor update
 2016-02-04 13:48:02 +01:00
LogicParrot
c3a4373ac5 Merge pull request #2955 from LogicParrot/worldBackwards 
Fix unexpected world creation introduced by #2821
 2016-02-04 10:43:54 +02:00
LogicParrot
8f7d929140 Fix unexpected world creation introduced by #2821 2016-02-04 10:06:07 +02:00
LogicParrot
7767acdc4b Merge pull request #2939 from LogicParrot/m_Target 
cMonster::m_target safety across worlds
 2016-02-04 09:20:08 +02:00
Kevin Riggle
6fea4a617f add self to CONTRIBUTORS 2016-02-04 01:21:53 -05:00
Kevin Riggle
e4a8c681b0 implement height logic for Acacia blocks 2016-02-04 01:20:31 -05:00
LogicParrot
4aade202e0 cMonster::m_Target safety across worlds 2016-02-03 22:50:17 +02:00
LogicParrot
a5403c8976 Merge pull request #2941 from LogicParrot/chunkBug2 
[Attempt 2] Fixed cChunk::m_Entities corruption upon world travel
 2016-02-03 20:19:11 +02:00
Mathias
9460e3b2cd Minor update 2016-02-02 23:16:44 +02:00
LogicParrot
fd91932a8b Merge pull request #2903 from marvinkopf/FixTabAutoComplete 
Fix TabAutoComplete
 2016-02-02 22:14:22 +02:00
Marvin Kopf
9840cc8218 Fix TabAutoComplete 
For tab on '/command s' the server now returns 'subcommand' instead of '/command subcommand'.
 2016-02-02 18:59:50 +01:00
LogicParrot
a8599efd77 Merge pull request #2908 from marvinkopf/FixMineCartSpeed 
Fix cPawn push logic
 2016-02-02 19:40:03 +02:00
LogicParrot
07b7fd4ad3 Fixed cChunk::m_Entities corruption upon world travel 2016-02-02 17:55:00 +02:00
Marvin Kopf
a1c48f4853 Fix cPawn pushing 
cPawn instances can no longer push an entity they are attached to. cEntity now has a IsAttachedTo method.
 2016-02-02 14:57:20 +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
Mathias
89f3dec7ac Updated old forum links 2016-01-31 02:25:03 +02:00
Alexander Harkness
b5437c9a77 Merge pull request #2913 from mathias-github/master 
MCServer to Cuberite
 2016-01-30 16:01:19 +00:00
Mathias
752d99c8b8 MCServer to Cuberite 2016-01-29 21:47:00 +02:00
LogicParrot
d9e4eaa2a6 Merge pull request #2910 from LogicParrot/posix 
compile.sh - posix-compatible program existence checking
 2016-01-29 19:42:29 +02:00
LogicParrot
08b4363330 compile.sh - posix-compatible program existence checking 2016-01-29 18:57:21 +02:00
Julian Laubstein
1491130a6e Merge pull request #2909 from mathias-github/readme 
Front-end update
 2016-01-28 19:48:34 +01:00
Mathias
152c7c064a Front-end update 2016-01-28 20:01:42 +02:00
Mattes D
24c418b2b6 Merge pull request #2907 from cuberite/LuaNoSslVerify 
LuaTcpSsl: Disabled cert verification due to missing CA chain.
 2016-01-24 17:22:49 +01:00
Mattes D
a62e7ff2c2 LuaTcpSsl: Disabled cert verification due to missing CA chain. 2016-01-24 17:22:05 +01:00
Mattes D
15a20a2767 Merge pull request #2899 from cuberite/FixHttpParsing 
Fixed HTTP parsing when in insecure mode.
 2016-01-22 23:34:46 +01:00
Mattes D
f14c6d3c7e Fixed HTTP parsing when in insecure mode. 
Parsing would ignore the size of data already buffered, resulting in bad_alloc exception.
Fixes #2898.
 2016-01-22 23:33:18 +01:00
LogicParrot
7ba432b338 Merge pull request #2882 from LogicParrot/wolfSpread2 
Improved tamed wolf pack cooperation and projectile reactions
 2016-01-22 21:52:49 +02:00
LogicParrot
439b3304f4 Improved tamed wolf pack cooperation and projectile reactions 2016-01-22 21:16:27 +02:00
LogicParrot
30b95fcc4e Merge pull request #2894 from LogicParrot/spider 
Spiders now friendly at daylight, new cChunk functions
 2016-01-22 20:53:34 +02:00
Julian Laubstein
b093e8e813 Merge pull request #2901 from birkett/servicefix 
Fix running as a service.
 2016-01-22 09:42:37 +01:00
Anthony Birkett
d75168ca03 Fix running as a service. 
Two problems identified, both traced to commit 4315a11

(main.cpp) ParseArguments() was no longer being called before checking cRoot::m_RunAsService.
This led to m_RunAsService never being set (we use -d on the command line to instigate a service start).

(Root.cpp) Terminate events were being ignored when running as a service.
We only need to ignore the cin.good() call, not terminate events as a whole.
 2016-01-21 16:38:13 +00:00
LogicParrot
d344e574de Spiders now friendly at daylight, new cChunk functions 2016-01-21 08:21:29 +02:00
LogicParrot
85e534b745 Merge pull request #2895 from LogicParrot/readme 
Readme update - compile.sh works for *nix
 2016-01-18 11:54:39 +02:00
LogicParrot
31e0132c10 Readme update - compile.sh works for *nix 2016-01-18 11:54:16 +02:00
LogicParrot
c0d842bcc8 Merge pull request #2884 from LogicParrot/sort 
Sorted .ini and .txt files alphabetically
 2016-01-18 11:04:38 +02:00
worktycho
7ca191baf6 Merge pull request #2871 from cuberite/seadragon91-patch1 
Fixed race conditions
 2016-01-17 19:42:05 +00:00
Lukas Pioch
e1ba104359 Fixed race conditions 2016-01-17 20:11:37 +01:00
LogicParrot
9c1cb488db Merge pull request #2887 from LogicParrot/water 
Use IsBlockWater in cPath
 2016-01-17 13:36:03 +02:00
LogicParrot
18a8caaf6d Use IsBlockWater in cPath 2016-01-17 12:52:00 +02:00
LogicParrot
67cd1b3b41 Merge pull request #2885 from SteveWinfield/master 
No second spawn broadcast necessary
 2016-01-17 12:44:13 +02:00
WinfieldSteve
d7bc866c7c No second spawn broadcast necessary 2016-01-17 11:23:42 +01:00
LogicParrot
d0f815a64f Alphabetically sorted configuration files 2016-01-17 11:39:54 +02:00
LogicParrot
c177a528e5 Merge pull request #2881 from LogicParrot/knockback 
Fixed wrong knockback direction after explosion damage
 2016-01-17 10:16:47 +02:00