Commit Graph

95 Commits

Author SHA1 Message Date
Jonathan Williams
4f3ffde892 Added timing/debugging code. 2014-06-25 12:06:24 -07:00
Jonathan Williams
f2c82cbf95 Refactored TimeUtil and added totalling option. 2014-06-20 20:42:36 -07:00
Chiss
c386023a6f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-06-16 10:18:30 +10:00
Chiss
fd17c1b254 More staggered teleports on game end
Logging teleports.
2014-06-16 10:18:10 +10:00
Jonathan Williams
0f7885d911 Added safety checks in ClientManager
Added logging and teampreference swap fix in arcade.
2014-06-15 16:25:32 -07:00
Chiss
6cba6b9b9e merge 2014-06-10 10:27:25 +10:00
Jonathan Williams
ebf40afe75 Fix dom bow shoot in lobby bug.
Work on preventing illegal builds.
2014-05-06 22:38:27 -07:00
Jonathan Williams
5f2b2c251d Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-06 09:06:49 -07:00
Jonathan Williams
8110506ac4 Fixed duplicate login issue with CoreClientManager
Added EloRanking and EloStart for elo games in Game.java

Refactored Elo code in Arcade to be based off of above values in Game

Changed Lobby scoreboard in Arcade to just Players at top current/max.
2014-05-06 09:06:39 -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
2f397e7d2a Work on elo manager.
implemented coreclient cleanup.
2014-05-04 22:40:44 -07:00
Jonathan Williams
0101531291 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2014-05-02 23:15:08 -07:00
Jonathan Williams
484ba97b23 Updated file delete mechanism so there is no reflection.
Removed list block on deleting players from coreclient quit.
2014-05-02 23:12:39 -07:00
Chiss
4304327bf9 Disallowed /spec during games. 2014-05-03 13:06:15 +10:00
Chiss
395a5d2c08 MAC disabled with Tournament Mode
Bridges TM game desc fix
2014-05-03 11:47:15 +10:00
Chiss
e818662161 Added /spec toggle, to allow players to not partake in games.
Added TeamArmorAddon for games to use, to mark team colors easier.
Minor other changes.
2014-05-03 11:23:10 +10:00
Chiss
1d4d98b910 Twitch Prep
MAC changes
2014-05-02 14:35:41 +10:00
Jonathan Williams
e958a922fe Fixed Hub chat so it goes through filter.
Added back in server name so it tracks correctly.

Fixed PlayerCount in Mineplexer AGAIN.
2014-04-29 12:53:22 -07:00
Jonathan Williams
3ec1653532 Added in chat filtering command and finished up filtration. 2014-04-29 11:54:20 -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
adf8821a26 more CP changes 2014-04-21 12:55:24 +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
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
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
Chiss
2e4bc587b1 Champs Update 2014-04-13 09:26:31 +10:00
Chiss
ecc40bda47 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-12 18:25:59 +10:00
Chiss
ba1c6ae35f Champs Balance 2014-04-12 18:22:53 +10:00
Jonathan Williams
eb1d1c1ed2 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-11 03:10:02 -07:00
Jonathan Williams
c8af89dded Fixed BH and GRavity. 2014-04-11 03:09:21 -07:00
Chiss
80df2c2944 Bux fixes for 1.7
Champions TDM
SSM Domination
2014-04-11 15:33:31 +10:00
Jonathan Williams
0375384fb5 Converted to Spigot's latest 1.7.5 2014-04-10 17:15:44 -07:00
Jonathan Williams
e4ca9084cc Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-09 02:03:41 -07:00
Jonathan Williams
ec29c66d1c Added arrows sticking in you.
Removed bouncing arrows.
2014-04-09 02:03:19 -07:00
Chiss
0ecd38c656 Champs Balance 2014-04-09 16:48:01 +10:00
Chiss
bb3f2c6281 CHAMPS 2014-04-08 10:53:41 +10:00
Jonathan Williams
05d916de3c Fixed custombuild selection not applying armor 2014-04-04 15:57:56 -04:00
Jonathan Williams
d227a6bd06 Changed full server message 2014-03-29 18:45:44 -04: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
de1365b5cf Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-13 17:56:16 -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
Chiss
82644002c5 A little bit o dem ol bug fixles. yknow what im sayin? 2014-03-13 16:32:48 +11: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