flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
10,981 Commits 1 Branch 0 Tags 92 MiB
fa917259a5
Commit Graph

558 Commits

Author SHA1 Message Date
Alexander Harkness
9ad87f670b Fixed GitHuB WebEdit fail. 2014-04-10 15:52:00 +01:00
Alexander Harkness
2d02ff1df8 Update Monster.cpp 2014-04-10 15:50:43 +01:00
Mattes D
e7b8e17746 Merge pull request #849 from mc-server/minorfixes 
Minor fixes
 2014-04-02 21:26:45 +02:00
Tycho
b449ad8613 Merge branch 'MacFixes' 
Conflicts:
	src/DeadlockDetect.cpp
	src/World.cpp
 2014-04-02 06:54:57 -07:00
Tiger Wang
ef48b30baa Final realisation of suggestions 2014-03-31 22:37:05 +01:00
Tiger Wang
0836fe9a84 Fixed a few Y too high/low asserts 2014-03-31 20:33:33 +01:00
Samuel Barney
eb3cc729d4 More fixes to get it to compile for me on Mac 10.9. Mostly just newline additions, but some of the unused variables were causing errors, so I wrapped them in #ifndef __APPLE__ calls, since I didn't know if they were going to be used in the future. 
Also had to undefine TOLUA_TEMPLATE_BIND a couple of times.
 2014-03-25 11:15:05 -06:00
andrew
c8445cd934 Fixed clang compilation 2014-03-25 11:40:54 +02:00
andrew
ba42166411 Fixed wither summoning 2014-03-25 11:13:27 +02:00
andrew
0fe1e50ffc Protocol: Wither metadata 2014-03-25 10:32:58 +02:00
andrew
4f3377bbbf Minor fixes 2014-03-25 09:10:55 +02:00
andrew
6b77dc74ad Wither invulnerability 2014-03-24 12:29:19 +02:00
madmaxoft
89027cb675 Fixed double to float conversions. 2014-03-16 22:00:28 +01:00
andrew
b4bf13aa4f Unified Vector classes 2014-03-11 16:02:25 +02:00
Tiger Wang
c2978a3457 Merge branch 'master' into ballisticmissiles 
Conflicts:
	src/ClientHandle.cpp
 2014-03-09 12:53:50 +00:00
andrew
070d483236 cBlockInfo now manages the respective cBlockHandler 2014-03-02 21:25:05 +02:00
Mattes D
b17d04737d Merge pull request #738 from xdot/master 
Refactored global block property arrays
 2014-03-02 16:13:43 +01:00
tonibm19
10fdc51b0a Creeper fixes 
- Fixed explosion time (1.5s, according to minecraftwiki)
- Creeper explodes if right clicked with flint and steel
 2014-03-02 14:35:03 +01:00
andrew
d73cdba1f6 g_BlockXXX => cBlockInfo::XXX 2014-03-01 21:34:19 +02:00
tonibm19
1de2c23d64 added mooshroom to cow conversion 2014-02-27 22:04:48 +01:00
Tiger Wang
a97f28939f Fixed sheep ASSERTing sometimes 2014-02-26 23:33:54 +00:00
Mattes D
23093fd4d1 Merge pull request #710 from TheJumper/master 
Fixed Mob Drops, Add Rare, Uncommon and Gear Drops, Looting inflicts Drops
 2014-02-24 18:30:44 +01:00
TheJumper
0b6aa7b370 Fixed Formatting, added compiler warning suppressing methods, fixed comments 2014-02-24 15:38:38 +01:00
TheJumper
2cc597372a Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters 2014-02-23 19:50:51 +01:00
Howaner
5e7f2ba6d6 Add Wolf Heal with Food 2014-02-20 20:41:53 +01:00
Alexander Harkness
72d312ac9b Merge pull request #690 from tonibm19/master 
Now mobs can't escape from fences.
 2014-02-17 16:12:59 +00:00
tonibm19
8707f7ddc8 Improved formatting 2014-02-17 17:01:22 +01:00
Alexander Harkness
d47e0b055b Merge pull request #692 from mc-server/wolfcleanup 
Wolf cleanup
 2014-02-17 10:21:38 +00:00
