Commit Graph

264 Commits

Author SHA1 Message Date
Jonathan Williams 29204de987 Removed old benefits.
Added youtube rank application from Owner

Fixed Dom bug : https://trello.com/c/OtwrpFXg/90-champions-24-skill-tokens-2-item-tokens-in-champions-so-broken
2014-11-20 21:58:39 -08:00
Jonathan Williams 2446e6d64d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-20 21:42:40 -08:00
Jonathan Williams 1f5be77880 Fixed text in Dom shop.
Cleaned up some code in benefit stuff.
2014-11-20 21:42:33 -08:00
Chiss f1ba5947a4 Some more wither updates 2014-11-21 16:32:12 +11:00
Chiss 7a8759dfba updated disguisemanager so it uses player arg
fixed invisibility bug on disguises for specific players
updated champs skills
made some hard achievements a bit easier
2014-11-21 09:42:05 +11:00
Jonathan Williams 77b47c9e13 Fixed UI achievement skill stuff. 2014-11-20 08:50:25 -08:00
Chiss 972911fe05 set achievement skills 2014-11-20 18:01:46 +11:00
Jonathan Williams d1a4080cbd Added GUI support for achievement skills. 2014-11-19 22:47:10 -08:00
Chiss 450cc9ada2 Champions achievement update
Wither update
2014-11-20 17:21:22 +11:00
Chiss f5022ecf16 Fixed dupe glitch (all games)
Some champions skill fixes
created GameSpectatorManager to handle spec stuffz
2014-11-18 16:43:39 +11:00
Chiss ca4eec20ed Wither Assault update 2014-11-15 19:31:56 +11:00
Chiss d7141e4943 Added warning note to punish 2014-11-11 20:02:35 +11:00
Chiss cd4d2c16a8 Fixed fortitude healing too much 2014-11-07 14:07:22 +11:00
Chiss f3b9ad8adf Chatting will reset Idle Timer in games (for DMT)
Minor kit changes
2014-11-05 14:46:49 +11:00
Chiss b00fb0952a Updated Sheep Quest to be 1.8 comptible.
Fixed fissure not working on slabs
Fixed a bug in recharge
Added ability for admins to give other people creative (they lose it when the admin quits)
2014-11-05 11:26:39 +11:00
Chiss f6df7705b1 - Added 3 kits for DMT
- Added achievement kit for OITQ/Sneaky Assassins/DMT
- Fixed stats/achievements not working (Keen Eye, I See You, Incompetence, DMT Wins)
- Various improvements/fixes for Champions
- Nerfed trollability of Digger kit in DE
2014-11-04 19:17:06 +11:00
Chiss 20fe69b596 added skills to lore of custom builds
fixed skeleton not having enough arrows
2014-11-02 11:09:20 +11:00
Chiss da88d68513 UHC does not record team stats 2014-11-01 15:42:52 +11:00
Chiss 83d182db2e Fixed Villager exploit! oops
Some balance stuff in champs
2014-11-01 08:38:36 +11:00
Chiss aa45f031ac 3 new achievement Kits
SSM Balance patch
Champs balance
tons of bug fixes
2014-10-31 10:35:47 +11:00
Chiss 4002528c51 Updated GUI text.
- recharges/etc now use bottom text
- uses appropriate bottom/top for 1.7 or 1.8
- fixed 1.7 dragon bar so it works as it did pre-1.8
- dragon bar in 1.8 will now send dragon+wither, for more reliability
- renamed utils to be more clear
2014-10-25 13:40:34 +11:00
Chiss 347e2b1bf5 Changed FIRE items to Blaze Powder 2014-09-08 10:14:55 +10:00
Shaun Bennett e7f79aa5bf Update IntelliJ files for latest changes 2014-09-03 11:42:50 -05:00
Jonathan Williams 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
Jonathan Williams 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
Shaun Bennett 8d06cddfb2 Remove Chiss' debug message for shop 2014-09-02 20:36:25 -05:00
Jonathan Williams 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
CoderTim fb90336d4e Finished stats/achievements 2014-08-23 16:00:15 -04:00
Chiss 231ef2bbe1 Cosmetic Update 2014-08-23 04:30:41 +10: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
Shaun Bennett f60a818e6a Update craftbukkit to remove the extra _INVALID mappings 2014-08-19 21:22:04 -05: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 85522cddca Debug (will clean once fixed)
Game stats
2014-08-15 09:49:00 +10:00
Jonathan Williams 6039168601 Updated code base to build #1604 spigot 2014-08-13 18:57:37 -05:00
Mini-Chiss 62f6ea815d Champs Balance Update
Map Parser Update
2014-07-07 16:23:55 -07:00
Mini-Chiss 46849745c4 Champions TDM Update 2014-06-23 16:20:50 -07:00
Jonathan Williams 57c3845df9 Finished up preferences.
Each preference saves, loads on login.
GUI working great.
2014-05-30 01:42:43 -07:00
Jonathan Williams 449fa13cc3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
Conflicts:
	.gitignore
