Chiss
|
74435bac12
|
fixed bug where players kept inventory open, to be able to enable morphs ingame.
|
2014-08-14 17:31:14 +10:00 |
|
Chiss
|
c72f4b6057
|
Dragon target cancel fix
|
2014-08-14 12:35:49 +10:00 |
|
Chiss
|
b21ae8ef72
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-14 10:32:52 +10:00 |
|
Chiss
|
7a3bba45a7
|
Mergey!
|
2014-08-14 10:32:41 +10:00 |
|
Jonathan Williams
|
27032ac2ed
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
Plugins/Mineplex.Core/src/mineplex/core/portal/PortalRepository.java
|
2014-08-13 18:59:59 -05:00 |
|
Jonathan Williams
|
6039168601
|
Updated code base to build #1604 spigot
|
2014-08-13 18:57:37 -05:00 |
|
Ty
|
4b4f43ac16
|
Convert PortalRepository's redis host fetch to ServerManager constant, and remove debug code section.
|
2014-08-13 16:37:05 -04:00 |
|
Ty
|
1bbb42214d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-12 11:14:53 -04:00 |
|
Ty
|
5b059e96ca
|
Commit missing PortalRepository.java file and finish clean() method.
|
2014-08-12 11:14:31 -04:00 |
|
Chiss
|
95394c51cc
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-12 11:24:12 +10:00 |
|
Chiss
|
2d67d4ce36
|
Achievement fix + active
|
2014-08-12 11:23:53 +10:00 |
|
Ty
|
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 |
|
Shaun Bennett
|
d63137ead2
|
Merge remote-tracking branch 'origin/master'
|
2014-08-11 12:44:28 -05:00 |
|
Shaun Bennett
|
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 |
|
Shaun Bennett
|
482b964580
|
Display particles when shouldDisplay() is true instead of false
|
2014-08-11 12:30:03 -05:00 |
|
Shaun Bennett
|
7e93ed657f
|
Display boss bar properly while a dragon mount is spawned in arcade
|
2014-08-11 12:26:56 -05:00 |
|
Chiss
|
02270a9d25
|
TNT effect only triggers off self tnt.
|
2014-08-11 15:33:45 +10:00 |
|
Chiss
|
e4871c4988
|
Disabling cosmetics 5s before game starts, was having some carryover due to lag.
|
2014-08-11 11:55:00 +10:00 |
|
Chiss
|
06bcf5079b
|
Disabled Gem hunter (bugged?)
Disabled chicken morph letting people fly
|
2014-08-10 18:36:18 +10:00 |
|
Chiss
|
25b525837f
|
Fixed TNT blowing up lobby when it changed to prepare.
|
2014-08-10 11:07:05 +10:00 |
|
Chiss
|
9057246ab8
|
Arcade Inventory fixes
|
2014-08-10 10:50:31 +10:00 |
|
Chiss
|
3533ce1b7e
|
Particles dont play in stealth games.
|
2014-08-10 01:04:53 +10:00 |
|
Chiss
|
53221e267e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-10 00:57:17 +10:00 |
|
Chiss
|
7aa017772f
|
Spectators will not play particle effects
ALL rank no longer displays on morphs.
|
2014-08-10 00:55:51 +10:00 |
|
Jonathan Williams
|
e50c179e8d
|
Fixed pet tag price.
|
2014-08-09 09:49:00 -05:00 |
|
Jonathan Williams
|
43862ea6bf
|
Moved Particles to Admin and up only.
|
2014-08-09 09:44:00 -05: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 |
|
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 |
|
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 |
|
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
|
3f54881a3e
|
Fixed multiple purchase of Gem Booster.
|
2014-08-08 23:06:16 -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
|
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
|
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 |
|
Chiss
|
02dd579844
|
Text change for Inventory Menu
|
2014-08-08 17:16:20 +10:00 |
|
Jonathan Williams
|
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 |
|