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

209 Commits

Author SHA1 Message Date
Safwat Halaby
db40172b64 Partial revert of #2446 2015-09-28 08:52:08 +03:00
Mattes D
82d9ac1e1c Namechange to Cuberite 2015-09-25 10:14:17 +02:00
Tiger Wang
baf3a07804 Fixed a position bug in the pathfinder 2015-08-22 17:06:08 +01:00
Samuel Barney
804805d35a Silenced and fixed many warning messages across multiple files. 2015-07-29 09:49:30 -06:00
Hallucino
53207d3f18 Support ageable mobs 
Move ageable stuff in Monster directly
 2015-07-14 22:41:31 +02:00
bibo38
bb46afcb7e Now Horses spawn with correct data values. 
The max-value of style is 4, of color is 6.
See http://wiki.vg/Entities#Horse
Also based on the if, the max value of HorseType is 7.
Bugfix #2259
 2015-06-26 19:32:16 +02:00
tycho
4956e8700d Merge branch 'master' into PreventNewWarnings 
Conflicts:
	src/Entities/ArrowEntity.cpp
 2015-05-29 00:12:56 +01:00
SafwatHalaby
f1540173da AI - Sane Skeleton 2015-05-28 19:19:56 +03:00
tycho
e19693e529 Merge branch 'master' into PreventNewWarnings 
Conflicts:
	src/Inventory.cpp
 2015-05-28 11:05:41 +01:00
SafwatHalaby
52fcbb5c65 AI - Saner Livestock 2015-05-27 19:26:08 +03:00
tycho
a6ccee5948 Merge branch 'master' into PreventNewWarnings 2015-05-24 17:27:05 +01:00
SafwatHalaby
7021547e99 Pathfinder - Bounding boxes and some tweaks 2015-05-23 22:16:19 +03:00
tycho
1577a080ee Merge branch 'master' into PreventNewWarnings 2015-05-23 11:31:03 +01:00
SafwatHalaby
8436e5d8bd Path recalculation improvements 2015-05-20 20:42:35 +03:00
tycho
77f1f58c0a Make -Werror disabling file only 
Ad fix a load of warnings
 2015-05-19 19:32:10 +01:00
Alexander Harkness
d852209f8d Manual merge of #2066 2015-05-19 09:29:27 +01:00
SafwatHalaby
29e31c5be9 Pathfinder - approximated paths when original destination unreachable 2015-05-17 19:36:52 +03:00
Tiger Wang
9c490293b8 Merge remote-tracking branch 'origin/master' into warnings 
Conflicts:
	src/Mobs/Monster.cpp
	src/Vector3.h
 2015-05-10 12:16:20 +01:00
Tiger Wang
11ef1fd24a Fixed some warnings and logic errors in Monster.cpp 2015-05-10 12:14:55 +01:00
Mattes D
92b8cd2f2a Merge pull request #1956 from Tri125/master 
Fixed Magma cube sound and spawn size
 2015-05-09 12:44:57 +02:00
Tiger Wang
218010cd96 Fixed some Visual Studio warnings 2015-05-08 23:32:02 +01:00
worktycho
1cef39cb73 Move chunk position accesses after the chunk validity checks 2015-05-08 23:20:22 +01:00
Tri125
9f6192687f Big Magma Cube can now spawn 
Following the same method as the Slime, Magma Cube can now spawn with the size of 1, 2 or 4.
 2015-05-06 23:56:08 -04:00
wiseoldman95
40af96b100 AI - Safer WouldBurnAt() 2015-05-06 20:01:06 +03:00
wiseoldman95
753dfb950a AI - Better shade cover 2015-05-06 20:01:06 +03:00
wiseoldman95
b8aa38b18d (duplicate) AI - Livestock escape fixed, water jumping fixed 2015-05-06 17:23:07 +03:00
wiseoldman95
020e928685 PF - Fixed mobs not reaching leaning player 2015-05-06 07:31:02 +03:00
wiseoldman95
304bc4eca4 AI - More conservative use of ResetPathFinding, fixed minor swimming / jumping bug 2015-05-05 12:51:58 +03:00
Tiger Wang
a509cf00ef Entity improvements 
•Pathfinder improvements
•Fixes #1217
•Fixes #1933

Merge remote-tracking branch 'SafwatHalaby/water2' into fixes
 2015-05-03 23:58:12 +01:00
Tiger Wang
f96f9dae66 Merge pull request #1930 from SafwatHalaby/AI_Jump 
AI - Improved Mob Jumping
 2015-05-03 13:23:04 +01:00
