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

1394 Commits

Author SHA1 Message Date
Jonathan Williams 43862ea6bf Moved Particles to Admin and up only. 2014-08-09 09:44:00 -05:00
Jonathan Williams cfd1d868b5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-09 09:41:07 -05:00
Jonathan Williams f15e539841 Added showing of only 3 full servers in server menu. 2014-08-09 09:40:59 -05:00
Chiss 616a0ecf11 Staff get all kits unlocked. 2014-08-10 00:32:50 +10:00
Chiss 38fd85335f Fixes disguises being disabled. 2014-08-10 00:21:45 +10:00
Chiss 62cc422f42 FINAL FIX 2014-08-10 00:13:04 +10:00
Chiss c95cf79aa6 fxied more 2014-08-10 00:10:08 +10:00
Chiss a43a5b2c0e bacon brawl fix 
signel game ultra shows in hub scoreboard
 2014-08-10 00:09:39 +10:00
Chiss 21b89d2771 removed particle debug 2014-08-09 23:36:36 +10:00
Chiss 59859b168f Fixed multi-morphs 2014-08-09 23:34:12 +10:00
Chiss 1a6540b4d0 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-09 23:25:26 +10:00
Chiss 3d1ddecffb Smash Kit fix 
Gem Booster (dragons) fix
 2014-08-09 23:25:13 +10:00
Jonathan Williams dffc56e3e0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-09 08:11:01 -05:00
Chiss cac7f85410 Single game ultra kit unlock 2014-08-09 23:10:40 +10:00
Jonathan Williams dbf59a032b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-09 08:08:41 -05:00
Jonathan Williams 0cdfda7765 Fixed message on free timer. 2014-08-09 08:08:24 -05:00
Chiss 175d9f9886 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-09 23:00:07 +10:00
Chiss 23f93e55cf fixed dragons destroying pregame lobby 2014-08-09 22:59:54 +10:00
Jonathan Williams 3ea2567079 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-09 07:41:09 -05:00
Jonathan Williams 9b75ef4f96 Fixed purchasing -2 cost gadgets. 2014-08-09 07:41:00 -05:00
Chiss 066dfbc9a9 Morph helmet fix 2014-08-09 22:38:58 +10:00
Jonathan Williams 800658ff48 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-09 07:26:05 -05:00
Jonathan Williams 2c75bcbdfe Added ability to store gem boosters in enjin. 2014-08-09 07:25:58 -05:00
Chiss e558796268 fixed TNT not being able to hit anyone 2014-08-09 22:16:49 +10:00
Chiss a34ce75252 price fix 2014-08-09 22:02:40 +10:00
Chiss 6c847e78b7 Gem Hunter exp change 2014-08-09 20:16:21 +10:00
Chiss 06a444bae6 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-09 19:55:35 +10:00
Chiss ff6ea3c798 Added Cosmetics to Arcade 
Set prices on cosmetics
 2014-08-09 19:55:05 +10:00
Jonathan Williams b0f6435661 Fixed items not updating immediately. 2014-08-09 04:29:34 -05:00
Chiss 951e1df3d5 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-09 19:05:34 +10:00
Jonathan Williams 8fe4e39207 Split up Cosmetic shop and Inventory 
Added Ammo purchase for item gadgets.
 2014-08-09 03:57:56 -05:00
Jonathan Williams 4e93707f0d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-09 00:06:53 -05:00
Jonathan Williams 0de8d22e62 Changed invis in hub to only be on server npc shops 
Fixed /a for senior mods and developers.
 2014-08-09 00:06:44 -05:00
Chiss 62eccbcc1e Snr Mod 
Creeper knockbak changes
 2014-08-09 15:06:00 +10:00
Chiss 91a79f0345 Pig Morph 
Morphs have tags/
 2014-08-09 14:57:01 +10:00
Jonathan Williams 3d909b7cbe Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-08 23:06:26 -05:00
Jonathan Williams 3f54881a3e Fixed multiple purchase of Gem Booster. 2014-08-08 23:06:16 -05:00
Chiss fb19e93992 Gem text 2014-08-09 13:46:41 +10:00
Chiss c93a49add2 More gem boosty! 2014-08-09 13:42:29 +10:00
Chiss 2e95548b6e Gem Boosters! 2014-08-09 13:39:57 +10:00
Chiss 3a220b6f1c Micro Update 
SGTeams inv click fix.
 2014-08-09 13:11:32 +10:00
Jonathan Williams 7fd40b38dd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-08 22:10:09 -05:00
Jonathan Williams 6bd9273edf Refactored getting item count for ClientInventory 
Fixed up Arcade gem boosters so they are hooked into inventory.
Cleaned up unused code.
 2014-08-08 22:10:02 -05:00
Chiss 97cf02eb37 Hub changes 2014-08-09 12:35:36 +10:00
Chiss db90bcc958 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-09 12:16:53 +10:00
Chiss 313f675ae4 Hub Parkour update 
Smash kit prices
 2014-08-09 12:16:37 +10:00
Jonathan Williams e7847cc495 Tweaked Gem booster description. 2014-08-08 20:50:07 -05:00
Jonathan Williams 26c4045bc3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/inventory/ui/page/Menu.java
 2014-08-08 20:49:27 -05:00
Jonathan Williams bed2545b04 Added back buttons for sub menus. 
Added Gem booster pack and booster count display.

Added reason and admin to mute message

Fixed inventory tracking.
 2014-08-08 20:48:15 -05:00
Ty ecb0b2d3bb Fix LobbyBalancer merge issue and convert PortalRepository to a redis-based system instead of MySQL. 2014-08-08 17:35:37 -04:00