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

5843 Commits

Author SHA1 Message Date
Shaun Bennett b9a688c4e7 Update monthly bonuses 2015-12-15 13:07:49 -05:00
Shaun Bennett e3e757da8a Fix mounts owned count 2015-12-15 13:06:11 -05:00
Shaun Bennett 3edba0fac6 Fix Grinch Hat 2015-12-15 12:28:06 -05:00
Shaun Bennett f2107b7b79 Merge remote-tracking branch 'origin/develop' into develop 2015-12-15 12:07:40 -05:00
Shaun Bennett 2216fdc52c Dont disable new gadgets in games 2015-12-15 12:07:34 -05:00
Sarah 40ae7743c6 reverting last "fix" 2015-12-15 14:20:21 +01:00
NewGarbo 6a346790f7 disable tutorial 2015-12-15 12:00:56 +00:00
NewGarbo 1da04b84b5 test push (change version to 0.17d) 2015-12-15 11:57:33 +00:00
NewGarbo c63bac6433 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-12-15 11:42:16 +00:00
libraryaddict 47ad563596 Spawn nametags far far away from players 2015-12-15 22:46:30 +13:00
Sarah cf58fdee4a trying to fix the spigot Chat spam thingy. 2015-12-15 05:29:59 +01:00
Cheese 871c97f7af changed chest %'s 2015-12-15 09:25:44 +11:00
Sarah afa45c47ca Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into pregametutorial 2015-12-14 14:23:42 +01:00
NewGarbo 9137fcfe40 loads of changes (pvp timer, unsafe stuff) 2015-12-14 12:39:00 +00:00
Cheese 0f38c7b287 increased minimum coal 2015-12-14 22:12:50 +11:00
Cheese 951cd65903 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 22:05:22 +11:00
Cheese 045bc760c2 increassed cooldown, people getting trapped perm 2015-12-14 22:05:08 +11:00
Cheese 809ff649be lowered rarities a bit 2015-12-14 22:03:09 +11:00
Shaun Bennett 7181a26e58 Remove pointless equals() 2015-12-14 05:56:39 -05:00
Cheese 9e72e5adf1 nicer text 2015-12-14 21:43:11 +11:00
Cheese daa9f165b1 removed coins from gadgets 2015-12-14 21:41:47 +11:00
Cheese 52394c89dd fixed skins beign wrong way around 2015-12-14 21:34:27 +11:00
Cheese 0ecd5a05f5 fixed hat ownership 
reduced coal cost
 2015-12-14 21:32:06 +11:00
Cheese 00de6880ba fixed wrong types 2015-12-14 21:25:30 +11:00
Cheese 342e9f2345 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 20:53:49 +11:00
Cheese 1189535748 icon fixes 2015-12-14 20:53:34 +11:00
Shaun Bennett 816c057eb3 Notify server about opening chest 2015-12-14 04:49:44 -05:00
Shaun Bennett 6ec8ec4c01 Merge pull request #97 in MIN/mineplex from william-gladiators to master 
* commit 'd91e4ab4f756746b31c7ebdd3e7d33c139ea7d30':
  Another door bug, and a title fix.
  Health looks nicer.
  Bug fixes. Title shortened.
 2015-12-14 03:45:55 -06:00
