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

9772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias
9c3b88d663 Fixed melon block recipe 2016-03-14 19:36:46 +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
Mattes D
72467fe0d4 HTTP: Added missing HasAuth flag initialization. 2016-03-11 10:44:35 +01:00
Mattes D
39144480f5 Merge pull request #3069 from cuberite/FixHttpHeaderParsing 
HTTP: Fixed header parsing.
 2016-03-03 16:37:39 +01:00
Mattes D
6f174b99bf HTTP: Fixed header parsing. 2016-03-03 16:20:11 +01:00
Julian Laubstein
50866be74b Merge pull request #3068 from cuberite/FinishHttpResponse 
WebAdmin: Finish HTTP responses.
 2016-03-03 15:59:18 +01:00
Mattes D
4bf2dd2d2b WebAdmin: Finish HTTP responses. 2016-03-03 13:46:45 +01:00
Mattes D
c815d03eb4 Merge pull request #3060 from tonibm19/master 
Fixed horse bug
 2016-03-01 20:07:11 +01:00
tonibm19
27968aa958 fixed horse bug 
horse could be "controlled" without a saddle or being tamed
 2016-03-01 19:52:21 +01:00
Mattes D
7cc8f8dd22 Merge pull request #3031 from cuberite/RenameHttpClasses 
Refactor HTTP parsing
 2016-03-01 16:58:43 +01:00
Mattes D
6ff389f6d4 HTTP: Fixed typos and bad leftovers. 2016-03-01 16:20:00 +01:00
Mattes D
71a1fa81f0 Renamed HTTPResponse to HTTPOutgoingResponse. 2016-03-01 16:19:59 +01:00
Mattes D
52d18b4559 WebAdmin uses the new HTTP parser framework. 2016-03-01 16:19:58 +01:00
Mattes D
12d95ab047 HTTP: Fixed response parser, unified API. 2016-03-01 16:19:58 +01:00
Mattes D
52c5ce6598 Fixed HTTP parsing when in insecure mode. 
Parsing would ignore the size of data already buffered, resulting in bad_alloc exception.
Fixes #2898.
 2016-03-01 16:19:57 +01:00
Mattes D
1d05fc95ae Added unit test for parsing HTTP request. 2016-03-01 16:19:57 +01:00
Mattes D
fea556ca1b Renamed HTTPServer folder to HTTP. 
It contains client code as well.
 2016-03-01 16:19:56 +01:00
Mattes D
fce68dc8f3 Added HTTPResponseParser. 2016-03-01 16:19:56 +01:00
Mattes D
b92346e3cc Moved cHTTPRequest to a separate file, renamed to cHTTPRequestParser. 2016-03-01 16:19:55 +01:00
Mattes D
2dbc54a148 Renamed the HTTP classes to indicate they're for server. 2016-03-01 16:19:55 +01:00
Mattes D
48532d86cf Merge pull request #3057 from tonibm19/master 
Mobs no longer spawn at the top of the nether.
 2016-03-01 12:45:43 +01:00
tonibm19
91072e1d62 Mobs no longer spawn at the top of the nether. 
I don't really know if this is the right place for the check, but it
works.

Add bedrock check

fix typo

Using code provided by NiLSpace and fixed a horse's bug

-Horses can no longer be "controlled" if they're not tamed and saddled

removed unrelated horse code

Fixed mobs spawning above bedrock
 2016-03-01 12:07:46 +01:00
Alexander Harkness
f9258892d1 Merge pull request #3040 from Woazboat/master 
Added more information about contributing to Cuberite
 2016-02-27 10:07:05 +00:00
Woazboat
f8ef939a8a Added more information about contributing to Cuberite 2016-02-26 21:18:13 +01:00
Mattes D
7f76c7f362 Merge pull request #3052 from cuberite/FixIntGens 
Fix int gens
 2016-02-24 21:29:38 +01:00
Mattes D
be9f24d942 Fixed LinearUpscale's bounds checking. 2016-02-24 14:57:36 +01:00
Mattes D
4457110579 Made ProtIntGen's max size compile-time-configurable. 2016-02-24 14:57:35 +01:00
Mattes D
191140dd5e Removed old and wrong code from Globals.h. 2016-02-24 14:57:34 +01:00
Mattes D
1540f8fb5e Fixed includes in IntGen. 2016-02-24 14:57:33 +01:00
LogicParrot
3c671b9c23 Merge pull request #3044 from LogicParrot/chunkRemove 
Fixed removing entities from parent chunks
 2016-02-23 16:05:39 +02:00
LogicParrot
8077c49593 Fixed removing entities from parent chunks 2016-02-22 10:30:24 +02:00
Mattes D
81e80f6edb Merge pull request #2897 from cuberite/FlushLuaSsl 
LuaTCPLink: Report data received via SSL just before connection closed.
 2016-02-21 12:25:43 +01:00
Mattes D
98d3bdebb4 LuaTCPLink: Report data received via SSL just before connection closed. 2016-02-21 10:44:34 +01:00
Tiger Wang
4909e271fa Merge pull request #3035 from marvinkopf/hotfix-parentchunk 
Hotfix: Add check if entity is in chunk before changing tick status
 2016-02-21 00:32:38 +00:00
Marvin Kopf
f9506f6405 Add check if entity is in chunk before changing tick status 2016-02-21 00:07:58 +01:00
Alexander Harkness
fa0159b082 Merge pull request #3032 from cuberite/3030-fix 
Fix #3030
 2016-02-20 20:11:03 +00:00
Alexander Harkness
e628908a7d Fix #3030 
Logicparrot's instructions
 2016-02-20 18:42:43 +00: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
Alexander Harkness
7901b9b80a Merge pull request #3029 from mathias-github/master 
Added BACKERS to list of files in Windows build
 2016-02-19 20:45:11 +00:00
Tyler Encke
f29908ce77 Stop Wolf from following player when he is flying 
Check to make sure player is not flying before allowing wolf to move to player.

Fixed isFlying to IsFlying
 2016-02-19 13:07:07 -05:00
Julian Laubstein
1a4f3efabb Merge pull request #3027 from LogicParrot/readmes 
Added testing instructions
 2016-02-19 18:30:20 +01:00
Mathias
f1af280202 Added BACKERS to list of files in Windows build 2016-02-19 18:11:30 +02:00
LogicParrot
5e182a01f7 Added testing instructions 2016-02-19 15:41:24 +02:00
LogicParrot
a776337e5e Merge pull request #2986 from LogicParrot/entityDestroy_approach4 
[Queue approach] Fix entity destruction in unticking chunks
 2016-02-19 10:58:35 +02:00
LogicParrot
83459d0d89 Proper entity destruction in non-ticking chunks 2016-02-19 07:05:22 +02: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
Lukas Pioch
dc4ea39755 Don't remove water after ice block has been destroyed 2016-02-18 08:16:34 +01:00
LogicParrot
f4049d8eaa Merge pull request #3009 from marvinkopf/pushing 
[WIP] Fix minecart entity collision
 2016-02-17 10:01:22 +02:00
Marvin Kopf
f96903c661 Fix minecart entity collision 
* Minecarts no longer handle a collision if the entity is behind them.
* Minecarts will leave the pushing after a collision on a straight rail to the entity.
 2016-02-16 17:02:05 +01:00
LogicParrot
7d09fcbd2f Merge pull request #3010 from LogicParrot/stringFix 
Fix unicode handling in StringUtils::TrimString
 2016-02-16 17:26:18 +02:00