d291521ad1
Clean up DonationManager
2016-12-14 19:52:13 -07:00
f2fc70f400
Titles
2016-12-14 19:52:13 -07:00
9234c7a7d5
Implement AddPunishCommand and RemovePunishCommand
2016-12-07 13:05:54 -06:00
c080d41dc2
Temp DB fixes
2016-11-17 19:08:32 -05:00
a8adf23c15
Allow dev servers
2016-09-07 11:45:42 -04:00
7de9da3d1c
Complete rework of disguising and antihack hook
...
This commit completely rewrites DisguiseManager, DisguisePlayer, and
PlayerDisguiseManager.
Changes to disguising means that much of the core was also changed,
primarily having to do with mapping by UUID versus player names.
Several new API classes were added, such as EntitySelector, Managers,
UtilTasks, and a brand new scoreboard API which is much more optimized and
allows for much longer lines
The new anticheat is hooked as well, with implementation for guardians
which follow the players around. Release two code is also included, but is
currently disabled via a boolean.
2016-08-10 21:03:30 -04:00
b136372d1b
Gem fountain changes; increase goal, link to eu
2016-07-20 18:03:01 -05:00
d54e47d8ea
Check for uptimes field
2016-07-14 11:22:10 -05:00
a0847b8d1a
Fix null ServerGroup uptimes value for MPSes
2016-07-14 08:08:24 -05:00
654ab281ea
Add option of "uptimes" to servergroups
2016-07-12 15:44:29 -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
3e77ce0f00
make arrays parseable by variables
2016-07-06 14:03:41 +02: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
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
09d2c00f66
Proper display of extra gem fountain rewards
2016-06-09 00:14:01 -05:00
1377e6724f
Merge with develop
2016-05-24 19:10:55 +10:00
63c44afa10
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants
2016-05-13 22:05:27 +02:00
9f2189d173
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2016-05-06 03:40:00 +02:00
a663cb3e01
Revert "Revert "Report system (version 1)""
...
This reverts commit d0d2de1e21
2016-05-04 15:24:29 +01:00
d0d2de1e21
Revert "Report system (version 1)"
2016-04-30 14:53:59 -04:00
6a00f26d5f
Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-29 23:42:27 +01:00
aa219ec3e5
Implement gamemode feature with modifiable variables and working on first moded games
2016-04-27 17:42:50 +02:00
41e2ea6490
Fix off by one error in GoalCounter
2016-04-26 16:20:14 +10:00
cabf4c4c8b
Add BlockProgressBar for Gem Fountain
2016-04-26 15:26:07 +10:00
e8370579c0
Counter refactoring
2016-04-26 13:55:06 +10:00
cb48df6a3d
Update fountain count every 5 seconds. Display Hologram
2016-04-19 14:30:38 +10:00
5a667a7d31
Add /fountain command. Fountain implementation
2016-04-19 13:57:19 +10:00
4477a215f4
Update to Redis 2.8.1 and clean up repositories ( #26 )
2016-04-16 22:51:20 -05:00
16dacbe3b3
Update to Redis 2.8.1 and clean up repositories
2016-04-17 12:58:44 +10:00
390b2878dc
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-07 14:28:30 +01:00
2fa0787792
Clans now load, added connection property to null zero date timestamps.
2016-04-04 16:31:37 -05:00
60010f90b4
Load simple clan token on player login to reduce overhead.
...
Increased dbpool connections to 4
2016-04-04 13:47:45 -05:00
97f5b60404
Merge github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-08 13:56:05 -05:00
ae2da31544
Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-03-05 23:14:32 +00:00
b18f2d8682
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
2016-03-02 20:02:09 +00:00
99150db2d7
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
2016-02-22 19:02:54 +00:00
3a73b05895
Fix for ServerMonitor not loading database config
2016-02-20 00:48:30 -06:00
82d51a896f
Add SERVER_STATS to DBPool. Rename STATS to MINEPLEX_STATS
2016-02-19 19:54:06 -06:00
8d7453b78e
Merge remote-tracking branch 'origin/develop' into develop
2016-02-19 19:33:52 -06:00
7032568a92
Add PLAYER_STATS DBPool
2016-02-19 19:33:39 -06:00
a84f8dd2d0
Fix dbcp, tone down sentry
2016-02-19 20:28:22 +11:00
81f9ca0bc2
Fix mysql
2016-02-19 20:10:01 +11:00
3b10207503
Class.forName!
2016-02-19 02:40:14 -06:00
67c355bf65
remove more eclipse files
2016-02-19 07:22:54 +00:00
441cf702c7
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-02-19 07:22:09 +00:00
d5583b93f2
remove eclipse files
2016-02-19 07:14:13 +00:00
7714e4960c
Use DBPool for everything
2016-02-19 00:17:38 -06:00
9601eabfeb
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-01-31 17:38:08 +00:00
002be01ef1
MAVEN TEST COMMIT
2016-01-31 16:21:04 +00:00
samczsun
Shaun Bennett
Shaun Bennett
cnr
xXVevzZXx
Keir Nellyer
Conrad
Shaun Bennett
Keir Nellyer
Jonathan Williams
Joseph Prezioso Jr
NewGarbo
Shaun Bennett
md_5