JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,929 Commits 1 Branch 0 Tags 481 MiB
f6ce98f65b
Commit Graph

2151 Commits

Author SHA1 Message Date
NewGarbo
a0ae500876 tutorial revamp [clans] 2015-11-28 09:03:58 +00:00
Cheese
700cf51206 titan stuff almost done 2015-11-28 16:35:11 +11:00
Cheese
963caae719 Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes' 2015-11-28 16:00:28 +11:00
Cheese
8af545af80 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitanData.java
 2015-11-28 15:59:26 +11:00
Cheese
0871663498 titan stuff 
I HATE YOU SNAKE.
 2015-11-28 15:57:07 +11:00
Shaun Bennett
1a87d85174 Merge remote-tracking branch 'remotes/origin/master' into clans-beta 2015-11-27 23:13:43 -05:00
xGamingDudex
24f8a98545 Added titan particle trail. 2015-11-28 02:22:41 +01:00
NewGarbo
fe085c1571 loaaads of stuff 2015-11-27 19:42:15 +00:00
libraryaddict
636dcdf9f7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitan.java
 2015-11-28 05:28:04 +13:00
libraryaddict
5f8f643d95 What snake mount code I did 2015-11-28 05:26:43 +13:00
Shaun Bennett
a5ebf9b059 Fixes for release 2015-11-27 05:53:57 -05:00
Cheese
4e2f48b37e Merge branch 'master' into clans-beta 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
 2015-11-27 19:16:30 +11:00