tonibm19
60bcf2807a Now mobs can't escape from fences. 2014-02-16 18:18:07 +01:00
Tiger Wang
2350b77bb5 Fixes to previous commit 2014-02-16 17:08:49 +00:00
Tiger Wang
1a84102b10 Slight cleanup of wolf code 2014-02-16 13:47:55 +00:00
Tiger Wang
8fbb936b63 Fixed TNT fizzing everywhere 2014-02-15 15:53:02 +00:00
Tiger Wang
7ced2f290f Simplified Attack() tracing 2014-02-12 21:53:21 +00:00
Tiger Wang
06239c8336 Fixed #627 
- Attack() is now called from cAggressive instead of cMonster
* Monsters can no longer attack through walls
* Should fix last remnants of player damage after teleporting (that both
STR and bearbin contributed fixes to :P)
 2014-02-11 22:09:56 +00:00
Tiger Wang
9d1c9097e3 Merge remote-tracking branch 'origin/master' into playerimprovements 
Conflicts:
	src/Root.cpp
	src/Root.h
	src/World.cpp
 2014-02-09 00:14:42 +00:00
Tiger Wang
f86f066615 Merge branch 'master' into playerimprovements 
Conflicts:
	MCServer/Plugins/APIDump/APIDesc.lua
 2014-02-09 00:04:42 +00:00
Alexander Harkness
b9aa0420a3 Merge pull request #646 from worktycho/warningfixes 
Fixed most of the reordering warnings
 2014-02-05 18:24:08 +00:00
Tycho
8ba6f73169 Fixed most of the reordering warnings 2014-02-05 09:43:49 -08:00
Tiger Wang
630507fd5b Fixed a bunch of MSVS warnings 
* Possibly also fixed some bugs with pathfinding and TNT, though
unlikely
 2014-02-04 23:07:22 +00:00
Mattes D
0ceb0ef607 Merge pull request #635 from tonibm19/master 
Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API
 2014-02-04 09:23:03 -08:00
tonibm19
a845b9abbb Blank lines and indentation. 
Also removed GetClosestPlayer documentation
 2014-02-04 17:29:36 +01:00
Tycho
80807eec2c Increased Type safety of Biomes 
Changed a number of funcictions from using integers to store biomes to using EMCSBiome
Note that switching from an int to an Enum is a non-breaking chang to the lua bindings
 2014-02-03 12:26:17 -08:00
tonibm19
c2e7dd34d9 Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API 2014-02-03 20:52:11 +01:00
Tycho
0b0aa5554f Merge branch 'master' into GeneratingBenchmark2 
Conflicts:
	src/Blocks/BlockTorch.h
 2014-02-02 06:56:07 -08:00
Tycho
b82fc394dd Changed Signiture of OnUpdate 2014-02-02 06:49:37 -08:00
Kirill Kirilenko
2a52b390c0 Monster's nominal speed was increased. 2014-02-01 20:38:53 +04:00
Kirill Kirilenko
0d33f2d11d Fixed teleport to air, if owner is flying. 2014-02-01 20:22:12 +04:00
tonibm19
e9c1d1ea9c Did what xoft said 2014-01-29 20:02:41 +01:00
tonibm19
1c1832b6ce Rewritten code. 
Implemented xoft suggestion.
Using MoveToPosition as tigerw suggested.
 2014-01-29 19:15:26 +01:00
tonibm19
ba4865f7ee Fixed sheep 2014-01-29 18:32:46 +01:00
tonibm19
73d9a285d5 Fixed a copypasta error... 2014-01-29 18:25:10 +01:00
tonibm19
ebe0f9372f Now mobs follow you when holding their breed item 2014-01-29 18:08:33 +01:00
STRWarrior
8ca98e0c0e Renamed Farmer functions and added doxycomments 2014-01-28 16:26:44 +01:00
STRWarrior
b2bacf3a25 Villager: NoCountDown and Action function don't check VillagersShouldHarvestCrops anymore because it shoudn't even be activated anywhere. 2014-01-28 15:40:13 +01:00
STRWarrior
807a4dba98 Villager doesn't check the environment for crops if it doesn't need to. 2014-01-27 22:04:24 +01:00
STRWarrior
babc80ed77 The world can now be configured wether farmers should be able to harvest crops. 2014-01-27 22:02:19 +01:00
STRWarrior
8bf9043f98 Villager: Few more comments. 2014-01-27 21:39:00 +01:00
STRWarrior
33ad2761a0 Cleanup 
Most code in Tick is now split up in different functions.
 2014-01-27 21:34:22 +01:00
