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

261 Commits

Author SHA1 Message Date
Jonathan Williams
5e47a12531 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-21 15:56:02 -05: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
Chiss
85522cddca Debug (will clean once fixed) 
Game stats
 2014-08-15 09:49:00 +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
e4871c4988 Disabling cosmetics 5s before game starts, was having some carryover due to lag. 2014-08-11 11:55:00 +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
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
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
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
Shaun Bennett
0edb0d74a7 Fix bugs with kit sorting + cost of kits 2014-08-04 00:31:46 -05:00
Shaun Bennett
fe32cf5444 Remove KitAvailability.Blue 2014-08-03 23:31:55 -05: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
599a6eb1f7 Changed kit availability to be based on free/premium. 2014-08-01 14:05:53 +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
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
Mini-Chiss
c65712c260 UHC fixes 
Sneaky Assassin listener leak fix
Some map parser stuffs.
 2014-07-04 23:04:46 -07:00
Mini-Chiss
bea6902198 Spectators can use /tp 2014-07-02 13:09:47 -07:00
Mini-Chiss
82dd94de9b Scoreboard fix 
Unbreakable boats in hub
 2014-07-02 12:50:04 -07:00
Mini-Chiss
8c461b3e1b Cooldown on Spec Compass 
Hub Forcefield Update
Scoreboard MINEPLEX refactor
 2014-06-30 16:12:42 -07:00
Mini-Chiss
f10b081473 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-06-26 18:38:28 -07:00
Mini-Chiss
3d12196b17 Merge 
UHC Public
Small refactor for player ranks in games.
Trimed scoreboard teams to 16 chars.
 2014-06-26 18:38:11 -07:00
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
Jonathan Williams
6cac04d399 Optimized create scoreboards. 2014-06-19 00:48:04 -07:00
Jonathan Williams
231ffd7234 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-15 17:21:47 -07:00
Jonathan Williams
93fbe70e9c Added more loggingggggg. 2014-06-15 17:21:40 -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
7fc2fbe564 Scoreboard Refactor 2014-06-10 12:51:47 +10:00
Chiss
967ff44d0a gamecreation fix 2014-06-05 10:15:22 +10:00
Chiss
644f946f69 error debug 2014-06-04 17:56:21 +10:00
Chiss
4c72651f86 game creation 2014-06-04 17:55:13 +10: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
Jonathan Williams
0634ee5543 Removed unused global stuff in Mineplexer. 
Did some edits in GroupManager...need to pick that up.

Changed TimeUtil to pop last entry when stopping.
Fixed WorldUtil's dimension thing for UHC.
Fixed Exception with AntihackRepository and no static lock object on _connection

Work on Elo manager.
Work on Queue.

Added checking for player to server transfer records.

Added option for rejoin time in TeamGame (UHC...yay)
 2014-05-27 02:10:29 -07:00
CoderTim
c45e7d2a80 Converted file encoding from ISO-8859-1 to UTF-8 2014-05-25 19:42:39 -04:00
Jonathan Williams
6d19c80af2 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-13 22:15:55 -05:00
Jonathan Williams
6af5d9205b Added TimeUtil.java 
Removed double gems.

Removed extra world uninitialize.

Changed AccountAdministrator to use UUID.
 2014-05-13 22:13:48 -05:00
Chiss
002260dce8 better date 2014-05-14 12:57:43 +10:00
Jonathan Williams
12041b0d72 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-13 21:54:58 -05:00
Chiss
8ea344cacd fixed a NPE 2014-05-14 12:38:06 +10:00
Jonathan Williams
40ba1a64f8 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-13 14:46:15 -05:00
Chiss
fbb0031dc1 fixed bug in dom where endCheck was being called multiple times 
logging for world stuff
 2014-05-13 11:18:17 +10:00
Jonathan Williams
b1514fef5a Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-09 21:18:48 -07:00
Jonathan Williams
0ec08d5208 Fixed chunk load outside borders (disabled for testing right now) 2014-05-09 21:18:38 -07:00
Chiss
208a78b070 respawning players are tp'd if leave area. 2014-05-10 14:01:02 +10:00
Chiss
d9225c003e CS Update 2014-05-10 09:55:27 +10: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
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
Jonathan Williams
2f397e7d2a Work on elo manager. 
implemented coreclient cleanup.
 2014-05-04 22:40:44 -07:00
Jonathan Williams
f079333d3b Optimized ChunkBlockChange. 
Still no dead chunks!

Fixed LobbyManager advertising to an empty lobby.
 2014-05-04 18:29:19 -07:00
Jonathan Williams
97e083c1e7 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-04 12:52:14 -07:00
Jonathan Williams
f623026dfc Fixed projectile order issue..check for dead before collision. 
Fixed dead chunks in Aracde.
 2014-05-04 12:52:04 -07:00
Chiss
6e8bdfa769 disabled hub clock for tournament 2014-05-03 17:26:21 +10:00
Chiss
0ce3b3fb2d Disabled AFK kick during Tournament 2014-05-03 17:23:10 +10:00
Chiss
4304327bf9 Disallowed /spec during games. 2014-05-03 13:06: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
Chiss
423a355057 Helpers+ wont be kicked yb MAC 2014-05-01 09:31:47 +10: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
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
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
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
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