JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,132 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

1132 Commits

Author SHA1 Message Date
Chiss fa73ab5335 Bridges Tourney stuff 2014-07-26 17:40:17 +10:00
Chiss 21314afabe Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-26 17:03:30 +10:00
Chiss 107388baa3 Added game flag to allow clicking in inventory during games 2014-07-26 17:03:03 +10:00
Jonathan Williams a455042c07 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-25 23:38:38 -07:00
Jonathan Williams 12b42cad29 Made tournament changes: 
Staff can't see team chat
Bridge tournament time is 90 min
Kits are not all free
Removed twitch charity text/motd
If team not picked, you go to spec.
 2014-07-25 23:38:21 -07:00
Jonathan Williams d6e06f4556 Removed some unnecessary logic in Lobby Balancer 
REmoved unused code in mineplexer.
 2014-07-25 23:37:24 -07:00
CoderTim c747638303 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-25 18:33:34 -04:00
CoderTim fe46355130 Added missing description to Sneak Assassin revealer items 2014-07-24 21:25:59 -04:00
CoderTim fe356add41 Restore original blocks when Sneaky Assassin power-up beacon is removed 2014-07-23 15:45:30 -04:00
Peter Miller d7037f1619 Breaking up "/news" commands (like "/npc" sub-commands) using multicommandbase. 2014-07-22 22:18:29 -04:00
Peter Miller 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
CoderTim a6a274069c Prevent power-up message spam when player is fully powered-up 2014-07-21 17:26:45 -04:00
CoderTim 4460f2e651 Prevent fully powered-up Sneaky Assassin players from using additional power-ups 2014-07-21 16:29:15 -04:00
Jonathan Williams 5bc7549b8c Disabled news because of console errors. 2014-07-19 14:48:05 -07:00
Jonathan Williams fc43f434f0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-19 13:56:30 -07: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 de5c0a77ef Added another requirement for Lobbies in ServerMonitor 1500 available slots 2014-07-19 13:54:27 -07:00
Jonathan Williams e6818c4c46 Added small tweaks to lobby balancer and sorter for better spread on connect. 2014-07-19 13:54:03 -07:00
Jonathan Williams 8b747a81e1 Fixed filter bypass 2014-07-19 13:53:14 -07:00
CoderTim d2038670d6 Merge remote-tracking branch 'origin/master' 2014-07-18 02:52:26 -04:00
CoderTim efa74f509a Fixed bug where revealer doesn't always work 
Prevent players from trading with sneaky assassin npcs
Display message when user powers up
 2014-07-18 02:48:06 -04:00
Chiss b719916bb8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
 2014-07-18 08:32:35 +10:00
Chiss 7a6393463d Rank SR.MOD 2014-07-18 08:29:49 +10:00
Peter Miller 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
Peter Miller d9110b4e3b Implementing BONUS: Clickable Chat Links. 2014-07-15 22:31:53 -04: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 cb4d436605 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-14 22:58:58 -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
CoderTim 64feaf63ed Implemented Sneaky Assassin Revealer kit 2014-07-15 00:36:38 -04:00
CoderTim c547801b7b Added Sneaky Assassin NPC movement 2014-07-11 22:55:48 -04:00
CoderTim b15534e1b2 Some work on Sneak Assassins NPCs 
Added /game start <seconds> to start a game faster
Optimized GameTeam.GetSpawn() by avoiding unnecessary square root calculations
 2014-07-11 00:56:25 -04:00
Peter Miller 2ec8371f98 Implementing /news add and delete commands. 2014-07-10 21:10:35 -04:00
Peter Miller 82ba7bf30f Implementing /news list and set commands. 2014-07-09 20:38:11 -04:00
Jonathan Williams 65b2e14689 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-09 11:15:06 -07:00
Jonathan Williams 193bd82b61 Minor adjustment to rule book. 2014-07-09 11:14:57 -07:00
Peter Miller f38af4ab8a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-08 22:56:02 -04:00
Peter Miller 58092c914a Initial database access and method stubbing for "news" command. 2014-07-08 22:55:51 -04:00
Mini-Chiss 5cd6bcfc82 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-08 18:08:46 -07:00
Mini-Chiss 03c56535ef MAPDATA 2014-07-08 18:08:37 -07:00
Jonathan Williams 97422e237f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-08 18:01:30 -07:00
Jonathan Williams 74817f5f2e Added rule book to Hub. 
Fixed mineplexer bungee internet status.

Fixed up ddosprotectionswitcher.
 2014-07-08 18:01:03 -07:00
Mini-Chiss bd6b9b8888 so many fix 2014-07-08 17:35:27 -07:00
Mini-Chiss c5e05523d3 sneakyfix 2014-07-08 17:34:47 -07:00
Mini-Chiss dd0040086d Parser Permissions 
Sneaky Assasssin thingy.
 2014-07-08 17:33:22 -07:00
Mini-Chiss 4d40df45d5 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-08 15:14:02 -07:00
Mini-Chiss 1455b4001f Parser Update 2014-07-08 15:13:30 -07:00
Jonathan Williams 45e38a8318 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-08 15:05:12 -07:00
Jonathan Williams fb5f92df2a Finalized internet status for bungees 2014-07-08 15:04:59 -07:00
Mini-Chiss 424a9defa9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
 2014-07-08 13:19:55 -07:00