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

9610 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
worktycho
3805431ddd Merge pull request #2883 from jammet/patch-8 
Update crafting.txt
 2016-01-17 02:05:37 +00:00
jammet
4127d61284 Update crafting.txt 
Added Mossy Cobblestone recipe
 2016-01-17 01:44:52 +01:00
LogicParrot
1379b92edf Fixed wrong knockback direction after explosion damage 2016-01-16 18:48:07 +02:00
LogicParrot
bc4a6ec3ea Merge pull request #2877 from LogicParrot/spawn2 
Fixed non-natural spawning near player (egg, breeding, etc.)
 2016-01-16 17:02:06 +02:00
LogicParrot
dc33276dda Merge pull request #2878 from LogicParrot/wolf2 
Fix crash when tamed wolf is hit by arrows
 2016-01-16 16:58:49 +02:00
LogicParrot
ac2c79f797 Fixed non-natural spawning near player (egg, breeding, etc.) 2016-01-16 16:40:47 +02:00
LogicParrot
8c12227687 Fix crash when tamed wolf is hit by arrows 2016-01-16 16:37:37 +02:00
LogicParrot
5ca2f4fd0c Merge pull request #2875 from LogicParrot/fallDamage 
Fix fall damage crash when tamed wolves neabry
 2016-01-16 11:56:19 +02:00
LogicParrot
0601adba25 Fix fall damage crash when tamed wolves neabry 2016-01-16 11:29:11 +02:00
LogicParrot
1aefef76d9 Merge pull request #2869 from LogicParrot/typos 
compile.sh - 70 columns print limit
 2016-01-13 12:41:06 +02:00
LogicParrot
0affb47c7d compile.sh - 70 columns print limit 2016-01-13 12:12:39 +02:00
Mattes D
4513f88a64 Merge pull request #2868 from bibo38/namelength 
Limited the username length to 16 characters.
 2016-01-13 10:21:48 +01:00
bibo38
41aa7cf123 Limited the username length to 16 characters. 
This fixes a client crash, because Minecraft requires that a username is not longer than 16 characters.
See also: http://minecraft.gamepedia.com/The_Player#Name
Fixes #2545
 2016-01-13 09:55:48 +01:00
LogicParrot
da19b1708c Merge pull request #2867 from LogicParrot/compile2 
compile.sh - Added updating note
 2016-01-13 08:52:00 +02:00
LogicParrot
847ee1ede2 compile.sh - added updating note 2016-01-13 08:48:48 +02:00
LogicParrot
0902d5121c Merge pull request #2864 from LogicParrot/compile 
Made compile.sh more generic
 2016-01-12 20:11:23 +02:00
LogicParrot
c948e852c5 Made compile.sh more generic 
kk
 2016-01-12 19:04:28 +02:00
LogicParrot
6d8a743ba6 Merge pull request #2863 from LogicParrot/spawn 
Do not spawn mobs too close to player
 2016-01-12 16:21:06 +02:00
LogicParrot
e77af000df Do not spawn mobs too close to player 2016-01-12 15:47:13 +02:00
LogicParrot
062b51c822 Merge pull request #2862 from LogicParrot/creeper 
Fixed creeper calling TargetIsInRange with null m_Target
 2016-01-12 15:42:39 +02:00
LogicParrot
3a24ed4b61 Fixed creeper calling TargetIsInRange with null m_Target 2016-01-12 15:26:51 +02:00
Mattes D
0b20d7ab96 Merge pull request #2861 from LogicParrot/hotfix 
Fixed crash introduced by #2821
 2016-01-12 14:25:40 +01:00
LogicParrot
41f2b6c99f Fixed crash introduced by #2821 2016-01-12 15:13:53 +02:00
LogicParrot
d4e99aedb1 Merge pull request #2859 from LogicParrot/attack2 
Fix mob attack interval
 2016-01-12 14:46:02 +02:00
LogicParrot
21df3cb0d8 Fix mob attack interval 2016-01-12 14:20:17 +02:00
LogicParrot
e64790db74 Merge pull request #2860 from LogicParrot/wolfChecks 
Friendly wolf attack safety checks
 2016-01-12 13:41:20 +02:00
LogicParrot
e0f13f9f26 Friendly wolf attack safety checks 2016-01-12 13:27:03 +02:00
LogicParrot
e2a053263f Merge pull request #2857 from LogicParrot/wolf 
AI: Tamed wolf defends owner
 2016-01-12 12:13:36 +02:00
LogicParrot
359e772dee Tamed wolf assists owner (attack / defence) 2016-01-12 11:47:59 +02:00
Mattes D
97ef08de84 Merge pull request #2853 from cuberite/DetailedBlockAreaLogging 
Added detailed logging to cBlockArea::Read() bad Y coords.
 2016-01-12 10:20:35 +01:00
Mattes D
e4adf2f9ae Added detailed logging to cBlockArea::Read() bad Y coords. 
Ref.: http://forum.mc-server.org/showthread.php?tid=2307
 2016-01-12 10:19:44 +01:00
Mattes D
f1ca68051f Merge pull request #2849 from cuberite/export_getseed 
Exported GetSeed to lua and added file extension opendb to .gitignore.
 2016-01-12 10:19:14 +01:00
Lukas Pioch
fe72eaaec2 Exported GetSeed to lua and added file extension opendb to .gitignore. 2016-01-12 10:18:24 +01:00