Shaun Bennett daf1d29ce0 Fix Carl 2015-12-14 04:44:11 -05:00
Shaun Bennett 50bf97ae4a Fancy treasure changes 2015-12-14 04:19:15 -05:00
Cheese 670eaa1954 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 19:16:03 +11:00
Shaun Bennett e4fd97467f More treasure changes 2015-12-14 03:14:52 -05:00
Cheese 288c20fc74 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 19:13:05 +11:00
Cheese 9e35399d1d rarities tweaked + shards 2015-12-14 19:09:55 +11:00
Shaun Bennett db9db558a0 Update GUI slots 2015-12-14 02:56:07 -05:00
Shaun Bennett 4afca01ad0 Treasures! 2015-12-14 02:49:51 -05:00
Cheese c508b5ea96 chest visuals 2015-12-14 18:13:19 +11:00
Shaun Bennett 063c87c4fe Merge remote-tracking branch 'origin/master' 2015-12-14 00:29:11 -05:00
Shaun Bennett cdbcae7e3e Cosmetic Menu Update 2015-12-14 00:28:28 -05:00
Cheese 048a9a81b8 gadget ammo should no logner be purchasable 2015-12-14 16:20:39 +11:00
Cheese 7f9e5c4ec9 more coal 2015-12-14 16:06:49 +11:00
Cheese f6f04fe256 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 16:04:05 +11:00
Cheese 55fffdad59 fixed some colors 2015-12-14 16:03:51 +11:00
Shaun Bennett e8b0e5dd8e Fix IntellIJ Files 2015-12-13 23:51:47 -05:00
Shaun Bennett 8e31c79c58 Merge remote-tracking branch 'origin/master' 2015-12-13 23:46:46 -05:00
Cheese bccade55bc reduced coal fumes size 2015-12-14 15:43:45 +11:00
Shaun Bennett 5be91de006 Merge master 2015-12-13 23:40:18 -05:00
Cheese f26c31b7ec xmas a little harder 2015-12-14 15:33:09 +11:00
Shaun Bennett fe3431ba04 Cosmetic Menu Update 2015-12-13 23:31:21 -05:00
Cheese 1073981778 Merge branch 'master' into update-xmaschaos 2015-12-14 15:30:15 +11:00
Cheese 94169a5b8a it made me push it :( 2015-12-14 15:29:34 +11:00
Cheese c34ac3ec52 xmas 2015-12-14 15:21:43 +11:00
Jonathan Williams dcf3c1ea88 Deleted and added new Cache since renaming was jacked up. 2015-12-13 23:14:17 -05:00
Mysticate 42244ae798 Snowman AI fix 2015-12-13 22:43:11 -05:00
Mysticate a04eaddc42 Fixed bump 2015-12-13 22:25:18 -05:00
libraryaddict f90484c37f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-12-14 15:43:03 +13:00
libraryaddict b5bdf7ced4 Remove custom name on players on join and arcade spectator 2015-12-14 15:42:32 +13:00
Mysticate 0dd7db27cd FIXED FORAMTTING 2015-12-13 19:49:41 -05:00
Mysticate a827f95eb4 Fixed scoreboard. VIVA LA FIESTA 2015-12-13 19:24:24 -05:00
Mysticate 0e9e8c155f Quick fix that I don't think i caused. 2015-12-13 19:11:06 -05:00
Mysticate 0c383f8bf4 Remove bad message 2015-12-13 18:58:03 -05:00
Mysticate 90145bf8e7 Merge branch 'master' of 
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
update-xmaschaos

Conflicts:
	Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
 2015-12-13 18:57:35 -05:00
Mysticate 35ab40727b XMAS UPDATE OMG :O 2015-12-13 18:55:21 -05:00
xGamingDudex 64fb2b11d8 Added fake skin data 
+Moved hats to use fake non-changing skin data
+Added Rudolph hat
+Added Grinch hat
+Added suport for fake skins on DisguisePlayer
+Tweaked PartyPopper
 2015-12-13 23:09:25 +01:00
William Burns d91e4ab4f7 Another door bug, and a title fix. 2015-12-13 20:27:37 +00:00
Shaun Bennett 677e95a7fd Update IntellIJ grouping 2015-12-13 14:05:28 -05:00
Sarah 63f5794c79 Only fix Giant facings is prepare Phase 2015-12-13 14:31:21 +01:00
William Burns e31124e212 Health looks nicer. 2015-12-13 13:29:46 +00:00
William Burns 4fad564e15 Bug fixes. Title shortened. 2015-12-13 12:50:06 +00: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
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
Sarah a92361f2fe some more descriptions for Tutorials 2015-12-12 20:03:35 +01: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
Sarah 09e5aed6e7 Adding some descriptions. 2015-12-11 22:06:23 +01:00
xGamingDudex 6d1e4b6cab Merge remote-tracking branch 'origin/master' into project-cosmetics 2015-12-11 18:09:09 +01:00
xGamingDudex 9af6fd6904 Merge branch 'project-cosmetics' of 
http://JustSomeDude@184.154.0.242:7990/scm/min/mineplex.git into
project-cosmetics

Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPartyPopper.java
	Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountBabyReindeer.java
 2015-12-11 18:06:35 +01: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
xGamingDudex ba087d119a Small tweaks 2015-12-11 17:31:05 +01:00
Cheese 2ffd1d4595 BOB ROSS 2015-12-11 23:11:33 +11:00
Cheese d5612a8f27 added a hint to how many more coal you need to your next prize. 2015-12-11 23:09:06 +11:00
Cheese 39f5f70a5f fixing up coal things 2015-12-11 22:43:34 +11:00
Shaun Bennett ac6d3c2c8f merge with master 2015-12-11 06:27:23 -05:00
Cheese 7c432461c9 changed coal item rewards to 3 tier :) 2015-12-11 22:25:14 +11:00
Cheese e01a5369fd set bonuses 
item gadget gui update
 2015-12-11 21:53:39 +11:00
