Commit Graph

772 Commits

Author SHA1 Message Date
CoderTim fb90336d4e Finished stats/achievements 2014-08-23 16:00:15 -04:00
Chiss 642f8b46b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-23 18:01:35 +10:00
Chiss 7348a26951 fixed damage dealt npe 2014-08-23 18:00:23 +10:00
Chiss af9bf0727a Fixed damage taken stat NPE
Added tournament team auto-rejoin
2014-08-23 17:55:28 +10:00
Jonathan Williams 70beb58bd6 Enabled debugging in Hub/Arcade 2014-08-23 01:49:48 -05:00
Chiss 3ec43f90e8 GameAchievementManager now utilises TaskManager to record whether or not people have previously completed Achievements 2014-08-23 15:04:43 +10:00
CoderTim 4afafe2d51 Some stats fixes 2014-08-22 21:54:08 -04:00
CoderTim b2b208bdba Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-22 17:30:08 -04:00
CoderTim 02bb53578a Registered stat listeners with each game 2014-08-22 17:20:02 -04:00
Chiss 231ef2bbe1 Cosmetic Update 2014-08-23 04:30:41 +10:00
Chiss 0022586e3e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-22 17:08:29 +10:00
Chiss 97c087a28d Allowed commands to specify specific ranks
allowed youtube/build to start/set games
2014-08-22 17:05:14 +10:00
CoderTim 591b5c026c Almost all achievements done 2014-08-21 18:55:40 -04:00
Jonathan Williams 5e47a12531 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-21 15:56:02 -05:00
CoderTim 94f2aade08 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-21 15:01:22 -04:00
Jonathan Williams 1398543490 Fixed bug with Projectile
Changed tp out of game to 1 per tick.
2014-08-21 02:07:54 -05:00
Chiss ac088e85b2 Added some game flags
Dragon escape changes
2014-08-21 13:35:31 +10:00
CoderTim f266f4e016 More achievements 2014-08-20 19:20:11 -04:00
Chiss 60869d114e Dragon Escape changes 2014-08-20 15:45:10 +10:00
Shaun Bennett a7bb84be0b Revert chris' revert 2014-08-19 21:24:49 -05:00
Shaun Bennett f60a818e6a Update craftbukkit to remove the extra _INVALID mappings 2014-08-19 21:22:04 -05:00
CoderTim 18ca7d5656 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-19 21:16:44 -04:00
CoderTim 599277b88e More work on achievements 2014-08-19 21:16:28 -04:00
Chiss 94e5eb03da Fixed errors for new getPlayers method. 2014-08-20 10:43:56 +10:00
Chiss 7535f39d18 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-20 10:39:58 +10:00
Chiss afea0ba87f Parser Merge 2014-08-20 10:39:41 +10:00
CoderTim 09c01d90ad Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-19 19:07:37 -04:00
Shaun Bennett e1a57a673e Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors 2014-08-19 16:58:55 -05:00
CoderTim 05686cb584 Work on achievements 2014-08-18 16:41:16 -04:00
Chiss d8123795aa changed the way disguises show rank. 2014-08-16 16:33:18 +10:00
Chiss 508ef65fcf Added missing file 2014-08-16 14:17:15 +10:00
CoderTim 19222c6815 Updated IntelliJ environment to be compatible with latest changes 2014-08-15 15:51:29 -04:00
Chiss 29db90837d Spleef Update
Map parser block stuff
2014-08-15 15:28:50 +10:00
Chiss 85522cddca Debug (will clean once fixed)
Game stats
2014-08-15 09:49:00 +10:00
Chiss 74435bac12 fixed bug where players kept inventory open, to be able to enable morphs ingame. 2014-08-14 17:31:14 +10:00
Chiss 5f80d9c57a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2014-08-14 11:24:51 +10:00
Chiss b6ba142c5a Mineplex in scoreboard is fancier. 2014-08-14 11:23:48 +10:00
Shaun Bennett b9534bd245 Merge remote-tracking branch 'origin/master' 2014-08-13 20:07:01 -05:00
Shaun Bennett cfe45139b6 Adjust lobby text for the removal of premium kits 2014-08-13 19:56:47 -05:00
Shaun Bennett 83f04273fa Sort kits properly when a game uses NullKit 2014-08-13 19:45:38 -05:00
Chiss b21ae8ef72 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-14 10:32:52 +10:00
Chiss 7a3bba45a7 Mergey! 2014-08-14 10:32:41 +10:00
Jonathan Williams 6039168601 Updated code base to build #1604 spigot 2014-08-13 18:57:37 -05:00
Chiss 95394c51cc Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-12 11:24:12 +10:00
Chiss 2d67d4ce36 Achievement fix + active 2014-08-12 11:23:53 +10:00
Shaun Bennett d63137ead2 Merge remote-tracking branch 'origin/master' 2014-08-11 12:44:28 -05:00
Shaun Bennett 7e93ed657f Display boss bar properly while a dragon mount is spawned in arcade 2014-08-11 12:26:56 -05:00
Chiss 02270a9d25 TNT effect only triggers off self tnt. 2014-08-11 15:33:45 +10:00
Chiss 7191d48bd0 fixed paintball pre-game bug 2014-08-11 14:25:11 +10:00
Chiss e4871c4988 Disabling cosmetics 5s before game starts, was having some carryover due to lag. 2014-08-11 11:55:00 +10:00
Chiss d81b32bd3a Sneaky Assassins balance+polish 2014-08-10 21:05:41 +10:00
Chiss 06bcf5079b Disabled Gem hunter (bugged?)
Disabled chicken morph letting people fly
2014-08-10 18:36:18 +10:00
Chiss 25b525837f Fixed TNT blowing up lobby when it changed to prepare. 2014-08-10 11:07:05 +10:00
Chiss 9057246ab8 Arcade Inventory fixes 2014-08-10 10:50:31 +10:00
Chiss 3533ce1b7e Particles dont play in stealth games. 2014-08-10 01:04:53 +10:00
Chiss 616a0ecf11 Staff get all kits unlocked. 2014-08-10 00:32:50 +10:00
Chiss 38fd85335f Fixes disguises being disabled. 2014-08-10 00:21:45 +10:00
Chiss 62cc422f42 FINAL FIX 2014-08-10 00:13:04 +10:00
Chiss c95cf79aa6 fxied more 2014-08-10 00:10:08 +10:00
Chiss a43a5b2c0e bacon brawl fix
signel game ultra shows in hub scoreboard
2014-08-10 00:09:39 +10:00
Chiss 3d1ddecffb Smash Kit fix
Gem Booster (dragons) fix
2014-08-09 23:25:13 +10:00
Chiss cac7f85410 Single game ultra kit unlock 2014-08-09 23:10:40 +10:00
Chiss 23f93e55cf fixed dragons destroying pregame lobby 2014-08-09 22:59:54 +10:00
Chiss ff6ea3c798 Added Cosmetics to Arcade
Set prices on cosmetics
2014-08-09 19:55:05 +10:00
Jonathan Williams 8fe4e39207 Split up Cosmetic shop and Inventory
Added Ammo purchase for item gadgets.
2014-08-09 03:57:56 -05:00
Chiss 91a79f0345 Pig Morph
Morphs have tags/
2014-08-09 14:57:01 +10:00
Chiss fb19e93992 Gem text 2014-08-09 13:46:41 +10:00
Chiss c93a49add2 More gem boosty! 2014-08-09 13:42:29 +10:00
Chiss 2e95548b6e Gem Boosters! 2014-08-09 13:39:57 +10:00
Chiss 3a220b6f1c Micro Update
SGTeams inv click fix.
2014-08-09 13:11:32 +10:00
Jonathan Williams 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
Chiss 313f675ae4 Hub Parkour update
Smash kit prices
2014-08-09 12:16:37 +10:00
Chiss b36b1cb007 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-08 17:05:23 +10:00
Chiss fa3695be4e Gem Booster In Lobby
Achievement Stuff
2014-08-08 17:05:11 +10:00
Shaun Bennett 9395711dcb Merge remote-tracking branch 'origin/master' 2014-08-08 01:51:50 -05:00
Shaun Bennett b7ecf5eb04 GET MINEPLEX ULTRA FOR AMAZING FUN TIMES 2014-08-08 01:51:11 -05:00
Chiss 1a33dbb5ee Achievement Module
Gem Booster/Achivement
2014-08-08 13:46:35 +10:00
Shaun Bennett 2fd7621a81 Display proper team in Arcade Lobby (Fixes bug where a player connecting will break scoreboards) 2014-08-07 18:44:27 -05: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 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
CoderTim 8a74b08b0d Fixed silly mistake I made 2014-08-06 23:59:52 -04:00
CoderTim f7f9d3e703 Sneaky assassin power-up maximum is 5 and hanging entities cannot be damaged 2014-08-06 21:35:11 -04:00
Chiss c647e6b48d Missing morphs
Bacon brawl knockback increase over time
Parse color error fix
2014-08-07 09:47:11 +10:00
Chiss a737aa8624 Game desc 2014-08-06 19:16:17 +10:00
Chiss c4768a8a9c Smokebomb doesnt end instantly :o 2014-08-06 19:13:25 +10:00
Chiss f68586cca4 Micro Battle 2014-08-06 19:00:18 +10:00
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
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
Chiss 07fe476fd3 fix for stuff that jon broke 2014-08-01 17:45:22 +10:00
Chiss b6fe33e6fb Ultra/hero gems removed 2014-08-01 17:03:07 +10:00
Chiss 0f9e72d623 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-01 14:06:13 +10:00
Chiss 599a6eb1f7 Changed kit availability to be based on free/premium. 2014-08-01 14:05:53 +10:00
CoderTim c36242cc47 Added stained glass around power-up beacon base in sneaky assassins to identify power-up more easily.
Added workaround to make revealer fireworks explode consistently
Power-ups use UtilPlayer.message and have a sound effect is player when a power-up is aqcuired
Power-up bug fixes
2014-07-31 23:35:50 -04:00
CoderTim 6ac00cde99 Move Sneaky Assassins NPCs during Prepare and Live 2014-07-31 23:32:26 -04:00
CoderTim 22748eb225 Updated KitRevealer description 2014-07-31 23:31:42 -04:00
CoderTim 77b6f0250e Play zombie_unfect sound when PerkRevealer explodes
PerkSmokeBomb also applies effects to NPCs
PerkSmokeBomb now uses HUGE_EXPLOSION effect
Set Sneaky Assassins PrepareFreeze flag to false
2014-07-30 23:56:40 -04:00
Chiss 308c2e1b91 Kit availability 2014-07-31 13:00:05 +10:00
Chiss a4d579789c Sneaky Assassins changes :) 2014-07-31 12:58:33 +10:00
Jonathan Williams 4d397438be Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-29 21:11:15 -07:00
CoderTim 0382afecd8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-29 20:24:04 -04:00
CoderTim fa91bf0a00 Disable dropping hunger in Sneaky Assassins 2014-07-29 20:22:46 -04:00
Jonathan Williams 46cc2576dd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-26 10:41:04 -07:00
Jonathan Williams 4e1a05e9bd Fixed whitelist issue with tournament mode. 2014-07-26 10:40:49 -07:00
Chiss 78b3d3b35c restored original bridge timer :) 2014-07-26 21:05:12 +10:00
Chiss 3f4e4b6607 fixed -1 not working 2014-07-26 21:03:50 +10:00
Chiss 802415be8f -1 team kills for suicide (only after bridge drop) 2014-07-26 20:57:40 +10:00
Chiss f090ed9313 end game fixes 2014-07-26 20:53:48 +10:00
Chiss 4f46ccc8aa Winner is decided on bridge tourney timeout 2014-07-26 20:29:01 +10:00
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
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
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
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
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
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 1455b4001f Parser Update 2014-07-08 15:13:30 -07:00
Jonathan Williams 963c71f128 Fixed internet status stuff for bungees.
Fixed new portal arg req.
2014-07-08 12:44:17 -07:00
Mini-Chiss cf25bdc44f Bridges fix being able to break mid chests before gamestart
Map parser Updates
2014-07-07 19:04:44 -07:00
Mini-Chiss ef86fe6948 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-07 16:24:43 -07:00
Mini-Chiss 62f6ea815d Champs Balance Update
Map Parser Update
2014-07-07 16:23:55 -07:00