a2250ea343
Fix for blocking logins if redis can't add account cache.
2015-08-02 18:59:13 -05:00
41189b9838
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-02 17:23:17 -05:00
70c1b883db
Fix bug with NPC server shops not properly calling the central method used for intervening and auto-joining. Also add in base for team/solo separation for specific server groups.
2015-08-02 18:20:52 -04:00
d3ba621e86
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-02 17:00:49 -05:00
638406254b
refactored a little so theres no data stored in the util
2015-08-02 12:07:00 +02:00
afc41c8831
converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity
2015-08-02 11:50:26 +02:00
ac4755a5a9
Fixed incorrect velocity
2015-08-02 11:24:34 +02:00
7910170327
fixed achievemnt amount
2015-08-01 18:39:18 +02:00
992c0fc36f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-01 01:12:24 -05:00
d3c5d0cbe6
Only store account cache stuff for 6 hours.
...
Update MOtd.
2015-08-01 01:12:01 -05:00
b2a567673c
disabled sale msg
...
added double gem weekend
2015-07-31 09:53:52 +02:00
8d7c42134b
fixed mounts having nametags
2015-07-30 14:54:23 +02:00
0cf333ec00
lowered win req
2015-07-30 14:12:17 +02:00
97a144150b
fixed an NPE that was causing games not to end in MS
2015-07-29 21:51:18 +02:00
862cdae14f
team modes
2015-07-29 16:32:11 +02:00
c9c3db70f3
Merge branch 'SSM2PlayerTeams'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-07-29 14:08:17 +02:00
932fe197b4
Merge branch 'perm-changes'
...
Conflicts:
Plugins/.idea/encodings.xml
reverted it.
2015-07-29 14:06:21 +02:00
c3e07522b4
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-07-29 12:22:11 +02:00
5af68e5628
Fulfill Shaun's request
2015-07-28 23:55:27 -07:00
10549601f8
Merge pull request #21 in MIN/mineplex from Myst_LOBBERS to master
...
* commit 'd0a45461d07904f70b5e42dee391f69843fb3978':
Fixed bug with direct hit
Final tweaks. this is as good as it's goign to get! ;d
Tweaks
Fixed waller achievement thing
Fixed waller kit bc I was stupid before ;c
Added an exception for a map to make it night.
Various improvements.
Added an achievement, removed team one, touched up another. Swag.
2015-07-29 00:15:41 -05:00
e4da4aa0ed
Remove NPC commands
2015-07-28 10:14:25 -07:00
c2cb86087a
Merge pull request #22 in MIN/mineplex from horus-bug-fixes to master
...
* commit '02f1211ddb7688737dc66605c174167cce708d0e':
Misc
Fix numerous trello bugs
Update IntelliJ builds
2015-07-28 02:24:15 -05:00
0557e10257
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-07-27 15:53:57 +02:00
0c4a7a847f
fixed annoying color bug!
2015-07-27 15:53:39 +02:00
7d9fd61c8e
Display changes
2015-07-26 22:31:40 -07:00
0b53bca385
Needed permission changes for Jr Developers (Pending approval)
2015-07-26 18:58:35 -07:00
47d410370d
Merge branch 'horus-bug-fixes'
2015-07-26 18:20:39 -07:00
02f1211ddb
Misc
2015-07-26 18:12:56 -07:00
8fd3a3a838
Merge branch 'Myst_LOBBERS'
2015-07-26 18:31:55 +02:00
e0b1567e54
Merge branch 'Myst_LOBBERS' of ssh://184.154.0.242:7999/min/mineplex into Myst_LOBBERS
2015-07-26 18:31:11 +02:00
727427165f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-26 08:49:49 -07:00
26ed7ebb94
Fixes to redis
...
Fixes for stat handler.
2015-07-26 08:49:35 -07:00
0fd59e9fdb
Added an achievement, removed team one, touched up another. Swag.
2015-07-25 21:50:37 -04:00
2b240f3dfa
removed visdata debug
2015-07-25 17:16:20 +02:00
9fa8c6ac45
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
2015-07-25 10:48:06 +02:00
6d367e3cee
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-25 01:38:54 -07:00
d3fede790a
Merge pull request #17 in MIN/mineplex from MinorTweaks to master
...
* commit '335eb5eacdcf9d837af48445d9fa9a59b4ef986a':
Fixed report link
http://pastebin.com/BRhT7pZP
Reverted things
Reverted Trainee to Helper due to popular demand.
LOTS of tweaks :D
Cleaned up somethings (lib's request)
I'm a dumbass
Fixed a few achievements
Changed mineplex.com/supporthub > mineplex.com/reports
2015-07-25 03:37:28 -05:00
a1ce1ed45d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-25 01:31:01 -07:00
84be48f264
Updated MiniDbClientPlugin to include accountId in the processLoginResultSet method.
...
Added conversion of stats to new stat table via StatHandler.
Changed stats value from int to long.
2015-07-25 01:30:50 -07:00
59d14624c0
Merge branch 'Myst_LOBBERS'
2015-07-25 10:26:47 +02:00
335eb5eacd
Fixed report link
2015-07-23 13:35:06 -04:00
71148ef387
gave twitch same perms as youtubers
2015-07-23 16:29:42 +02:00
91db076053
Fixed lobbers icon in stats
2015-07-23 09:28:35 -04:00
fe80ed373a
Fix numerous trello bugs
...
- Stacker as Block morph
- Punish mistake
- Achievement mistake
- Stacking a chest opener
2015-07-22 22:28:44 -07:00
e4ecc9e858
http://pastebin.com/BRhT7pZP
2015-07-22 23:31:07 -04:00
b9762bddc4
Fixes
2015-07-22 16:50:57 -04:00
e55ca81d48
Reverted Trainee to Helper due to popular demand.
2015-07-20 15:45:16 -04:00
6addf00037
LOTS of tweaks :D
2015-07-20 14:27:10 -04:00
8b2b4c2826
Added to MPS
2015-07-19 15:51:34 -04:00
6edc923002
Changed mineplex.com/supporthub > mineplex.com/reports
2015-07-19 15:43:13 -04:00
Jonathan Williams
Ty Sayers
Mini-Chiss
Ben Sihota
Christopher Jozsa
Mysticate