Cheese 40c2fdc3fc fixed suits 2015-12-11 21:11:35 +11:00
Cheese d7f39bdfd8 costume sets 2015-12-11 20:59:55 +11:00
Cheese 7fc08f34a7 fixed typo 2015-12-11 20:34:01 +11:00
Cheese f717a5f8cc more set stuff 2015-12-11 20:30:41 +11:00
Cheese 0cda29e135 improved cosmetic set implementation 2015-12-11 20:08:36 +11:00
Cheese a6f664006f set display in gui 2015-12-11 20:01:54 +11:00
Cheese d8a5edf9e9 fixed up gui items 2015-12-11 19:24:19 +11:00
Cheese 61a8d2825e gadget gui overhaul 2015-12-11 19:20:13 +11: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
Cheese 66011cde8c fixed player count 2015-12-11 17:25:23 +11: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
Cheese 98e91d29f6 more cosmetic stuff :) 2015-12-11 17:21:54 +11:00
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
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
Shaun Bennett bc46518a05 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 2015-12-10 22:54:53 -05:00
Shaun Bennett 1ab13d2ef5 Treasure Shards! 2015-12-10 22:52:15 -05:00
libraryaddict 4cfa7c436b Add missing file 2015-12-11 16:48:40 +13: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
Shaun Bennett 557f3e97a5 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 2015-12-10 21:32:35 -05: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
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
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 f8d7aeb5ea before revert 2015-12-11 01:32:32 +00:00
William Burns dda5ac6728 work 2015-12-11 01:20:36 +00:00
Sarah 4abad9e1c4 fixing chat and test commands. 2015-12-11 02:00:26 +01:00
Sarah ffb75a7832 Adding CustomEnding 2015-12-11 01:44:19 +01: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 5d96ceb41e Let owner+ disguise as staff - easy way to check a player's rank 2015-12-10 19:20:11 -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 5b0909012d Renamed GadgetActivateEvent to GadgetEnable event 
Some files didn't make it to prev commit
 2015-12-11 01:07:47 +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 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
William Burns 3586642414 Added back the tutorial. 2015-12-10 19:32:25 +00:00
William Burns af7c058f22 Lots of bug fixes / additions since the testing 12/9/15. 2015-12-10 19:06:07 +00:00
Sarah 0f8028f6e6 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
 2015-12-10 12:24:11 +01:00
