Commit Graph

343 Commits

Author SHA1 Message Date
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
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 fa3695be4e Gem Booster In Lobby
Achievement Stuff
2014-08-08 17:05:11 +10: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 e051c1d62c Work on inventoryManager and Enjin translator. 2014-08-07 21:22:18 -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 c8dfb2f02e Parser Fixes
Sneaky Stuff
2014-08-06 11:07:49 +10:00
CoderTim 39e23c16f0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-04 00:00:12 -04:00
CoderTim 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
Shaun Bennett 6d7e8072d5 Remove premium server restriction in ServerCommand 2014-08-03 13:41:14 -05:00
Jonathan Williams 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
Shaun Bennett c2b1f2a52f Deny joining Premium servers through server command without premium 2014-07-31 13:47:51 -05:00
Peter Miller fb0469adfa Chat filter API changes from TwoHat/PottyMouth to Inversoft/CleanSpeak. 2014-07-30 20:09:58 -04:00
Shaun Bennett dcc8eaaa21 Add Server Menu for Premium Servers. Item lore still needs some work 2014-07-30 17:19:51 -05:00
Jonathan Williams 1362deca59 More work on FriendManager 2014-07-19 13:56:21 -07:00
Jonathan Williams 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
Jonathan Williams 8b747a81e1 Fixed filter bypass 2014-07-19 13:53:14 -07:00
Jonathan Williams 3636255e8a Fixed bug with DisguiseManager undisguising players.
Temp fix for emeralds not triggering in Perk Revealer.
2014-07-14 23:48:34 -07:00
Jonathan Williams 1207ed8199 Added DDOSProtectionSwitcher email functionality
mineplex.core.Server cleanup.

Refactored RepositoryBase.

Implemented core functionality of Friends
2014-07-14 22:58:36 -07:00
Peter Miller 58092c914a Initial database access and method stubbing for "news" command. 2014-07-08 22:55:51 -04:00
Jonathan Williams 963c71f128 Fixed internet status stuff for bungees.
Fixed new portal arg req.
2014-07-08 12:44:17 -07:00
Jonathan Williams e6e86c2042 Updated DnsMadeEasy api.
Cleaned up some bungee code.

Added InternetStatus to Bungees.

Fixed some portal stuff.
2014-07-08 12:20:19 -07:00
Peter Miller ddf1a8ff74 Pointed "send" command to "AddTransferRecord" method in Portal module.
Corrected "serverTarget" to "playerTarget" in "Player...does not exist!" message.
Cleaned up unnecessary references.
2014-07-07 17:30:03 -04:00
Jonathan Williams a66e877028 Cleaned up Bungee mineplexer a bit.
Refactored send/server commands for Portal.
2014-07-05 10:56:20 -07:00
Jonathan Williams c882ab1b34 Fixed portal command stuff.
Removed temp code from PlayerTracker

Added temp project for future ddos prot switching.
2014-07-04 23:23:19 -07:00
Jonathan Williams e6666932aa Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-04 14:32:41 -07:00
Jonathan Williams 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
CoderTim 2fb2aadf66 Merge remote-tracking branch 'origin/master' 2014-07-04 11:12:52 -04:00
Peter Miller b56855c33c Squished remaining concurrency/checking bugs! Happy 4th o'July! 2014-07-04 02:19:20 -04:00
Jonathan Williams d2caf23ed7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-03 11:19:23 -07:00
Jonathan Williams b058665e93 Fixed sync db calls for PlayerTracker
Fixed name update with new UUID

Skeleton work for Friends
2014-07-03 11:18:11 -07:00
Peter Miller 2531dd7a8f Implementing user/serverName checks 2014-07-03 00:17:49 -04:00
Jonathan Williams 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
Mini-Chiss 558f79fe34 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-02 10:58:34 -07:00
Mini-Chiss 17c36026f6 fixed bug where player who comes first was not being added to ranks. (get nothing) 2014-07-02 10:57:30 -07:00
Peter Miller e7832fd06c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
2014-07-02 03:47:14 -04:00
Peter Miller 1f515565ff Moving improved server/send command code to separate command files 2014-07-02 03:24:48 -04:00
CoderTim 44a57a485f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 21:39:03 -04:00
Jonathan Williams 41c4d5a0a8 Changed joining full servers to helper+ 2014-07-01 18:33:33 -07:00
Jonathan Williams 6fd889d8fc Added Player mapping.
Removed joining full servers for ultra.
2014-07-01 18:31:17 -07:00
Jonathan Williams b627e8fdf5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 10:25:12 -07:00
Jonathan Williams 9fd3f14248 Added RankUpdate command.
Fixed Lobby joinable issue with server monitor.
Changed server monitor to be fully dynamic for us.
2014-07-01 10:23:22 -07:00
CoderTim 7ea818c0c8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 02:20:45 -04:00
Mini-Chiss 7bc3966feb Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-06-30 16:13:15 -07:00