mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-14 17:59:41 +00:00
Code Issues Projects Releases Wiki Activity
11,019 Commits 16 Branches 439 Tags
Commit Graph

11019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dylan K. Taylor
994781494f Merge branch 'next-minor' 2019-11-29 12:06:27 +00:00
Dylan K. Taylor
4cfceeeb8e bootstrap: fix merge error introduced by cb76f8a5dfba79857ecfd71d2953b759a03671e7 
this error is harmless since it points to a deprecated function, but it showed up as conflicted in master merge.
 2019-11-29 12:03:07 +00:00
Dylan K. Taylor
8ee3d4486a update build/php submodule to pmmp/php-build-scripts@7e985c932a 2019-11-29 11:56:36 +00:00
Dylan K. Taylor
3e4e0d51df Merge branch 'stable' into next-minor 2019-11-29 11:55:12 +00:00
Dylan K. Taylor
f2ac63d235 update build/php submodule to pmmp/php-build-scripts@8308571448 2019-11-29 11:54:42 +00:00
Stephen
5d17405b92 Better checks on resource patch 2019-11-28 19:48:34 -05:00
Stephen
3dd53ad998 Remove offset for crafting grid 2019-11-28 19:42:34 -05:00
Stephen
a303c4b294 Add some isset checks to prevent server from crashing on an invalid resourcepatch 2019-11-21 17:58:33 -05:00
Stephen
fa56290bb4 Reflect StartGamePacket changes in Player 2019-11-21 15:05:09 -05:00
Stephen
01d6cbe9c3 Added : void typehint to SkinAdapterSingleton & provide documentation 2019-11-21 15:01:34 -05:00
Stephen
f682c16740 Changed eduMode to eduEditionOffer and added an unsignedVarInt in availablecommandspacket 2019-11-21 14:55:29 -05:00
Stephen
74c09dc202 Remove inline assignment 2019-11-21 14:49:01 -05:00
Stephen
0917b67573 Generate param docs for constructor 2019-11-21 14:46:10 -05:00
Stephen
5cb0eafcb2 Should be checking the string, not an object 2019-11-21 14:24:47 -05:00
Stephen
221e6db47d Remove persona capes off of classic skins, add checks for empty cape data when converting 2019-11-21 14:21:08 -05:00
Stephen
8d06018d81 make toSkinData return statement multi lined 2019-11-21 13:54:22 -05:00
Stephen
600e16d9f6 Fixed floatingtextparticle yet again 2019-11-21 13:54:00 -05:00
Stephen
4340349db7 Generate getters for SkinData, applied suggested change, and fixed an underfined variable in PlayerListPacket 2019-11-21 13:52:27 -05:00
SOFe
cb76f8a5df
Merge branch 'stable' into next-minor 2019-11-21 23:21:16 +08:00
Stephen
6105198313 Update AvailableCommandsPacket constants 2019-11-20 22:47:48 -05:00
Stephen
c96ba13c23 Extract geometry name from resource patch 2019-11-20 22:42:56 -05:00
Stephen
c8d0cb315b Move persona skin hack to legacyskinadapter 2019-11-20 21:52:49 -05:00
Stephen
be9c413a9e Added network components for skins, to collect instead of throw out data 2019-11-20 21:43:41 -05:00
Dylan T
3e4366b30d
readme: add XLM since Keybase made it so easy 
... and also gave lots of keybase users free XLM. Well played, Keybase, you managed to make me adopt Stellar.
 2019-11-20 10:51:07 +00:00
Stephen
7f3460190b
Merge pull request #5 from dktapps/drew-1.13 
more 1.13
 2019-11-12 14:19:31 -05:00
Dylan K. Taylor
10d44292e1 fix classic capes 2019-11-12 12:27:50 -05:00
Dylan K. Taylor
70f81334ae MultiplayerSettingsPacket 2019-11-12 11:58:40 -05:00
Dylan K. Taylor
ead572fab9 fix skin sharing stupidity 2019-11-12 07:08:48 -05:00
Dylan K. Taylor
ef8e286277 Merge branch 'stable' of https://github.com/drew-mcbe/pocketmine-mp into drew-1.13 2019-11-12 06:57:57 -05:00
Dylan T
ba5a5981a0
Update Player.php 2019-11-12 08:19:05 +00:00
Dylan K. Taylor
c428596009 AddPlayerPacket: missing field 2019-11-11 16:36:55 -05:00
Stephen
a81d8dd6d5 Return false in unexpected condition 2019-11-11 16:25:53 -05:00
Stephen
5bcbef90ea Added variables for getSkin's animation for easier readability 2019-11-11 15:32:48 -05:00
Stephen
1c67f094e3 Change get and put SkinImage visibility to private 2019-11-11 15:29:57 -05:00
Stephen
99d350914e Remove convertToLegacyName 2019-11-11 15:29:42 -05:00
Stephen
49a9e0a880 Remove changes to FloatingTextParticle 2019-11-11 15:26:36 -05:00
Stephen
7b152def7d Move SkinAnimation and changed SerializedImage to SkinImage 
Also change putImage and getImage to getSkinImage and putSkinImage
 2019-11-11 15:23:48 -05:00
Stephen
3eb78fb0ff
Merge pull request #4 from dktapps/drew-1.13 
moar 1.13 changes
 2019-11-11 15:04:33 -05:00
Dylan K. Taylor
38c759c86e ResourcePackStack: missing field 2019-11-11 14:58:45 -05:00
Dylan K. Taylor
314ce1d012 build/make-release: push after 5 seconds instead of 10 2019-11-11 16:41:50 +00:00
Dylan K. Taylor
7fcd40df15 add encode/decode for some new packets 2019-11-11 11:20:37 -05:00
Dylan K. Taylor
ba39327b28 Merge remote-tracking branch 'origin/stable' into drew-1.13 2019-11-11 10:42:25 -05:00
Dylan K. Taylor
8d2e3894ef DataPacket: fixed var_dump() not showing private & protected subclass properties 2019-11-11 15:41:08 +00:00
Dylan K. Taylor
8ee0fbccc5 Merge branch 'stable' of https://github.com/drew-mcbe/pocketmine-mp into drew-1.13 2019-11-11 05:48:17 -05:00
Dylan T
fe4354959b
SkinAnimation: fix typo 2019-11-11 10:07:45 +00:00
Dylan T
19377c86a4
PlayerSkinPacket: reduce diff pollution 2019-11-11 09:47:04 +00:00
Stephen
fb23aade34 Clean up unused imports 2019-11-10 21:49:58 -05:00
Stephen
57e9fe78a3 change buildPlatform parameter to -1 2019-11-10 21:45:33 -05:00
Stephen
6b97281c58 Update SkinAnimation constants and docs 2019-11-10 21:41:00 -05:00
Stephen
da67a085fc Remove unused imports and unused todo 2019-11-10 21:37:55 -05:00