Jonathan Williams
|
530c40ad0c
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-08-03 02:07:31 -05:00 |
|
Jonathan Williams
|
adcd91bf61
|
Servers with more than 40 max slots always send to largest server.
Fixed space in Solo lore.
|
2015-08-03 02:07:23 -05:00 |
|
Mini-Chiss
|
2e1bccb3ad
|
DUN ALLOW overful
|
2015-08-03 09:02:28 +02:00 |
|
Mini-Chiss
|
6a1e5d6bfc
|
changed item text
|
2015-08-03 08:23:49 +02:00 |
|
Jonathan Williams
|
c32074e733
|
Fixed MPS/Event server guis so they open up like old.
Changed sticks to player heads in solo/team selection.
|
2015-08-03 00:53:06 -05:00 |
|
Jonathan Williams
|
bfaa0e6849
|
Fixed event/mps hardcode.
|
2015-08-02 23:51:43 -05:00 |
|
Ty Sayers
|
58933fc855
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
|
2015-08-02 21:19:00 -04:00 |
|
Ty Sayers
|
944a4a9535
|
Fix accidental double-queueing bug when left clicking server NPCs and add two second cooldown before attempting to auto-join servers. Fix bug with server groups not properly loading server NPC names into shops. Fix bug with server key/name/npc name not being properly interchangeable during server selection and auto-joining process.
|
2015-08-02 21:18:24 -04:00 |
|
Jonathan Williams
|
3b090d369d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-08-02 19:41:49 -05:00 |
|
Jonathan Williams
|
a561bbbf12
|
Added hardcode for EVENT/MPS :D
|
2015-08-02 19:41:42 -05:00 |
|
Shaun Bennett
|
38cc318387
|
Update JOOQ, downcast BigInteger to Long in stats for now
|
2015-08-02 19:36:24 -05:00 |
|
Ty Sayers
|
32a2687991
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
|
2015-08-02 20:00:15 -04:00 |
|
Jonathan Williams
|
d9a641fd92
|
Updated ServerManager to read server npc stuff from redis.
Updated ServerGroup to have NPC name in it.
|
2015-08-02 18:59:43 -05:00 |
|
Jonathan Williams
|
a2250ea343
|
Fix for blocking logins if redis can't add account cache.
|
2015-08-02 18:59:13 -05:00 |
|
Ty Sayers
|
4852e69991
|
Temporary un-finished changes for adding in team/solo UI pages and allowing players to select.
|
2015-08-02 19:19:40 -04:00 |
|
Jonathan Williams
|
f520908f8d
|
Added team and portal location info to server group.
|
2015-08-02 17:52:51 -05:00 |
|
Jonathan Williams
|
41189b9838
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-08-02 17:23:17 -05:00 |
|
Ty Sayers
|
fa2bcf7f69
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
|
2015-08-02 18:21:01 -04:00 |
|
Ty Sayers
|
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 |
|
Jonathan Williams
|
d3ba621e86
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-08-02 17:00:49 -05:00 |
|
Mini-Chiss
|
0a84bd69d8
|
fixed some OITQ stuff
|
2015-08-02 23:17:23 +02:00 |
|
Ty Sayers
|
c2f6c402da
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
|
2015-08-02 13:25:09 -04:00 |
|
Ty Sayers
|
612d967aa0
|
Add ability for auto-joining of gametypes to bypass manual server selection by player.
|
2015-08-02 13:24:59 -04:00 |
|
Mini-Chiss
|
4cc810f1c0
|
Merge branch 'Myst_KITS'
|
2015-08-02 17:55:53 +02:00 |
|
Mini-Chiss
|
8ea967b37e
|
fixed possible NPE
|
2015-08-02 12:35:25 +02:00 |
|
Mini-Chiss
|
638406254b
|
refactored a little so theres no data stored in the util
|
2015-08-02 12:07:00 +02:00 |
|
Mini-Chiss
|
afc41c8831
|
converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity
|
2015-08-02 11:50:26 +02:00 |
|
Mini-Chiss
|
ac4755a5a9
|
Fixed incorrect velocity
|
2015-08-02 11:24:34 +02:00 |
|
Mini-Chiss
|
7910170327
|
fixed achievemnt amount
|
2015-08-01 18:39:18 +02:00 |
|
Jonathan Williams
|
992c0fc36f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-08-01 01:12:24 -05:00 |
|
Jonathan Williams
|
d3c5d0cbe6
|
Only store account cache stuff for 6 hours.
Update MOtd.
|
2015-08-01 01:12:01 -05:00 |
|
Mini-Chiss
|
ae8d351145
|
Merge branch 'SSM2PlayerTeams'
|
2015-07-31 14:09:55 +02:00 |
|
Sarah
|
fba10e4cbd
|
fixing the long term "Kit" bug ;D
|
2015-07-31 14:08:08 +02:00 |
|
Sarah
|
b2c538b189
|
little tag fix.
|
2015-07-31 13:40:39 +02:00 |
|
Sarah
|
60a1768821
|
Fixing Team display bug on disbanding.
|
2015-07-31 13:05:28 +02:00 |
|
Mini-Chiss
|
b2a567673c
|
disabled sale msg
added double gem weekend
|
2015-07-31 09:53:52 +02:00 |
|
Mini-Chiss
|
a3d768af6b
|
added res pack for HH
|
2015-07-30 15:07:40 +02:00 |
|
Mini-Chiss
|
31fd19aab5
|
added res pack for CC
|
2015-07-30 15:07:05 +02:00 |
|
Mini-Chiss
|
8d7c42134b
|
fixed mounts having nametags
|
2015-07-30 14:54:23 +02:00 |
|
Mini-Chiss
|
8a5088e181
|
fixed SGT deathmatch not working
|
2015-07-30 14:47:59 +02:00 |
|
Mini-Chiss
|
45d117a95a
|
added armor hotbar to smash
fixed scoreboard in snowfight
|
2015-07-30 14:45:28 +02:00 |
|
Mini-Chiss
|
0cf333ec00
|
lowered win req
|
2015-07-30 14:12:17 +02:00 |
|
Mini-Chiss
|
8ef93c0b33
|
Merge branch 'SSM2PlayerTeams'
|
2015-07-30 08:42:50 +02:00 |
|
Sarah
|
30fa3b3309
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams
|
2015-07-30 03:07:41 +02:00 |
|
Sarah
|
37e432f0b2
|
Git fix.
|
2015-07-30 03:07:21 +02:00 |
|
Sarah
|
bf75594853
|
Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams
|
2015-07-30 02:33:51 +02:00 |
|
Sarah
|
de4d0a7dc3
|
Fixing needler, projectiles in SW and "Banannas...".
|
2015-07-30 02:33:06 +02:00 |
|
Mini-Chiss
|
97a144150b
|
fixed an NPE that was causing games not to end in MS
|
2015-07-29 21:51:18 +02:00 |
|
Mini-Chiss
|
be910cced9
|
gamemode color change
|
2015-07-29 17:00:36 +02:00 |
|
Mini-Chiss
|
0e55ce1879
|
removed old hint
|
2015-07-29 16:54:30 +02:00 |
|