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

1265 Commits

Author SHA1 Message Date
TadahTech
107a296239 Fuck you intellij 2016-09-01 05:49:59 -05:00
TadahTech
68743cf73c Mavs changes. 2016-09-01 03:24:38 -05:00
TadahTech
46053e82e1 Mavs changes. 2016-09-01 02:35:31 -05:00
TadahTech
c0c75ea375 Allow team selecting to work on the mavs hub. 2016-08-31 23:46:29 -05:00
cnr
9cd5b73432 Merge branch 'update/basketball-game' into develop 2016-08-31 23:19:51 -05:00
cnr
55086efd91 Merge branch 'feature/shadowmute' into develop 2016-08-31 23:16:57 -05:00
AlexTheCoder
8ca214a4d8 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game 2016-08-30 01:37:14 -04:00
AlexTheCoder
5108a6f08d Convert to npc for entering mavericks lobby 2016-08-30 01:02:26 -04:00
AlexTheCoder
d7d8ef021e Disable using cosmetics inside mavericks hub 2016-08-30 00:47:48 -04:00
TadahTech
dfced7186f Finish tweaks for the hub 2016-08-29 22:32:07 -05:00
Shaun Bennett
f72647e1d4 Merge with develop 2016-08-29 21:56:03 -04:00
Shaun Bennett
f3e38031ab Add shadowmuting 2016-08-29 18:57:07 -04:00
TadahTech
f9cc505908 Minor tweaks to soccer fields 2016-08-25 04:02:17 -05:00
TadahTech
19cfcc414b Fix stacking minecarts 2016-08-25 03:58:39 -05:00
TadahTech
f518185518 Tweak parkour 2016-08-24 22:55:39 -05:00
TadahTech
1654850e8c Final Changes 2016-08-24 22:26:38 -05:00
TadahTech
ba2bee4f25 Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java
 2016-08-24 21:29:01 -05:00
TadahTech
42c228773c Fix entity directions 2016-08-23 01:52:19 -05:00
TadahTech
3b9d6adfbc Lobby Update 2016-08-23 01:37:07 -05:00
Shaun Bennett
a744566cd3 Add AntiSpam front end 2016-08-11 11:34:17 -05:00
cnr
7b1ac5ded2 Merge branch 'update/clans' into develop 2016-08-10 21:27:43 -04:00
samczsun
7de9da3d1c Complete rework of disguising and antihack hook 
This commit completely rewrites DisguiseManager, DisguisePlayer, and
PlayerDisguiseManager.

Changes to disguising means that much of the core was also changed,
primarily having to do with mapping by UUID versus player names.

Several new API classes were added, such as EntitySelector, Managers,
UtilTasks, and a brand new scoreboard API which is much more optimized and
allows for much longer lines

The new anticheat is hooked as well, with implementation for guardians
which follow the players around. Release two code is also included, but is
currently disabled via a boolean.
 2016-08-10 21:03:30 -04:00
AlexTheCoder
4e0971ab0a Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-08-05 14:35:57 -04:00
AlexTheCoder
14f140143b Re-enable music in hub gadgets 2016-08-05 13:34:33 -04:00
cnr
3610f78b37 Merge branch 'feature/thanks' into develop 2016-08-03 22:23:46 -04:00
Shaun Bennett
e113bedea5 Fix accidentally refactoring "thanks" in strings 2016-08-03 15:11:31 -05:00
Shaun Bennett
ca13b8f29e Fix compile errors 2016-08-03 14:18:26 -05:00
Shaun Bennett
f41cd8c104 Add /thank command. Update jooq files 2016-08-02 00:10:46 -05:00
cnr
d853f8467c Merge branch 'update/clans' into develop 2016-07-28 22:56:23 -05:00
AlexTheCoder
3aad06cc8a Make Clans displayed as FULL instead of BETA in server compass 2016-07-28 19:11:14 -04:00
TadahTech
ab9bf2f405 Fixes possible bug with party leaders not seeing chat. 
Adds pling when you received an invite.
 2016-07-28 03:40:24 -05:00
AlexTheCoder
031a9575ae Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-27 15:13:18 -04:00
cnr
3d0cc2a5fd Refactor Clans gold dependency out of core 2016-07-27 13:52:03 -05:00
AlexTheCoder
9a73784b7c Make clans in the hub route through clans hubs 2016-07-25 11:18:10 -04:00
TadahTech
5180e46be7 Revert party chat symbol to "@". Change team chat symbol to "#". 2016-07-24 22:17:50 -05:00
TadahTech
ceccf2d2ac Don't give the item when a game is in progress. 2016-07-23 22:36:53 -05:00
TadahTech
5d0b5f80c0 Fix Party server sending. Tweak playercount and GUI display 2016-07-21 18:01:43 -05:00
AlexTheCoder
55c63364f2 Fix KOTH starting in other hub worlds and hub basketball teams always being null 2016-07-21 16:57:24 -04:00
AlexTheCoder
286a7aa32a Even more debug 2016-07-21 16:16:38 -04:00
AlexTheCoder
b5ce35544f Fix merge conflict 2016-07-21 15:48:56 -04:00
AlexTheCoder
fc3ceddf4d Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2016-07-21 15:47:59 -04:00
AlexTheCoder
97ef408e14 Debug 2016-07-21 15:46:48 -04:00
AlexTheCoder
11992129d1 Convert to EntityPortalEnterEvent 2016-07-21 14:01:08 -04:00
AlexTheCoder
d59882007b Slightly increase boundaries 2016-07-21 13:55:09 -04:00
AlexTheCoder
37cf863625 Tiny fixes 2016-07-21 13:46:13 -04:00
AlexTheCoder
57f9f7db4b Fix ClassCastException 2016-07-21 13:25:17 -04:00
cnr
9a06cce0a0 Merge branch 'feature/party-v2' into develop 2016-07-20 16:41:50 -05:00
TadahTech
67a185acc9 Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-07-20 15:52:59 -05:00
AlexTheCoder
ff210271c9 Add javadocs 2016-07-20 12:21:15 -04:00
AlexTheCoder
0b4c9d78ff Finalize game integration into map 2016-07-20 11:22:14 -04:00