wiseoldman95
d68b75a679 AI - Improved Mob Jumping 2015-05-03 14:24:24 +03:00
wiseoldman95
599ad97b65 PathFinder - Crash fix, chunks in parameters are now references 2015-05-03 10:49:06 +03:00
Tiger Wang
9226bdbd4c Merge pull request #1925 from SafwatHalaby/PathFinder_Optimze 
Pathfinder optimization
 2015-05-02 16:50:42 +01:00
wiseoldman95
3586f25853 AI - Better daylight handling 2015-05-02 14:32:33 +03:00
wiseoldman95
16b6fc9b5d PathFinding - Chunk querying optimization and improve cPath::IsSolid 2015-05-02 14:16:16 +03:00
wiseoldman95
1b0e21e0b2 A* Pathfinding and better monster AI 2015-05-01 13:18:47 +03:00
mathias-gh
f370443b9b Added MobTypeName for Giant 2015-04-17 19:33:34 +03:00
Tommy Santerre
3f6d823aa4 Correct world height validations. 
Unify the way we test block above the current one (Height - 1 instead of a_RelY + 1).
Allow generation of world of flat height = 255
 2015-03-19 20:32:17 -04:00
Tycho
bfe1960191 Converted Monster to std::chrono 2015-01-16 14:38:21 +00:00
Tycho
2a9664d6ca Initial convertion of a_Dt to std::chrono 
also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
 2015-01-11 21:12:26 +00:00
Mattes D
3da6e4374e Fixed basic style. 2014-12-25 00:44:09 +01:00
Masy98
6e8e1c6d8d Added Rabbits 2014-12-20 10:31:34 +01:00
Masy98
f09c6701eb Guardian can now spawn if wanted!? 2014-12-18 20:44:39 +01:00
Masy98
c836b52dd1 Added Entity Guardian 2014-12-18 19:30:32 +01:00
Tiger Wang
3acdf25b05 Merge remote-tracking branch 'origin/master' into c++11 
Conflicts:
	src/OSSupport/Thread.cpp
 2014-12-06 17:41:48 +00:00
Mattes D
e2a04f580a BasicStyle: Added missing braces to control statements. 2014-12-05 16:59:11 +01:00
Mattes D
c014f5624c Merged branch 'origin/master' into c++11. 2014-12-04 22:04:16 +01:00
Howaner
bcbd73f7d8 MobSpawner fixes. 2014-12-01 14:58:13 +01:00
Howaner
677dde51bd Merge branch 'master' into MobSpawner 
Conflicts:
	MCServer/Plugins/APIDump/APIDesc.lua
 2014-12-01 14:43:03 +01:00
Howaner
c173bf61ad Removed old StringToMobType() function from Monster.cpp 2014-11-30 02:29:17 +01:00
Howaner
2478e290f9 Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes. 2014-11-29 15:20:44 +01:00
Tiger Wang
187bdab4fa Merge remote-tracking branch 'origin-master' into c++11 2014-11-25 23:03:33 +00:00
Mattes D
1240e583d2 Mobs: Fixed crash with terrain too high. 2014-11-15 21:45:57 +01:00
Tiger Wang
a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Tiger Wang
987f79afdd En masse NULL -> nullptr replace 2014-10-20 21:55:07 +01:00
Tiger Wang
aa19a3afb0 Migrated random generators to std::random 2014-10-19 14:10:18 +01:00
madmaxoft
c94e82980e Fixed a missed value. 2014-10-05 22:56:56 +02:00
madmaxoft
77c5b410e6 Fixed eMonsterType Lua API mismatch. 2014-10-05 22:09:19 +02:00
Tycho
9c459cbe50 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Mobs/Monster.h
 2014-09-25 15:22:08 +01:00
Howaner
4b38e077cf Merge branch 'master' into EntityCustomName 
Conflicts:
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/World.cpp
	src/World.h
 2014-09-23 14:39:49 +02:00
Tycho
045d54e0e2 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Blocks/ChunkInterface.h
 2014-09-17 18:47:33 +01:00