libraryaddict 1ee1e7a04b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-12-10 20:02:39 +13:00
libraryaddict eaf3937004 Fix the damage while walking on falling block 2015-12-10 20:02:12 +13:00
Cheese fabf3dab59 updated blocksearch 2015-12-10 13:12:01 +11:00
Sarah c94c84f203 Some fixes 2015-12-10 02:59:22 +01:00
Sarah 76b29756ff Fixing some stats and disabling Chat spam messages. 2015-12-10 02:02:36 +01:00
William Burns 87a834c01b FIX 2015-12-10 00:03:57 +00:00
William Burns 90896073d4 debug 2015-12-10 00:03:17 +00:00
William Burns cea2716851 fight man 2015-12-09 23:59:20 +00:00
William Burns 05bd55f720 iter 2015-12-09 23:53:04 +00:00
William Burns b8a2304edd work 2015-12-09 23:39:00 +00:00
William Burns 3ad0a3db6e fix 2015-12-09 23:14:08 +00:00
William Burns 17c989d941 Less per-player arena stuff 2015-12-09 22:39:04 +00:00
William Burns 513db5dd8d doing byes 2015-12-09 21:33:31 +00:00
William Burns 852be97bae Work 2015-12-09 20:16:16 +00:00
Sarah a5c46545df fixing timer being shown. 2015-12-09 14:44:22 +01:00
NewGarbo 667f076202 fixed unsafe timer 2015-12-09 10:46:05 +00:00
William Burns c021fbf9ed Bounce baby bounce. 2015-12-08 23:27:38 +00:00
William Burns d709071feb Much fix, many wow. 2015-12-08 23:20:42 +00:00
Shaun Bennett 2e49611035 LinkedHashMaps, Buttons 2015-12-08 17:45:27 -05:00
Shaun Bennett 7f75749194 Merge remote-tracking branch 'origin/master' 2015-12-08 16:55:14 -05:00
Cheese 26c5c419f8 fixed a bug where old displayName would be used after name was updated. 2015-12-09 08:38:05 +11:00
Sarah 484dce18e1 Changing some Achievement things, to allow double values and dividing, Adding WPM, fixing some bugs. 2015-12-08 22:34:42 +01:00
Cheese fba88ec231 mount stuff is fixed 2015-12-09 08:19:55 +11:00
William Burns a83ede3caa Handling slow movers 2015-12-08 21:14:19 +00:00
William Burns 7bdbd5a6af Woo almost done! 2015-12-08 21:10:27 +00:00
Cheese 2decc049c5 fixed my muddling of perks 2015-12-09 07:47:07 +11:00
Cheese 09d8367b4b fixed method 2015-12-09 07:32:36 +11:00
Christopher Jozsa 0b8e0409b6 Merge pull request #92 in MIN/mineplex from update-SSM to master 
* commit '504a49278cb7e140029e4c2ceb85f3defe524a33':
  SSM kit description change, grammar mistake
  SSM Pig bomb bug fix
 2015-12-08 14:29:32 -06:00
Shaun Bennett ca71f1f64f Merge remote-tracking branch 'origin/master' 2015-12-08 14:32:17 -05:00
William Burns d598f83ec0 More progress 2015-12-08 18:17:43 +00:00
Teddy 504a49278c SSM kit description change, grammar mistake 2015-12-08 16:35:49 +00:00
Teddy 2bf1012fa4 SSM Pig bomb bug fix 2015-12-08 16:34:07 +00: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
William Burns 4e2a422f27 Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java
 2015-12-08 13:13:18 +00:00
William Burns 2b12016e14 Progress 2015-12-08 13:12:30 +00:00
Shaun Bennett addb2c8c0e Fix java 8 compiler issue 2015-12-08 08:02:40 -05:00
William Burns cdc602a435 Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators 2015-12-08 10:55:57 +00:00
Shaun Bennett 89e8a7a2b5 Merge pull request #91 in MIN/mineplex from clans-beta to master 
* commit 'b22c64ca6a5419e6b23abea1681cc750d15b6d37':
  Fix excludes
 2015-12-08 04:51:58 -06:00
Shaun Bennett b22c64ca6a Fix excludes 2015-12-08 05:51:21 -05:00
Shaun Bennett ffbf76a125 Merge pull request #90 in MIN/mineplex from clans-beta to master 
* commit 'a84f580719d1b221bbcaa49cd19d4251defa3b11':
  Update IntelliJ to Java 8
 2015-12-08 04:46:47 -06:00
Shaun Bennett a84f580719 Update IntelliJ to Java 8 2015-12-08 05:45:26 -05:00
William Burns 99cf7ea22c Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators 2015-12-08 10:44:43 +00:00
William Burns e6d995008e Arenas 2015-12-08 10:44:24 +00:00
Cheese fe1f763374 changed order blocks will be added to the list 2015-12-08 15:26:32 +11: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
Cheese 719297ebb1 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-08 10:31:25 +11:00
Cheese 4ba2e8c96c fixed old staff being stuck invis. 
partially changed scoreboard to show playercount
 2015-12-08 10:31:11 +11:00
