Shaun Bennett
|
28806aaf0a
|
Update Bonus amounts, Attempting to fix Votifier plugin for EU/US
|
2015-08-10 00:33:54 -05:00 |
|
Shaun Bennett
|
d20fe54010
|
Disable carl features when carl can't be found
|
2015-08-09 16:36:48 -05:00 |
|
Mini-Chiss
|
c2d066a576
|
ui fixes
|
2015-08-09 19:31:24 +02:00 |
|
Mini-Chiss
|
41dcc564c9
|
polish polish polish
MAKE IT SHINE!
|
2015-08-09 19:02:07 +02:00 |
|
Mini-Chiss
|
97c6726d1d
|
Merge branch 'Bonus' of ssh://184.154.0.242:7999/min/mineplex into Bonus
|
2015-08-09 18:46:37 +02:00 |
|
Sarah
|
8c66ef7f15
|
changing Hub items and adding Profile GUI.
|
2015-08-09 18:33:44 +02:00 |
|
Sarah
|
941e746ca9
|
Finalizing Poll GUI in Carl's GUI.
|
2015-08-09 16:47:03 +02:00 |
|
Sarah
|
85c8e42f53
|
Finalizing and improving the Carl spinner and adding creeper explosion animations.
|
2015-08-09 15:00:54 +02:00 |
|
Shaun Bennett
|
e6519206af
|
Add event to be called when a player tries to buy a carl spin
|
2015-08-08 16:29:03 -05:00 |
|
Shaun Bennett
|
4f6dfdb856
|
Update carl spin button to consume tickets, Updates to Votifier Plugin, Redis Vote Command, Various bug fixes
|
2015-08-08 06:35:25 -05:00 |
|
Shaun Bennett
|
f76d9b0d37
|
Replace Consumers with Callbacks
|
2015-08-07 04:20:54 -05:00 |
|
Shaun Bennett
|
5ebc7080ee
|
Push fixes
|
2015-08-07 04:13:09 -05:00 |
|
Mini-Chiss
|
5f8e80a55f
|
art
|
2015-08-07 11:10:50 +02:00 |
|
Shaun Bennett
|
5f435a079e
|
Update vote button
|
2015-08-06 21:59:21 -05:00 |
|
Shaun Bennett
|
be18dc1bf5
|
Add experience rewards to reward manager
|
2015-08-06 21:41:56 -05:00 |
|
Shaun Bennett
|
6311ceaa0f
|
Reward work for new Game reward rarity and setup for carl, work on carl spinner
|
2015-08-06 21:15:17 -05:00 |
|
Shaun Bennett
|
44e30a0903
|
SimpleGui Improvements, Change daily timer to 20 hours, Add Carl Spin button, Starter code for Spin Gui
|
2015-08-06 15:34:56 -05:00 |
|
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 |
|