Commit Graph

1524 Commits

Author SHA1 Message Date
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
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
Jonathan Williams
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
Chiss
b36b1cb007 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-08 17:05:23 +10:00
Chiss
fa3695be4e Gem Booster In Lobby
Achievement Stuff
2014-08-08 17:05:11 +10:00
Shaun Bennett
9395711dcb Merge remote-tracking branch 'origin/master' 2014-08-08 01:51:50 -05:00
Shaun Bennett
b7ecf5eb04 GET MINEPLEX ULTRA FOR AMAZING FUN TIMES 2014-08-08 01:51:11 -05:00
Chiss
8f72ba4ab7 Hooked in statchangeevent 2014-08-08 13:53:58 +10:00
Chiss
1a33dbb5ee Achievement Module
Gem Booster/Achivement
2014-08-08 13:46:35 +10:00
Jonathan Williams
57cf3e4da6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-07 21:22:28 -05:00
Jonathan Williams
e051c1d62c Work on inventoryManager and Enjin translator. 2014-08-07 21:22:18 -05:00
Shaun Bennett
2fd7621a81 Display proper team in Arcade Lobby (Fixes bug where a player connecting will break scoreboards) 2014-08-07 18:44:27 -05:00
Jonathan Williams
5d89d1f728 Fixed gadget adding/removing from hotbar
Fixed stats manager _stats not initializing
Optimized saving call.
2014-08-07 01:46:10 -07:00
Jonathan Williams
2a31bbee95 Added new gadget stuff to core.
Hooked up particle page.
2014-08-07 01:20:19 -07:00
Jonathan Williams
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
Jonathan Williams
055e4c5895 Converted PreferencesManager to RepositoryBase 2014-08-07 00:43:54 -07:00
Jonathan Williams
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
Chiss
0317795a04 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-07 17:31:01 +10:00
Chiss
dc1a37a92e Gadget STuff 2014-08-07 17:30:46 +10:00
CoderTim
8d05938306 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-07 00:00:01 -04:00