Cheese
f55b6761a8 disabled titan gadgets! 2015-11-27 19:14:35 +11:00
Cheese
77be81c216 pet changes 2015-11-27 16:50:22 +11:00
Cheese
2b047cdde8 more titan stuff 2015-11-27 16:46:48 +11:00
Cheese
05e7183b65 titan stuff update 2015-11-27 15:55:00 +11:00
NewGarbo
0274bf2847 loads of changes. 2015-11-27 03:28:19 +00:00
libraryaddict
3c98243201 Some more guardian stuff 2015-11-27 15:56:56 +13:00
libraryaddict
0a4416381b Fix guardian 2015-11-27 15:55:02 +13:00
Cheese
98d988584d titan cosmetics 2015-11-27 13:35:25 +11:00
NewGarbo
0d43ffc7b2 fixessss 2015-11-26 06:54:49 +00:00
libraryaddict
3e8a53562e Add new hologram interaction thingy so holograms can catch interactions that they would normally block 2015-11-26 15:49:28 +13:00
Shaun Bennett
1306137cb2 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-25 14:51:00 -05:00
Shaun Bennett
ff5d828dd7 Merge with master, lots of clans fixes/work 2015-11-25 14:50:49 -05:00
NewGarbo
2adfef41ca bug fixes and new stuff ( https://docs.google.com/spreadsheets/d/1jrKJIXhIF0TZvYKLyAC50IYfN8ylLZK_M8lSexEZTkc/edit#gid=0&vpid=A10 ) 2015-11-25 16:46:53 +00:00
xGamingDudex
3b89d65a09 Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
	Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java
 2015-11-25 15:59:18 +01:00
libraryaddict
ca81265b9e Readded PacketHandler debug message 2015-11-25 13:42:11 +13:00
Sarah
46362a3d5f Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-11-24 15:38:52 +01:00
Cheese
837be048a6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-24 21:38:47 +11:00
Jonathan Williams
f8d8b75586 Changed how timings is used. 2015-11-24 04:36:18 -06:00
fooify
f300fd2c98 Merge remote-tracking branch 'origin/master' into foo 2015-11-23 15:34:27 -08:00
Shaun Bennett
ef7c26c04c Clans changes 2015-11-23 15:57:13 -05:00
NewGarbo
a551e89310 fixed clans tips preferences, and changed World Event commands perms from being ALL to EVENT 2015-11-23 09:44:35 +00:00
AlexTheCoder
3bb11bba08 - Fixed Stats [caused by bad communication between chiss and I] 2015-11-21 11:30:53 -05:00
Cheese
6eb1bef1c6 Merge branch 'master' into minestrike-update 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
 2015-11-21 11:09:28 +11:00
Cheese
d5076b1c47 CTF fix 2015-11-21 09:41:02 +11:00
Sarah
6f7d49b71b Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-20 19:04:51 +01:00
AlexTheCoder
386032a4f5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-20 06:03:30 -05:00
AlexTheCoder
f51358552a -B 2015-11-20 05:57:29 -05:00
Jonathan Williams
700e4c9a1f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-19 22:12:08 -06:00
Cheese
3a5ab3f17c Merge branch 'master' into monster-league 2015-11-20 11:51:07 +11:00
Shaun Bennett
3820035762 Cleaning up duplicate code/small optimizations (untested) 2015-11-19 14:35:59 -05:00
Sarah
bff9a065d9 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
#	Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
 2015-11-18 18:08:51 +01:00
NewGarbo
5c2569e822 revert certain permissions from being ALL or containing JR.DEV (that were used for testing) 2015-11-18 16:20:27 +00:00
Shaun Bennett
1eff698a34 Merge pull request #75 in MIN/mineplex from william-global to master 
* commit 'a11ca138e764417c23a0060dd134ef7c49741295':
  ranks
  woops easy fix
  rawr and fixes
  Added the ability to give out game loot.
  Reformatting titles
  Added GlobalGiveCoins. Changes Gems a little and the manager.
  More global stuff! Added GlobalGiveGems.
  Global Packet work. Added giveitem sub-command.
 2015-11-18 10:15:33 -06:00
William Burns
a11ca138e7 ranks 2015-11-18 16:01:53 +00:00
William Burns
04a4b072af woops easy fix 2015-11-18 15:48:25 +00:00
William Burns
2e223d0660 rawr and fixes 2015-11-18 15:42:33 +00:00
William Burns
e16ee9036a Added the ability to give out game loot. 2015-11-18 14:35:40 +00:00
William Burns
e83b49d490 Reformatting titles 2015-11-18 13:43:22 +00:00
NewGarbo
f79c282225 Clan energy warnings implemented. (not tested yet) 2015-11-18 07:39:00 +00:00
William Burns
e19d4e11e1 Added GlobalGiveCoins. Changes Gems a little and the manager. 2015-11-17 18:54:39 +00:00
William Burns
a28adc9673 More global stuff! Added GlobalGiveGems. 2015-11-17 18:26:19 +00:00
Mysticate
448dd33c1a Switching branches c: 2015-11-17 11:38:02 -05:00
William Burns
0f7c52391f Global Packet work. Added giveitem sub-command. 2015-11-17 08:19:36 +00:00
Cheese
adfc2f19eb Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-17 09:20:15 +11:00
Cheese
46505a8e8e converted to new res pack locations 2015-11-17 09:19:33 +11:00
libraryaddict
208d90c4bc Fixed getTargetBlock being 0 when its infinite 2015-11-17 10:18:42 +13:00
Jonathan Williams
ac792dcd02 Removed some unnecessary code in updateRank and opened up all ranks to be used. 2015-11-15 18:33:43 -06:00
AlexTheCoder
217509b75a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
Conflicts Resolved
 2015-11-15 18:58:20 -05:00
AlexTheCoder
ecaa4a49b4 - Fix for stats 2015-11-15 17:48:00 -05:00
NewGarbo
24dee0ebf6 updated ScoreboardElement to use the interface instead of the implementation. PLEASE NEVER USE THE IMPLEMENTATION FOR DEFINING THE TYPE!!! 2015-11-15 20:52:45 +00:00
NewGarbo
c247fe9317 World event prettification and fixes 2015-11-15 18:19:28 +00:00
fooify
db21d627d8 Merge remote-tracking branch 'origin/master' into foo 2015-11-14 09:13:51 -08:00
Jonathan Williams
daee44d262 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-14 02:01:24 -06:00
Jonathan Williams
4a73bce586 Added gadget and projectileUser logging. 2015-11-14 00:36:34 -06:00
Cheese
259397b6ae READY 2 GO 2015-11-14 12:52:14 +11:00
Shaun Bennett
bbc7bf770c 1.8 Fixes - Still doing map fix 2015-11-12 19:18:42 -05:00
Shaun Bennett
639d2d110f Merge remote-tracking branch 'remotes/origin/master' into clans-beta 2015-11-12 17:55:33 -05:00
Shaun Bennett
0b41450603 Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"" 
This reverts commit 6c17b2926c.
 2015-11-12 17:51:13 -05:00
Cheese
3122397f7a Merge branch 'master' into minestrike-update 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
 2015-11-13 09:19:44 +11:00
Shaun Bennett
6c17b2926c Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta" 
This reverts commit ce1c09b88f, reversing
changes made to 1aef7fe0b9.
 2015-11-12 16:35:31 -05:00
AlexTheCoder
bc1b185f0e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-12 02:44:54 -05:00
AlexTheCoder
a8b27e66d1 - Finalized game to chiss and sigils' requirements minus flag status in scoreboard, will add next commit 
- Fixed items ever being lost from treasurechests
 2015-11-12 00:06:21 -05:00
fooify
8a0906587d Merge remote-tracking branch 'origin/master' into foo 2015-11-11 20:15:31 -08:00
Shaun Bennett
875c399c9f Merge branch 'master' into clans-beta 2015-11-11 21:31:03 -05:00
libraryaddict
25f299b490 Fix interact types 2015-11-12 14:34:12 +13:00
Shaun Bennett
e66bebcfb1 Give all treaure items when opening the chest 2015-11-11 18:13:47 -05:00
NewGarbo
ce1c09b88f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java
	Plugins/Libraries/craftbukkit.jar
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
 2015-11-11 19:35:44 +00:00
libraryaddict
b915131407 Fix some armorstands and interaction bugs 2015-11-12 04:26:55 +13:00
Cheese
ef2411b7d5 Merge branch 'master' into minestrike-update 2015-11-11 13:43:36 +11:00
libraryaddict
3e6d73221b Disabled a fix 2015-11-11 15:21:17 +13:00
Cheese
a47752cfe2 disabled usage of /minecraft: commands in 1..8 2015-11-11 12:49:19 +11:00
Cheese
59a054eeba fixed merge erorr 2015-11-11 07:52:02 +11:00
Cheese
520eb55b88 Merge branch 'master' into minestrike-update 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-11-11 07:43:50 +11:00
fooify
394d680470 Merge remote-tracking branch 'origin/master' into monster-league 2015-11-10 07:09:19 -08:00
fooify
ca1177685f totally WIP commit 2015-11-10 07:08:08 -08:00
AlexTheCoder
e165cad50f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-10 04:53:32 -05:00
Shaun Bennett
2707173a8b Merge with 1.8 Branch 2015-11-10 01:48:33 -05:00
Shaun Bennett
ec3427bcc0 Giveaway manager bug fix 2015-11-09 04:08:26 -05:00
NewGarbo
7a8a5918c0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/.idea/dataSources.xml
	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java

** CONFLICTS ALL FIXED **
 2015-11-09 08:59:37 +00:00
Shaun Bennett
05b52614fe Forgot to remove debug code for testing 2015-11-09 03:49:12 -05:00
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
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
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
AlexTheCoder
dfbf19c66a Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-08 01:02:06 -05: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
Cheese
cc2e5bc6e4 minestrike update! 2015-11-08 11:30:19 +11: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
Shaun Bennett
ec7600a4a2 Giveaway tweaks 2015-11-07 01:10:27 -05: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
AlexTheCoder
fafc92606c Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
 2015-11-06 18:43:11 -05:00
Keir
783bec75db Fix for some preferences not applying correctly. 2015-11-06 23:04:51 +00: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
AlexTheCoder
87d7ff8a8f - Synced up expire times for proximity weapons 2015-11-05 02:21:36 -05:00
AlexTheCoder
61653347c7 - Fixed proximity weapons not being able to detonate 2015-11-05 02:11:20 -05:00
AlexTheCoder
9c49ab0408 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-05 01:23:40 -05:00
NewGarbo
3ff044fddb Added PlayerUnClaimTerritoryEvent, and added some new stuff to TutorialClanTips 2015-11-04 11:32:06 +00:00
libraryaddict
b3f86ba638 Fixing bugs 2015-11-04 18:34:22 +13: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
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
libraryaddict
3de906ab19 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
 2015-11-03 14:57:25 +13:00
Shaun Bennett
4794cc6924 Clans Gui 2015-11-02 20:41:08 -05:00
Jonathan Williams
8838ea75e4 Some code cleanup for tasks. 2015-11-02 09:37:11 -06:00
Jonathan Williams
3b38302429 Optimized TaskManager task locks and calls. 
Run all player messages on the main thread.
 2015-11-02 09:35:35 -06:00
Jonathan Williams
55d028d706 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-01 22:09:58 -06:00
Shaun Bennett
9cf62cfe7f Don't use player skulls until caching is setup and working properly 2015-11-01 22:58:22 -05:00
Jonathan Williams
cb96124feb Added extra cleanup for FriendsGUI and AddFriendPage 2015-11-01 17:42:23 -06:00
NewGarbo
baa4a744fb Fixed a whole load of bugs: 
Fixed the next button occasionally displaying a blank page in the gear GUI.
Fixed not being able to click the back button when selecting a bow in the gear GUI.
Made selectable items glowing in the gear GUI.
 2015-10-31 23:11:12 +00:00
Jonathan Williams
073321fb14 Refactored TrickOrTreat Stuff. 2015-10-31 14:45:42 -05:00
Cheese
b8b260bca1 fixed expire time on projectiles 2015-10-31 19:01:49 +11:00
Cheese
c463b80fe0 fixed insta-expire 2015-10-31 19:00:28 +11:00
Cheese
3636fdfba0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-31 18:23:06 +11:00
Cheese
225f067ab3 fixed some projectile stuff 2015-10-31 18:22:53 +11:00
Shaun Bennett
cd15df0238 Merge remote-tracking branch 'origin/master' 2015-10-31 02:13:24 -04:00
Cheese
23be8aa1dd removed unncessary stuff 
balanced rewards
 2015-10-31 14:33:41 +11:00
Cheese
a92a52f009 Merge branch 'Myst_TRICKORTREAT' 2015-10-31 14:27:06 +11:00
Mysticate
4884032a1a Added a beautiful Trick o' Treat system for the hub. Happy Halloween! <3 2015-10-30 23:24:32 -04:00
Cheese
b9d7c80f80 cow kit 2015-10-31 13:25:57 +11:00
libraryaddict
301b8012ff Final commit 2015-10-30 19:30:17 +13:00
libraryaddict
ea1e4b79f7 Changes from SnD branch 2015-10-30 19:25:02 +13:00
libraryaddict
ed18588a6a Fix missing code and stuff 2015-10-30 19:12:04 +13:00
Cheese
c4e93180fa Merge branch 'master' into smash-champs-balance 2015-10-30 13:00:30 +11:00
AlexTheCoder
0be51d5629 - Even more bugfixes 2015-10-29 16:48:51 -04:00
Shaun Bennett
e2947718fe Remove code that wasnt meant to be commited 2015-10-29 13:10:10 -04:00
libraryaddict
0486404c4b 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-10-28 14:38:34 +13:00
libraryaddict
5ec932d1ca Fixing bugs 2015-10-28 14:36:48 +13:00
AlexTheCoder
7770fa0284 - Added system to ensure banned players are removed from the network 2015-10-26 07:09:01 -04:00
AlexTheCoder
f5b4f28848 - Fixed achievements 
- Various balance patches/audio changes
 2015-10-26 00:25:33 -04:00
fooify
cbe147d705 typo fix in legendary aura description 2015-10-25 12:32:27 -07:00
fooify
7024084ce3 Update achievement kit reference text 2015-10-25 11:29:06 -07:00
fooify
bb806d6260 Merge remote-tracking branch 'origin/master' into foo 2015-10-25 10:10:06 -07:00
NewGarbo
327c129f46 Fixed the rest of merge conflicts (? [I hope {shaun help me ;-;}]) 2015-10-25 12:28:12 +00:00
Shaun Bennett
556d5adcd9 Change /global to /globalpacket (fixes conflict with announcement command) 2015-10-24 17:46:25 -04:00
NewGarbo
1e4b3442fa Conflicts: 
Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java
 2015-10-24 20:45:39 +01:00
Shaun Bennett
0d56eefd44 Titan/Rewards adjustments 2015-10-24 13:40:17 -04:00
Shaun Bennett
40afcaf26b Global Packet Commands 2015-10-23 15:07:53 -04:00
libraryaddict
2eb8b3e234 Catch PacketHandler exceptions 2015-10-24 02:17:19 +13:00
libraryaddict
5ec4203fd9 More changes to disguise 2015-10-24 01:36:42 +13:00
libraryaddict
a450b828b7 Fix disguises custom name 2015-10-24 00:48:54 +13:00
AlexTheCoder
f7dab72e8c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-10-23 03:23:35 -04:00
Cheese
af208da953 Merge branch 'alex-testrank' 2015-10-23 18:10:59 +11:00
Shaun Bennett
e3e7dd4694 Titan rewards from mythical chests 2015-10-23 02:08:31 -04:00
AlexTheCoder
1512d87f9e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank 2015-10-23 00:28:32 -04:00
AlexTheCoder
5a94e33d5e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-10-23 00:24:52 -04:00
libraryaddict
aedf04b3e3 Fix renaming pet not opening proper window 2015-10-23 09:26:21 +13:00
libraryaddict
53aa1b655b Remove custom formatter because it trims too short, don't need to commit it. Cleaned up CustomTagFix 2015-10-23 09:20:24 +13:00
libraryaddict
8cde506a2c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-10-23 05:25:36 +13:00
libraryaddict
ddb8d592f8 Remove all is1_8 checks 2015-10-22 18:37:14 +13:00
Shaun Bennett
00a689ea03 War work 2015-10-21 14:48:27 -04:00
Jonathan Williams
c719d693dd Added delete benefit call for repository. 
Added failsafe in case inventory update didn't apply
Removed 43k benefit.
 2015-10-21 01:15:09 -05:00
NewGarbo
227e9f7bfc Pretty much finished with tutorials, not fully though, but I am simply pushing so I don't lose all my work. 
CHANGES----

Added a little hack to ScoreboardElement.java that allows for a single element to clear the currently existing scoreboard lines output, or modify it.

Coded in the functionality of 7 tasks, will do the rest now.
 2015-10-21 04:27:14 +01:00
Sarah
6860f013d0 Fixing some spelling typos chat filtering and the scoreboard. 2015-10-20 19:23:58 +02:00
libraryaddict
07f032a5d2 Fix wither pet making sounds, fixed worldtime. 2015-10-21 04:22:31 +13:00
libraryaddict
ddd674e371 Packets implement Pcaket right 2015-10-20 17:19:46 +13:00
libraryaddict
b3caf7c2d4 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-10-20 04:38:12 +13:00
Jonathan Williams
3ef33bd9c5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-19 01:32:23 -05:00
Jonathan Williams
5e307da15a Fix for inventory failure. 2015-10-19 01:32:12 -05:00
Shaun Bennett
6d7f15cd6d Fix hub time after light flicker 2015-10-18 18:52:16 -04:00
libraryaddict
55f97ef984 More fixes, along with a fix for Block Hunt 2015-10-19 06:21:16 +13:00
Shaun Bennett
177e482dbc Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2015-10-18 12:35:31 -04:00
Jonathan Williams
9e7629b1fe Added 43k player chest benefit. 
Updated MOTD.
 2015-10-18 00:21:01 -05:00
AlexTheCoder
12319169a9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/RadarData.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilRadar.java
 2015-10-18 00:54:18 -04:00
libraryaddict
6f91827d57 Vector to Vector3f, updated Maze to 1.8 2015-10-18 12:40:01 +13:00
libraryaddict
02bf202d52 1.8 update 2015-10-17 13:21:03 +13:00
libraryaddict
3a0781b3c7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
 2015-10-17 00:10:32 +13:00
libraryaddict
14a524cf54 Stuff 2015-10-17 00:08:30 +13:00
libraryaddict
f71cb80bd0 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/game/games/minestrike/MineStrike.java
 2015-10-16 22:26:07 +13:00
libraryaddict
70c76d976f More changes 2015-10-16 22:10:13 +13:00
Jonathan Williams
62b209fede Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-16 01:57:30 -05:00
Jonathan Williams
d00fa856f3 Fixed Pets so they work correctly. 
Also fixed legend benefits.
Fixed chest pet rewards.
 2015-10-16 01:57:19 -05:00
Cheese
577c67cacd Merge branch 'Myst_HALLOWEEN' 2015-10-16 14:18:35 +11:00
Mysticate
b15b81a7e2 Spacing 2015-10-15 23:09:23 -04:00
Cheese
6cc33fd6c6 Merge branch 'thanos-bug-fixes' 2015-10-16 12:53:43 +11:00
Mysticate
41511dce7b Merge remote-tracking branch 'origin/master' into monster-maze 2015-10-15 21:19:24 -04:00
libraryaddict
3dda9352e7 Progress 2015-10-16 13:32:23 +13:00
libraryaddict
4205dc6c25 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/game/games/halloween/Halloween.java
 2015-10-15 12:34:34 +13:00
Shaun Bennett
0df637b80a Run punishBot in main server thread 2015-10-13 22:56:14 -04:00
Shaun Bennett
f683e932ae Clans merge fixes 2015-10-13 22:24:15 -04:00
Mysticate
a049d7666f Merge remote-tracking branch 'origin/master' into monster-maze 2015-10-13 22:14:19 -04:00
Cheese
45cd2a38e1 admins can botspam 2015-10-14 11:55:59 +11:00
Shaun Bennett
88709f85b6 Merge with master 2015-10-13 18:13:01 -04:00
Shaun Bennett
cb0d82174e Apply botspam to chat messages as well 2015-10-13 17:41:25 -04:00
Sarah
d925ae7f8d adding animation for Speed Boost, fixing mob item dropping. 2015-10-13 15:53:48 +02:00
Cheese
d105ea5d7e botspam addition 2015-10-13 23:19:48 +11:00
libraryaddict
58a86c5abb That's the easy stuff done.. 2015-10-13 19:49:15 +13:00
AlexTheCoder
e1d8b25e91 - Fix misc champs bugs 2015-10-13 01:24:57 -04:00
Cheese
f5b80c941c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-13 11:58:27 +11:00
Cheese
e8388437b6 botspam now checks for chat as well 2015-10-13 11:58:14 +11:00
AlexTheCoder
0bd026f506 - Fixed merge issues 2015-10-12 18:04:35 -04:00
AlexTheCoder
f497eab633 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-10-12 17:54:11 -04:00
Sarah
9010b8bfe9 removing some unneeded stuff and fixing tag overlaying 2015-10-12 22:01:23 +02:00
libraryaddict
cef52368a3 Hologram fixes 2015-10-13 08:59:13 +13:00
Sarah
ff7ebeed57 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-10-12 20:23:34 +02:00
AlexTheCoder
bbb863ba92 - Merge conflict patch 2015-10-12 02:36:10 -04:00
Cheese
2b9a66e7b2 more ssm update 2015-10-12 16:32:23 +11:00
Shaun Bennett
1aecc9505c Add region to titan, new MOTD 2015-10-12 01:30:31 -04:00
AlexTheCoder
bef942f6da Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank 2015-10-12 00:47:56 -04:00
Cheese
6a173073a4 added flag to projectiles 
work on cow kit
 2015-10-12 14:39:14 +11:00
libraryaddict
dab258dcdd Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Libraries/BungeeCord.jar
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
	Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
 2015-10-12 16:22:52 +13:00
Mysticate
2abf3edad4 Made items for titanic cosmetics dyes. 2015-10-11 22:29:26 -04:00
Mysticate
b6d573a4d5 Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 2015-10-11 22:25:25 -04:00
Mysticate
7a4ccdf680 Bug fixes 2015-10-11 22:17:34 -04:00
Mysticate
20dd9c683b Merge remote-tracking branch 'origin/master' into monster-maze 
Conflicts:
	Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java

Changed the scoreboard a bit, added it to MPS.
 2015-10-11 10:52:45 -04:00
Jonathan Williams
e6485a9009 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-10 23:02:36 -06:00
Jonathan Williams
5866e0cce6 Reducing max connections for the DBPool to 3. 2015-10-10 23:02:08 -06:00
Cheese
f23bf18928 adhering to mysts OCD 2015-10-11 14:50:57 +11:00
Cheese
f3e2f3c145 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-11 14:48:17 +11:00
Cheese
cb9e8f8e0b pumpkin smasher achievement 2015-10-11 14:48:02 +11:00
Jonathan Williams
998d5f6984 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-10 21:25:29 -06:00
Jonathan Williams
061a7b7c73 Fixed Pet FK errors. 
Added SUPPORT to acceptable updateRank command.
 2015-10-10 21:24:47 -06:00
Cheese
6860fa608a titan placeholder perks 
art
fixed pumpkin gem count
 2015-10-11 11:26:09 +11:00
Cheese
323842c693 fixed mods staying in flight 2015-10-10 19:36:38 +11:00
Shaun Bennett
a242c6b592 Halloween Update finishes 2015-10-10 03:23:37 -04:00
Cheese
e9207acd7f Merge branch 'alex-halloween' 2015-10-10 17:38:09 +11:00
Cheese
7bc3b4970b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java
 2015-10-10 17:34:17 +11:00
AlexTheCoder
67a1f4ce8d Titan Giveaway: 
- Added Titan pumpkin animation
Titan Perks (For later, Removed from Menu):
- Added Kronos Particle
 2015-10-10 02:31:52 -04:00
Mysticate
930cfa5cb8 DONE 2015-10-10 02:30:11 -04:00
Shaun Bennett
f1e9acbb58 Titan giveaway 2015-10-10 02:19:05 -04:00
Mysticate
9a7357e484 Work 2015-10-10 01:00:49 -04:00
Shaun Bennett
36fabf93b6 Merge remote-tracking branch 'origin/master' 2015-10-09 23:14:13 -04:00
Shaun Bennett
bc7bf8a2e2 fixes/debug 2015-10-09 23:13:39 -04:00
Jonathan Williams
512e08af19 Removed all create table statements. 2015-10-09 21:02:35 -06:00
Mysticate
7851cb451a Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
 2015-10-09 22:34:05 -04:00
Shaun Bennett
aa9fd1abf3 Titan giveaway work 2015-10-09 22:14:10 -04:00
Peter Miller
611fb88f15 Commented out unnecessary table creation statements (tables already exist in database and these statements are causing database lag under high player load). 2015-10-09 20:40:50 -04:00
Cheese
d99c64e45d fixed merge error 2015-10-10 10:37:20 +11:00
Cheese
02c6eccfda Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
 2015-10-10 10:36:42 +11:00
Cheese
7dbd9da582 dragon sale Bar 2015-10-10 10:35:48 +11:00
Shaun Bennett
ba36ff565d Merge remote-tracking branch 'origin/master' 2015-10-09 18:23:55 -04:00
Shaun Bennett
97ef4a4252 Pushing titan giveaway stuff for laptop 2015-10-09 18:23:47 -04:00