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
CoderTim
8a74b08b0d
Fixed silly mistake I made
2014-08-06 23:59:52 -04:00
Shaun Bennett
04487fae3e
Only show 5 open servers on Server Gui
2014-08-06 21:31:53 -05:00
Shaun Bennett
0b942e5180
Stop DragonMount from causing the news bar to flicker
2014-08-06 21:03:48 -05:00
CoderTim
f7f9d3e703
Sneaky assassin power-up maximum is 5 and hanging entities cannot be damaged
2014-08-06 21:35:11 -04:00
Chiss
c647e6b48d
Missing morphs
...
Bacon brawl knockback increase over time
Parse color error fix
2014-08-07 09:47:11 +10:00
Chiss
a737aa8624
Game desc
2014-08-06 19:16:17 +10:00
Chiss
c4768a8a9c
Smokebomb doesnt end instantly :o
2014-08-06 19:13:25 +10:00
Chiss
f68586cca4
Micro Battle
2014-08-06 19:00:18 +10:00
Chiss
248111749f
Sneaky Changes
2014-08-06 17:14:07 +10:00
CoderTim
bea6eabb95
Sneaky Assassins: Revealed players have wither effect. Fireworks are yellow. Additional announce messages
2014-08-06 01:41:50 -04:00
CoderTim
16353c4bc9
Changes to Sneaky Assassin power-ups, including addition of compass power-up.
2014-08-06 01:23:06 -04:00
Chiss
9e047847c2
scoreboard fix
2014-08-06 12:42:07 +10:00
Chiss
4108a02f50
Sneaky scoreboard order
2014-08-06 12:37:41 +10:00
Chiss
a0010668c6
Sneaky Assassins changes
2014-08-06 12:23:02 +10:00
Chiss
f09506e436
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/SneakyAssassins.java
2014-08-06 11:09:16 +10:00
Chiss
c8dfb2f02e
Parser Fixes
...
Sneaky Stuff
2014-08-06 11:07:49 +10:00
CoderTim
3ee0b271b6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-05 01:23:37 -04:00
CoderTim
0240d50029
Sneaky Assassins Changes:
...
- when you get a kill, give an armor upgrade and 1 smoke bomb
- Revealer range increased to 12 blocks
- NPC dies once every 2 seconds
- Lose 1 hunger every second. Gain 8 when damaging player or NPC
- Reveal all players every 60 seconds, for 2 seconds
- Added cloaking back to smoke bomb
- Power-up is always green and type alternates per player. Power-ups always include smoke bomb and mushroom soup.
- NPC speed slightly decreased
- Corrected sword power-up progression
2014-08-05 01:23:24 -04:00
Ty
2e43d565bd
Resolve merge conflicts.
2014-08-04 19:14:04 -04:00
Ty
1b7c762942
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancer.java
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/Repository.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerGroupData.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
2014-08-04 18:47:49 -04:00
Shaun Bennett
e8d14e9fbf
Remove created by comment
2014-08-04 00:33:34 -05:00