2014-05-27 02:23:22 -07:00
CoderTim 49de140f41 Configured eclipse to use UTF-8 2014-05-25 21:04:14 -04:00
CoderTim c45e7d2a80 Converted file encoding from ISO-8859-1 to UTF-8 2014-05-25 19:42:39 -04:00
CoderTim 3859a42f1d Removed broken and obsolete shifter code
Set up more intellij stuff
2014-05-25 19:11:58 -04:00
CoderTim aa6b5324eb Set up IntelliJ IDEA 2014-05-20 00:39:50 -04:00
Jonathan Williams eae2d41fad Fixed party out of bounds exception.
Fixed tnt in wrong place in dom shop.
2014-05-08 20:01:21 -07:00
Jonathan Williams ebf40afe75 Fix dom bow shoot in lobby bug.
Work on preventing illegal builds.
2014-05-06 22:38:27 -07:00
Chiss f79b3b147c Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-05-06 15:59:20 +10:00
Chiss 223da7bf4d ResetAll for class skills 2014-05-06 15:55:14 +10:00
Jonathan Williams a9f4a900f0 Working on fixing dead chunks.
Fixed Blizzard memory issue.
2014-05-04 09:31:04 -07:00
Chiss 1d4d98b910 Twitch Prep
MAC changes
2014-05-02 14:35:41 +10:00
Chiss 8240101d60 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
2014-05-01 09:33:59 +10:00
Chiss 423a355057 Helpers+ wont be kicked yb MAC 2014-05-01 09:31:47 +10:00
Jonathan Williams fd372b8418 Changed skills to 2k gems each.
Changed power/booster to 2k gems each.

Added AntiHack perm storage of kicks.
Commented out SafeChat stuff for now.
2014-04-28 01:05:08 -07:00
Chiss 40ef432211 Cannot use skills/items in HubManager
Dom CP score rate lowered
Dom items dont use energy
2014-04-28 09:41:00 +10:00
Chiss 07ca3a83ca Arrows shouldnt bounce 2014-04-26 13:37:01 +10:00
Chiss b86b014058 Fixed a whole bunch of bugs 2014-04-26 11:59:11 +10:00
Jonathan Williams a37ace7576 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-25 00:44:27 -07:00
Jonathan Williams 9136fa0b15 Upgraded to latest spigot.
Fixed npcs being so loud.
Npcs are now ghosted automatically.

