Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merged branch 'origin/master' into c++11. | Mattes D | 2014-12-04 | 1 | -62/+62 |
|\ | |||||
| * | MobSpawner fixes. | Howaner | 2014-12-01 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'master' into MobSpawner | Howaner | 2014-12-01 | 1 | -10/+0 |
| |\ | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| | * | Removed old StringToMobType() function from Monster.cpp | Howaner | 2014-11-30 | 1 | -10/+0 |
| | | | |||||
| * | | Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes. | Howaner | 2014-11-29 | 1 | -52/+61 |
| |/ | |||||
| * | Mobs: Fixed crash with terrain too high. | Mattes D | 2014-11-15 | 1 | -2/+2 |
| | | |||||
| * | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 1 | -14/+14 |
| | | |||||
* | | Merge remote-tracking branch 'origin-master' into c++11 | Tiger Wang | 2014-11-26 | 1 | -2/+2 |
| | | |||||
* | | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-20 | 1 | -14/+14 |
| | | |||||
* | | Migrated random generators to std::random | Tiger Wang | 2014-10-19 | 1 | -1/+0 |
|/ | |||||
* | Fixed a missed value. | madmaxoft | 2014-10-05 | 1 | -1/+1 |
| | |||||
* | Fixed eMonsterType Lua API mismatch. | madmaxoft | 2014-10-05 | 1 | -0/+10 |
| | |||||
* | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 1 | -0/+54 |
|\ | | | | | | | | | Conflicts: src/Mobs/Monster.h | ||||
| * | Merge branch 'master' into EntityCustomName | Howaner | 2014-09-23 | 1 | -1/+5 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | Added CustomName saving. | Howaner | 2014-09-02 | 1 | -2/+8 |
| | | | |||||
| * | | Added name tag | Howaner | 2014-09-01 | 1 | -0/+19 |
| | | | |||||
| * | | Added CustomName to cMonster. | Howaner | 2014-09-01 | 1 | -0/+29 |
| | | | |||||
* | | | Merge branch 'master' into redstoneTests | Tycho | 2014-09-17 | 1 | -1/+5 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: src/Blocks/ChunkInterface.h | ||||
| * | | Improved cBlockHandler::DropBlock | Tiger Wang | 2014-09-13 | 1 | -1/+1 |
| | | | |||||
| * | | Renamed SetWalkSpeed() to SetRelativeWalkSpeed() | Howaner | 2014-09-02 | 1 | -2/+2 |
| | | | |||||
| * | | Added SetWalkSpeed() to cMonster. | Howaner | 2014-08-30 | 1 | -0/+4 |
| |/ | |||||
* / | Added first test to show the object can be created | Tycho | 2014-09-17 | 1 | -58/+58 |
|/ | |||||
* | Fixed mob burning. | reiter | 2014-08-28 | 1 | -1/+1 |
| | | | Fixes #1298 | ||||
* | Merge branch 'master' into Monster | Howaner | 2014-08-04 | 1 | -2/+1 |
|\ | |||||
| * | Refactored case-conversion functions. | madmaxoft | 2014-08-04 | 1 | -2/+1 |
| | | | | | | | | StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place. | ||||
* | | Changed /** to /* | Howaner | 2014-08-04 | 1 | -3/+5 |
| | | |||||
* | | Fixed warnings | Howaner | 2014-08-04 | 1 | -3/+3 |
| | | |||||
* | | Attempt to fix knockback and swimming. | Howaner | 2014-08-04 | 1 | -3/+9 |
|/ | |||||
* | Improved endermen code a little | Tiger Wang | 2014-08-01 | 1 | -1/+3 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 1 | -19/+5 |
|\ | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp | ||||
| * | Style: Normalized spaces after if, for and while. | madmaxoft | 2014-07-21 | 1 | -1/+1 |
| | | |||||
| * | Monsters: Made IsUndead overridable by the respective mob classes | archshift | 2014-07-19 | 1 | -10/+0 |
| | | |||||
| * | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 1 | -1/+1 |
| | | |||||
| * | Fixed clamping issues | archshift | 2014-07-19 | 1 | -5/+1 |
| | | |||||
| * | Merge branch 'Entities' | madmaxoft | 2014-07-18 | 1 | -2/+2 |
| |\ | |||||
| | * | Fixed slime-related comments. | madmaxoft | 2014-07-18 | 1 | -2/+2 |
| | | | |||||
| | * | Slime sizes are 1, 2 or 4 and not 1, 2 or 3. | Howaner | 2014-07-18 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -48/+43 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | Monster fixes | Tiger Wang | 2014-07-18 | 1 | -26/+1 |
| | | | | | | | | | | | | | | | * Fixes #1203 * Fixes #627 | ||||
| * | | Fixed tabs used for alignment. | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| | | | |||||
| * | | Basic style fixes. | madmaxoft | 2014-07-17 | 1 | -3/+3 |
| | | | |||||
| * | | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -12/+12 |
| |/ | | | | | | | | | 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. | ||||
| * | Merge branch 'master' into potions | madmaxoft | 2014-07-17 | 1 | -3/+3 |
| |\ | |||||
| | * | Merge pull request #1193 from mc-server/deathmessages | Mattes D | 2014-07-17 | 1 | -3/+3 |
| | |\ | | | | | | | | | Death messages | ||||
| | | * | Tailored death messages | Tiger Wang | 2014-07-04 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'master' into potions | madmaxoft | 2014-07-15 | 1 | -3/+3 |
| |\| | | |||||
| | * | | Merge branch 'master' into Sounds | Howaner | 2014-07-13 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * \ | Merge branch 'master' into Sheep | Howaner | 2014-07-13 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | * | | | Fix sheep color's, add shear sound. | Howaner | 2014-06-28 | 1 | -1/+1 |
| | | | |/ | | | |/| | |||||
| | * | | | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 1 | -2/+2 |
| | | |/ | | |/| | |||||
| * | | | Merge remote-tracking branch 'origin/master' into potions | archshift | 2014-07-10 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp | ||||
| | * | | Fixed slime handling in cMonster::StringToMobType(). | madmaxoft | 2014-07-06 | 1 | -1/+1 |
| | |/ | |||||
| * | | EntityEffects.x -> EntityEffect.x, Object-Oriented effects | archshift | 2014-06-19 | 1 | -45/+0 |
| | | | | | | | | | | | | Changed effect map to take a pointer of the effect as a result. | ||||
| * | | Entity effects: changed User to Creator, removed pawn pass-by-value | archshift | 2014-06-17 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed MSVC compilation. | madmaxoft | 2014-06-17 | 1 | -3/+3 |
| | | | |||||
| * | | Pawn: renamed HandleEntityEffects to HandleEntityEffect | archshift | 2014-06-17 | 1 | -2/+2 |
| | | | | | | | | | | | | Exported entity effect functions for ToLua and documented them in APIDesc.lua | ||||
| * | | Monster: added IsUndead(), undead-specific entity effects | archshift | 2014-06-17 | 1 | -0/+65 |
| |/ | |||||
* | | More suggestions | Tiger Wang | 2014-06-21 | 1 | -1/+1 |
| | | |||||
* | | Fixed decision failure | Tiger Wang | 2014-06-05 | 1 | -1/+1 |
| | | |||||
* | | Added checks for no downfall biomes | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-04 | 1 | -4/+14 |
|\| | |||||
| * | Small tweak for mobs | STRWarrior | 2014-06-02 | 1 | -4/+14 |
| | | | | | | | | Mobs move a bit smoother and aren't able to move allot when in air. | ||||
* | | Very minor code changes | Tiger Wang | 2014-05-29 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #998 from mc-server/StatManager | Mattes D | 2014-05-18 | 1 | -1/+3 |
|\ | | | | | Statistic Manager | ||||
| * | Fixes | andrew | 2014-05-13 | 1 | -1/+1 |
| | | |||||
| * | Movement Statistics | andrew | 2014-05-12 | 1 | -1/+3 |
| | | |||||
* | | Fixed a few more switch warnings. | archshift | 2014-05-12 | 1 | -0/+2 |
|/ | |||||
* | Fixed MagmaCube spawning. | madmaxoft | 2014-05-02 | 1 | -0/+4 |
| | | | | Fixes #928. | ||||
* | Merge pull request #940 from Howaner/GlobalFixes | Mattes D | 2014-04-28 | 1 | -2/+6 |
|\ | | | | | Add entity invulnerable | ||||
| * | Add entity invulnerable | Howaner | 2014-04-26 | 1 | -2/+6 |
| | | |||||
* | | Fixed mobs that don't naturally spawn. | archshift | 2014-04-26 | 1 | -2/+5 |
| | | |||||
* | | Giants! | archshift | 2014-04-25 | 1 | -6/+11 |
|/ | | | | Changed mfMaxplusone to mfUnhandled for readability, and fixed a default case warning. | ||||
* | Fixed class capitalization for the cave spider. | archshift | 2014-04-24 | 1 | -1/+1 |
| | |||||
* | Compilation fix | Tiger Wang | 2014-04-18 | 1 | -1/+1 |
| | |||||
* | Fixed #906 | Tiger Wang | 2014-04-18 | 1 | -1/+2 |
| | |||||
* | Fixed #904 | Tiger Wang | 2014-04-18 | 1 | -1/+1 |
| | |||||
* | Added new AI rules | Tiger Wang | 2014-04-17 | 1 | -12/+26 |
| | | | | | | | + Added new AI rules handling cacti and large heights * Fixed cIniFile not recognising comments in cIniFile::ReadFile() * Fixed users.ini not being properly generated * Changed all instances of (int)floor(GetPosXXX()) to POSXXX_TOINT | ||||
* | Fixed GitHuB WebEdit fail. | Alexander Harkness | 2014-04-10 | 1 | -0/+1 |
| | |||||
* | Update Monster.cpp | Alexander Harkness | 2014-04-10 | 1 | -2/+4 |
| | |||||
* | Final realisation of suggestions | Tiger Wang | 2014-03-31 | 1 | -5/+7 |
| | |||||
* | Fixed a few Y too high/low asserts | Tiger Wang | 2014-03-31 | 1 | -5/+5 |
| | |||||
* | Wither invulnerability | andrew | 2014-03-24 | 1 | -0/+1 |
| | |||||
* | Fixed double to float conversions. | madmaxoft | 2014-03-16 | 1 | -5/+5 |
| | |||||
* | g_BlockXXX => cBlockInfo::XXX | andrew | 2014-03-01 | 1 | -5/+5 |
| | |||||
* | Fixed Formatting, added compiler warning suppressing methods, fixed comments | TheJumper | 2014-02-24 | 1 | -1/+1 |
| | |||||
* | Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters | TheJumper | 2014-02-23 | 1 | -0/+76 |
| | |||||
* | Improved formatting | tonibm19 | 2014-02-17 | 1 | -2/+2 |
| | |||||
* | Now mobs can't escape from fences. | tonibm19 | 2014-02-16 | 1 | -2/+2 |
| | |||||
* | Fixed #627 | Tiger Wang | 2014-02-11 | 1 | -14/+0 |
| | | | | | | | - 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) | ||||
* | Merge remote-tracking branch 'origin/master' into playerimprovements | Tiger Wang | 2014-02-09 | 1 | -4/+4 |
|\ | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp | ||||
| * | Merge pull request #646 from worktycho/warningfixes | Alexander Harkness | 2014-02-05 | 1 | -4/+4 |
| |\ | | | | | | | Fixed most of the reordering warnings | ||||
| | * | Fixed most of the reordering warnings | Tycho | 2014-02-05 | 1 | -4/+4 |
| | | | |||||
* | | | Merge branch 'master' into playerimprovements | Tiger Wang | 2014-02-09 | 1 | -0/+12 |
|\| | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| * | | Blank lines and indentation. | tonibm19 | 2014-02-04 | 1 | -0/+4 |
| | | | | | | | | | | | | Also removed GetClosestPlayer documentation | ||||
| * | | Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API | tonibm19 | 2014-02-03 | 1 | -0/+8 |
| |/ | |||||
* / | Fixed a bunch of MSVS warnings | Tiger Wang | 2014-02-05 | 1 | -1/+1 |
|/ | | | | | * Possibly also fixed some bugs with pathfinding and TNT, though unlikely | ||||
* | Monster's nominal speed was increased. | Kirill Kirilenko | 2014-02-01 | 1 | -1/+1 |
| | |||||
* | Implemented fall damage for mobs | Tiger Wang | 2014-01-25 | 1 | -4/+27 |
| | | | | | | + Implemented mobile fall damage * Formatting fixes + Defined new Position->Integer macros | ||||
* | Mob bugfixes | Tiger Wang | 2014-01-25 | 1 | -20/+29 |
| | | | | | | | | | | * 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 | ||||
* | Fixed a generator bug | Tiger Wang | 2014-01-25 | 1 | -0/+3 |
| | |||||
* | Miscellaneous improvements | Tiger Wang | 2014-01-24 | 1 | -5/+4 |
| | |||||
* | Monsters no longer check for direct line of sight | Tiger Wang | 2014-01-24 | 1 | -10/+2 |
| | |||||
* | Large reworking of mob code [SEE DESC] | Tiger Wang | 2014-01-24 | 1 | -162/+238 |
| | | | | | | | + Implemented better pathfinding - Removed lots of unused variables, functions, etc. * Changed some variable types * Other miscellaneous fixes, and also completes the previous PRs | ||||
* | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 1 | -1/+1 |
| | |||||
* | Merge branch 'fixes&features' of git://github.com/tonibm19/MCServer | madmaxoft | 2013-12-25 | 1 | -0/+6 |
|\ | |||||
| * | Some fixes (SEE DESC) | tonibm19 | 2013-12-23 | 1 | -0/+6 |
| | | | | | | | | -Added missing mobs (wither, enderdragon and iron golem) to type to string list. -Wither and iron golem can now spawn | ||||
* | | Preliminary mobile entity saving | Tiger Wang | 2013-12-25 | 1 | -1/+2 |
|/ | | | | | | | * Fixes #252 * Alleviates #380 + Adds mob saving * Fixed some debug !ASSERTs | ||||
* | EnderDragons and SnowGolems are able to spawn. | STRWarrior | 2013-12-22 | 1 | -0/+2 |
| | |||||
* | Sorted a few constructors to remove warnings. | madmaxoft | 2013-12-20 | 1 | -7/+7 |
| | |||||
* | Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). | madmaxoft | 2013-12-20 | 1 | -1/+1 |
| | |||||
* | Fixed not getting XP from mobs. | STRWarrior | 2013-12-14 | 1 | -0/+6 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -0/+55 |
| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+758 |