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

2058 Commits

Author SHA1 Message Date
Cheese
7f8c9c02bc and the mounts 2015-12-11 16:38:44 +11:00
Cheese
fe7ce40783 finished cosmetic names 2015-12-11 16:31:15 +11:00
Cheese
05a80b23a1 converting gadget text. (kill me now) 2015-12-11 16:07:02 +11:00
Cheese
88f44a293b candy! 2015-12-11 15:31:35 +11:00
Cheese
3447de9a92 Merge branch 'master' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusRepository.java
 2015-12-11 15:20:50 +11:00
Cheese
a5b28422cd cosmetics 2015-12-11 15:19:20 +11: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
Shaun Bennett
1ab13d2ef5 Treasure Shards! 2015-12-10 22:52:15 -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
Shaun Bennett
5a1892e1ed Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics 2015-12-10 21:32:14 -05:00
Shaun Bennett
d6aed5dff7 More work 2015-12-10 21:32:10 -05:00
Cheese
31cea3342e some gadget stuff 2015-12-11 13:17:38 +11:00
Shaun Bennett
ffd4658740 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 2015-12-10 21:06:50 -05: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
Shaun Bennett
16f39c1e71 Pushing changes to go help william 2015-12-10 20:51:34 -05:00
William Burns
626a812844 Many changes 2015-12-11 00:40:54 +00:00
Shaun Bennett
4d8b8bd58b Fix errors, update cosmetic menu 2015-12-10 19:27:32 -05:00
Shaun Bennett
a9e6224eca Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-12-10 19:21:33 -05:00
Shaun Bennett
7b4f5d5b75 Christmas chest in gui 2015-12-10 19:19:20 -05:00
Shaun Bennett
72a8aaf556 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-12-10 19:18:49 -05:00
xGamingDudex
44a244caf4 Merge branch 'project-cosmetics' of http://JustSomeDude@184.154.0.242:7990/scm/min/mineplex.git into project-cosmetics 2015-12-11 01:10:54 +01:00
xGamingDudex
a6a4c8be36 Cosmetic Update 
+ Added GadgetDisable Event
+ Renamed GadgetActivateEvent to GadgetEnable event
+ Added hat framework, and some example hats
+ Added sets and Frost Lord set
+ Fixed some imports
+ Added new way of checking ownership of gadgets
+ Added some utility methods to GadgetManager
+ Added support for alternative package name of gadgets
+ Fixed coal
+ New Blood Helix particle
 2015-12-11 01:05:32 +01:00
Shaun Bennett
d16d9a36e9 Use Account ID from client manager instead of PlayerCache 2015-12-10 17:25:39 -05:00
Shaun Bennett
851b613d2e Now playing fix 2015-12-10 17:04:15 -05:00
William Burns
d709071feb Much fix, many wow. 2015-12-08 23:20:42 +00:00
Shaun Bennett
7f75749194 Merge remote-tracking branch 'origin/master' 2015-12-08 16:55:14 -05:00
Cheese
fba88ec231 mount stuff is fixed 2015-12-09 08:19:55 +11:00
Shaun Bennett
ca71f1f64f Merge remote-tracking branch 'origin/master' 2015-12-08 14:32:17 -05:00
William Burns
f8f95c64e5 Fixing arena moving 2015-12-08 15:10:29 +00:00
Shaun Bennett
a1915e324c Some java 8 code 2015-12-08 08:42:45 -05:00
xGamingDudex
b1536547d3 Cosmetic Update 2 
+ Item Coal
+ Freeze Cannon
+ Party Popper / Party Bomb
+ Snowball
+ Coal Fumes Particle
+ Snowman sneak trail/glide
+ Teaked stuff
 2015-12-08 00:50:08 +01:00
Shaun Bennett
42a0354c9e Now Playing, Preference to disable ads 2015-12-07 18:28:05 -05:00
William Burns
55f0453897 Start of re-write 2015-12-07 23:20:03 +00:00
Shaun Bennett
8ff034fb5d Merge pull request #89 in MIN/mineplex from clans-beta to master 
* commit 'eed6966a5b39d1fc9544055a5b5801758a62a56a':
  Winter MOTD, Stat fixes (maybe?!)
  made use ability teleport player back to where they should be
  Forgot to push these changes last update!
  fixed tnt blowing up in claims when offline
  fixed task not getting cleanup up after /skiptutorial
  fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping
  Fix heavy attribute, disable claim visualizer
  Disable subtasks for now
  Clans alpha 0.17
  clan claim visualizer
  fixed infinite claims
 2015-12-07 12:22:10 -06:00
Shaun Bennett
c3ace42a68 Winter MOTD, Stat fixes (maybe?!) 2015-12-07 13:21:11 -05:00
Shaun Bennett
ffbb057d23 Merge pull request #88 in MIN/mineplex from iKeirNez_Bugfix to master 
* commit '9bd7869e2260e23a0ff981b7084ff9b4a3768b43':
  Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved.
 2015-12-07 11:25:17 -06:00
Shaun Bennett
c6c012031f Less ugly formatting 2015-12-07 04:44:19 -05:00
Shaun Bennett
4354133de9 Add Minecraft timings to /lag 2015-12-07 04:40:34 -05:00
Cheese
e1efcabfbf chat sale msgs 2015-12-07 20:39:31 +11:00
Shaun Bennett
44a5bcb793 remove titan chest message, update pumkin message, holiday MB/DMT words 2015-12-07 02:06:00 -05:00
Shaun Bennett
7b5db2d4fb Hub Music, HubMusic Preference 2015-12-07 00:58:44 -05:00
Shaun Bennett
488895ea53 Note block player 2015-12-06 21:12:10 -05:00
xGamingDudex
c36182b8d4 Cosmetic Update 
New:
+ New GUI System
+ Candy Cane Particle
+ Candy Cane Double Jump
+ Candy Cane Death Effect
+ Candy Cane Arrow Trail
+ Snowman Morph
+ Baby Reindeer Mount
+ Pet Coal Apparition

