CoderTim
|
09c01d90ad
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-19 19:07:37 -04:00 |
|
Shaun Bennett
|
e1a57a673e
|
Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors
|
2014-08-19 16:58:55 -05:00 |
|
CoderTim
|
05686cb584
|
Work on achievements
|
2014-08-18 16:41:16 -04:00 |
|
Shaun Bennett
|
b99e9d3f70
|
Simplified poll system, derp
|
2014-08-18 14:15:32 -05:00 |
|
Shaun Bennett
|
36d5c2c3af
|
Don't add player's current poll to the queue
|
2014-08-17 18:11:55 -05:00 |
|
Shaun Bennett
|
34ffc06166
|
Add functionality to skip polls
|
2014-08-17 18:07:16 -05:00 |
|
Shaun Bennett
|
6e9d2b3244
|
Allow setting a time when it should poll again
|
2014-08-17 17:53:38 -05:00 |
|
Shaun Bennett
|
43fd604695
|
Queue up polls for players instead of constantly checking for next poll
|
2014-08-17 17:47:38 -05:00 |
|
Shaun Bennett
|
4ba7da9a54
|
Polls! Still needs tweaks
Hub artifact stuff for IntelliJ
|
2014-08-17 17:30:35 -05:00 |
|
Shaun Bennett
|
e5340238b6
|
IntelliJ Hub Configurations
|
2014-08-17 13:57:20 -05:00 |
|
Shaun Bennett
|
6793deffd0
|
Copy Command
Small Fixes
Single Imports IntellIJ config
|
2014-08-16 20:17:21 -05:00 |
|
Shaun Bennett
|
b6c31294c7
|
Parse map properly, bug fixes
|
2014-08-16 16:19:33 -05:00 |
|
Shaun Bennett
|
e286a45de8
|
Code cleanup for spawn location, remove JoinCommand
|
2014-08-16 16:01:00 -05:00 |
|
Shaun Bennett
|
18e1265afd
|
Remove join list, adjust intellij import style to be more like eclipse
|
2014-08-16 15:55:29 -05:00 |
|
Shaun Bennett
|
eac0f9fd6a
|
MapParser refactoring/changes
|
2014-08-16 15:50:33 -05:00 |
|
Shaun Bennett
|
4193ee53ea
|
Merge remote-tracking branch 'origin/master'
|
2014-08-16 12:13:11 -05:00 |
|
Shaun Bennett
|
ef6871491d
|
Add MapParser IntellIj configurations
|
2014-08-16 12:12:59 -05:00 |
|
Jonathan Williams
|
8aec9e345e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-16 01:37:17 -05:00 |
|
Jonathan Williams
|
df97873d32
|
Fixed index issue with lobby balancer
Added performance output for server monitor.
Removed logging of debug stuff.
|
2014-08-16 01:37:06 -05:00 |
|
Chiss
|
d8123795aa
|
changed the way disguises show rank.
|
2014-08-16 16:33:18 +10:00 |
|
Jonathan Williams
|
686203ed8a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-16 00:39:36 -05:00 |
|
Chiss
|
a888d4f14b
|
Fixed leaks
|
2014-08-16 15:39:02 +10:00 |
|
Jonathan Williams
|
249a56360e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-15 23:19:13 -05:00 |
|
Chiss
|
508ef65fcf
|
Added missing file
|
2014-08-16 14:17:15 +10:00 |
|
Jonathan Williams
|
f98dc0c66d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-15 23:03:34 -05:00 |
|
CoderTim
|
ae6cb4aa22
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-15 15:56:44 -04:00 |
|
CoderTim
|
19222c6815
|
Updated IntelliJ environment to be compatible with latest changes
|
2014-08-15 15:51:29 -04:00 |
|
Ty
|
5c0e1ad484
|
Fix issue where null MinecraftServer entries were being returned in getServerStatuses() method in RedisServerRepository.
|
2014-08-15 15:32:01 -04:00 |
|
Ty
|
3c4c537998
|
Fix issue where broken Jedis instances were returned as functional instances.
|
2014-08-15 14:49:01 -04:00 |
|
Jonathan Williams
|
3f827a310a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-15 11:54:19 -05:00 |
|
Jonathan Williams
|
efdaa21ae7
|
Proper cleanup on lobby menu update.
|
2014-08-15 11:52:57 -05:00 |
|
Ty
|
0d38ac4e96
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
Plugins/Mineplex.ServerData/src/mineplex/serverdata/RedisServerRepository.java
|
2014-08-15 11:40:15 -04:00 |
|
Ty
|
da8aa3f1e3
|
Fix issue where broken Jedis resources were not being properly handled.
|
2014-08-15 11:33:34 -04:00 |
|
Chiss
|
29db90837d
|
Spleef Update
Map parser block stuff
|
2014-08-15 15:28:50 +10:00 |
|
Chiss
|
697897b967
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-15 09:49:12 +10:00 |
|
Chiss
|
85522cddca
|
Debug (will clean once fixed)
Game stats
|
2014-08-15 09:49:00 +10:00 |
|
Jonathan Williams
|
846c75453c
|
Revamping Redis Server status so it uses a consistent time value from redis database.
|
2014-08-14 07:41:04 -05:00 |
|
Jonathan Williams
|
cacf736f4f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-14 04:10:21 -05:00 |
|
Jonathan Williams
|
682735e994
|
Added build fixes for ServerMonitor.java
Added redis fixes for ServerMonitor
Added ServerStatusManager fixes.
|
2014-08-14 04:10:11 -05:00 |
|
Chiss
|
282219fb4c
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-14 17:31:27 +10:00 |
|
Chiss
|
74435bac12
|
fixed bug where players kept inventory open, to be able to enable morphs ingame.
|
2014-08-14 17:31:14 +10:00 |
|
Jonathan Williams
|
f524ffb093
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-13 21:53:15 -05:00 |
|
Jonathan Williams
|
d1e69a34f1
|
Fix chiss path errorrrrrrrrrrrrrrrrrrrrs.
|
2014-08-13 21:53:03 -05:00 |
|
Chiss
|
c72f4b6057
|
Dragon target cancel fix
|
2014-08-14 12:35:49 +10:00 |
|
Chiss
|
5f80d9c57a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
|
2014-08-14 11:24:51 +10:00 |
|
Chiss
|
b6ba142c5a
|
Mineplex in scoreboard is fancier.
|
2014-08-14 11:23:48 +10:00 |
|
Shaun Bennett
|
b9534bd245
|
Merge remote-tracking branch 'origin/master'
|
2014-08-13 20:07:01 -05:00 |
|
Shaun Bennett
|
cfe45139b6
|
Adjust lobby text for the removal of premium kits
|
2014-08-13 19:56:47 -05:00 |
|
Shaun Bennett
|
83f04273fa
|
Sort kits properly when a game uses NullKit
|
2014-08-13 19:45:38 -05:00 |
|
Chiss
|
b21ae8ef72
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-14 10:32:52 +10:00 |
|