STRWarrior
723bb78dd1 Villagers: Harvesting is more rare. 2014-01-27 20:52:42 +01:00
STRWarrior
5b983b72fa Villager: Farmers can't place crops on blocks other then farmland. 2014-01-27 20:44:18 +01:00
STRWarrior
9cf006ecea Fixed compiler error. 2014-01-27 19:06:50 +01:00
STRWarrior
3dbe6c6de9 Villager: Farmer: Crops finding is more random. 2014-01-27 18:58:09 +01:00
STRWarrior
9807056a9c Added GetCropsPos and DidFindCrops functions. 2014-01-27 18:33:57 +01:00
STRWarrior
06c3bc1ea5 Villagers: Farmers now replant the crops. 2014-01-27 18:27:57 +01:00
STRWarrior
2cdd8f1961 Villagers: Fixed only gettings the crops block when farming. 2014-01-27 17:30:18 +01:00
STRWarrior
ca12decaf6 Villagers don't look for new crops when they already found one. 
Slight cleanup.
 2014-01-27 17:20:39 +01:00
STRWarrior
969bf05a26 Villagers: Farmers can also harvest carrots and potatoes. 2014-01-27 15:44:55 +01:00
STRWarrior
ed95f4d81b Makes farmers farm crops. 2014-01-27 14:40:31 +01:00
Mattes D
1f4e12c50c Merge pull request #590 from mc-server/Wolf_Fix 
Wolf: Small fix since the new AI and a new small feature.
 2014-01-26 04:40:16 -08:00
STRWarrior
4c780e7b44 Fixed bug where wolfs would teleport while they were sitting. 2014-01-26 13:27:35 +01:00
STRWarrior
a533386144 Small fix since the new AI and a new small feature. 
You get particles when trying to tame wolfs.
They don't walk anymore when they are sitting.
 2014-01-26 13:07:21 +01:00
Tiger Wang
70113b5730 Fixed segmentation fault on villager damage 
It occurred when attack was environmental.
 2014-01-26 00:14:00 +00:00
Mattes D
5749b40422 Merge pull request #588 from mc-server/Sheep_Eating 
Implemented sheeps eating grass.
 2014-01-25 13:36:47 -08:00
Mattes D
cdcad2237a Merge pull request #587 from mc-server/mobimprovements 
Mob improvements & rudimentary artificial intelligence
 2014-01-25 13:36:32 -08:00
Tiger Wang
cdd6478cea Did what xoft recommended 2014-01-25 21:29:27 +00:00
STRWarrior
7b8dc01db3 Implemented sheeps eating grass. 2014-01-25 21:19:52 +01:00
Tiger Wang
7468ba0f10 Implemented fall damage for mobs 
+ Implemented mobile fall damage
* Formatting fixes
+ Defined new Position->Integer macros
 2014-01-25 19:02:13 +00:00
Tiger Wang
60b7f5f23d Attack() is no longer always called 2014-01-25 19:00:50 +00:00
Tiger Wang
314fc3cdac Mob bugfixes 
* Mobs no longer require constant line-of-sight to a player to remain
aggravated
* Fixed an ASSERT
* Fixed mobs jumping
* Fixed Idle state not properly using AI
+ Added FILE_IO_PREFIX to favicon loading
+ Implemented #563
 2014-01-25 14:42:26 +00:00
