Shaun Bennett
|
c67f4fa7e6
|
Votifier fixes
|
2015-08-06 06:45:47 -05:00 |
|
Shaun Bennett
|
35d999d747
|
Remove some debug messages
|
2015-08-06 05:56:31 -05:00 |
|
Shaun Bennett
|
9e9f9862d0
|
Bonus bonus bonus!
|
2015-08-06 05:47:32 -05:00 |
|
Shaun Bennett
|
4cad99eb76
|
Lots of bonus work, start adding Votifier plugin
|
2015-08-06 00:45:39 -05:00 |
|
Shaun Bennett
|
bcd4f4f9e2
|
Open gui through npc
|
2015-08-05 00:41:50 -05:00 |
|
Shaun Bennett
|
b33b0ac935
|
More bonus work
|
2015-08-04 04:00:51 -05:00 |
|
Shaun Bennett
|
e200ddd777
|
Merge branch 'master' into Bonus
# Conflicts:
# Plugins/.idea/misc.xml
|
2015-08-03 08:32:45 -05:00 |
|
Shaun Bennett
|
bd9d222cff
|
Fix IntellIJ Files
|
2015-08-03 05:50:02 -05:00 |
|
Mini-Chiss
|
7c028ae936
|
fixed skywars teams icon in MPS
|
2015-08-03 11:44:13 +02:00 |
|
Mini-Chiss
|
bb2e15c4fd
|
made it so games can set another game as its 'kit source' so games can share kit unlocks
|
2015-08-03 11:38:16 +02:00 |
|
Mini-Chiss
|
8d7b7f8c8b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-08-03 10:56:54 +02:00 |
|
Mini-Chiss
|
1d0bfbdf2d
|
fixed team sheep displaying in UHC lobby
|
2015-08-03 10:56:23 +02:00 |
|
Jonathan Williams
|
6c0666c59b
|
Fix for server groups / teams.
|
2015-08-03 03:20:27 -05:00 |
|
Mini-Chiss
|
b26e01649b
|
removed requirement for ach kit
|
2015-08-03 10:13:46 +02:00 |
|
Mini-Chiss
|
eac8a3cd1c
|
fixed OITQ kit being unobtainable
|
2015-08-03 10:12:37 +02:00 |
|
Mini-Chiss
|
a87b3a9284
|
fixed kits not sharing for team vers
|
2015-08-03 10:10:29 +02:00 |
|
Mini-Chiss
|
8ec271bd82
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-08-03 10:06:30 +02:00 |
|
Mini-Chiss
|
472409dc4b
|
fixed broadcast formatting
|
2015-08-03 10:06:15 +02:00 |
|
Jonathan Williams
|
302252f193
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-08-03 02:56:31 -05:00 |
|
Jonathan Williams
|
af0d769d3d
|
Fixed skywars quick shop.
Fixed issue with skywars not opening.
Fixed chest size for MPS
|
2015-08-03 02:56:24 -05:00 |
|
Mini-Chiss
|
5bb2f80b8e
|
fixed text
|
2015-08-03 09:54:34 +02:00 |
|
Mini-Chiss
|
72c473ad6b
|
removed annoying mineplex thing from subtext in news
|
2015-08-03 09:51:10 +02:00 |
|
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 |
|
Shaun Bennett
|
cadd21c18b
|
More bonus work
|
2015-08-02 19:12:39 -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 |
|
Shaun Bennett
|
06be7b2cdd
|
Fix stats
|
2015-08-02 05:24:25 -05:00 |
|
Shaun Bennett
|
db15ffad72
|
Bonus changes + Update jooq
|
2015-08-02 05:17:51 -05:00 |
|