Commit Graph

1366 Commits

Author SHA1 Message Date
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
Shaun Bennett 1c5b3919e1 Merge remote-tracking branch 'origin/master' 2014-08-04 00:31:56 -05:00
Shaun Bennett 0edb0d74a7 Fix bugs with kit sorting + cost of kits 2014-08-04 00:31:46 -05:00
CoderTim e7d3cf9e02 Sneaky Assassins previous commit bug fix 2014-08-04 01:06:11 -04:00
CoderTim 012382ec48 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-04 01:02:27 -04:00
CoderTim 8a727e1365 Smarter Sneaky Assassins AI 2014-08-04 01:02:05 -04:00
Shaun Bennett e4662ab563 Update my SneakyAssassinKit change to work with Tim's changes 2014-08-03 23:41:54 -05:00
Shaun Bennett 34dfe8dacd Merge remote-tracking branch 'origin/master' 2014-08-03 23:32:37 -05:00
Shaun Bennett fe32cf5444 Remove KitAvailability.Blue 2014-08-03 23:31:55 -05:00
CoderTim 39e23c16f0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-04 00:00:12 -04:00
CoderTim 482f48f994 Prevent players in Sneaky Assassins from breaking paintings and item frames 2014-08-04 00:00:04 -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 35b16e026c Blue kits cost gems instead of being premium kits 2014-08-03 22:44:01 -05:00
Jonathan Williams 7408afa697 Reverted Free/Premium split in Server Monitor. 2014-08-03 20:01:37 -07:00
Shaun Bennett 6d7e8072d5 Remove premium server restriction in ServerCommand 2014-08-03 13:41:14 -05:00
Shaun Bennett 69b709b3ab Change clock timer to be 35 seconds 2014-08-03 13:28:56 -05:00
Shaun Bennett 69aa881ba2 Remove reference to server split in clock text 2014-08-03 13:27:04 -05:00
Shaun Bennett db61a10c7f Remove server split from server selection pages
Select any server with portals
2014-08-03 13:24:13 -05:00
Jonathan Williams cb1a466a5b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-02 03:01:53 -07:00
Jonathan Williams 51faf5cd15 Reduced free timer. 2014-08-02 03:01:36 -07:00
Ty 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
Shaun Bennett 5d1ab654b9 Merge remote-tracking branch 'origin/master' 2014-08-01 03:57:57 -05:00
Shaun Bennett 232088cd55 Make sure servers are in progress before counting them 2014-08-01 03:57:34 -05:00
Jonathan Williams 874c1413a3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-01 00:46:34 -07:00
Jonathan Williams f2d1380478 Fixed bug with Server monitor. 2014-08-01 00:46:00 -07:00
Chiss fb1f4ed5ac Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-01 17:45:35 +10:00
Chiss 07fe476fd3 fix for stuff that jon broke 2014-08-01 17:45:22 +10:00
Jonathan Williams b056733ba1 Removed duration code and replaced with 60000L 2014-08-01 00:09:35 -07: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
Jonathan Williams a608783580 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-01 00:03:42 -07:00
Chiss b6fe33e6fb Ultra/hero gems removed 2014-08-01 17:03:07 +10:00
Shaun Bennett 95a45409a9 Use UtilPlayer and F.main for messaging 2014-08-01 01:43:50 -05:00
Jonathan Williams 46fb27afbb Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-31 23:39:08 -07:00
Jonathan Williams eae4bed630 Removed unused ServerManagerUpdater.java
Tweaked ServerMonitor to handle Free/Premium
2014-07-31 23:37:39 -07:00
Shaun Bennett 15d48d2867 Fix flashing clock (oops!) 2014-08-01 01:25:11 -05:00
Shaun Bennett fbe6ab2fdb Sound effects and knockbacks! 2014-08-01 01:22:01 -05:00
Shaun Bennett fd01b4933b Flashing wool instead of clock for the timer 2014-08-01 00:39:38 -05:00
Shaun Bennett 6b18fdf396 Change duration of timer. Don't punish a party if the leader has ultra 2014-08-01 00:38:26 -05:00