Tiger Wang
fd7fc7e59e All mobs now drown (fixes #54) 
* Implemented mob drowning
* Iron Golems and squids are excluded
 2014-01-24 23:58:51 +00:00
Tiger Wang
1112f5adc6 Fixed a generator bug 2014-01-24 23:56:19 +00:00
Tiger Wang
b367a74d3e Zombies and skeletons use AI 2014-01-24 23:56:05 +00:00
Tiger Wang
a988063915 Miscellaneous improvements 2014-01-24 21:55:04 +00:00
Tiger Wang
bf2af73899 Changed a condition to IsGameMode 2014-01-24 21:54:20 +00:00
madmaxoft
f0a75f7f73 Fixed a failure in cSquid. 
Probably due to rounding errors the squid was querying out-of-chunk coords.
 2014-01-24 22:23:57 +01:00
Tiger Wang
0583b9df39 Made wolves compatible with new AI code 2014-01-24 20:46:47 +00:00
Tiger Wang
1f82b6e192 Monsters no longer check for direct line of sight 2014-01-24 20:46:22 +00:00
Tiger Wang
9c0e3615ce Large reworking of mob code [SEE DESC] 
+ Implemented better pathfinding
- Removed lots of unused variables, functions, etc.
* Changed some variable types
* Other miscellaneous fixes, and also completes the previous PRs
 2014-01-24 19:57:32 +00:00
Tiger Wang
3e675f8c38 Implemented creeper abilities 
* Creepers now explode with a sound effect
* Creepers drop a music disc on the unlikely event of being killed by a
skeleton's arrow

Inspired by @maniak89's PR #132.
 2014-01-24 19:52:52 +00:00
Tiger Wang
74645fdfaa Removed obsoleted functions 2014-01-16 19:00:49 +00:00
madmaxoft
77aaa5c367 Merge branch 'fixes&features' of git://github.com/tonibm19/MCServer 2013-12-25 19:50:18 +01:00
Tiger Wang
548273c8f7 Preliminary mobile entity saving 
* Fixes #252
* Alleviates #380
+ Adds mob saving
* Fixed some debug !ASSERTs
 2013-12-25 16:07:52 +00:00
tonibm19
c6946fb8c4 Some fixes (SEE DESC) 
-Added missing mobs (wither, enderdragon and iron golem) to type to string list.
-Wither and iron golem can now spawn
 2013-12-23 10:32:49 +01:00
STRWarrior
5af74fe77c Fixed bug where snowgolems could replace non-solid blocks to snow blocks. 2013-12-22 21:12:34 +01:00
STRWarrior
5a9b26d322 Snow golems die in hot biomes and leave a snow trail. 2013-12-22 20:40:07 +01:00
STRWarrior
488d7ddd7d EnderDragons and SnowGolems are able to spawn. 2013-12-22 20:15:09 +01:00
Tycho Bickerstaff
779aca6051 Merge branch 'master' into cmake 2013-12-21 13:32:40 +00:00
madmaxoft
f5e6124ee0 Fixed the rest of constructor reorders. 2013-12-20 19:10:15 +01:00
madmaxoft
d6de11da07 Sorted a few constructors to remove warnings. 2013-12-20 16:39:20 +01:00
Tycho Bickerstaff
32e6be002d Merge branch 'master' into cmake 2013-12-20 15:33:04 +00:00
madmaxoft
8610d45ef1 Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). 2013-12-20 16:01:34 +01:00
STRWarrior
483ef89503 Fixed not getting XP from mobs. 2013-12-14 12:50:08 +01:00
Tycho Bickerstaff
ec5af4cffe moved mobs to globs 2013-12-10 23:07:30 +00:00
Tycho Bickerstaff
dd633d5a94 Merge branch 'master' into cmake 2013-12-10 23:01:35 +00:00
Tycho Bickerstaff
6cdc990884 more cmake 2013-12-10 21:39:20 +00:00
Alexander Harkness
0de95a215f Merge remote-tracking branch 'origin/master' into foldermove2 
Conflicts:
	VC2008/MCServer.vcproj
 2013-11-26 17:21:06 +00:00
Alexander Harkness
c3cd436ec3 Merge remote-tracking branch 'origin/master' into foldermove2 
Conflicts:
	GNUmakefile
 2013-11-24 14:37:03 +00:00
Alexander Harkness
675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00