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

5781 Commits

Author SHA1 Message Date
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
Virizion 93c13d138d Remove some debug stuff I forgot to remove. 2015-12-14 00:10:45 -05:00
Virizion 09643d3e61 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-14 00:08:32 -05: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
Virizion b3b41e453b Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-14 00:01:41 -05:00
Virizion d8f44434ff Fixed a bunch of bugs. Still need to fix clicking compass ending game. 2015-12-14 00:00:40 -05: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
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
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
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
Sarah a92361f2fe some more descriptions for Tutorials 2015-12-12 20:03:35 +01: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
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
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
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
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
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