a0847b8d1a
Fix null ServerGroup uptimes value for MPSes
2016-07-14 08:08:24 -05:00
4d0903dba7
Fix compile error
2016-07-14 03:11:59 -05:00
e28320b361
Fix disableCustom not firing properly
2016-07-14 02:47:49 -05:00
917b83250d
Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing"
...
This reverts commit 30287a0832b8650d741d
2016-07-14 00:10:37 -05:00
7dcf7378ef
Many changes
...
Fix spectator race condition
Refactor out cut clean into modules
Add combat log module
Add antixray module
2016-07-13 21:30:54 -05:00
a7b30f4f59
Merge branch 'thanos-mineware' into develop
2016-07-13 21:26:25 -05:00
4343fa3512
Merge branch 'project-cosmetics' into develop
2016-07-13 21:22:41 -05:00
6af04b5438
Fixes for winroom gadget disable messages
2016-07-13 18:21:08 -03:00
369dabffae
Amplifier updates - move to boost shards only
2016-07-13 15:07:24 -05:00
711a04ffa8
Add Bawk Bawk Battles to hub compass
2016-07-13 21:40:31 +03:00
9c3aee6373
Convert all possible gem vote rewards to treasure shard vote rewards to comply with Mojang EULA
2016-07-13 11:17:24 -05:00
7df228a8fa
Move WinEffectGadget schematics to update folder
2016-07-13 06:36:42 -05:00
179b59af2c
Merge branch 'develop' into thanos-mineware
2016-07-13 13:28:03 +03:00
e40abd4859
Merge branch 'thanos-mineware' into develop
2016-07-13 05:04:50 -05:00
85db0ad613
Remove global rawr
2016-07-12 15:51:47 -05:00
654ab281ea
Add option of "uptimes" to servergroups
2016-07-12 15:44:29 -05:00
0f3b2da8b7
Fix Bouncing Block, re-add features for testing
2016-07-12 23:02:01 +03:00
daddaa477e
Merge branch 'update/brawl-games' into develop
2016-07-12 06:45:32 -05:00
ac8a920484
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/brawl-games
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/GunModule.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java
2016-07-12 03:07:31 +02:00
30287a0832
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing
2016-07-11 14:46:08 -04:00
6a87be13f0
Remove features that contain bugs
2016-07-11 01:02:19 +03:00
5b98bfddce
Update YouTube link to landing + sub confirmation
2016-07-08 15:20:50 -05:00
331c1bcf91
Merge branch 'develop' into thanos-mineware
2016-07-08 22:29:59 +03: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
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
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
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
cnr
Shaun Bennett
samczsun
LCastr0
Thanos Paravantis
AlexTheCoder
xXVevzZXx
Kenny Goodin