6039168601
Updated code base to build #1604 spigot
2014-08-13 18:57:37 -05:00
5c5a57b048
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-13 16:37:20 -04:00
4b4f43ac16
Convert PortalRepository's redis host fetch to ServerManager constant, and remove debug code section.
2014-08-13 16:37:05 -04:00
93811b200d
Small adjustment to lobby balancer code.
2014-08-12 17:01:54 -05:00
5363f686e5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-12 13:00:24 -05:00
5618a3edad
Removed extra free version generator in server monitor.
2014-08-12 13:00:17 -05:00
1bbb42214d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-12 11:14:53 -04:00
5b059e96ca
Commit missing PortalRepository.java file and finish clean() method.
2014-08-12 11:14:31 -04:00
95394c51cc
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-12 11:24:12 +10:00
2d67d4ce36
Achievement fix + active
2014-08-12 11:23:53 +10:00
36d6a58e0a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
2014-08-11 15:39:56 -04:00
d63137ead2
Merge remote-tracking branch 'origin/master'
2014-08-11 12:44:28 -05:00
4006c454c3
Change order of events when enabling a gadget (Fixes bug where switching gadgets while a gadget is enabled doesn't show up on gadget page)
2014-08-11 12:39:26 -05:00
482b964580
Display particles when shouldDisplay() is true instead of false
2014-08-11 12:30:03 -05:00
7e93ed657f
Display boss bar properly while a dragon mount is spawned in arcade
2014-08-11 12:26:56 -05:00
02270a9d25
TNT effect only triggers off self tnt.
2014-08-11 15:33:45 +10:00
7191d48bd0
fixed paintball pre-game bug
2014-08-11 14:25:11 +10:00
e4871c4988
Disabling cosmetics 5s before game starts, was having some carryover due to lag.
2014-08-11 11:55:00 +10:00
d81b32bd3a
Sneaky Assassins balance+polish
2014-08-10 21:05:41 +10:00
06bcf5079b
Disabled Gem hunter (bugged?)
...
Disabled chicken morph letting people fly
2014-08-10 18:36:18 +10:00
25b525837f
Fixed TNT blowing up lobby when it changed to prepare.
2014-08-10 11:07:05 +10:00
9057246ab8
Arcade Inventory fixes
2014-08-10 10:50:31 +10:00
3533ce1b7e
Particles dont play in stealth games.
2014-08-10 01:04:53 +10:00
53221e267e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-10 00:57:17 +10:00
7aa017772f
Spectators will not play particle effects
...
ALL rank no longer displays on morphs.
2014-08-10 00:55:51 +10:00
e50c179e8d
Fixed pet tag price.
2014-08-09 09:49:00 -05:00
43862ea6bf
Moved Particles to Admin and up only.
2014-08-09 09:44:00 -05:00
cfd1d868b5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-09 09:41:07 -05:00
f15e539841
Added showing of only 3 full servers in server menu.
2014-08-09 09:40:59 -05:00
616a0ecf11
Staff get all kits unlocked.
2014-08-10 00:32:50 +10:00
38fd85335f
Fixes disguises being disabled.
2014-08-10 00:21:45 +10:00
62cc422f42
FINAL FIX
2014-08-10 00:13:04 +10:00
c95cf79aa6
fxied more
2014-08-10 00:10:08 +10:00
a43a5b2c0e
bacon brawl fix
...
signel game ultra shows in hub scoreboard
2014-08-10 00:09:39 +10:00
21b89d2771
removed particle debug
2014-08-09 23:36:36 +10:00
59859b168f
Fixed multi-morphs
2014-08-09 23:34:12 +10:00
1a6540b4d0
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-09 23:25:26 +10:00
3d1ddecffb
Smash Kit fix
...
Gem Booster (dragons) fix
2014-08-09 23:25:13 +10:00
dffc56e3e0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-09 08:11:01 -05:00
cac7f85410
Single game ultra kit unlock
2014-08-09 23:10:40 +10:00
dbf59a032b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-09 08:08:41 -05:00
0cdfda7765
Fixed message on free timer.
2014-08-09 08:08:24 -05:00
175d9f9886
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-09 23:00:07 +10:00
23f93e55cf
fixed dragons destroying pregame lobby
2014-08-09 22:59:54 +10:00
3ea2567079
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-09 07:41:09 -05:00
9b75ef4f96
Fixed purchasing -2 cost gadgets.
2014-08-09 07:41:00 -05:00
066dfbc9a9
Morph helmet fix
2014-08-09 22:38:58 +10:00
800658ff48
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-09 07:26:05 -05:00
2c75bcbdfe
Added ability to store gem boosters in enjin.
2014-08-09 07:25:58 -05:00
e558796268
fixed TNT not being able to hit anyone
2014-08-09 22:16:49 +10:00
a34ce75252
price fix
2014-08-09 22:02:40 +10:00
6c847e78b7
Gem Hunter exp change
2014-08-09 20:16:21 +10:00
06a444bae6
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-09 19:55:35 +10:00
ff6ea3c798
Added Cosmetics to Arcade
...
Set prices on cosmetics
2014-08-09 19:55:05 +10:00
b0f6435661
Fixed items not updating immediately.
2014-08-09 04:29:34 -05:00
951e1df3d5
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-09 19:05:34 +10:00
8fe4e39207
Split up Cosmetic shop and Inventory
...
Added Ammo purchase for item gadgets.
2014-08-09 03:57:56 -05:00
4e93707f0d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-09 00:06:53 -05:00
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
62eccbcc1e
Snr Mod
...
Creeper knockbak changes
2014-08-09 15:06:00 +10:00
91a79f0345
Pig Morph
...
Morphs have tags/
2014-08-09 14:57:01 +10:00
3d909b7cbe
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-08 23:06:26 -05:00
3f54881a3e
Fixed multiple purchase of Gem Booster.
2014-08-08 23:06:16 -05:00
fb19e93992
Gem text
2014-08-09 13:46:41 +10:00
c93a49add2
More gem boosty!
2014-08-09 13:42:29 +10:00
2e95548b6e
Gem Boosters!
2014-08-09 13:39:57 +10:00
3a220b6f1c
Micro Update
...
SGTeams inv click fix.
2014-08-09 13:11:32 +10:00
7fd40b38dd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-08 22:10:09 -05:00
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
97cf02eb37
Hub changes
2014-08-09 12:35:36 +10:00
db90bcc958
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-09 12:16:53 +10:00
313f675ae4
Hub Parkour update
...
Smash kit prices
2014-08-09 12:16:37 +10:00
e7847cc495
Tweaked Gem booster description.
2014-08-08 20:50:07 -05:00
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
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
ecb0b2d3bb
Fix LobbyBalancer merge issue and convert PortalRepository to a redis-based system instead of MySQL.
2014-08-08 17:35:37 -04:00
02dd579844
Text change for Inventory Menu
2014-08-08 17:16:20 +10:00
e1be732202
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java
2014-08-08 02:07:20 -05:00
9f2a83c956
Added Coins to donation.
...
Fixed order of gadgets, mounts, pets, morphs, particles.
Fixed display of active pet in Menu
Fixed coins purchase for most items.
Added Coins reward for ENjinTranslator.
Added Coin transactions.
2014-08-08 02:05:58 -05:00
b36b1cb007
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-08 17:05:23 +10:00
fa3695be4e
Gem Booster In Lobby
...
Achievement Stuff
2014-08-08 17:05:11 +10:00
9395711dcb
Merge remote-tracking branch 'origin/master'
2014-08-08 01:51:50 -05:00
b7ecf5eb04
GET MINEPLEX ULTRA FOR AMAZING FUN TIMES
2014-08-08 01:51:11 -05:00
8f72ba4ab7
Hooked in statchangeevent
2014-08-08 13:53:58 +10:00
1a33dbb5ee
Achievement Module
...
Gem Booster/Achivement
2014-08-08 13:46:35 +10:00
57cf3e4da6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-07 21:22:28 -05:00
e051c1d62c
Work on inventoryManager and Enjin translator.
2014-08-07 21:22:18 -05:00
2fd7621a81
Display proper team in Arcade Lobby (Fixes bug where a player connecting will break scoreboards)
2014-08-07 18:44:27 -05:00
5d89d1f728
Fixed gadget adding/removing from hotbar
...
Fixed stats manager _stats not initializing
Optimized saving call.
2014-08-07 01:46:10 -07:00
2a31bbee95
Added new gadget stuff to core.
...
Hooked up particle page.
2014-08-07 01:20:19 -07:00
c01fbd279d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/GadgetManager.java
2014-08-07 00:48:32 -07:00
055e4c5895
Converted PreferencesManager to RepositoryBase
2014-08-07 00:43:54 -07:00
6d86f403ac
Added coins Currency to web api
...
Added coins purchase for all cosmetic items
Added Stats manager
Added Inventory Manager
Redesigned gadgets/morph/particle/pets/mounts page and inventory.
2014-08-07 00:33:24 -07:00
0317795a04
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-07 17:31:01 +10:00
dc1a37a92e
Gadget STuff
2014-08-07 17:30:46 +10:00
8d05938306
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-07 00:00:01 -04:00
8a74b08b0d
Fixed silly mistake I made
2014-08-06 23:59:52 -04:00
04487fae3e
Only show 5 open servers on Server Gui
2014-08-06 21:31:53 -05:00
0b942e5180
Stop DragonMount from causing the news bar to flicker
2014-08-06 21:03:48 -05:00
f7f9d3e703
Sneaky assassin power-up maximum is 5 and hanging entities cannot be damaged
2014-08-06 21:35:11 -04:00
Jonathan Williams
Ty
Chiss
Shaun Bennett
CoderTim