Fixed/Updated:
* Added getTick to UpdateEvent and UtilTime
* Added more methods to UtilParticle
* Gadget manager isMoving now counts flying as moving
* Updated some cosmetics
 2015-12-07 02:53:14 +01:00
Cheese
ccb6456110 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
 2015-12-06 18:09:24 +11:00
Cheese
35c362b8bf small youtuber perms 2015-12-06 18:08:36 +11:00
Shaun Bennett
b7b5235f59 Fix error 2015-12-06 00:57:43 -05:00
Cheese
d095e14b4c Merge branch 'monster-league' 2015-12-06 16:33:21 +11:00
Cheese
9880e9a3c7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-06 16:32:59 +11:00
Cheese
040e94f1fb bouncy 2015-12-06 16:32:45 +11:00
Shaun Bennett
618105b4c8 Add minimum rank to Announcement Command 2015-12-06 00:15:49 -05:00
Shaun Bennett
8d831d5228 Fix END_PORTAL bug causing gui's to break 2015-12-06 00:06:31 -05:00
Shaun Bennett
32a6d572ee Disable gadgets in arcade for player count > 40 2015-12-05 22:56:15 -05:00
libraryaddict
b98944b0a0 Handle attach entity 2015-12-06 14:38:00 +13:00
libraryaddict
d5606f55ea Modified CustomTagFix to support player name titles 2015-12-06 10:18:35 +13:00
Keir
9bd7869e22 Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved. 2015-12-05 01:08:21 +00:00
fooify
d7497ec098 Fixed Micro Battle icon not appearing in stats menu 2015-12-04 15:56:48 -08:00
Cheese
49c735e43c removed duplicate code 2015-12-05 10:34:06 +11:00
Cheese
4a53667539 gadget restructure 
converted frost lord and titan particles into 4 subcategories.
 2015-12-05 10:22:00 +11:00
Shaun Bennett
5c575b41fc Clans alpha 0.17 2015-12-04 05:15:28 -05:00
fooify
b1bd2ff5ac Gravity's icon changed to ENDER_PORTAL_FRAME 2015-12-03 16:50:27 -08:00
fooify
348f2d8e4c Merge remote-tracking branch 'origin/master' into foo 2015-12-03 16:31:16 -08:00
Christopher Jozsa
8717f962e6 Merge pull request #83 in MIN/mineplex from mrsomeone12_SmallFixes to master 
* commit 'c98b427fdebb0d8abcce3a17731c0f9b35eece01':
  Added missing MountData and SingleEntityMountData files.
  Mount bug fix.
  Added method to edit NoAI field on entities.
  Implemented new mount data system replacing instead of entities as data.
  We only need to add the "Go Back" page once...
  TitanMount fixes
 2015-12-03 17:15:21 -06:00
NewGarbo
d6ca52e4a4 modifications 2015-12-02 05:11:09 +00:00
fooify
338e0f1892 fixed naming pets non-alphanumeric characters 2015-12-01 16:23:07 -08:00
Jonathan Williams
633697dc7a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-30 23:49:32 -06:00
Jonathan Williams
03a1f19df9 Fixed memory leaks in Disguise and Recall. 
Removed debug messages in ItemMapManager
 2015-11-30 23:49:16 -06:00
Cheese
51023a7630 cosmetic cooldown fix 2015-12-01 15:38:54 +11:00
Cheese
208eaf3a01 cosmetics recharge slowdown 2015-12-01 11:38:52 +11:00
xGamingDudex
c98b427fde Added missing MountData and SingleEntityMountData files. 
For some reason, git decided that it was a good idea to remove these two
files from the index...
 2015-12-01 00:46:20 +01:00
xGamingDudex
6120c8246b Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes 2015-11-29 19:11:24 +01:00
xGamingDudex
d1d58919f4 Mount bug fix. 
Mount was put in map before removed, resulting in new mount being half
disabled.
 2015-11-29 19:09:55 +01:00
xGamingDudex
509835ea64 Implemented new mount data system replacing instead of entities as data. 
+ Removed some unnecessary code
+ Made StackManager use new mount system

This system also fixes a bug allowing players "hijack" some of the
mounts as it was not properly persistent.
 2015-11-29 19:08:00 +01:00
xGamingDudex
327bf8d09b We only need to add the "Go Back" page once... 2015-11-29 18:32:24 +01:00
fooify
61df87b446 Merge remote-tracking branch 'origin/master' into foo 2015-11-29 06:37:30 -08:00
Shaun Bennett
7c947ad97b Merge master 2015-11-28 23:55:00 -05:00
NewGarbo
9ff9724fc8 tutorial revamp 2.0 2015-11-29 02:10:39 +00:00
Cheese
5cefe27257 cosmetic fixes 2015-11-29 11:40:19 +11:00
NewGarbo
aa68701ebd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-28 20:16:49 +00:00
fooify
8cdae7ce1a Merge remote-tracking branch 'origin/master' into foo 2015-11-28 09:33:47 -08:00
xGamingDudex
dc0da3987b TitanMount fixes 
Added so that the magma cube is looking in the direction of which the
player is flying.
Removed players ability to unequipt the armorstand that take out the
netherrack block from their head slot.
 2015-11-28 17:22:17 +01:00
Cheese
51227ae4f3 fixed leak 2015-11-29 01:25:15 +11:00
NewGarbo
0dceca5cfc Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-28 09:04:15 +00:00
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