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

9946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
LogicParrot
f405c8820e Fix unicode handling in StringUtils::TrimString 2016-02-16 16:58:27 +02:00
Tiger Wang
3c272b55ea Merge pull request #2985 from marvinkopf/poweredrail 
Update RedstoneSimulator to delete unused cached PowerData
 2016-02-09 22:02:50 +00:00
Marvin Kopf
af514acd8c Update RedstoneSimulator to delete unused cached PowerData 
When a new block was placed that has a corresponding RedstoneHandler the PowerData for the position was cached, but never deleted and remained unchanged when the block got destroyed. The RedstoneSimulator now erases all cached PowerData for positions where the block doesn't have a RedstoneHandler (i.e. Air).
 2016-02-09 22:19:29 +01:00
LogicParrot
6504ce0c84 Merge pull request #2996 from LogicParrot/message2 
Add forum link to linkage error message
 2016-02-09 10:16:29 +02:00
LogicParrot
3fb32a5535 Write to console when autofixing linkages 2016-02-09 10:02:36 +02:00
LogicParrot
f3e0a5f656 Add forum link to linkage error message 2016-02-09 09:30:22 +02:00
LogicParrot
ce11880a98 Merge pull request #2995 from LogicParrot/message 
Improve world linkage error message
 2016-02-09 00:43:54 +02:00
LogicParrot
91fd275c0b Improve world linkage error message 2016-02-09 00:40:26 +02:00
LogicParrot
efa670dacb Merge pull request #2989 from LogicParrot/blockBreak 
Prevent player falling when block breaking is denied
 2016-02-08 17:16:33 +02:00
LogicParrot
816dee285f Merge pull request #2992 from LogicParrot/posix 
Remove nproc to allow BSD compilation
 2016-02-08 14:31:52 +02:00
LogicParrot
945d3f6343 Remove nproc to allow BSD compilation 2016-02-08 14:31:33 +02:00
LogicParrot
6e269de274 Prevent player from falling when block breaking is denied 2016-02-08 14:10:51 +02:00
LogicParrot
bcbfd3348d Merge pull request #2990 from LogicParrot/defaultWorld 
Add DefaultWorld to newly generated INI
 2016-02-08 12:49:20 +02:00
LogicParrot
345eec5a2e Merge pull request #2962 from LogicParrot/createAndInitialize 
[PhantomWorlds - 5] Remove CreateAndInitializeWorld
 2016-02-08 12:35:15 +02:00
LogicParrot
dd34243521 Add DefaultWorld to newly generated INI 2016-02-08 12:26:21 +02:00
LogicParrot
3efdfca61d remove cWorld::createAndInitializeWorld 2016-02-08 12:17:10 +02:00
LogicParrot
ed97946bb9 Merge pull request #2961 from LogicParrot/enforce 
[PhantomWorlds - 4] Prevent server from starting if there's bad world linkage
 2016-02-08 11:57:57 +02:00
LogicParrot
8fd2cb5db2 Merge pull request #2953 from LogicParrot/worldRebuild 
[PhantomWorlds - 3] Regenerate worlds with proper dimension types and linkages
 2016-02-08 11:57:42 +02:00
LogicParrot
aefacbd3cd Merge pull request #2969 from LogicParrot/ini 
Ignore trailing and leading spaces in INI values
 2016-02-08 00:33:16 +02:00
Tiger Wang
f76a964f65 Merge pull request #2981 from Drahoslav7/master 
Fix Pickups of BlockFlower
 2016-02-07 14:27:34 +00:00
LogicParrot
837b3a6cdf Merge pull request #2978 from cuberite/checker 
Style checker - Prevent whitespace-only lines
 2016-02-07 08:33:36 +02:00
Drahoslav Bednář
d85c3590fc Fix Pickups of BlockFlower 
BlockMeta is handled correctly, when converting to pickups, so flowers
now drops right flower type.
 2016-02-06 22:04:00 +01:00
LogicParrot
0709f76478 Style checker - Prevent whitespace-only lines 2016-02-06 19:07:03 +02:00
Julian Laubstein
6fdd7194c8 Merge pull request #2974 from LogicParrot/perl 
Bulk clearing of whitespace
 2016-02-06 11:37:34 +01:00
LogicParrot
2b81759bdc Merge pull request #2958 from LogicParrot/fence 
Pathfinder now properly treats nonsolids above fence
 2016-02-06 10:25:06 +02:00
LogicParrot
96f9afa278 Proper world linkages and dimension types for newly created world.ini's 2016-02-06 10:18:13 +02:00