Shaun Bennett
2eaa326929
Merge remote-tracking branch 'origin/master'
2015-11-09 03:27:50 -05:00
Shaun Bennett
2c54e9e59a
Giveaway extras
2015-11-09 03:27:42 -05:00
Jonathan Williams
fb4978305f
Fixed up EnjinTranslator
...
Added extra overload for inventoryManager if you have the accountId already.
2015-11-09 02:26:45 -06:00
Shaun Bennett
2a7b272de3
Merge remote-tracking branch 'origin/master'
2015-11-09 01:55:36 -05:00
Jonathan Williams
283a774e03
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-09 00:04:55 -06:00
Jonathan Williams
4915ebc5ad
Added Purchase logging manager for Enjin.
...
Added extra callback method for SaveRank.
2015-11-09 00:04:38 -06:00
Jonathan Williams
ff936784d3
Remove debug code.
2015-11-08 17:27:00 -06:00
Jonathan Williams
e86623c8d0
Disabled TrickOrTreatManager to test for Lobby lockups.
2015-11-08 17:26:43 -06:00
Jonathan Williams
fd3ccf7ce0
Fix Bungee lobby balancer code.
2015-11-08 17:25:54 -06:00
libraryaddict
d466005c35
Fix custom names not changing
2015-11-09 05:08:08 +13:00
libraryaddict
752d8152d2
Merge pull request #72 in MIN/mineplex from iKeirNez_Bugfix to master
...
* commit '783bec75db7592dc191698b8dfbb89be08a818aa':
Fix for some preferences not applying correctly.
2015-11-08 08:23:20 -06:00
libraryaddict
1999e09e69
Update CB
2015-11-09 02:44:16 +13:00
libraryaddict
ce3af6cf9c
Update cb.jar
2015-11-09 00:15:28 +13:00
libraryaddict
e039f2249c
Update cb
2015-11-08 18:02:36 +13:00
libraryaddict
c4d6bcba02
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
2015-11-08 17:56:34 +13:00
Shaun Bennett
3c82574386
Testing pushing/ignore this
2015-11-07 20:02:07 -05:00
Shaun Bennett
ffc389f9c7
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-07 19:58:12 -05:00
Shaun Bennett
af1d91913b
Clans gui work
2015-11-07 19:58:03 -05:00
NewGarbo
9a70d33b17
Fixed clans user directory being wrong on test servers (because a backslash ['\'] is not seperator for certain OS). Changed /gear command rank back to Admin, and added assassin armor to the gear GUI.
2015-11-07 20:26:43 +00:00
Shaun Bennett
addde570bb
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-07 14:53:35 -05:00
Shaun Bennett
bf97cf5d77
Remove debug code
2015-11-07 13:53:34 -05:00
libraryaddict
79d0466355
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2015-11-07 21:36:36 +13:00
libraryaddict
627ce08113
Add info on note particle
2015-11-07 21:35:26 +13:00
Shaun Bennett
e1f56a5d5a
Merge remote-tracking branch 'origin/master'
2015-11-07 01:10:34 -05:00
Shaun Bennett
ec7600a4a2
Giveaway tweaks
2015-11-07 01:10:27 -05:00
Cheese
c922c3248c
disabled trick or treat
2015-11-07 13:36:16 +11:00
Cheese
f4bf685e96
removed halloween hub
...
removed titan giveaway and pumpkins
2015-11-07 13:20:29 +11:00
Shaun Bennett
4add7449eb
Merge remote-tracking branch 'origin/master'
2015-11-06 21:15:45 -05:00
Shaun Bennett
3893617d58
Logitech Giveaway (still needs testing)
2015-11-06 21:15:37 -05:00
Keir
783bec75db
Fix for some preferences not applying correctly.
2015-11-06 23:04:51 +00:00
libraryaddict
d3d448ccfe
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
2015-11-07 04:47:37 +13:00
libraryaddict
cc0f12f6c8
Fix player interactions packets not working properly on armorstand and when clicking block behind entity
2015-11-07 04:45:02 +13:00
NewGarbo
b835823230
Preferences page changes to free up space, as the current preferences layout is completely full.
...
Removed unnecessary Spawn variable in Clans.java, as it was causing a warning and warnings look ugly.
2015-11-06 13:19:02 +00:00
NewGarbo
7675b00999
Dominance event. Shaun will have to call the new events once he's done with Dominance.
2015-11-06 07:11:06 +00:00
NewGarbo
1375623625
Added alpha messages.
2015-11-04 17:03:52 +00:00
libraryaddict
77125b3a24
Don't re-set scoreboard lines
2015-11-05 01:10:08 +13:00
libraryaddict
31b4fbec15
Fix a null
2015-11-05 00:49:26 +13:00
libraryaddict
0352e52a68
Tentative beginnings of wider scoreboards
2015-11-05 00:42:45 +13:00
NewGarbo
3ff044fddb
Added PlayerUnClaimTerritoryEvent, and added some new stuff to TutorialClanTips
2015-11-04 11:32:06 +00:00
libraryaddict
a0676b7bcf
Fix tnt in SG being usable during DM invul
2015-11-04 21:44:10 +13:00
libraryaddict
21d10e4bec
Fix typo
2015-11-04 19:15:06 +13:00
libraryaddict
b3f86ba638
Fixing bugs
2015-11-04 18:34:22 +13:00
NewGarbo
8033b40011
made math in GearPage a tiny bit more understandable
2015-11-04 01:27:33 +00:00
NewGarbo
ed1e394a84
removed an unused type and a bit more cleanup; getting ready to clean up GearPage, which is... *shudders*
2015-11-04 00:09:46 +00:00
NewGarbo
a455804dce
some Tutorial code cleanup
2015-11-04 00:07:32 +00:00
NewGarbo
4bf92ce0a0
gah why isn't this working?! git is annoying!!!
2015-11-03 23:47:35 +00:00
NewGarbo
ecd3b0ef76
removed a multiple Mineplex.Core.Common import thingy in the core project or something. i dunno, it was causing errors so i fixed it, yay!
2015-11-03 22:06:23 +00:00
NewGarbo
b7bf4765c4
DANG YOU WILLIAM
2015-11-03 22:05:17 +00:00
NewGarbo
7f03ca0936
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java
2015-11-03 21:19:17 +00:00
NewGarbo
78ab895a14
Added heart particles to the GiantsBroadsword healing feature, also added some strong sounds.
...
Made it so that players using the broadsword's effects cannot attack anything.
Added small smoke particle to UtilParticle.
Added a burnout feature to the WindBlade, disallowing players to speed around on the ground for ever.
Moved the Lapis Lazuli block particles from infront of the player, to the feet of the player when using the AlligatorsTooth, as per SamitoD's request.
Removed some debug messages thrown around the code.
2015-11-03 19:49:14 +00:00
