72f078fe54
Fix using wrong name, add missing jooq files
2016-08-03 15:04:06 -05:00
6d93efc1a2
Adjust button text as well
2016-08-03 14:57:30 -05:00
ad6c1dd970
Adjust some text wording
2016-08-03 14:55:33 -05:00
2e80838376
Update ClaimTips lore
2016-08-03 14:25:07 -05:00
1ae7f6cb25
Integrate the new ThankManager into Amplifiers
2016-08-03 14:03:12 -05:00
3f0938815d
Merge branch 'update/clans' into develop
2016-08-03 12:39:52 -04:00
2b8754aa32
Metal Kit bug fixes
2016-08-02 23:34:12 +01:00
c327309a65
Switch over to new method of determining if user is banned, this will allow unbanning of players in the near future
2016-08-02 16:46:14 +01:00
f41cd8c104
Add /thank command. Update jooq files
2016-08-02 00:10:46 -05:00
bd00ac8446
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-08-01 19:34:40 +01:00
2c37af32ca
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-08-01 19:19:34 +01:00
d12d353c20
Fix pronoun in message autoreply
2016-07-30 17:36:03 -04:00
635e07c5a2
This wasn't meant to be included in the last commit
2016-07-29 15:09:21 +01:00
bb9dbf1da4
PC-877 Vanish report handler when teleporting to offender's server
2016-07-29 15:08:03 +01:00
806ec2460a
Add Gameplay report category for gameplay related reports
2016-07-29 13:20:06 +01:00
43c94e95b3
PC-875 Players should only be banned after 3 abusive reports (currently is set to 1)
2016-07-29 12:58:08 +01:00
9c76fec54e
PC-874 Show label for report closure reason when closing a report
2016-07-29 12:56:14 +01:00
d853f8467c
Merge branch 'update/clans' into develop
2016-07-28 22:56:23 -05:00
9529789159
Remove 3 second chat delay.
2016-07-28 22:54:04 -05:00
47d79bbad5
Fix bugs arising during clans release
2016-07-28 19:08:47 -04:00
ab8d6daa2c
GitHub being annoying again
2016-07-28 19:59:49 -03:00
ab52965e44
Power Play button inside Carl, and the power play manager
2016-07-28 18:07:10 -03:00
5dd35d45c4
PC-873 Alert user regardless of usage if banned from using /report
2016-07-28 17:41:20 +01:00
8ee6ab6a1b
Display message to reporters of a report when it is closed
2016-07-28 17:17:12 +01:00
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
dd38a1dd76
Merge branch 'update/clans' into develop
2016-07-27 20:40:35 -05:00
05e59ae9cc
Revert "Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing""
...
This reverts commit 917b83250d
2016-07-27 19:03:04 -05:00
031a9575ae
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-27 15:13:18 -04:00
8648581140
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-27 19:57:25 +01:00
ee38cb4c39
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-07-27 19:56:36 +01:00
167c0f2b5e
Reimplement EnergyShopButton with new machinery
2016-07-27 13:52:03 -05:00
3cddf35d12
Refactor out legacy ConfirmationPage
2016-07-27 13:52:03 -05:00
3d0cc2a5fd
Refactor Clans gold dependency out of core
2016-07-27 13:52:03 -05:00
dc96258055
Merge branch 'feature/party-v2' into develop
2016-07-27 13:19:25 -05:00
0d46bc4609
Add Amplifier thank button
2016-07-27 13:17:36 -05:00
97d72e97e4
Variable refactorings for consistency
2016-07-27 16:09:38 +01:00
f2435c3b43
Packet class refactorings
2016-07-27 16:08:23 +01:00
d474139220
Don't show Punish GUI unless report result is ACCEPTED
2016-07-27 15:46:54 +01:00
63917297ef
Show /report and /reportclose command usage when attempting to use the command incorrectly
2016-07-27 15:45:12 +01:00
72b5507390
Fixed PC-120
2016-07-27 12:29:07 +02:00
157c969e8d
Completely prevent players in parties from joining Clans servers
2016-07-27 05:51:49 -04:00
2a167745a6
Update chatsnap url
2016-07-26 16:51:59 +01:00
a1fd021f8d
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-25 10:59:38 -04:00
979bb92034
Allow treasure chests to be placed in other locations instead of fixing them in the main hub's configuration
2016-07-25 10:57:15 -04:00
25b0ae5916
Add support for sending players back to any clans hub via portal
2016-07-25 10:56:30 -04:00
a23c2c4e1c
Update UI to reflect allowing upgrades to be shown, per kit.
2016-07-24 16:05:19 -05:00
76da92f42e
QuiverPayload added
...
Basic implementation added
2016-07-24 21:27:31 +01:00
f4c40c61bb
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-07-24 13:18:53 -03:00
195a82f78f
Github is annoying me about this, but I don't know what it is
2016-07-24 13:18:33 -03:00
0dce530438
PowerPlayClub managers and stuff
2016-07-24 13:15:32 -03:00
a8503d2fb8
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-07-24 11:50:48 +01:00
ceccf2d2ac
Don't give the item when a game is in progress.
2016-07-23 22:36:53 -05:00
133376fb94
Relocation of Full server check in party invites. Fixes a bug where people cannot invite players to their party, regardless of which server they are on, when the inivters server is full.
2016-07-23 19:50:57 -05:00
50de769e36
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-24 00:13:13 +01:00
818ed4c9a9
Set up clans monetization features in the shop and fix some hardcoded names in core
2016-07-22 00:18:34 -04:00
5d0b5f80c0
Fix Party server sending. Tweak playercount and GUI display
2016-07-21 18:01:43 -05:00
369246f635
Fix out of bounds statement parameter caused by earlier removal of report preferences
2016-07-21 23:11:48 +01:00
c5f3f2b2d6
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-07-21 22:44:43 +01:00
75cc75f40c
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-21 17:25:15 -04:00
2b8930eee8
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-07-21 15:32:49 -05:00
d7c5184980
Party fixes and tweaks.
2016-07-21 15:24:48 -05:00
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
9ed0bbe43a
Fix NPC's for unloaded worlds
2016-07-21 14:22:38 -05:00
0262452b6a
Add enchantments to items, lower arrow spawn rate and limit, give players some steak and make armor unbreakable.
2016-07-21 13:59:35 -05:00
9b58c53e90
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-07-21 16:11:09 +01:00
faece2c5f8
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-21 11:13:15 +01:00
f48009d9f8
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-07-21 11:12:23 +01:00
e7658b4bf2
New kits and upgrades for old kits
2016-07-21 11:05:21 +01:00
2615ef74dd
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-21 05:09:54 -04:00
b48f97fd2e
Fix stupid JOOQ issue and IntelliJ.
2016-07-21 03:46:18 -05:00
b734dc4e87
Remove Pay wall for Party sizes
2016-07-21 02:59:15 -05:00
9f0f4e0018
Fix possible cross server invite spamming.
2016-07-21 02:20:02 -05:00
f1b3c4756d
Use UUID's instead of playernames.
2016-07-21 02:16:26 -05:00
4cab91f251
Use getPlayerExact.
2016-07-21 02:05:37 -05:00
76ac89266e
-sigh- a hotfix.
...
Won't invite players across servers who are already in parties.
Fix transferring ownership to non-party members
2016-07-21 02:05:10 -05:00
b0f5b536b1
Merge branch 'feature/party-v2' into develop
2016-07-20 18:06:14 -05:00
31d6a2542d
Replace runSync call with runAsync
2016-07-20 18:03:01 -05:00
b136372d1b
Gem fountain changes; increase goal, link to eu
2016-07-20 18:03:01 -05:00
c3b7a81730
Don't show all buttons in all menus. Protected fields != private fields.
2016-07-20 17:48:24 -05:00
0fc64c45a8
Update JoinResponseReason
2016-07-20 16:33:26 -05:00
96261c1a6d
Party PR Updates.
2016-07-20 16:18:49 -05:00
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
48f9085c79
Small changes to report close functionality
2016-07-20 11:58:09 +01:00
856f91da24
Update close report command syntax
2016-07-20 10:40:42 +01:00
5c3f78b428
Fix query used to fetch report(s) account is handling
2016-07-20 10:40:03 +01:00
d53a917627
getAbilityDetails using map and list interface
...
Changes so it uses the interface rather than the concrete class.
2016-07-19 22:38:32 +01:00
37a06816dd
Modify /reportclose to no longer require a report id parameter
2016-07-19 16:37:53 +01:00
c8075b2b47
Merge remote-tracking branch 'origin/feature/party-v2' into feature/party-v2
2016-07-18 19:04:26 -05:00
b4aa303923
Bug fixes.
2016-07-18 19:04:02 -05:00
5ecfaef413
Merge branch 'feature/mavericks-master-builders' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game
2016-07-18 16:28:22 -04:00
976e8788b7
Update report message if a player reports another player multiple times
2016-07-18 18:37:21 +01:00
7c300acaa3
No particles for vanished players!
2016-07-16 20:00:21 -03:00
f012e8d4ed
Merge from develop
2016-07-16 08:41:15 +01:00
0d9aad37f9
Optimise imports
2016-07-15 16:31:25 +01:00
f0c2686ca7
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-07-14 23:01:11 +01:00
da7806147d
These brackets don't need to be here
2016-07-14 22:39:59 +01:00
7b5adc717d
Prevent non-handlers from closing a report
2016-07-14 22:16:53 +01:00
1885854bc4
Simplify and shorten createReport method
2016-07-14 22:06:25 +01:00
209ca20959
Rename "reportPlayer" to "createReport" for method name consistency
2016-07-14 21:13:06 +01:00
f75806d2dd
Ensure messages shown to players are consistent
2016-07-14 21:11:43 +01:00
4ed51b5747
Fix getProfiles and getReports methods
2016-07-14 21:01:49 +01:00
65e8b92c1a
Small refactorings (class relocations and renames)
2016-07-14 20:15:14 +01:00
15b5198dbb
Ensure words are fully capitalised
...
Previously only the first word was capitalised.
2016-07-14 19:25:53 +01:00
7f48151c8c
Made handler messages slightly more prettier
2016-07-14 19:19:16 +01:00
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
d3270b9289
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-11 14:50:16 -04: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
f40299e402
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-11 18:34:48 +01:00
0be317e5be
Implement tweaks and finalize implementations for bosses and fix loot dropping bugs
2016-07-11 11:36:48 -04:00
6a87be13f0
Remove features that contain bugs
2016-07-11 01:02:19 +03:00
e1adf7d4e2
JavaDocs
2016-07-10 13:32:20 -04:00
b808121d68
Make ReportResult and ReportMessage timezone friendly.
...
This switches all if not most of the report feature code to using the
new Java 8 date time API since it is much better for handling
timezone's.
This commit also creates a few new methods in UtilTime as they are
used throughout the "report" and "chatsnap" packages. They may also
come in useful for other developers using timezones.
2016-07-09 23:41:39 -04:00
3f8eaf0da7
Missing semi-colon
2016-07-09 22:56:32 -04:00
edf63dcafd
Print exceptions for everything!!!
2016-07-09 18:09:26 -04:00
ac95a59f81
Mark reports as expired when an expired report is detected
...
Also wrote JavaDocs for expireReport and saveReport methods.
2016-07-09 15:47:31 -04:00
d7736e9e02
Wait until report data has been saved to the database, otherwise the
...
message task will not function until it's second iteration
2016-07-09 15:32:46 -04:00
400a6adab2
Show message when report has been closed
...
Also run Bukkit API methods synchronously.
2016-07-09 15:24:41 -04:00
e26ced1438
First report handler detail message should be instant
2016-07-09 14:59:27 -04:00
5c6cac2849
Remove debug line
2016-07-09 14:57:55 -04:00
c909cd4733
A report is active if it is being handled but has not yet been closed
2016-07-09 14:55:42 -04:00
6a78556fda
Ninja fix for previous commit
2016-07-09 14:49:00 -04:00
aadb3df715
A report is no longer active if a result for it has been set
2016-07-09 14:48:26 -04:00
29b1110f6b
Access to SnapshotsManager inside ReportManager is no longer required
2016-07-09 14:40:17 -04:00
1eb3fb4aa3
Modify GET_REPORTS_HANDLING query to ignore closed reports
2016-07-09 14:38:12 -04:00
c98c352546
Prevent reputation from being 0, this causes all reports the player
...
opens to be instantly closed
2016-07-09 14:37:23 -04:00
87df6804c9
Improve code and error logging
2016-07-09 14:36:30 -04:00
0783f3b693
Fix sql error when a report is closed due to expiration
2016-07-09 11:31:51 -04:00
abea5bbf81
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-07-08 23:27:07 -04:00
5c83f09456
SnapshotRepository no longer extends MinecraftRepository
...
It doesn't need to.
2016-07-08 23:26:33 -04:00
d9288277d5
Push chat snapshots from all servers
...
This fixes an issue whereby the handler would not be able to see chat
snapshots unless they begin the handling process whilst connected to
the same server as the offender.
2016-07-08 23:22:55 -04:00
2cac4c9c66
Remove toLowerCase owner method
2016-07-08 16:17:48 -05:00
a0d046ab8b
Optimize getting of ReportProfile's from database
2016-07-08 17:14:41 -04:00
cbb0fa37fb
Lang tweaks.
2016-07-08 15:32:25 -05: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
1313db4071
Commit lost file.
2016-07-08 14:06:16 -05:00
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
5349d26115
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders
2016-07-08 03:41:13 +02:00
1ce1c796f4
Repository classes no longer need to extend MinecraftRepository
2016-07-07 21:12:08 -04:00
b9f1dcbcd5
Make method `getReportPrefix(Report)` simpler
2016-07-07 21:05:41 -04:00
8d2916c23e
Create JavaDoc's for all methods in ReportManager
2016-07-07 21:04:16 -04:00
c50ec49ad9
Minor updates
...
Tweaked some location values.
Added more event handling to the reveiw hub and mavericks hub.
Added builder info holograms to all sides of the display slots in the
mavericks hub.
2016-07-08 02:59:33 +02:00
cb555a41ab
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-07-07 20:47:19 -04:00
0dc17bf6fa
Further code cleanup
2016-07-07 18:12:52 -04:00
58df3022a5
Completely remove old staff notifications system
2016-07-07 18:08:19 -04:00
da9ad913b2
Finalisation of update
2016-07-07 23:03:23 +01:00
bc2b7884ee
Make this code a lot smarter
2016-07-07 17:57:19 -04:00
4361379eaa
Close expired reports when they are detected
...
This improves performance and allows for easier database maintenance.
2016-07-07 15:35:47 -04:00
77a98bc250
Remove spammy and useless report notifications
2016-07-07 13:58:09 -04:00
fa02b18ffb
These shouldn't be batched as there will only ever be a single query
2016-07-07 13:28:08 -04:00
175c3523f8
Remove todo relating to removal of database cleanup of chat entries
...
after a report has been closed
An external cleanup job/script will be used to remove old data
2016-07-07 13:19:42 -04: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
67213ec696
Tie all these together
2016-07-05 16:14:30 -04: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
6d9e84b817
Merge branch 'develop' of
...
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
feature/mavericks-master-builders
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/F.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/BuildData.java
2016-06-30 23:08:31 +02:00
32ee27d9ee
Small bugfixes with QA
...
Never re-show reviewed builds in review-server.
Toggle debug messages in review-server.
Fixed minor bugs with QA
2016-06-29 03:49:53 +02: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
8ad63ef7ea
Tweaked some code to better fitt schematics.
2016-06-28 06:29:44 +02:00
561734e7fe
Remove unused imports (accidentally added)
2016-06-27 21:18:40 -04:00
a69101bef3
Cleaned out some debug messages and added some java-docs.
2016-06-28 01:35:37 +02:00
ab315627ad
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game
2016-06-27 17:45:36 -04:00
48a2d0d304
Remove old completed todo
2016-06-27 18:06:01 +01:00
42bd2148e5
Don't allow a user to handle more than one report simultaneously
2016-06-27 17:56:01 +01:00
d6672c44f4
Finalized the hub module and finished local testing
...
Cleaned up some source. Applied some small updates. Finished local
testing.
2016-06-27 00:34:17 +02:00
90df695624
Merge branches 'feature/report-v2' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-06-26 00:18:07 +01: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
323d865b57
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-06-24 18:13:51 +01:00
c5319dbe1d
Switch identifier system for id system (no need for tokens any more)
2016-06-24 18:08:47 +01:00
52873d5618
Do away with tokens
2016-06-24 17:59:26 +01:00
45418b3a4d
Add todo
2016-06-24 17:56:01 +01:00
daae2f7a3a
Shorten method name
2016-06-24 17:54:54 +01:00
871bb04451
Fix /reporthandle command
2016-06-24 17:45:56 +01:00
d178e9112b
Temporarily base priority on report age
2016-06-24 15:39:48 +01:00
fd64753ba0
New /reporthandle command
2016-06-24 12:14:58 +01: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
d67082bca2
Ran a code inspection and implemented some suggested changes
2016-06-23 23:31:51 +01:00
dc57f7b4e6
add testrank command for SR.Mods
2016-06-23 22:05:26 +02:00
7f75a7ff50
Unfortunately we can't batch these SQL commands as we have to retrieve the snapshot id after inserting
2016-06-23 20:36:34 +01: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
e6989cd8da
Output errors caused by inserting snapshots into database
2016-06-23 20:06:16 +01:00
4606f27408
Switch report ids to use data type 'long'
...
This is because in the database we store them as an unsigned integer, which means the Java integer type will not be able to hold values after a certain point.
2016-06-23 14:11:58 +01: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
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
4fc5e036fa
Remove old redundant chat cache command
...
Fix broken code in SnapshotPlugin
2016-06-23 01:13:18 +01:00
8bbeb3292f
Removed old code resulting in compiler error and replaced with a todo for the future
2016-06-23 01:03:25 +01:00
Shaun Bennett
cnr
Sam
Keir Nellyer
AlexTheCoder
TadahTech
LCastr0
xGamingDudex
xXVevzZXx
samczsun
Thanos Paravantis
Kenny Goodin