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

557 Commits

Author SHA1 Message Date
Shaun Bennett
8f9794a5f7 Merge remote-tracking branch 'origin/master' 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
 2014-12-22 23:56:18 -06:00
Shaun Bennett
706b3e25ef Fix broken player count when changing max players 2014-12-22 23:54:51 -06:00
Chiss
64d37d1886 minor snd changes 2014-12-23 16:50:31 +11:00
Shaun Bennett
1957db25d9 Add player head button 2014-12-22 23:20:20 -06:00
Chiss
f961fd0233 Merge remote-tracking branch 'remotes/origin/searchanddestroy' 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
 2014-12-23 15:09:58 +11:00
Chiss
19a7e6d666 time update 2014-12-23 13:01:44 +11:00
Chiss
4797b251b1 YAY Champions enable/disable works. 2014-12-23 11:39:03 +11:00
Chiss
71cf8e8fd2 undid champs stuff :( 2014-12-23 11:22:41 +11:00
Chiss
ec9401506c Game servers can now run champions/normal on the fly. 2014-12-23 11:18:48 +11:00
Chiss
a197724de8 fixed le bugs. 2014-12-23 10:48:15 +11:00
Shaun Bennett
1396c3395a Add kill button, rename ban to remove, add some messages for actions, add remove admin 2014-12-22 17:37:02 -06:00
Chiss
ec8e1f0546 more MPS stuff 
fixed bridges exploit
 2014-12-22 16:31:13 +11:00
Chiss
2472ca95ec MPS updates 2014-12-22 13:19:45 +11:00
Chiss
0e7dec919d minor updates 2014-12-22 10:51:19 +11:00
Chiss
184c6cb4ba added func to change attackreason for combatmanager 2014-12-19 13:59:18 +11:00
Chiss
437c1aeabe MPS rank todo 2014-12-18 13:06:57 +11:00
Chiss
679f7909b0 Merge branch 'feature/private-servers' of ssh://184.154.0.242:7999/min/mineplex into feature/private-servers 2014-12-18 12:45:56 +11:00
Chiss
56d14b7bc0 Particle stuff 2014-12-18 12:45:45 +11:00
Shaun Bennett
a63c48e338 Refactoring private server menu 2014-12-17 18:45:15 -06:00
Chiss
12973aba7d Merge branch 'master' into feature/private-servers 2014-12-17 16:47:19 +11:00
libraryaddict
0e7adab3eb Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-17 18:32:50 +13:00
libraryaddict
17ac36d9ae Add wither pet, pets are no longer stackable. Enderdragon no longer has his health changed in the hub 2014-12-17 18:31:51 +13:00
Shaun Bennett
6eb3efa0b6 More changes 2014-12-16 20:37:14 -06:00
Shaun Bennett
62a621270e More work on private server gui. Still need to do a bunch of refactoring 2014-12-16 13:43:01 -06:00
Shaun Bennett
83218c9a73 Pushing unfinished code for laptop 2014-12-16 11:42:06 -06:00
Chiss
a433ad764d Wither Morph 
Legend Particle
 2014-12-16 16:18:09 +11:00
Chiss
d7eb01e8f0 fixed CC Bug :D 2014-12-15 15:49:52 +11:00
Chiss
95081a8ab7 Gems cannot be given multiple times for certain things (prevents bugs giving mass gems) 2014-12-15 14:33:38 +11:00
Chiss
0aba82eee6 fixed some eclipse java6 stuff with mail 
Christmas game update
 2014-12-10 15:38:57 +11:00
Chiss
bee81ff455 lowered coin rewards 2014-12-09 20:23:56 +11:00
Chiss
50358c0c30 removed EULA breach in bridges private blocks 2014-12-08 18:23:47 +11:00
Chiss
ef8e5104f1 SnD Kits 
minor bug fixes
 2014-12-08 17:28:18 +11:00
Jonathan Williams
abaf9f4693 Refactored IRelation method names 
Added support for negative amounts in Support server.

Clans in core testing state.
 2014-12-03 13:06:50 -08:00
Jonathan Williams
9d39cb922c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-01 01:22:51 -08:00
Jonathan Williams
433483dcca Fixed error in GameLootManager 2014-12-01 01:22:43 -08:00
Chiss
cee48f1978 made it so you can use fireworks without aiming against block in blockhunt 
removed fire from magma blast
private blocks are no longer private if owner is dead
 2014-12-01 19:33:36 +11:00
Chiss
b3beadf8b5 made recharge look nicer for 1.7 
added missing files
 2014-11-29 09:14:33 +11:00
Chiss
8f9f88987b mods can no longer use /tp Here 
only disqualifies on tp in live games.
 2014-11-28 10:09:18 +11:00
Chiss
fdc67e021c Staff using /tp commands will take them out of the game (Mod to Admin only) 
Changed spec /tp command to /spec
 2014-11-28 10:00:31 +11:00
Jonathan Williams
484dfaaea9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-25 13:25:41 -08:00
Shaun Bennett
f1fbc21570 Merge remote-tracking branch 'origin/master' 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
 2014-11-23 20:02:09 -06:00
Shaun Bennett
c7f2a8072e Antistack replacement 2014-11-23 19:51:23 -06:00
Jonathan Williams
cb43bc04d3 Added /lobby 2014-11-23 03:35:16 -08:00
Chiss
f1ba5947a4 Some more wither updates 2014-11-21 16:32:12 +11: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
057594205e Only closing CREATIVE Inv for non-ops. 2014-11-15 22:40:56 +11:00
Chiss
ca58f11174 specs should be able to view stats now 2014-11-15 22:32:00 +11:00
Chiss
fb70b76d29 FINGERS CROSSED 2014-11-15 22:29:53 +11:00
Shaun Bennett
d16896e493 Merge remote-tracking branch 'origin/master' 2014-11-15 05:04:57 -06:00
Shaun Bennett
1ca23390cc Fix my derp 2014-11-15 05:04:48 -06:00
Chiss
51bc53262d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-15 19:32:08 +11:00
Chiss
ca4eec20ed Wither Assault update 2014-11-15 19:31:56 +11:00
Shaun Bennett
223bc2d0c0 Remove some debug messages that we no longer need 2014-11-13 19:34:55 -06:00
Shaun Bennett
8b73b89a17 Merging spectator gui with main branch 2014-11-13 16:03:14 -06:00
Chiss
fc2bba7eeb reverted idlemanager stuff for dmt(had already made talking in chat count as action) 2014-11-08 11:08:13 +11:00
CoderTim
80226a20fa Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 18:55:20 -05:00
CoderTim
4c98d833e0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 18:33:46 -05:00
Chiss
e286bec777 added a little msg for people in UHC, informing that it will start soon 2014-11-08 10:30:32 +11:00
CoderTim
ae35e82e22 Disabled AFK kick in Draw My Thing 2014-11-07 18:28:06 -05:00
Chiss
75c07588a5 UHC wont start for 2 minutes after creation 2014-11-08 10:22:23 +11:00
Chiss
c61ad8907a set minimum MP level for staff 2014-11-08 09:15:27 +11:00
Jonathan Williams
3309c0406b Added ∞ for admin/owners as player level. 
Fixed customer support issue where it wasn't totaling coins correctly.
Fixed Recharge memory leak.
 2014-11-07 13:54:11 -08:00
Chiss
519e63a1c1 re-unlocked kits for single game ultra chaps. 2014-11-07 23:10:33 +11:00
Chiss
c93862f299 updated player level 
added /givestat command for owners (must use full string; Global.ExpEarned)
 2014-11-07 22:10:41 +11:00
Chiss
9c80103d6e completely disabled gamehost manager (double safe) 2014-11-07 21:32:44 +11:00
Chiss
fadaa59526 added mineplex level 
removed ability to go into negative gems as villager morph
 2014-11-07 19:20:15 +11:00
Chiss
b7ce12165e game host stuff 2014-11-07 12:14:33 +11:00
Chiss
91e0b42de8 Added start of MPS stuff 
Some new gadgets
 2014-11-07 11:52:58 +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
aa45f031ac 3 new achievement Kits 
SSM Balance patch
Champs balance
tons of bug fixes
 2014-10-31 10:35:47 +11:00
Chiss
cfcfad610f Improved recruit/prepare countdown timers 2014-10-25 13:56:23 +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
Chiss
92d9fc4ca0 Deleted deprecated firework module and converted to Util 2014-10-25 11:03:45 +11:00
Chiss
01f311a3d6 Added missing requirements for SG Achievement Kit 
fixed a parkour exploit
 2014-10-25 10:38:47 +11:00
Chiss
25fc3c0645 Achievement Kits (3 games) 
Halloween Pumpkins
Youtube command (allows kits)
 2014-10-24 19:05:57 +11:00
Chiss
d4512e464a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-23 14:05:54 +11:00
Chiss
c2bb53c887 Halloween pumpkins 
Minestrike balance
bug fixes
 2014-10-23 14:05:35 +11:00
Shaun Bennett
a47be7a2f6 Merge remote-tracking branch 'origin/master' 2014-10-19 00:08:13 -05:00
Shaun Bennett
1394e33056 Fix for Arcade Kit NPC Names in 1.8 2014-10-18 21:15:53 -05:00
Chiss
6e6e0e2ae0 added flags to disable gem multipliers per-game. UHC was giving too much :O 2014-10-13 09:44:30 +11:00
Chiss
603c0cb66e Staggered UHC game teleports to help reduce lag. 2014-10-12 18:26:18 +11:00
Chiss
9cc28d1ad8 MAC Update 2014-10-12 14:19:35 +11:00
Jonathan Williams
797dd002ad Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-11 02:43:56 -07:00
Jonathan Williams
19afebe53d Added in mysql hooks for coins/gems/ranks for database conversion preperation. 
Added in failover database calls in CoreClient/DonationManager
 2014-10-11 01:32:22 -07:00
Chiss
d0d2622ecc added UHC on-the-fly anti-xray 2014-10-10 18:54:38 +11:00
Chiss
a739712dca fixed game autostart flag bug. 
added UHC gem rewards
 2014-10-10 15:26:04 +11:00
Chiss
e3747b5183 Minestrike fixes 
Hub UHC announcer
 2014-10-10 13:07:59 +11:00
Chiss
232dd231d0 UHC joinability/MOTD 
Minestrike spec shop bug fix
 2014-10-10 10:49:39 +11:00
Chiss
8701f9ddcc Added TabTitle 
Converted MineStrike to use scoreboard name hiding
 2014-10-09 10:35:54 +11:00
Chiss
cda9234ad3 Fixed TimeInGame stat not recording sometimes 2014-10-03 11:17:36 +10:00
Chiss
31ceaad7fe MineStrike audio update 2014-10-03 10:49:26 +10:00
Chiss
969c7c0fde Music gadget fixes 
Tournament point tally
Removed snow from frosty HorseMount
Added Tournament hub invite messages
 2014-09-24 15:46:55 +10:00
Chiss
a58335d906 Added GameStatManager.java 2014-09-22 17:46:36 +10:00
Chiss
7ca4b6830b added in GameStatManager 2014-09-21 09:28:12 +10:00
Chiss
9fce0b1926 Added small cooldown to be able to click hub clock after your gamestate changes. (prevents accidental clicking) 
Moved stat stuff to gamemanager.
 2014-09-21 09:26:34 +10:00
Chiss
9bbac7578e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
 2014-09-20 08:29:06 +10:00
Jonathan Williams
96498af626 Fixed parkour bug with gadget blocks. 
Removed a ton of debug messages with inventory close.
 2014-09-19 09:06:42 -10:00
Chiss
91037384f9 Loot tweaks 
Music fixes
some bug fixes
 2014-09-19 18:01:38 +10:00
Shaun Bennett
5d643c00d5 treasssssurreeeeees 2014-09-18 21:03:46 -05:00
Shaun Bennett
88a8e3a896 Hackyish way to log rewards given out in a database 2014-09-18 14:35:59 -05:00
Chiss
ed59e03795 Loot update 2014-09-18 17:05:56 +10:00
Chiss
fed3d31374 MineStrike fixes 2014-09-18 15:44:48 +10:00
Chiss
09a3cc16b0 Reward stuffs 2014-09-18 14:36:22 +10:00
Chiss
bb8e481c7f More Reward stuff 2014-09-18 14:25:39 +10:00
Chiss
26a51f4ef2 Re-allowed opening of chests (for GUIs) during games. 2014-09-14 15:28:43 +10:00
Jonathan Williams
a196e43fde Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
 2014-09-12 19:46:19 -10:00
Jonathan Williams
14c4152248 Fixed CustomTagFix. 
Updated ServerData ServerGroup and SErverMonitor for new flags in Arcade.
 2014-09-12 10:03:33 -10:00
Chiss
0dff0412d1 Fixed game flag for not allowing inventory opens 
Removed some redundant flags in game
Lots of MineStrike updates
Fixed NPE in WinWithoutLosingTeammateStatTracker
 2014-09-12 11:47:39 +10:00
Chiss
092e9ba479 Modified UHC borders for release 2014-09-11 17:44:57 +10:00
Chiss
f138a4108b Deregister stat trackers from listener 2014-09-06 22:01:05 +10:00
Jonathan Williams
558231457c Fixed disguises leaving extra tags 
Fixed memory problem in Arcade.
 2014-09-06 03:39:20 -07:00
Jonathan Williams
d01529a344 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2014-09-05 04:38:23 -07:00
Jonathan Williams
1c6790b611 Fixed for DisguiseManager 
Rewrote packet handling
Fixed up CustomTagFix
Removed swapping kits in Block Hunt
Removed Stacked entities for 1.8 players.
 2014-09-05 04:36:01 -07:00
Chiss
f6ce9abed8 Minestrike 
- added mixed slow/instant mode
- added accurate hitboxes for slow bullets
- added many new weapons
- removed speed from knife
- adjusted gun balance
 2014-09-05 12:28:29 +10:00
Chiss
50140ef92d Minestrike update 2014-09-03 14:49:38 +10:00
Chiss
5d6834633f MineStrike update 2014-09-02 11:16:17 +10:00
Chiss
05623b7522 Initial MineStrike push 
fixed frames being breakable in games
 2014-09-01 21:37:39 +10:00
Chiss
2b333859d1 PUUSH 2014-08-30 19:24:04 +10:00
Chiss
2c30cc3ef4 Implemented new servers flags 
Removed OP from Admisn in HUB, gave them /gm command instead
 2014-08-30 16:33:56 +10:00
Chiss
41daba98c4 Background work for Minestrike 
Admins no longer have OP in hubs. They have /gm command to gamemode.
 2014-08-29 18:21:08 +10:00
Chiss
ec4cb91a1c Poll changes 
Achievement output double space fix
 2014-08-28 11:50:09 +10:00
Chiss
f25f7d3aa2 Fixed 1v3 achievement not giving achievement if players quit (required 4 at END) 2014-08-27 09:52:33 +10:00
Chiss
5540835052 removed micro debug 
fixed a bug in achievement output
 2014-08-27 09:09:06 +10:00
Chiss
f9ce0d353c Achievements now need 75%+ players at START of game 2014-08-27 08:57:11 +10:00
Chiss
17649ce36c Fixed bug where desc for past-completed achievements was still showing 2014-08-26 21:51:59 +10:00
Chiss
ab29a5fa29 Fixed text output in Achi GUI for completed 2014-08-26 18:06:01 +10:00
Chiss
3eae26ef80 Updated Achievement Output 2014-08-26 18:03:29 +10:00
Chiss
d62b59776f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-26 17:54:50 +10:00
Chiss
116fe496a8 Changed post game achievement output 
Added Reward to Achi GUI
 2014-08-26 17:53:54 +10:00
Chiss
7e7906865f Fixed some stats being added after send-off 2014-08-26 17:45:35 +10:00
Jonathan Williams
526b5c333a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-26 00:34:00 -07:00
Jonathan Williams
137b8692e4 Added Gem booster use. 2014-08-26 00:33:48 -07:00
Chiss
0546c9e175 Fixed so only Supply drop chests trigger achievement 2014-08-26 17:33:23 +10:00
Chiss
1b15a57fc8 Added Gem Rewards for Achievements 2014-08-26 17:10:20 +10:00
Chiss
13eb3da0fa Achievment gui changes 2014-08-25 09:26:01 +10:00
Shaun Bennett
ff441f2262 Merge remote-tracking branch 'origin/master' 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2014-08-24 16:14:29 -05:00
Shaun Bennett
2cb87b23e6 Stat Gui, Start of Treasure Gui (disabled) 2014-08-24 16:08:19 -05:00
Chiss
af9bf0727a Fixed damage taken stat NPE 
Added tournament team auto-rejoin
 2014-08-23 17:55:28 +10: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
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
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
Chiss
1bf1f04d53 Champs Stuff 2014-04-19 14:50:14 +10:00
Chiss
2e4bc587b1 Champs Update 2014-04-13 09:26:31 +10: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