Tycho
6e7c0e33b5 Added first test to show the object can be created 2014-09-17 18:40:10 +01:00
Tiger Wang
fdabfd77e2 Improved cBlockHandler::DropBlock 2014-09-13 22:49:27 +01:00
Howaner
38e824dbcf Renamed SetWalkSpeed() to SetRelativeWalkSpeed() 2014-09-02 20:10:41 +02:00
Howaner
5c53608dd0 Added CustomName saving. 2014-09-02 19:34:58 +02:00
Howaner
dfed6f94ca Added name tag 2014-09-01 21:05:45 +02:00
Howaner
7c4cb9a385 Added CustomName to cMonster. 2014-09-01 20:12:56 +02:00
Howaner
d7ee2245e8 Added SetWalkSpeed() to cMonster. 2014-08-30 12:44:54 +02:00
reiter
690e6cb6f8 Fixed mob burning. 
Fixes #1298
 2014-08-28 00:01:01 +02:00
Howaner
7bd414e9ed Merge branch 'master' into Monster 2014-08-04 12:11:38 +02:00
madmaxoft
1fa210c7f9 Refactored case-conversion functions. 
StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place.
 2014-08-04 11:30:20 +02:00
Howaner
e70077361d Changed /** to /* 2014-08-04 11:23:35 +02:00
Howaner
7bea90d6ca Fixed warnings 2014-08-04 01:35:25 +02:00
Howaner
0911072d27 Attempt to fix knockback and swimming. 2014-08-04 01:34:12 +02:00
Tiger Wang
c865fc8ca5 Improved endermen code a little 2014-08-01 22:15:32 +01:00
Tiger Wang
3385ed56b8 Merge remote-tracking branch 'origin/master' into portals 
Conflicts:
	src/Chunk.cpp
	src/Entities/Player.cpp
	src/Root.cpp
	src/World.cpp
 2014-07-22 10:24:28 +01:00
madmaxoft
6be79575fd Style: Normalized spaces after if, for and while. 2014-07-21 17:38:50 +02:00
archshift
ada88a5805 Monsters: Made IsUndead overridable by the respective mob classes 2014-07-19 14:35:35 -07:00
madmaxoft
00c524519e Fixed style: spaces after commas. 2014-07-19 14:53:41 +02:00
archshift
041bfd5860 Fixed clamping issues 2014-07-19 01:40:29 -07:00
madmaxoft
44a4a83292 Merge branch 'Entities' 2014-07-18 23:21:04 +02:00
madmaxoft
19d012c96e Fixed slime-related comments. 2014-07-18 23:20:42 +02:00
Tiger Wang
37140ae578 Merge branch 'master' into portals 
Conflicts:
	src/Blocks/WorldInterface.h
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Generating/FinishGen.cpp
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol16x.cpp
	src/Protocol/Protocol16x.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/Root.h
	src/World.cpp
 2014-07-18 20:10:51 +01:00
Howaner
509d3d3b62 Slime sizes are 1, 2 or 4 and not 1, 2 or 3. 2014-07-18 16:55:28 +02:00
Tiger Wang
f1be1eb674 Monster fixes 
* Fixes #1203
* Fixes #627
 2014-07-18 10:47:00 +01:00
madmaxoft
c03161f75d Fixed tabs used for alignment. 2014-07-17 23:16:55 +02:00
madmaxoft
5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +02:00
madmaxoft
2423fbf2ef Normalized comments. 
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
 2014-07-17 22:15:34 +02:00
madmaxoft
7d0fc85d00 Merge branch 'master' into potions 2014-07-17 11:01:26 +02:00
Mattes D
98244e96d1 Merge pull request #1193 from mc-server/deathmessages 
Death messages
 2014-07-17 10:12:22 +02:00
madmaxoft
8e946da8ac Merge branch 'master' into potions 2014-07-15 09:01:32 +02:00
Howaner
e48d172f49 Merge branch 'master' into Sounds 2014-07-13 11:09:19 +02:00
Howaner
d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Howaner
4b093972ea Merge branch 'master' into Sheep 2014-07-13 00:54:11 +02:00
archshift
e824cd09b3 Merge remote-tracking branch 'origin/master' into potions 
Conflicts:
	src/Entities/Player.cpp
	src/Entities/ProjectileEntity.cpp
 2014-07-09 23:28:27 -07:00
madmaxoft
66fa015534 Fixed slime handling in cMonster::StringToMobType(). 2014-07-06 13:37:28 +02:00
Tiger Wang
a0d2df9327 Tailored death messages 2014-07-04 10:55:09 +01:00
Howaner
bef84b4821 Fix sheep color's, add shear sound. 2014-06-28 12:59:09 +02:00
Tiger Wang
1296c5dce7 More suggestions 2014-06-21 20:42:29 +01:00
archshift
f5529e544c EntityEffects.x -> EntityEffect.x, Object-Oriented effects 
Changed effect map to take a pointer of the effect as a result.
 2014-06-18 22:54:14 -07:00