Commit Graph

8612 Commits

Author SHA1 Message Date
Shaun Bennett
6e2c751be1 Adjust amplifiers queue message 2016-06-22 21:09:09 -07:00
Shaun Bennett
1ea680cd20 Return to an invisible armor stand name 2016-06-22 21:01:37 -07:00
Shaun Bennett
bcf82ad513 Remove debug messages 2016-06-22 21:00:50 -07:00
Shaun Bennett
761e550d6c Add shards to announcement message 2016-06-22 20:55:27 -07:00
Shaun Bennett
0873efd876 Update more lore text 2016-06-22 20:54:29 -07:00
Shaun Bennett
621d72f541 Fix merge issues, update lore text 2016-06-22 20:51:58 -07:00
Shaun Bennett
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
Shaun Bennett
906e0e0044 Allow API error messages from HTTP 503 2016-06-22 20:31:18 -07:00
samczsun
956cfeac44
Don't recall if player is dead, show UUID for custom items 2016-06-22 21:14:50 -04:00
samczsun
14c6c4215c
Silent chest opening! 2016-06-22 21:12:24 -04:00
samczsun
032b6a77c0
Display UUID for CMod+ 2016-06-22 21:12:24 -04:00
samczsun
2e1bb25b0b
Fix exceptions 2016-06-22 21:12:24 -04:00
Keir Nellyer
addbd4dd88 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-23 01:21:12 +01:00
Keir Nellyer
a795ee3d0f Fix feature initialisation code 2016-06-23 01:18:16 +01:00
Keir Nellyer
4fc5e036fa Remove old redundant chat cache command
Fix broken code in SnapshotPlugin
2016-06-23 01:13:18 +01:00
Keir Nellyer
8bbeb3292f Removed old code resulting in compiler error and replaced with a todo for the future 2016-06-23 01:03:25 +01:00
Keir Nellyer
2931826916 Improve readability by separating these functions out 2016-06-23 01:01:20 +01:00
Keir Nellyer
352ecc6ad6 Improve database performance by executing queries in batch 2016-06-23 00:57:41 +01:00
Keir Nellyer
09a74e3772 Work on pushing chat snapshots to db 2016-06-23 00:38:24 +01:00
Alex-The-Coder
2453f82061 Rename Filterbutton.java to FilterButton.java 2016-06-22 18:40:12 -04:00
TadahTech
50534c3af9 UI And server manager changes 2016-06-22 17:28:43 -05:00
Thanos Paravantis
4e9ea23db8 Fix spawn facing, separate scoreboard functions 2016-06-22 21:47:39 +03:00
Shaun Bennett
e855a866c7 Fix more thanks and booster occurrences 2016-06-22 08:58:27 -07:00
TadahTech
e53b474f3f Fix typo. 2016-06-22 00:59:22 -05:00
TadahTech
ebff8f865b Undid a little too much. 2016-06-22 00:58:30 -05:00
TadahTech
38a13d01f1 Open server menu properly 2016-06-22 00:56:44 -05:00
TadahTech
d9c5e6323a Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-06-22 00:36:23 -05:00
TadahTech
4d31867e98 PC Party updates. 2016-06-22 00:35:57 -05:00
samczsun
d739df8623 UHC is faster now 2016-06-21 22:21:27 -05:00
Sam
0131850fc3 SSM fixes 2016-06-21 20:41:53 +01:00
Keir Nellyer
ef0c3721d8 Micro-optimisation since this ArrayList will only ever hold a maximum of 2 items 2016-06-21 17:47:44 +01:00
Keir Nellyer
b46f08938e Implement age decay algorithm as supplied by @alexthecoder 2016-06-21 17:46:52 +01:00
TadahTech
e39326b592 Help Command UI. 2016-06-21 00:11:33 -05:00
TadahTech
b75e87753d Party UI work. 2016-06-20 22:45:53 -05:00
TadahTech
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
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
Shaun Bennett
1c1912b92a Update fountain goals again 2016-06-20 00:52:33 -05:00
Shaun Bennett
73183af9bf Fixing podium npc bug 2016-06-20 00:45:57 -05:00
Shaun Bennett
afc636b7c5 Fix amplifier reward message 2016-06-19 20:16:33 -05:00
Shaun Bennett
bb8d94f38a Fix a lot more Booster cases 2016-06-19 19:48:17 -05:00
Shaun Bennett
63b7648608 Amplifier rename, move podium backwards 2016-06-19 19:05:04 -05:00
Keir Nellyer
b4f10531cb Merge branch 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-19 22:46:19 +01:00
Keir Nellyer
2cfb84eece Shorten some code 2016-06-19 22:46:06 +01:00
Keir Nellyer
ec2ec878e8 Message type id mapping in preparation for storing chat messages in database 2016-06-19 22:28:56 +01:00
Keir Nellyer
71a4b601e5 Some work on getting the chatsnap site to read from the database 2016-06-19 22:21:12 +01:00
Sam
a830b5b388 Removal of debug message and compilation error 2016-06-19 17:12:58 +01:00
Sam
e8b8a3cd66 PC-504
Fixes an issue where if players in SSM destroyed all of the spawn point
locations, players would not be handled correctly
2016-06-19 17:10:22 +01:00
Shaun Bennett
38058bc670 Confirmation Paging 2016-06-19 05:49:32 -05:00
TadahTech
d572635e99 Fix spelling mistake 2016-06-19 02:19:33 -05:00
TadahTech
5316dfe0c6 Remove Spammy "Loaded default kit message".
Fixed SSM kits not closing the GUI when the central item is clicked.
Fixed Smash Crystals being carried over into the next game.
2016-06-19 02:09:17 -05:00