Commit Graph

88 Commits

Author SHA1 Message Date
3042c74aa5 Merge branch 'stable' into master 2020-08-21 21:41:29 +01:00
ebd20f997d Merge commit 'e80ad22702f87f4a006ab16af3b46baae0490856' into master
# Conflicts:
#	build/php
#	resources/vanilla
#	src/pocketmine/Player.php
#	tests/plugins/DevTools
2020-08-21 21:39:17 +01:00
4fe3401182 travis: moved PHP-specific configuration to its own YAML file
this allows it to be imported by other repos using the same config (for example plugins needing PHPStan analysis) without them needing to copy paste big blocks of shit every time something little changes.
2020-08-21 17:42:47 +01:00
974cbae725 travis: added PHP 7.4 2020-08-20 16:21:58 +01:00
98db4c5200 Merge branch 'stable' into master
# Conflicts:
#	.gitmodules
#	composer.lock
#	resources/vanilla
#	src/network/mcpe/protocol/PlayerAuthInputPacket.php
#	src/pocketmine/Player.php
#	src/pocketmine/network/mcpe/protocol/LoginPacket.php
2020-08-10 17:55:49 +01:00
9bd6d5c67e Updated travis pthreads to pmmp/pthreads@45579e1e62 2020-08-10 17:45:06 +01:00
ca0d92ac59 Merge commit '1fb0ba6fc051a3052bf6ef8a84db31f85cfd4313' 2020-05-18 10:52:44 +01:00
a5edfa368e Merge branch 'stable' into next-minor 2020-05-18 10:25:25 +01:00
1fb0ba6fc0 travis: update PHP extension versions 2020-05-18 09:47:56 +01:00
766a2178a0 Merge branch 'next-minor'
# Conflicts:
#	composer.lock
#	resources/vanilla
2020-04-19 12:56:44 +01:00
70a4f73d73 Drop PHP 7.2 support 2020-04-19 12:49:25 +01:00
fb1126797a Merge branch 'stable' 2020-02-07 18:13:55 +00:00
4140af459e travis: cache leveldb artifacts to reduce build time 2020-02-07 14:05:11 +00:00
f713cf25b1 travis: update leveldb version, only build sharedlibs targets on travis 2020-02-07 13:54:22 +00:00
e964dd2ca8 travis: cache composer vcs directory too 2020-02-06 08:37:38 +00:00
4572ec8175 travis: run composer with --prefer-dist 2020-02-05 17:14:11 +00:00
896cca0778 store composer cache for travis 2020-02-05 13:36:45 +00:00
afeb9838e4 Merge branch 'stable' 2020-02-02 16:47:19 +00:00
663469dfa7 travis: remove xdebug to improve build time
xdebug is almost completely useless here.
2020-02-02 16:30:00 +00:00
9a5d3e3d4f Merge branch 'stable' 2020-01-28 14:35:50 +00:00
41d02003c2 Install PHPStan and PHPUnit via dev dependencies 2020-01-27 12:04:42 +00:00
c16337a80f Merge branch 'stable' with changes 2019-11-09 18:01:04 +00:00
025cb73bf5 update travis pthreads 2019-11-09 17:34:04 +00:00
ec13cd695d travis: use ds 1.2.9 2019-10-24 13:19:29 +01:00
dbc4f84bcb travis: add igbinary 2019-10-24 13:18:42 +01:00
3cd6e12e71 Renaming "Level" -> "World" (#2907)
This has been a pain point for a long time due to the misleading nature of the name "level". It's also confusing when trying to do things like getting the XP level of the player or such, and also does not translate well to other languages.

This transition was already executed on the UI some time ago (language strings) and now it's time for the same change to occur on the API.

This will burn a lot of plugins, but they'll acclimatize. Despite the scary size of this PR, there isn't actually so many changes to make. Most of this came from renaming `Position->getLevel()` to `Position->getWorld()`, or cosmetic changes like changing variable names or doc comments.
2019-05-07 14:47:28 +01:00
13bea6c787 Updated Travis configuration 2019-03-10 19:53:55 +00:00
1f5c901f29 ext-ds is now required 2019-03-01 20:03:16 +00:00
f882f557fb Merge branch '3.5' 2019-01-15 10:33:58 +00:00
6cf30dc813 build 7.3 on travis 2019-01-11 23:54:44 +00:00
2bf6764112 Implemented network encryption (#2343)
For those who fuss about performance, you can disable the `network.enable-encryption` option to use sessions without encryption.
2018-07-31 15:54:18 +01:00
6a637d9099 update pthreads version for travis 2018-07-12 17:23:52 +01:00
5d07f66d86 Travis: Limit worker count to 4
By default it starts 30 workers on Travis because there are 32 logical cores available. This is ridiculously excessive and pollutes the log with debug spam.
2018-06-01 18:58:30 +01:00
8bb785b7af Update pthreads for Travis 2018-02-03 14:17:42 +00:00
aca1422fca Updated pthreads version for Travis 2018-01-23 16:49:32 +00:00
7baadf9dad Throw updated pthreads at Travis 2017-09-19 20:49:41 +01:00
1fd7f441b4 Travis: use older version of pthreads
master is broken - https://github.com/krakjoe/pthreads/issues/757
2017-09-18 10:20:15 +01:00
25adac8859 Added support for Composer (#323) 2017-09-10 19:23:34 +01:00
021a9a4820 Merge branch 'php/7.0' 2017-09-07 19:33:01 +01:00
5b7565664c Removed WeakRef from Travis CI 2017-09-07 19:32:04 +01:00
16aeb0ac85 Update .travis.yml 2017-08-31 21:12:45 +01:00
ddfe828445 Require PHP 7.2, bump PocketMine-MP version to 1.7dev 2017-08-31 20:27:05 +01:00
50bf671c28 Update .travis.yml 2017-02-06 19:32:34 +00:00
904c52bb0f Merge branch 'master' into mcpe-1.0 2017-01-22 16:08:34 +00:00
3ab9722a9f Add DevTools as submodule, build DevTools for Travis Test 2017-01-22 16:02:22 +00:00
496061ba54 Travis: Build DevTools on the spot 2017-01-20 10:12:16 +00:00
17a418f133 fix travis 2016-12-20 16:12:13 +00:00
d37afde0dc Disable Travis emails 2016-12-04 10:49:00 +00:00
6696b7ed52 Clean up .travis.yml 2016-12-02 12:21:06 +00:00
958473b333 update PHP-YAML to 2.0.0 for Travis 2016-11-24 12:04:52 +00:00