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
c647e6b48d
Missing morphs
...
Bacon brawl knockback increase over time
Parse color error fix
2014-08-07 09:47:11 +10:00
a737aa8624
Game desc
2014-08-06 19:16:17 +10:00
c4768a8a9c
Smokebomb doesnt end instantly :o
2014-08-06 19:13:25 +10:00
f68586cca4
Micro Battle
2014-08-06 19:00:18 +10:00
248111749f
Sneaky Changes
2014-08-06 17:14:07 +10:00
bea6eabb95
Sneaky Assassins: Revealed players have wither effect. Fireworks are yellow. Additional announce messages
2014-08-06 01:41:50 -04:00
16353c4bc9
Changes to Sneaky Assassin power-ups, including addition of compass power-up.
2014-08-06 01:23:06 -04:00
9e047847c2
scoreboard fix
2014-08-06 12:42:07 +10:00
4108a02f50
Sneaky scoreboard order
2014-08-06 12:37:41 +10:00
a0010668c6
Sneaky Assassins changes
2014-08-06 12:23:02 +10:00
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
c8dfb2f02e
Parser Fixes
...
Sneaky Stuff
2014-08-06 11:07:49 +10:00
3ee0b271b6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-05 01:23:37 -04:00
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
2e43d565bd
Resolve merge conflicts.
2014-08-04 19:14:04 -04:00
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
e8d14e9fbf
Remove created by comment
2014-08-04 00:33:34 -05:00
1c5b3919e1
Merge remote-tracking branch 'origin/master'
2014-08-04 00:31:56 -05:00
0edb0d74a7
Fix bugs with kit sorting + cost of kits
2014-08-04 00:31:46 -05:00
e7d3cf9e02
Sneaky Assassins previous commit bug fix
2014-08-04 01:06:11 -04:00
012382ec48
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-04 01:02:27 -04:00
8a727e1365
Smarter Sneaky Assassins AI
2014-08-04 01:02:05 -04:00
e4662ab563
Update my SneakyAssassinKit change to work with Tim's changes
2014-08-03 23:41:54 -05:00
34dfe8dacd
Merge remote-tracking branch 'origin/master'
2014-08-03 23:32:37 -05:00
fe32cf5444
Remove KitAvailability.Blue
2014-08-03 23:31:55 -05:00
39e23c16f0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-04 00:00:12 -04:00
482f48f994
Prevent players in Sneaky Assassins from breaking paintings and item frames
2014-08-04 00:00:04 -04:00
ec48a59301
Added option DISGUISE_TYPE:<ENTITY_TYPE> in WorldConfig.dat for Sneaky Assassins to configure which entity players are disguised as.
2014-08-03 23:59:10 -04:00
35b16e026c
Blue kits cost gems instead of being premium kits
2014-08-03 22:44:01 -05:00
7408afa697
Reverted Free/Premium split in Server Monitor.
2014-08-03 20:01:37 -07:00
6d7e8072d5
Remove premium server restriction in ServerCommand
2014-08-03 13:41:14 -05:00
69b709b3ab
Change clock timer to be 35 seconds
2014-08-03 13:28:56 -05:00
69aa881ba2
Remove reference to server split in clock text
2014-08-03 13:27:04 -05:00
db61a10c7f
Remove server split from server selection pages
...
Select any server with portals
2014-08-03 13:24:13 -05:00
cb1a466a5b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-02 03:01:53 -07:00
51faf5cd15
Reduced free timer.
2014-08-02 03:01:36 -07:00
6a9255e97b
Add new Mineplex.ServerData library for interfacing with the ServerRepository, and modify Mineplex.ServerMonitor, Mineplex.Bungee.Mineplexer and Mineplex.Core to integrate changes.
2014-08-01 17:56:29 -04:00
5d1ab654b9
Merge remote-tracking branch 'origin/master'
2014-08-01 03:57:57 -05:00
232088cd55
Make sure servers are in progress before counting them
2014-08-01 03:57:34 -05:00
874c1413a3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-01 00:46:34 -07:00
f2d1380478
Fixed bug with Server monitor.
2014-08-01 00:46:00 -07:00
fb1f4ed5ac
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-01 17:45:35 +10:00
07fe476fd3
fix for stuff that jon broke
2014-08-01 17:45:22 +10:00
b056733ba1
Removed duration code and replaced with 60000L
2014-08-01 00:09:35 -07:00
53ce70488f
Merge pull request #1 from premium-server-menu to master
...
* commit '95a45409a98c141a115e463e56e440b204ae2029':
Use UtilPlayer and F.main for messaging
Fix flashing clock (oops!)
Sound effects and knockbacks!
Flashing wool instead of clock for the timer
Change duration of timer. Don't punish a party if the leader has ultra
Lighten load on our servers, not free servers!
Lore edit on clock item
Place players on correct server corresponding to their rank via portals
Visual clock update
Fix lore messages not displaying correctly under certain circumstances
Use constants for lore messages on server page
Prevent free players from joining servers before time limit
Deny joining Premium servers through server command without premium
Fix "Click to Spectate" formatting
Identify free servers from server name
Add Server Menu for Premium Servers. Item lore still needs some work
2014-08-01 02:05:39 -05:00
a608783580
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-01 00:03:42 -07:00
b6fe33e6fb
Ultra/hero gems removed
2014-08-01 17:03:07 +10:00
95a45409a9
Use UtilPlayer and F.main for messaging
2014-08-01 01:43:50 -05:00
46fb27afbb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-31 23:39:08 -07:00
eae4bed630
Removed unused ServerManagerUpdater.java
...
Tweaked ServerMonitor to handle Free/Premium
2014-07-31 23:37:39 -07:00
15d48d2867
Fix flashing clock (oops!)
2014-08-01 01:25:11 -05:00
fbe6ab2fdb
Sound effects and knockbacks!
2014-08-01 01:22:01 -05:00
fd01b4933b
Flashing wool instead of clock for the timer
2014-08-01 00:39:38 -05:00
6b18fdf396
Change duration of timer. Don't punish a party if the leader has ultra
2014-08-01 00:38:26 -05:00
ccf5893051
Lighten load on our servers, not free servers!
2014-08-01 00:04:12 -05:00
Chiss
Jonathan Williams
Ty
Shaun Bennett
CoderTim