Virizion
d8f44434ff
Fixed a bunch of bugs. Still need to fix clicking compass ending game.
2015-12-14 00:00:40 -05:00
Virizion
54911bb213
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-13 19:54:57 -05:00
Virizion
12eba41975
Fixed corner stairs.
2015-12-13 19:52:32 -05:00
Cheese
b095fa9efe
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-13 21:15:32 +11:00
Cheese
011a194dc6
fixed exploit
2015-12-13 21:14:57 +11:00
Virizion
8bcc36adb1
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-13 01:39:42 -05:00
Virizion
ec86cad7ee
Changed descriptions.
2015-12-13 01:38:38 -05:00
libraryaddict
e7213fdb7e
Remove project specific settings
2015-12-13 16:41:37 +13:00
libraryaddict
9058428484
Change ItemBuilder to have ItemFlag, change hub icons to not display weapon damage
2015-12-13 16:40:46 +13:00
Virizion
2a45018fcd
array thing
2015-12-11 23:41:46 -05:00
Virizion
7a82cf04f0
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-11 23:02:16 -05:00
Shaun Bennett
402530d671
Merge pull request #94 in MIN/mineplex from william-gladiators to master
...
* commit '0d4bd91b573ca251d15471b6454452bd4ebca195':
lag detection thing
Scoreboard change and breaking blocks.
Couple of fixes
2015-12-11 18:57:52 -06:00
Shaun Bennett
c470ad880d
Merge pull request #77 in MIN/mineplex from foo to master
...
* commit 'd7497ec09881047d7461630fac2c3b51bf37a06c': (23 commits)
Fixed Micro Battle icon not appearing in stats menu
Gravity's icon changed to ENDER_PORTAL_FRAME
world's smallest bugfix - admin->co-host
Fixed advertisement being able to be bypassed by spec and instant join
fixed naming pets non-alphanumeric characters
changed reference to premium ranks
removed important debug thing
fixed ssm enderman always facing south on teleport
fixed bacon blast exloding blocks
fixed shield smash and fissure affecting spectators
fixed slab issue with Assassin's Flash
Re-fixed Barbarian bug
Fixed SG Barbarian bug
SSM bug fix: magma cube flame dash doesn't make player invisible
fixed several smash bugs and one global issue
Slightly bumped Monster Maze jump time value
fixed bridge bug "Death Bomber counts suicides as well"
typo fix in legendary aura description
Update achievement kit reference text
Fixed tnt bug (SG)
...
2015-12-11 18:57:18 -06:00
William Burns
0d4bd91b57
lag detection thing
2015-12-11 22:47:07 +00:00
William Burns
6456d7bd66
Scoreboard change and breaking blocks.
2015-12-11 16:55:15 +00:00
William Burns
1dcbf5f7fd
Couple of fixes
2015-12-11 16:34:04 +00:00
Shaun Bennett
ac6d3c2c8f
merge with master
2015-12-11 06:27:23 -05:00
William Burns
523c1875ef
fix
2015-12-11 06:58:11 +00:00
Jonathan Williams
95a81ef368
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
2015-12-11 01:26:20 -05:00
Jonathan Williams
222173ab17
Improved and implemented GameProfile caching.
2015-12-11 01:24:59 -05:00
Jonathan Williams
b5c157c123
Changed PlayerCache to Cache
2015-12-11 01:24:16 -05:00
libraryaddict
9a4006df27
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-12-11 17:18:07 +13:00
libraryaddict
c5f0624bf7
Add build file
2015-12-11 17:17:52 +13:00
Shaun Bennett
4588091c5b
Merge remote-tracking branch 'origin/master'
2015-12-10 23:15:42 -05:00
Shaun Bennett
21c8a66917
Fix imports
2015-12-10 23:15:35 -05:00
libraryaddict
3cd187ff04
Move LineFormat.java
2015-12-11 16:57:21 +13:00
libraryaddict
4cfa7c436b
Add missing file
2015-12-11 16:48:40 +13:00
Virizion
14b5a9453a
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-10 22:18:00 -05:00
Virizion
68360c6705
shortened if
2015-12-10 22:17:10 -05:00
William Burns
a760dba783
i lied.
2015-12-11 02:59:16 +00:00
William Burns
7a597d90b7
final push goodnight
2015-12-11 02:48:06 +00:00
William Burns
1607345f04
title + debug
2015-12-11 02:41:44 +00:00
William Burns
563a0f0ec7
remove tutorial and no flicker
2015-12-11 02:30:44 +00:00
libraryaddict
a0b7870acc
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-12-11 15:21:18 +13:00
libraryaddict
1661c056c1
Added line stuff
2015-12-11 15:21:05 +13:00
Shaun Bennett
2694787590
Reverting
2015-12-10 20:59:57 -05:00
Shaun Bennett
cf73d27a84
Merge remote-tracking branch 'origin/master'
2015-12-10 20:53:42 -05:00
Shaun Bennett
4d05bd5c50
Player count for chiss
2015-12-10 20:53:38 -05:00
William Burns
f8d7aeb5ea
before revert
2015-12-11 01:32:32 +00:00
William Burns
dda5ac6728
work
2015-12-11 01:20:36 +00:00
William Burns
626a812844
Many changes
2015-12-11 00:40:54 +00:00
Shaun Bennett
ab16bf89e5
Merge remote-tracking branch 'origin/master'
2015-12-10 17:04:25 -05:00
Shaun Bennett
851b613d2e
Now playing fix
2015-12-10 17:04:15 -05:00
William Burns
4cf33eef05
Tutorial changes!
2015-12-10 21:32:14 +00:00
William Burns
624e8bbe89
Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-10 20:56:03 +00:00
William Burns
0bd276c16a
Merge branch 'pregametutorial' of ssh://184.154.0.242:25565/min/mineplex into pregametutorial
2015-12-10 20:53:01 +00:00
William Burns
8d7b03e3f6
Added the ability to have title AND subtitle per TutorialText.
2015-12-10 20:52:41 +00:00
William Burns
2951088005
Tutorial changes/additions.
2015-12-10 20:48:13 +00:00
Virizion
c73bd54aec
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-10 15:38:17 -05:00
William Burns
3586642414
Added back the tutorial.
2015-12-10 19:32:25 +00:00