Shaun Bennett 42a0354c9e Now Playing, Preference to disable ads 2015-12-07 18:28:05 -05:00
William Burns 43192317ad Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators 2015-12-07 23:20:21 +00:00
William Burns 55f0453897 Start of re-write 2015-12-07 23:20:03 +00:00
Sarah 0619fb857f fixing invisibility. 2015-12-07 23:44:02 +01: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 eed6966a5b Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-12-07 13:21:17 -05:00
Shaun Bennett c3ace42a68 Winter MOTD, Stat fixes (maybe?!) 2015-12-07 13:21:11 -05:00
Sarah 3f7eef35d5 Forcefield range. 2015-12-07 18:59:06 +01:00
Sarah dfb1837e81 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
 2015-12-07 18:54:19 +01: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 7984c0ac31 Add ! 2015-12-07 06:12:49 -05:00
Cheese a39b11ce67 slowed meteors 2015-12-07 21:56:00 +11:00
Cheese 1fe6b5489a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-07 21:53:49 +11:00
Cheese d318a5cf87 interacto! 2015-12-07 21:53:34 +11: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 6e67f34db1 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-07 20:39:46 +11:00
Cheese e1efcabfbf chat sale msgs 2015-12-07 20:39:31 +11:00
Shaun Bennett 3cdf8c4b08 Merge remote-tracking branch 'origin/master' 2015-12-07 04:23:33 -05:00
Shaun Bennett 2afbe23a7c Load songs from update folder 2015-12-07 04:23:26 -05:00
Cheese 7b11baf24b Christmas sale bossbars 2015-12-07 20:20:49 +11:00
Cheese 8c4615203c sale message 2015-12-07 20:07:20 +11:00
Cheese ed3bea8e85 DONE! 2015-12-07 18:36:05 +11:00
Cheese 5c632a1e3a sharper target 2015-12-07 18:20:12 +11:00
Cheese 1a0d90a495 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-07 18:06:43 +11:00
Cheese fea637db80 fixed some freeze 2015-12-07 18:06:26 +11:00
Shaun Bennett ecde1dd314 Merge remote-tracking branch 'origin/master' 2015-12-07 02:06:09 -05:00
Shaun Bennett 44a5bcb793 remove titan chest message, update pumkin message, holiday MB/DMT words 2015-12-07 02:06:00 -05:00
Cheese d75d7a2c8f snowfight finish 2015-12-07 17:56:35 +11:00
Cheese 1e441ac017 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-07 17:37:04 +11:00
Cheese 1ada06af91 rewrote lots! 2015-12-07 17:36:45 +11:00
Shaun Bennett 7b5db2d4fb Hub Music, HubMusic Preference 2015-12-07 00:58:44 -05:00
Cheese 5486d8acf6 more prep 2015-12-07 13:42:59 +11:00
Cheese 97fe633e4c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-07 13:25:48 +11:00
Cheese 54ec0e39bb more polisshhhh on snowfight 
enabled xmas chests
 2015-12-07 13:25:32 +11:00
Shaun Bennett 488895ea53 Note block player 2015-12-06 21:12:10 -05:00
Cheese cbafb2ba91 fixes 2015-12-07 13:04:45 +11:00
Cheese 0c397d6a81 simplified kits and intro 2015-12-07 13:02:26 +11: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 b2a595b01b snwo fight changes 2015-12-07 12:02:53 +11:00
Mysticate 09f7a03444 Quick changes to improve things. 2015-12-06 20:00:22 -05:00
Sarah 072856be7d teleportations. 2015-12-06 23:19:53 +01:00
Mysticate b5967a1205 Uncommented bouncy balls 2015-12-06 17:14:51 -05:00
Mysticate e74b83f8f2 Merge remote-tracking branch 'origin/master' into update-paintball 2015-12-06 17:12:29 -05:00
Mysticate 5e57caa94d Final tweaks to random armorstand 2015-12-06 17:09:33 -05:00
Cheese 6f16eeead7 missin files 2015-12-07 08:48:55 +11:00