Added UUID on login.
2014-04-25 00:44:14 -07:00
Chiss 9495630bf2 CP rate increase 2014-04-25 11:10:37 +10:00
Jonathan Williams 7fef4adbee Fixed resupply resetting skills. 2014-04-22 22:19:03 -07:00
Chiss 0325892e2a Champs water fixes
First push for Twitch games
2014-04-23 10:21:01 +10:00
Jonathan Williams e62dfb0dd2 Fix skill/item packs not deducting gems.
Fix players not getting spectating flag when dying.
2014-04-22 16:50:44 -07:00
Jonathan Williams 7680eaaedc Fixed non-Ultra being able to unlock spells/skills.
Fixed Items that weren't free.
2014-04-22 11:20:00 -07:00
Jonathan Williams 2378df6191 Fixed builds losing tokens. 2014-04-22 10:35:56 -07:00
Chiss 923d2455d0 Stampede ends immediately on taking damage 2014-04-21 17:21:52 +10:00
Chiss 62c245d728 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-21 17:06:08 +10:00
Chiss 0f0b66a8cf Stampede cancel on damage taken 2014-04-21 17:04:51 +10:00
Jonathan Williams 9ce6d4866d Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-20 23:37:01 -07:00
Jonathan Williams e012129427 Fixed edit custom build bugs.
Fixed vehicle exit event not firing.
Fixed item info not showing once you have the item.
2014-04-20 23:36:45 -07:00
Chiss b1e082b73a fixed riposte bug
tweaked capture effects
2014-04-21 11:56:14 +10:00
Chiss 0eaa3110f5 Risposte nerf 2014-04-21 11:18:14 +10:00
Chiss 07098b0b82 fixed no damage on weapons
items not usable until game is live
fixed proxies not triggering
some skill balance/fixes
players with null kit are now given default knight
2014-04-21 10:48:04 +10:00
Jonathan Williams 60039d5b76 More missing files. 2014-04-20 01:07:59 -07:00
Jonathan Williams 8bf40169f3 Added missing files. 2014-04-20 01:06:55 -07:00
Jonathan Williams 65e94e59cc Changed item tokens to 10 for non bow classes.
Fixed token prices on power/booster items.
Removed You already have this item message on items in CustomBuild.
2014-04-20 01:06:17 -07:00
Jonathan Williams 1f225f05ff Custom build fixes. 2014-04-20 00:27:32 -07:00
Jonathan Williams dc625726c4 Item Custom Build Fixes. 2014-04-19 22:54:52 -07:00
Jonathan Williams 458f5741d7 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-19 20:54:04 -07:00
Jonathan Williams e5e9cc7284 Custom Items in custom Builds for dom. 2014-04-19 20:53:55 -07:00
Chiss 845d45bd4d fixed some skill bugs
players quitting during recruit will no longer remain on a team, caused unbalance
GiveClock flag added to game, to stop giving clock.
2014-04-20 13:50:15 +10:00
Chiss 1bf1f04d53 Champs Stuff 2014-04-19 14:50:14 +10:00
Chiss 424f915388 Champs Merge 2014-04-18 13:24:30 +10:00
Jonathan Williams 6b07541b3b DERP JONLONS 2014-04-15 18:40:43 -07:00
Chiss 5ac48a02fb Stripped indicator func out of Condition
Class Combat skills arent usable before game starts
Silence re-enabled for class combat skills
2014-04-15 17:53:24 +10:00
Jonathan Williams 81ab27cd83 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-14 17:09:47 -07:00
Jonathan Williams 6c8651d2c7 Fixed classes not being added. 2014-04-14 17:09:37 -07:00
Chiss 1c23cf7b4e Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-14 09:27:44 +10:00
Chiss e5ea7483db Merge 2014-04-14 09:27:31 +10:00
Jonathan Williams d3a3cc278f Fixed ultra custom builds not saving.
Fixed default builds.
Fixed armor bug.
2014-04-13 04:24:22 -07:00
Jonathan Williams 591caa1589 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-13 01:36:46 -07:00
Jonathan Williams cac59afed4 Fixed bug with missing default skill and kit page opening. 2014-04-13 01:36:34 -07:00
Chiss 5df8d34426 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java
2014-04-13 18:01:55 +10:00
Chiss 9874dae60f Merge 2014-04-13 18:00:53 +10:00
Jonathan Williams 5efaf9bd36 Fixed inf loop. 2014-04-13 00:59:55 -07:00
Chiss b22be81cbb Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-13 17:49:44 +10:00
Jonathan Williams 8b159557b2 Added PvpClass set in default customBuild. 2014-04-13 00:49:16 -07:00
Chiss d087b379d1 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-13 17:21:02 +10:00
Chiss 85aa748218 Champs Bug Fixes 2014-04-13 17:20:49 +10:00
Jonathan Williams d84c234f47 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-13 00:16:07 -07:00
Jonathan Williams 1b25dce2c5 Added default application on setGameClass.
Removed print info on custom build saving.
2014-04-13 00:15:44 -07:00
Chiss f25a6c26c9 Champs Update 2014-04-13 11:06:10 +10:00
Chiss f73d4d3e23 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-13 09:29:12 +10:00
Chiss 2e4bc587b1 Champs Update 2014-04-13 09:26:31 +10:00
Jonathan Williams 1cb35262ac Fixed skill tokens not being returned. 2014-04-12 14:02:40 -07:00
Jonathan Williams 98430be09e Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-12 01:45:01 -07:00
Jonathan Williams 8f42d91d8a Fixed ban kick bug.
Fixed Hub right click mount crash bug.
Fix for custom builds not saving.
Fixed Bridges not starting/hanging.

Updated to 1.7.8 spigot support.

