b691b1bad0
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-05 12:51:59 +10:00
f6ce9abed8
Minestrike
...
- added mixed slow/instant mode
- added accurate hitboxes for slow bullets
- added many new weapons
- removed speed from knife
- adjusted gun balance
2014-09-05 12:28:29 +10:00
b28fc8ee6b
Added custom name tag fix for mobs for 1.8 players
...
Worked on boss bar display.
Bug with <=50% hp.
2014-09-04 11:33:51 -07:00
e7f79aa5bf
Update IntelliJ files for latest changes
2014-09-03 11:42:50 -05:00
92191dc19a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R4/PlayerConnection.java
2014-09-03 03:47:15 -07:00
a4871b5509
Updated to latest spigot with 1.8 support.
...
Tweaked disguise manager for 1.8 support.
Work on CUstomer support server + admin stuff.
2014-09-03 03:46:24 -07:00
4dbe7003b2
Update Arcade Icon in the game menu
2014-09-02 21:09:12 -05:00
08e6b73b1f
Disable Treasure stuff for now
2014-09-02 19:04:43 -05:00
5905ef5ef7
Treasure Stuff
2014-08-30 14:27:11 -05:00
b07670f6af
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-30 02:04:32 -07:00
1bd0209b39
Added multi-server tags for npcs
...
Fixed Customer support packages.
Fixed Account rank expire for Hero
Added SNR mod to update Rank
Changed SNR mod color to gray.
2014-08-30 02:04:04 -07:00
2c30cc3ef4
Implemented new servers flags
...
Removed OP from Admisn in HUB, gave them /gm command instead
2014-08-30 16:33:56 +10:00
41daba98c4
Background work for Minestrike
...
Admins no longer have OP in hubs. They have /gm command to gamemode.
2014-08-29 18:21:08 +10:00
fa56aa0843
Fixed regular players not able to join Beta servers.
2014-08-28 14:02:55 -07:00
5281558cdb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-28 14:01:49 -07:00
409e2c6141
Tweaked menus for quick game, Cosmetic menu.
...
Removed debug for Hub
Output a little debug info in LobbyBalancer
Added duplicate check to ServerMonitor
updated Customer SUpport server to have changeable password, added logging of command executors, added lifetime perks for hero/ultra
2014-08-28 14:01:37 -07:00
ec4cb91a1c
Poll changes
...
Achievement output double space fix
2014-08-28 11:50:09 +10:00
b67e127902
Merge remote-tracking branch 'origin/master'
2014-08-27 14:08:47 -05:00
573f71164f
Add a way to view poll statistics in game, load polls that aren't enabled for stat tracking
2014-08-27 14:07:22 -05:00
4e43a2ca73
Extended range of snake parkour, ensuring people tp back to it when they fall.
2014-08-27 15:19:08 +10:00
da5f953212
Fixed BlockMorph leaving blocks behind when player was teleported.
2014-08-27 14:22:35 +10:00
b508cd036c
Lazy fix so that polls award gems instead of coins
2014-08-26 18:36:40 -05:00
5fdf466722
Fixed bug in server monitor.
...
re-enabled animal spawn in hub.
2014-08-26 02:02:31 -07:00
526b5c333a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-26 00:34:00 -07:00
137b8692e4
Added Gem booster use.
2014-08-26 00:33:48 -07:00
1b15a57fc8
Added Gem Rewards for Achievements
2014-08-26 17:10:20 +10:00
162a86d4b2
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/CosmeticShop.java
2014-08-25 23:58:54 -07:00
b8b6c031cd
Re-did and added a game to the quick game menu.
...
Fixed npc triggers with non npcs named the same.
Fixed naming pet longer than 16 chars.
Added sugar cane to restricted block type for paintball gun
Properly hooked in gadget block event for paitnball gun.
Added auto purchase page on item gadget ammo empty.
Added check on rank for customer support command.
Fixed ConcurrentModificationException problem with spigot.
2014-08-25 23:56:58 -07:00
1b3e32ca26
Added Arcade Achievements
2014-08-26 14:42:17 +10:00
28d523d696
Added Achievements
2014-08-26 13:42:42 +10:00
07ee44508e
Missing Gadgets
2014-08-26 08:17:41 +10:00
0e3cf67402
Some new cosmetics
2014-08-25 12:59:29 +10:00
13eb3da0fa
Achievment gui changes
2014-08-25 09:26:01 +10:00
ff441f2262
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2014-08-24 16:14:29 -05:00
2cb87b23e6
Stat Gui, Start of Treasure Gui (disabled)
2014-08-24 16:08:19 -05:00
70beb58bd6
Enabled debugging in Hub/Arcade
2014-08-23 01:49:48 -05:00
931cb5ece8
Removed MineKart code.
...
Fixed up DisguisePlayer
Added ProfileLoader
Fixed up Notch gadget.
2014-08-23 00:40:07 -05:00
3a47a161c5
Enabled snake parkour
...
Updated servermanager/serverNpcPage to handle free and beta timers.
2014-08-22 22:53:15 -05:00
e40cb17e47
Updated tutorial locations
2014-08-23 08:52:50 +10:00
e5944ff872
Spawn location fix
2014-08-23 08:40:02 +10:00
9fad775f73
More cosmetics
2014-08-23 07:50:07 +10:00
a159f04d50
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-23 04:30:52 +10:00
231ef2bbe1
Cosmetic Update
2014-08-23 04:30:41 +10:00
83b3e49151
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-22 10:48:27 -05:00
70217fe957
Finished first release of Customer Support plugin.
2014-08-22 10:47:46 -05:00
97c087a28d
Allowed commands to specify specific ranks
...
allowed youtube/build to start/set games
2014-08-22 17:05:14 +10:00
830eeca835
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-20 20:14:32 -05:00
315da32518
Removed unused code in Party
...
Fixed path var in Core.Common
2014-08-20 20:14:23 -05:00
60869d114e
Dragon Escape changes
2014-08-20 15:45:10 +10:00
217ab51b40
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-19 22:24:16 -05:00
a7bb84be0b
Revert chris' revert
2014-08-19 21:24:49 -05:00
f60a818e6a
Update craftbukkit to remove the extra _INVALID mappings
2014-08-19 21:22:04 -05:00
24f984a365
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-19 21:37:11 -04:00
9ee25c6292
Did some cleanup in Pvp project.
...
Did work in Coreclient manager and added StaffServer (still in progress)
2014-08-19 21:36:23 -04:00
94e5eb03da
Fixed errors for new getPlayers method.
2014-08-20 10:43:56 +10:00
7535f39d18
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-20 10:39:58 +10:00
afea0ba87f
Parser Merge
2014-08-20 10:39:41 +10:00
e1a57a673e
Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors
2014-08-19 16:58:55 -05:00
b99e9d3f70
Simplified poll system, derp
2014-08-18 14:15:32 -05:00
36d5c2c3af
Don't add player's current poll to the queue
2014-08-17 18:11:55 -05:00
34ffc06166
Add functionality to skip polls
2014-08-17 18:07:16 -05:00
6e9d2b3244
Allow setting a time when it should poll again
2014-08-17 17:53:38 -05:00
43fd604695
Queue up polls for players instead of constantly checking for next poll
2014-08-17 17:47:38 -05:00
4ba7da9a54
Polls! Still needs tweaks
...
Hub artifact stuff for IntelliJ
2014-08-17 17:30:35 -05:00
8aec9e345e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-16 01:37:17 -05:00
d8123795aa
changed the way disguises show rank.
2014-08-16 16:33:18 +10:00
f98dc0c66d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-15 23:03:34 -05:00
19222c6815
Updated IntelliJ environment to be compatible with latest changes
2014-08-15 15:51:29 -04:00
3f827a310a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-15 11:54:19 -05:00
efdaa21ae7
Proper cleanup on lobby menu update.
2014-08-15 11:52:57 -05:00
697897b967
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-15 09:49:12 +10:00
85522cddca
Debug (will clean once fixed)
...
Game stats
2014-08-15 09:49:00 +10:00
846c75453c
Revamping Redis Server status so it uses a consistent time value from redis database.
2014-08-14 07:41:04 -05:00
6039168601
Updated code base to build #1604 spigot
2014-08-13 18:57:37 -05:00
5618a3edad
Removed extra free version generator in server monitor.
2014-08-12 13:00:17 -05: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
7191d48bd0
fixed paintball pre-game bug
2014-08-11 14:25:11 +10:00
f15e539841
Added showing of only 3 full servers in server menu.
2014-08-09 09:40:59 -05:00
a43a5b2c0e
bacon brawl fix
...
signel game ultra shows in hub scoreboard
2014-08-10 00:09:39 +10:00
0cdfda7765
Fixed message on free timer.
2014-08-09 08:08:24 -05:00
a34ce75252
price fix
2014-08-09 22:02:40 +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
91a79f0345
Pig Morph
...
Morphs have tags/
2014-08-09 14:57:01 +10:00
97cf02eb37
Hub changes
2014-08-09 12:35:36 +10:00
313f675ae4
Hub Parkour update
...
Smash kit prices
2014-08-09 12:16:37 +10: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
fa3695be4e
Gem Booster In Lobby
...
Achievement Stuff
2014-08-08 17:05:11 +10: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
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
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
c647e6b48d
Missing morphs
...
Bacon brawl knockback increase over time
Parse color error fix
2014-08-07 09:47:11 +10:00
c8dfb2f02e
Parser Fixes
...
Sneaky Stuff
2014-08-06 11:07:49 +10: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
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
232088cd55
Make sure servers are in progress before counting them
2014-08-01 03:57:34 -05: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
95a45409a9
Use UtilPlayer and F.main for messaging
2014-08-01 01:43:50 -05: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
5ea6eaeb9e
Lore edit on clock item
2014-08-01 00:03:26 -05:00
c01e9abf29
Place players on correct server corresponding to their rank via portals
2014-07-31 23:56:51 -05:00
7d1da7114f
Visual clock update
2014-07-31 23:49:52 -05:00
cf724272dd
Fix lore messages not displaying correctly under certain circumstances
2014-07-31 17:30:02 -05:00
41128cbc9d
Use constants for lore messages on server page
2014-07-31 17:17:05 -05:00
4c74ce60eb
Prevent free players from joining servers before time limit
2014-07-31 15:36:00 -05:00
b93d6b9cb1
Fix "Click to Spectate" formatting
2014-07-30 17:44:09 -05:00
3e9aebdb87
Identify free servers from server name
2014-07-30 17:30:46 -05:00
dcc8eaaa21
Add Server Menu for Premium Servers. Item lore still needs some work
2014-07-30 17:19:51 -05:00
f235f67aa5
Added +20 player buffer for lobbies.
2014-07-29 21:11:07 -07:00
d7037f1619
Breaking up "/news" commands (like "/npc" sub-commands) using multicommandbase.
2014-07-22 22:18:29 -04:00
e8d4ab2517
Re-enabled News commands after adding check to "Reset newsIndex if outside of bounds of news array after RefreshNews but before UtilTime.elapsed" in NewsManager.java
2014-07-21 18:06:33 -04:00
5bc7549b8c
Disabled news because of console errors.
2014-07-19 14:48:05 -07:00
fc43f434f0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-19 13:56:30 -07:00
2ae3d89496
Fixed issue with RepositoryBase and Friend/MysqlRepo
...
Each db call on login gets its own async after the first two account calls are finished.
2014-07-19 13:56:03 -07:00
944e7fca40
Finalizing BONUS clickable text hover text and News Entry issue overall.
...
Fixing bug with "/news set" command with insufficient command arguments.
2014-07-16 18:49:49 -04:00
d9110b4e3b
Implementing BONUS: Clickable Chat Links.
2014-07-15 22:31:53 -04:00
cb4d436605
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-14 22:58:58 -07:00
1207ed8199
Added DDOSProtectionSwitcher email functionality
...
mineplex.core.Server cleanup.
Refactored RepositoryBase.
Implemented core functionality of Friends
2014-07-14 22:58:36 -07:00
2ec8371f98
Implementing /news add and delete commands.
2014-07-10 21:10:35 -04:00
82ba7bf30f
Implementing /news list and set commands.
2014-07-09 20:38:11 -04:00
65b2e14689
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-09 11:15:06 -07:00
193bd82b61
Minor adjustment to rule book.
2014-07-09 11:14:57 -07:00
f38af4ab8a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-08 22:56:02 -04:00
58092c914a
Initial database access and method stubbing for "news" command.
2014-07-08 22:55:51 -04:00
74817f5f2e
Added rule book to Hub.
...
Fixed mineplexer bungee internet status.
Fixed up ddosprotectionswitcher.
2014-07-08 18:01:03 -07:00
963c71f128
Fixed internet status stuff for bungees.
...
Fixed new portal arg req.
2014-07-08 12:44:17 -07:00
ff8c506690
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-04 23:23:30 -07:00
ce8560bdbf
hub news
2014-07-04 23:20:46 -07:00
c265c7ce5c
Fixed sync db Logger.java
...
Added temp test code in player tracker...ignore.
fixed bug in dynamic server sorter.
2014-07-04 14:23:11 -07:00
d0fafce585
Reverted change to helper only joining full, now ultras can.
...
Added check so BETA servers cannot be joined by less than Helper.
Fixed message in AccountAdministrator for rankUpdate
2014-07-02 16:59:31 -07:00
Chiss
Jonathan Williams
Shaun Bennett
CoderTim
Ty
Peter Miller
Mini-Chiss