TadahTech
|
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 |
|
samczsun
|
d6d8d288ca
|
Prevent TNT duping in Bridges. Fixes PC-132
|
2016-06-15 22:10:43 -04:00 |
|
samczsun
|
5c2a9d5807
|
Prefixes are too long or something
|
2016-06-15 21:52:25 -04:00 |
|
samczsun
|
2d8b7f4ecd
|
Cleanse lore
|
2016-06-15 21:52:25 -04:00 |
|
samczsun
|
18d7eba9db
|
Let's not eagerly delete clans
|
2016-06-15 21:52:25 -04:00 |
|
samczsun
|
5564b07a36
|
Remove unnecessary serializations
|
2016-06-15 21:52:25 -04:00 |
|
samczsun
|
9933345a7b
|
Remove debug messages
|
2016-06-15 21:52:25 -04:00 |
|
samczsun
|
67f4361959
|
Cleanup CustomItems after a while
|
2016-06-15 21:52:25 -04:00 |
|
samczsun
|
1e5d91e392
|
Make porting from old legendaries work, fix null commandcenter
|
2016-06-15 21:52:25 -04:00 |
|
samczsun
|
d49ce27a1b
|
Make GearShop work again
|
2016-06-15 21:52:25 -04:00 |
|
samczsun
|
808e506911
|
Revert "Revert "Clans optimizations""
This reverts commit 25a315ac05.
|
2016-06-15 21:52:25 -04:00 |
|
samczsun
|
45e6cb902f
|
Save changes
|
2016-06-15 21:52:25 -04:00 |
|
samczsun
|
a753a3ab07
|
Clean up legendary code
|
2016-06-15 21:52:25 -04:00 |
|
TadahTech
|
27afd3d96c
|
Kit progression update
|
2016-06-15 15:54:53 -05:00 |
|
TadahTech
|
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 |
|
cnr
|
06cee364fc
|
Merge branch 'mopple' into develop
|
2016-06-10 14:12:07 -05:00 |
|
Sam
|
739fcdc649
|
Fixes the problem where players could not fire a bow in OITQ
Users with high latency were not able to fire bows.
|
2016-06-10 16:29:27 +01:00 |
|
Shaun Bennett
|
e30cd6747b
|
Increase goal 10 million, probably need to change later
|
2016-06-09 23:40:58 -05:00 |
|
Shaun Bennett
|
1d365d726c
|
brawl fountain now displays proper info on the weekend
|
2016-06-09 23:40:58 -05:00 |
|
Shaun Bennett
|
35e1c2af65
|
Use rewardCoinsLater for giving shards
|
2016-06-09 18:19:22 -05:00 |
|
Alex-The-Coder
|
77e9de0f8f
|
Update required rank in
fountain add help message
|
2016-06-09 17:02:00 -05:00 |
|
Alex-The-Coder
|
0306f1d703
|
Update required rank in
booster command help message
|
2016-06-09 17:02:00 -05:00 |
|
Alex-The-Coder
|
dbe8f39eeb
|
Update required rank in
add booster help message
|
2016-06-09 17:02:00 -05:00 |
|
xXVevzZXx
|
f6b60ad956
|
fix idle manager to persist teleports and make xp rewards depending on playtime
|
2016-06-09 15:51:27 -05:00 |
|
cnr
|
ba319599ba
|
Fix fountain schematic file paths
|
2016-06-09 01:18:09 -05:00 |
|
Shaun Bennett
|
91f6ddce55
|
Add some minor documentation
|
2016-06-09 00:48:44 -05:00 |
|
Shaun Bennett
|
611cb28d1a
|
Fix a typo
|
2016-06-09 00:47:03 -05:00 |
|
Shaun Bennett
|
cade7b4081
|
Remove got boosters message
|
2016-06-09 00:43:59 -05:00 |
|
Shaun Bennett
|
d6bce63967
|
Use schematics from update folder
|
2016-06-09 00:43:03 -05:00 |
|
Shaun Bennett
|
ece08c23a9
|
Fix merge issues
|
2016-06-09 00:40:05 -05:00 |
|
Shaun Bennett
|
699b35995f
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/gems
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
|
2016-06-09 00:39:39 -05:00 |
|
Shaun Bennett
|
d4ac309daa
|
Merge remote-tracking branch 'remotes/origin/master' into feature/gems
|
2016-06-09 00:29:27 -05:00 |
|
Shaun Bennett
|
83be0d7efe
|
Disable game boosters in arcade
|
2016-06-09 00:28:48 -05:00 |
|
Shaun Bennett
|
85829d355d
|
Fix command permissions
|
2016-06-09 00:25:54 -05:00 |
|
Shaun Bennett
|
22bb56dfda
|
Remove game booster button
|
2016-06-09 00:22:54 -05:00 |
|
Shaun Bennett
|
09d2c00f66
|
Proper display of extra gem fountain rewards
|
2016-06-09 00:14:01 -05:00 |
|
cnr
|
cf6e3cf05d
|
Merge branch 'feature/game-variants' into develop
|
2016-06-08 22:47:16 -05:00 |
|
Shaun Bennett
|
c9d5b91c52
|
Proper booster activation events
|
2016-06-08 19:22:25 -05:00 |
|
xXVevzZXx
|
ce8c8543f6
|
fix game class not beeing added to modable classes
|
2016-06-09 01:11:19 +02:00 |
|
xXVevzZXx
|
b66b459e05
|
implement xp multiplier
|
2016-06-08 23:40:48 +02:00 |
|
cnr
|
d54bed150e
|
Merge branch 'mopple' into develop
|
2016-06-08 12:59:06 -05:00 |
|
xXVevzZXx
|
1aba217c55
|
slowly increase spider energy
|
2016-06-08 12:51:07 -05:00 |
|
xXVevzZXx
|
aa1c599b5e
|
Disable particles in DMT, disable Monster Damage in OITQ, fix teleport out minion despawning, horsman description, ice melting in master builders and energy draining for spider leap in SSM
|
2016-06-08 12:51:07 -05:00 |
|
Shaun Bennett
|
37a412f1bf
|
Starting to merge boosters into arcade code
|
2016-06-07 17:24:24 -05:00 |
|
Sam
|
7da009d133
|
Revert "Space in front of disguised player's names when rank = all"
This reverts commit 3bcfe22835.
|
2016-06-06 21:10:51 +01:00 |
|
Sam
|
3bcfe22835
|
Space in front of disguised player's names when rank = all
Fixes a small problem where there would be a space in front of a user's
name if they were disguised as a player with a rank of ALL.
|
2016-06-06 21:06:40 +01:00 |
|
Sam
|
298c09ab82
|
Lowercase rank prefixes in tablist when in party
When in a party the rank prefix in the tablist of every user is now
uppercase.
|
2016-06-06 20:45:07 +01:00 |
|
Sam
|
8066eb939a
|
PC-500
Fixes an issue where players were able to open beacon inventories can
give themselves the buffs from it.
|
2016-06-06 18:14:06 +01:00 |
|
TadahTech
|
474a9dc975
|
Heavy UI and Command work. Begin testing
Time: 2hrs
|
2016-06-05 23:37:08 -05:00 |
|
TadahTech
|
c577e5827c
|
Heavy UI and Command progress.
Time: 4hrs
|
2016-06-05 22:55:06 -05:00 |
|