Removed logging on HS.
2014-04-12 01:28:33 -07:00
Chiss ba1c6ae35f Champs Balance 2014-04-12 18:22:53 +10:00
Chiss 80df2c2944 Bux fixes for 1.7
Champions TDM
SSM Domination
2014-04-11 15:33:31 +10:00
Chiss 71b2931936 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-11 10:34:51 +10:00
Chiss 2adf0395a1 Merge 2014-04-11 10:33:56 +10:00
Jonathan Williams 0375384fb5 Converted to Spigot's latest 1.7.5 2014-04-10 17:15:44 -07:00
Jonathan Williams 84ffd56c82 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-09 02:50:46 -07:00
Jonathan Williams 8460fcc8f6 Added ninja check for bow charge if you just right click quickly. 2014-04-09 02:50:37 -07:00
Chiss b868db0f22 Fixed so you can now charge bow skills in air. 2014-04-09 19:07:12 +10:00
Chiss 146202a52c Champs Balance + Red Arrow Fix 2014-04-09 18:50:38 +10:00
Chiss 0ecd38c656 Champs Balance 2014-04-09 16:48:01 +10:00
Jonathan Williams 9b4e1aa9eb Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-07 22:25:08 -04:00
Jonathan Williams 109d2cb6f1 Fixed edit build issue. 2014-04-07 22:18:04 -04:00
Chiss bb3f2c6281 CHAMPS 2014-04-08 10:53:41 +10:00
Chiss 85c57f2942 IButton now has Left/Right
Added right-click skill removal.
2014-04-06 12:45:52 +10:00
Jonathan Williams 88131836d7 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-05 16:01:07 -04:00
Jonathan Williams db2ae49074 Fixed saving custom builds.
Work on skill tokens.
2014-04-05 15:53:22 -04:00
Chiss 8214e3b8f4 Lots of little bug fixes 2014-04-05 16:52:23 +11:00
Jonathan Williams 05d916de3c Fixed custombuild selection not applying armor 2014-04-04 15:57:56 -04:00
Chiss 13b8f1e7ea Champs Update 2014-04-04 13:26:00 +11:00
Chiss 26fe974b00 More CHamps 2014-04-03 15:48:58 +11:00
Chiss 80c153095b Cooldown bar 2014-04-02 22:03:56 +11:00
Chiss 2f0167ea09 Champs Update 2014-04-02 21:22:21 +11:00
Chiss 2aaf749414 Champions Update 2014-04-02 15:19:58 +11:00
Chiss 0f937b165c skill shop stuff 2014-03-30 09:45:53 +11:00
Chiss e1eda749a7 Skill lore changes 2014-03-30 09:05:29 +11:00
Jonathan Williams b7857ef20c Fixes for Skill level desc.
Fix for level staying same across skill changes.
Removed logging statements in ClientClass
2014-03-29 02:49:57 -04:00
Chiss f4e8879d55 skilly test stuff 2014-03-29 17:07:07 +11:00
Chiss fce249d7d8 fixed some desc stuff
castle seige removed OP kit
2014-03-28 18:50:38 +11:00
Chiss 4386ce0b96 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/ISkill.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java
2014-03-28 14:55:13 +11:00
Chiss f5ca6408f8 Merge? 2014-03-28 14:51:26 +11:00
Jonathan Williams aae40d3899 Changed up Skills and SkillsPage for Dom 2 changeover.
Fixed CustomBuild stuff.
2014-03-27 22:17:31 -04:00
Jonathan Williams 8bf78fe14d Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-21 15:30:06 -07:00
Chiss ab2a72ba16 CS Update 2014-03-21 11:59:56 +11:00
Jonathan Williams f24f81b7c3 Finished conversion. 2014-03-19 04:09:40 -07:00
Jonathan Williams 7042159f46 Updated to 1.7 and changed namespaces to 1.7 2014-03-19 02:24:26 -07:00
Jonathan Williams 24f1c6c722 Fixed saving custom builds.
Fixed items staying from previous class in game.
2014-03-18 23:40:54 -07:00
Jonathan Williams efee9fdcbf Fixed Hub class shop.
Added chat logging.
Added message with file updater.
2014-03-13 17:56:05 -07:00
Jonathan Williams b6ee99596a Work on Dom shop page.
Removed unused shops

Removed unnecessary include of Core project files in build xml
2014-03-12 01:06:56 -07:00
Jonathan Williams c4b7cd19c8 Added default builds for kits in Champions/Dominate
Added default build selection in lobby when only hitting kit and not selecting a build.
2014-03-11 03:29:11 -07:00
Jonathan Williams 02a1e68c8c Fixed kits opening correct page. 2014-03-09 19:42:54 -07:00
Jonathan Williams a565da45e4 Added classes to champions.
Added ability to open direct classes page.
2014-03-09 19:32:27 -07:00
Chiss 1031846198 SSM Update
Gravity game start
2014-01-18 12:34:24 +11:00
Jonathan Williams 49e796c39d Fixed Game.Core build issue.
Cleaned up a lot.

Added missing files for Mineplexer
2013-11-06 20:19:56 -08:00
Jonathan Williams 2064c58d1b Fixed up ServerStatusRepository to insert into specific columns
Fixed Dominate shop.

Some work on Server Monitor
2013-11-05 10:19:04 -08:00