ce72d25832
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-07-08 13:09:02 -05:00
8c7308add5
Add documentation.
...
Refactor code.
Remove most command backend capabilities to limit user error.
Cleanup.
2016-07-08 13:08:34 -05:00
443576ba1a
Update YouTube link and send shard reward message
2016-07-06 20:15:41 -05:00
63b6158fe4
More UHC Fixes
...
Fixes:
PC-137
PC-138
PC-497
PC-665
PC-710
PC-719
PC-754
Also fixes chunk synchronization issue, plugs potential memory leaks
Fancy spectating
Use enum priorities
2016-07-06 15:55:12 -04:00
8cf470cfd0
Update fountain goals
2016-07-06 13:39:56 -05:00
17f89f6937
Merge branch 'project-cosmetics' into develop
2016-07-06 13:00:29 -05:00
63500c19c9
Removed commented lines
...
Added javadocs to GadgetChangeEvent
2016-07-06 14:45:05 -03:00
185ba600ca
Merge branch 'develop' into thanos-mineware
2016-07-06 17:48:31 +03:00
67adb34311
Fixes for the WinRooms
...
Removed Freedom Chests from the menu
2016-07-06 00:00:50 -03:00
eccd7deedc
Fix merge errors and properly force disable particles by checking the game's settings
2016-07-05 17:25:01 -04:00
0eab6db116
Soccer bug fixes and minor improvements
...
- Slimeball will no longer be able to get stacked.
- Players in soccer mode will not able to stack others.
- Guardian lazer can no longer be used in the soccer field.
- Players in soccer won't get knockback, except if they double jump.
2016-07-05 15:39:10 -05:00
9f58e57a67
Bug fixes.
2016-07-05 14:35:37 -05:00
978ee0055a
Bug fixes.
2016-07-04 09:15:47 -05:00
0ebddf9f45
Add UI Item.
...
Add check to make sure player's cant be invited to another party if they're already in one.
Bug fixes.
2016-07-04 05:43:01 -05:00
584c8f50f0
PC Party bugs and tweaks.
2016-07-04 05:12:02 -05:00
06feb615a9
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-07-04 04:18:01 -05:00
af9d91faa8
Further prevent nullpointer errors
2016-07-03 04:11:14 -04:00
ffdc7b4be0
Temporarily patch random nullpointer
2016-07-02 18:05:26 -04:00
9898b3d95d
Fix block state not saving on restore (Untested) (PC-610)
2016-07-02 18:02:59 -04:00
54cda56c11
Initial Commit
2016-07-02 17:16:42 -04:00
050ae75e49
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-07-02 13:33:33 -03:00
7a6335a021
Fixes for win rooms? Or not yet?!
2016-07-02 13:32:35 -03:00
e4c94f5421
Fix whitelist for Customer Support servers
2016-07-02 01:32:42 -05:00
24186d9992
More fixes for gadget persistence
2016-06-28 18:11:00 -03:00
c5c08562c3
Merge branch 'master' into thanos-mineware
2016-06-28 23:01:42 +03:00
30f413d04e
Fixes for persistence:
...
No longer save items after they are disabled
No longer keep the particle effect after a staff vanishes
2016-06-25 02:22:20 -03:00
50759661cf
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-06-24 23:52:27 -05:00
d75abe3aea
Persistence fixes
2016-06-25 00:36:00 -03:00
83f4b25887
Testing persistence fixes
2016-06-25 00:33:36 -03:00
c430566c6d
Never reset a player's YouTube click time locally
2016-06-24 16:59:27 -05:00
94fe9f57d2
Add missing imports
2016-06-24 12:36:56 -07:00
dc9145c707
Hotfix, disable youtube and twitter buttons in BonusGUI
2016-06-24 15:33:07 -04:00
8fbb06ae3d
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-06-24 04:11:38 -05:00
e71fc291d1
Fix cross server invites / joining servers.
2016-06-24 04:01:51 -05:00
b4caf5125b
Adjust tip amounts
2016-06-24 03:16:42 -05:00
d708c478d7
Dont display other boosters, fix typo
2016-06-24 03:16:42 -05:00
348cb9efba
Fix remaining booster message
2016-06-24 02:23:09 -05:00
b58ff8c066
Add YouTube and Twitter buttons to UI
2016-06-24 01:30:10 -05:00
def57e2c0b
Fix HubManager, add failsafe for BoosterManager
2016-06-23 23:19:02 -07:00
fd843b88cb
Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/inventory/GemBooster.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
# Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java
2016-06-23 23:02:26 -07:00
a9f291338f
Amplifiers GM Candidate
2016-06-23 22:49:12 -07:00
c204562eb3
Fix cross server invites / joining servers.
2016-06-23 23:25:26 -05:00
ce1aab5e11
Fixes and changes
2016-06-23 21:53:12 -05:00
3433e0e3bc
Merge branch 'project-cosmetics' into develop
2016-06-23 18:42:47 -05:00
dc57f7b4e6
add testrank command for SR.Mods
2016-06-23 22:05:26 +02:00
c1b7be6363
Fix merge problems
2016-06-23 16:33:20 -03:00
7749314e64
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-06-23 16:11:49 -03:00
a441727e09
Freedom update:
...
Freedom chests
Freedom Aura
Shock and Awe
Leap of Freedom
Price of Freedom
Uncle Sam Morph
Freedom Mount
Uncle Sam Hat
Persistence update:
Items will still be enabled after player leaves the server
2016-06-23 16:09:31 -03:00
33cce620be
Update UI and fix typos
2016-06-23 03:11:45 -05:00
df53021f7c
Fix Party Redis. Improve Party UI. General testing and fixing. (Funny enough, again.
2016-06-23 02:56:42 -05:00
fb6a772eb0
Fix Party Redis. Improve Party UI. General testing and fixing.
2016-06-23 02:39:05 -05:00
6e2c751be1
Adjust amplifiers queue message
2016-06-22 21:09:09 -07:00
0873efd876
Update more lore text
2016-06-22 20:54:29 -07:00
621d72f541
Fix merge issues, update lore text
2016-06-22 20:51:58 -07:00
249a5c70aa
Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-22 20:35:40 -07:00
906e0e0044
Allow API error messages from HTTP 503
2016-06-22 20:31:18 -07:00
2453f82061
Rename Filterbutton.java to FilterButton.java
2016-06-22 18:40:12 -04:00
50534c3af9
UI And server manager changes
2016-06-22 17:28:43 -05:00
e855a866c7
Fix more thanks and booster occurrences
2016-06-22 08:58:27 -07:00
e53b474f3f
Fix typo.
2016-06-22 00:59:22 -05:00
38a13d01f1
Open server menu properly
2016-06-22 00:56:44 -05:00
4d31867e98
PC Party updates.
2016-06-22 00:35:57 -05:00
e39326b592
Help Command UI.
2016-06-21 00:11:33 -05:00
b75e87753d
Party UI work.
2016-06-20 22:45:53 -05:00
a49e815765
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-06-20 16:40:33 -05:00
2211cf4dec
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-20 16:37:07 -05:00
1c1912b92a
Update fountain goals again
2016-06-20 00:52:33 -05:00
afc636b7c5
Fix amplifier reward message
2016-06-19 20:16:33 -05:00
bb8d94f38a
Fix a lot more Booster cases
2016-06-19 19:48:17 -05:00
63b7648608
Amplifier rename, move podium backwards
2016-06-19 19:05:04 -05:00
38058bc670
Confirmation Paging
2016-06-19 05:49:32 -05:00
2f0a559441
Add reload command, change podium to lime dye, change tip message
2016-06-18 14:41:32 -05:00
5f9a57b7e2
Lower booster tip cooldown to 1 minute
2016-06-17 16:10:01 -05:00
4e3062f413
Swap Cosmetic and Booster interface slot
2016-06-17 15:23:53 -05:00
0873ee0116
Show entire booster queue in booster gui
2016-06-16 16:54:54 -05:00
1893e98036
Don't run chat filtering on the main thread
2016-06-16 16:39:43 -04:00
5ac6249684
Fix Bridges Kits not getting their items.
...
Fix Kits breaking at Level 5
2016-06-16 15:34:23 -05:00
ea551182b6
Make booster gui smaller
2016-06-16 15:29:05 -05:00
e7d76e2ef4
Hot fixes.
2016-06-16 03:56:32 -05:00
1e5d91e392
Make porting from old legendaries work, fix null commandcenter
2016-06-15 21:52:25 -04:00
cbfbd6fe1c
Booster GUI update
2016-06-15 17:40:20 -05:00
27afd3d96c
Kit progression update
2016-06-15 15:54:53 -05:00
aa785ed3d5
Code clean-up and documentation
2016-06-12 21:18:11 -05:00
22e22ff508
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/party/Party.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-12 00:42:22 -05:00
cf87469400
Fix a possible NPE, use proper IP and port for api
2016-06-10 20:24:22 -05:00
2421fd1cfe
Update booster page, proper booster rewards
2016-06-10 19:40:27 -05:00
42c35063b3
Display all the boosters you have activated
2016-06-10 17:40:59 -05:00
6964b1f266
Booster gui command
2016-06-10 17:20:23 -05:00
e6920b4549
Work on booster gui, display wait time
2016-06-10 17:17:43 -05:00
ceb4de8b35
Load booster groups for arcade
2016-06-10 16:33:53 -05:00
6d380c6c6f
Rename building champion to Speedy Builders
2016-06-10 22:44:13 +03:00
0a204a3b90
Use redis pub/sub to send booster updates
2016-06-10 12:44:27 -05:00
52ce640391
Merge branch 'develop' into thanos-mineware
2016-06-10 12:15:54 +03:00
e30cd6747b
Increase goal 10 million, probably need to change later
2016-06-09 23:40:58 -05:00
1d365d726c
brawl fountain now displays proper info on the weekend
2016-06-09 23:40:58 -05:00
08e47b4b1b
Enable tips in bonus gui
2016-06-09 22:41:41 -05:00
77e9de0f8f
Update required rank in
...
fountain add help message
2016-06-09 17:02:00 -05:00
0306f1d703
Update required rank in
...
booster command help message
2016-06-09 17:02:00 -05:00
dbe8f39eeb
Update required rank in
...
add booster help message
2016-06-09 17:02:00 -05:00
ba319599ba
Fix fountain schematic file paths
2016-06-09 01:18:09 -05:00
TadahTech
cnr
samczsun
Shaun Bennett
LCastr0
Thanos Paravantis
AlexTheCoder
Kenny Goodin
xXVevzZXx
Alex-The-Coder