1
0
Fork 0
Commit Graph

117 Commits

Author SHA1 Message Date
Tiger Wang 8bff3e5af2 Implemented end and nether portals 2014-05-31 22:28:51 +01:00
Tiger Wang f55f5ec47f Merge branch 'master' into achievementtranslate
Conflicts:
	src/Entities/Player.cpp
2014-05-24 23:21:39 +01:00
andrew 07baf9bdd3 Cleaned up cPlayer::UpdateMovementStats; Wither achievements 2014-05-20 15:52:59 +03:00
Alexander Harkness 507df71845 Update Player.cpp 2014-05-20 13:35:39 +01:00
Tiger Wang 42c36429d7 Added client translation to achievements 2014-05-19 20:40:56 +01:00
madmaxoft a651c865e4 There's no "round" function in MSVC2008. 2014-05-18 22:49:27 +02:00
andrew 466ff2204f Fixes 2014-05-13 14:53:15 +03:00
andrew aea866f5b1 Movement Statistics 2014-05-12 21:38:52 +03:00
andrew b3d2b5b2c9 cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement() 2014-05-12 17:05:09 +03:00
andrew e3c6c8f3dd Fixed stat serialization 2014-05-11 20:30:54 +03:00
andrew c7c3724a3e Statistic Manager 2014-05-11 14:57:06 +03:00
Tiger Wang cca8376a01 Suggestions'd #2 2014-05-06 19:38:01 +01:00
Tiger Wang 1df7dbe7c9 Suggestions'd 2014-05-05 23:45:35 +01:00
madmaxoft 839447f0bb Merge branch 'master' into fixes. 2014-05-02 19:34:28 +02:00
Tiger Wang 15767badac A tiny speed improvement in ApplyFoodExhaustion() 2014-04-26 23:52:18 +01:00
Howaner 7e76f030aa Add entity invulnerable 2014-04-26 00:32:30 +02:00
Tiger Wang 48904ae201 Merge branch 'master' into fixes
Conflicts:
	src/World.h
2014-04-24 18:57:25 +01:00
Tiger Wang 7f5cf417de Some change to Entity.cpp
* Added comments to BroadcastMovementUpdate() and the collision tracer
2014-04-23 21:06:46 +01:00
jfhumann f48d43f050 Fixed Flint and Steel, reverted Minecart change, renamed a parameter name 2014-04-19 20:51:52 +02:00
jfhumann 67344a3782 Merge remote-tracking branch 'origin/master' into fixes
Conflicts:
	src/Authenticator.cpp
	src/ClientHandle.cpp
	src/Entities/Minecart.cpp
	src/Protocol/Protocol17x.cpp
2014-04-18 21:44:58 +02:00
jfhumann 013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
Mattes D b7e074b10b Merge pull request #891 from mc-server/fixes
Fixes to redstone & general
2014-04-17 22:37:00 +02:00
Tiger Wang bdea8706d8 Added new AI rules
+ 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
2014-04-17 18:50:25 +01:00
Tiger Wang c0c47d33c5 Entities handle chunks properly again
* Entities properly handle chunks
* Changed EntityStatus enums to be less shouty
2014-04-12 13:16:48 +01:00
madmaxoft 1cab52f867 Added cPlayer:SendRotation() API function. 2014-04-05 12:09:30 +02:00
Tiger Wang 6dea7993f2 Fixed #721 and FS439 2014-03-28 23:25:11 +00:00
madmaxoft b370cacf0c Plugins can set flying speed. 2014-03-20 16:14:40 +01:00
madmaxoft 64d9390069 Rewritten player speeds to be relative unit-less.
Value of 1 means "default speed", 2 means "double the speed", 0.5 means "half the speed". This allows for easier plugins and is more future-proof.
2014-03-20 15:45:42 +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
Tiger Wang c05a1db88d CheckBlockInteractionsRate() fixed & enabled 2014-03-09 12:48:52 +00:00
andrew d73cdba1f6 g_BlockXXX => cBlockInfo::XXX 2014-03-01 21:34:19 +02:00
andrew 692a84af31 Shortened enums 2014-03-01 14:20:29 +02:00
andrew 5c44945287 Exported and documented cScoreboard 2014-03-01 12:08:40 +02:00
madmaxoft 35def963f0 Moved common cGroupManager code to a separate function.
This fixes my concerns in PR #709.
2014-02-28 15:31:20 +01:00
Mattes D 6ad4b78a7b Merge pull request #709 from Howaner/GlobalFixes
Add 'Group not found', when the Server load the users.ini and add auto g...
2014-02-28 14:28:50 +01:00
Tiger Wang 9ac9249aca Removed unneeded includes in Player.cpp 2014-02-27 21:49:10 +00:00
Howaner 3777873f22 Remove users.ini generation in Player.cpp and use the CheckUsers() Function 2014-02-21 15:10:31 +01:00
Howaner 21febaf4b3 Add 'Group not found', when the Server load the users.ini and add auto generate from users.ini 2014-02-21 14:53:46 +01:00
andrew 83d3a2eedf Manual merge (Fixed conflicts) 2014-02-20 15:37:15 +02:00
andrew 3b24bc870b Map item handler; Fixed several bugs 2014-02-17 16:27:12 +02:00
Tiger Wang 4908b6f500 Fixed minor formatting issues from #682
- Removed unused PlaySoundEffect
* Simplified and parenthesised code
2014-02-16 13:37:36 +00:00
Howaner f3bd288f02 Add Exp Bottle Effects 2014-02-16 01:19:30 +01:00
Howaner d15d6acc58 Disable Hunger Death 2014-02-16 01:18:10 +01:00
Alexander Harkness 584f7bd806 Merge pull request #679 from mc-server/NotchDeath
NotchApple
2014-02-15 19:04:13 +00:00
STRWarrior 0040a88b9b If a player is called "Notch" he drops an apple. http://minecraft.gamepedia.com/Notch 2014-02-15 19:51:05 +01:00
Tiger Wang 91ebb6cef0 Made player jump reset less ambiguous 2014-02-12 21:53:46 +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 88a64ec40d Improved chat messaging functions
* Moved string manipulation into cClientHandle and therefore...
+ Added configuration option for prefixes.
* Cleaned up code.
* Updated documentation for API.
2014-02-07 18:58:52 +00:00