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

142 Commits

Author SHA1 Message Date
Jonathan Williams
b69a75355c Fixed scoreboard alignment. 2016-04-22 02:17:40 -05:00
Jonathan Williams
6d00e8b41f Refactored Elo to work correctly. 2016-04-22 00:21:11 -05:00
AlexTheCoder
d0e3b094c1 - cleaned up and prepped for live update 2016-04-21 20:57:35 -04:00
Joseph Prezioso Jr.
f86b18b603 Elo Works Now 
Ready to move on to MCL implementation
 2016-04-20 22:09:18 -04:00
Joseph Prezioso Jr.
6a5c8336cf Elo and Division fixed 
Elo and Division should be displaying properly

Cleaned the code up a bit

Added endElo() to Game.java to handle team Elo code

Added event listener to check for GameState.End in TDM to call endElo()
 2016-04-20 14:52:06 -04:00
libraryaddict
c25b1969de More progress 2015-11-04 04:00:53 +13:00
libraryaddict
3de906ab19 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
 2015-11-03 14:57:25 +13:00
Cheese
92a2c2ebaa fixed npe in kit npc creation 2015-10-31 19:55:58 +11:00
Cheese
5d58c56c27 fixed kit bug 2015-10-31 18:31:13 +11:00
libraryaddict
da0a99d662 Spawn facing fixes 2015-10-30 16:06:47 +13:00
Cheese
c4e93180fa Merge branch 'master' into smash-champs-balance 2015-10-30 13:00:30 +11:00
libraryaddict
ddb8d592f8 Remove all is1_8 checks 2015-10-22 18:37:14 +13:00
libraryaddict
f71cb80bd0 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
 2015-10-16 22:26:07 +13:00
Cheese
6cc33fd6c6 Merge branch 'thanos-bug-fixes' 2015-10-16 12:53:43 +11:00
libraryaddict
3dda9352e7 Progress 2015-10-16 13:32:23 +13:00
libraryaddict
4205dc6c25 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
 2015-10-15 12:34:34 +13:00
libraryaddict
58a86c5abb That's the easy stuff done.. 2015-10-13 19:49:15 +13:00
Cheese
2b9a66e7b2 more ssm update 2015-10-12 16:32:23 +11:00
Cheese
6a173073a4 added flag to projectiles 
work on cow kit
 2015-10-12 14:39:14 +11:00
Mysticate
dda65b4c77 Fixed tnt exploding lobbies 2015-10-11 19:56:36 -04:00
Cheese
c03c8163c5 fixed exploision stuff 2015-10-09 14:01:58 +11:00
Mysticate
598ea84e7a Fixed explosions and cleaned up. 2015-10-08 22:52:57 -04:00
Mysticate
1011c36c43 Fixed lobby being destroyed. 2015-10-08 22:41:45 -04:00
Thanos paravantis
c2518bc6c4 Some additional bug fixes were applied on the previous commit. 
Water damage by TNT on game lobbies is now patched.
 2015-10-04 16:32:34 +03:00
Jonathan Williams
e9b33668bc Added donorsOnline to MinecraftServer snapshot 
Refactored Rank class to use lowercase methods.
 2015-08-28 13:22:04 -07:00
Mini-Chiss
bb2e15c4fd made it so games can set another game as its 'kit source' so games can share kit unlocks 2015-08-03 11:38:16 +02:00
Sarah
fba10e4cbd fixing the long term "Kit" bug ;D 2015-07-31 14:08:08 +02:00
Mini-Chiss
be910cced9 gamemode color change 2015-07-29 17:00:36 +02:00
Mini-Chiss
c9c3db70f3 Merge branch 'SSM2PlayerTeams' 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-07-29 14:08:17 +02:00
Sarah
c3742ec794 Fixing the too long String bug. 2015-07-24 15:00:49 +02:00
Sarah
609199a6b8 Improving Team names in Team games. 2015-07-24 13:14:41 +02:00
Mini-Chiss
71148ef387 gave twitch same perms as youtubers 2015-07-23 16:29:42 +02:00
Cheese
6ed3f93df7 fixed some scoreboard stuff 2015-07-17 16:17:01 +10:00
Sarah
b7ad0035bc Implementing UHC team system to ssm, sg and skywars. 2015-07-17 07:06:49 +02:00
Aaron Brock
8ea23f96fc Froze time using doDayNightCycle instead of setting the time on UpdateEvent. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 01:36:05 -04:00
Mini-Chiss
e13e735246 UHC updates! 2015-05-12 14:46:21 -05:00
Cheese
e62d9774a9 Initial Event Game push 2015-03-06 19:11:26 +11:00
Shaun Bennett
efce714375 DEVP-66 Refactor commonly used classes to Java conventions 
Refactoring + testing jira
 2015-02-26 00:07:07 -05:00
Shaun Bennett
6b3f2114f2 Holy debug code! 2015-02-10 13:27:29 -05:00
Shaun Bennett
6cefeb1b74 More work on War 2015-02-03 14:02:45 -05:00
Jonathan Williams
c83643564b Fixed scoreboards reading from file. 
Fixed scoreboard server name length
Changed how we pull server group on startup.
 2015-01-13 12:22:47 -08:00
Chiss
5f36c8e424 minor scoreboard changes 
legend loot bonus
 2014-12-30 08:50:37 +11:00
Shaun Bennett
eb0f23318f Fix my fix for scoreboard - mine broke when new players joined 2014-12-23 00:06:30 -06:00
Shaun Bennett
706b3e25ef Fix broken player count when changing max players 2014-12-22 23:54:51 -06:00
Chiss
56d14b7bc0 Particle stuff 2014-12-18 12:45:45 +11:00
Chiss
519e63a1c1 re-unlocked kits for single game ultra chaps. 2014-11-07 23:10:33 +11:00
Chiss
bd2e7faf3e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-25 13:40:53 +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
Shaun Bennett
6138da5f93 Merge remote-tracking branch 'origin/master' 2014-10-24 19:43:06 -05:00
Shaun Bennett
5cf3e6c3a1 Fix for arcade custom tags 2014-10-24 19:36:22 -05:00