Sarah
|
2d7d7f6dde
|
Improving messages, animations and some Items.
|
2015-08-11 13:01:20 +02:00 |
|
Sarah
|
f3558b144c
|
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
|
2015-08-11 12:05:23 +02:00 |
|
Sarah
|
c821523240
|
removed vote broadcast.
|
2015-08-11 12:04:54 +02:00 |
|
Shaun Bennett
|
1c484367a1
|
Add hasPoll
|
2015-08-11 04:57:45 -05:00 |
|
Shaun Bennett
|
3eb7e91fbb
|
Removing the magical 3
|
2015-08-11 04:38:37 -05:00 |
|
Sarah
|
8abefaf856
|
The magical +3.
|
2015-08-11 11:31:51 +02:00 |
|
Mini-Chiss
|
4c32f32ced
|
removed game reward type
|
2015-08-11 11:17:20 +02:00 |
|
Mini-Chiss
|
74b83d6851
|
fixed!
|
2015-08-11 10:56:07 +02:00 |
|
Mini-Chiss
|
184feec875
|
cleany and logic
|
2015-08-11 10:54:24 +02:00 |
|
Mini-Chiss
|
f66a0439e8
|
no need to gen so many
|
2015-08-11 10:34:33 +02:00 |
|
Mini-Chiss
|
a1c10a7ec5
|
clean up
|
2015-08-11 10:33:44 +02:00 |
|
Mini-Chiss
|
1c40478e6e
|
SPIN DOGGY SPIN
|
2015-08-11 10:32:49 +02:00 |
|
Shaun Bennett
|
fe153bee11
|
Fix revert issues
|
2015-08-11 03:19:27 -05:00 |
|
Shaun Bennett
|
184c592786
|
Merge remote-tracking branch 'origin/Bonus' into Bonus
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/VoteButton.java
|
2015-08-11 03:12:55 -05:00 |
|
Shaun Bennett
|
13e7e58986
|
Creeper visual!
|
2015-08-11 03:09:21 -05:00 |
|
Shaun Bennett
|
c177307f70
|
Votifier fixes
|
2015-08-11 02:53:54 -05:00 |
|
Sarah
|
2c30d20cb1
|
changing OP method, setHost permissions and /e command.
|
2015-08-11 09:26:01 +02:00 |
|
Sarah
|
55ded96209
|
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
|
2015-08-11 09:13:39 +02:00 |
|
Sarah
|
b99c526169
|
Implementing Carl message.
|
2015-08-11 09:09:16 +02:00 |
|
Shaun Bennett
|
5d3503b733
|
Carl rewards
|
2015-08-11 01:55:27 -05:00 |
|
Sarah
|
d457e3a955
|
changing the setOP Event.
|
2015-08-11 08:36:39 +02:00 |
|
Shaun Bennett
|
d2983b831e
|
Merge remote-tracking branch 'origin/Bonus' into Bonus
|
2015-08-11 00:35:44 -06:00 |
|
Shaun Bennett
|
d833385df4
|
Fix carl spinner and ticket command, Fix polls not displaying in available count, Visual fixes
|
2015-08-11 00:35:02 -06:00 |
|
Mini-Chiss
|
66f2a5df5e
|
renamed GAME
|
2015-08-11 08:32:12 +02:00 |
|
Mini-Chiss
|
b4e8b4f1ac
|
cant go spinnin while its a countin!
|
2015-08-11 08:24:28 +02:00 |
|
Sarah
|
3bedc4ce84
|
Improving animation timing.
|
2015-08-11 05:37:58 +02:00 |
|
Mysticate
|
bd414cd231
|
Merge remote-tracking branch 'origin/master' into Myst_EVO
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
|
2015-08-10 19:47:53 -04:00 |
|
Mysticate
|
873a2f3c56
|
Changed slowness from 255 - 2
|
2015-08-10 19:45:40 -04:00 |
|
Mysticate
|
e81a3f7ecd
|
Added a method to UtilAlg.
|
2015-08-10 14:32:49 -04:00 |
|
Mysticate
|
a618b19b73
|
Small changes
|
2015-08-10 14:32:35 -04:00 |
|
Sarah
|
fef269b856
|
Fixing /e set.
|
2015-08-10 17:28:27 +02:00 |
|
Sarah
|
186e3028c2
|
removing temp fix "there was an error processing your request" for the Spinner.
|
2015-08-10 17:15:56 +02:00 |
|
Sarah
|
3be811e480
|
Fixing Spinner announcements.
|
2015-08-10 17:08:03 +02:00 |
|
Sarah
|
ed7b8949bb
|
Adding SpinnerFiller and SpinnerRewards.
|
2015-08-10 17:04:47 +02:00 |
|
Sarah
|
2253a63e96
|
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
|
2015-08-10 16:43:05 +02:00 |
|
Sarah
|
c6beb122e3
|
Adding firework animations for spinner.
|
2015-08-10 16:42:43 +02:00 |
|
Mini-Chiss
|
ad8781fd84
|
Merge branch 'Bonus' of ssh://184.154.0.242:7999/min/mineplex into Bonus
|
2015-08-10 16:14:24 +02:00 |
|
Mini-Chiss
|
18d11f7d68
|
new enums
|
2015-08-10 16:13:17 +02:00 |
|
Sarah
|
7492ed310e
|
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
|
2015-08-10 15:33:26 +02:00 |
|
Sarah
|
65fc81a2aa
|
improving animations again.
|
2015-08-10 15:33:00 +02:00 |
|
Mini-Chiss
|
db70df1bf4
|
Merge branch 'Bonus' of ssh://184.154.0.242:7999/min/mineplex into Bonus
|
2015-08-10 14:51:39 +02:00 |
|
Mini-Chiss
|
65b51a137c
|
new party tute room
|
2015-08-10 14:50:44 +02:00 |
|
Mysticate
|
1804d668e1
|
A few small tweaks. Removed the "Frozen" effect.
|
2015-08-10 08:42:03 -04:00 |
|
Sarah
|
aea081c292
|
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
|
2015-08-10 14:01:12 +02:00 |
|
Sarah
|
5781009f4e
|
Improving animations and some text.
|
2015-08-10 14:00:40 +02:00 |
|
Mini-Chiss
|
bd2c9aa5e6
|
hub stuff
|
2015-08-10 14:00:02 +02:00 |
|
Shaun Bennett
|
aa13bcf5c6
|
Bug fix!
|
2015-08-10 04:54:01 -05:00 |
|
Shaun Bennett
|
adb76b0681
|
Fix giving out gold
|
2015-08-10 04:51:46 -05:00 |
|
Shaun Bennett
|
8745884153
|
Various fixes
|
2015-08-10 04:51:11 -05:00 |
|
Shaun Bennett
|
b8b19ed4a5
|
Merge remote-tracking branch 'remotes/origin/master' into Bonus
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
|
2015-08-10 03:24:59 -05:00 |
|