Sarah
|
be699558f1
|
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
|
2015-08-12 08:38:18 +02:00 |
|
Sarah
|
af19754bcd
|
Implementing Carl to Arcade.
|
2015-08-12 08:37:54 +02:00 |
Mini-Chiss
|
7cda53cb28
|
carl spinner in arcade/
tutorial fixes
|
2015-08-12 08:36:21 +02:00 |
|
Mini-Chiss
|
e8963cc2af
|
fixed paintbrush
|
2015-08-12 08:10:43 +02:00 |
|
Mini-Chiss
|
2ed388552b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-08-12 07:59:39 +02:00 |
Shaun Bennett
|
99a94251fd
|
Fixes
|
2015-08-12 00:56:20 -05:00 |
|
Shaun Bennett
|
8e4ae35256
|
Merge remote-tracking branch 'remotes/origin/master' into Bonus
|
2015-08-12 00:56:04 -05:00 |
|
Shaun Bennett
|
4549c810d4
|
Fix for voting
|
2015-08-11 22:59:59 -05:00 |
|
Mini-Chiss
|
a7cc3e1aa6
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-08-11 21:13:59 +02:00 |
|
Mini-Chiss
|
d41ab3432f
|
remove paintbrush when moved away
|
2015-08-11 21:13:45 +02:00 |
libraryaddict
|
72adf21bff
|
Gadget Paintball: Add particles on impact, change block break effect to stone break sound.
|
2015-08-12 06:23:13 +12:00 |
fooify
|
07bdbdde46
|
minor grammar issue
|
2015-08-11 09:55:10 -07:00 |
|
fooify
|
ddc663cc75
|
remove duplicate method
|
2015-08-11 09:52:04 -07:00 |
|
fooify
|
10f979772b
|
Merge remote-tracking branch 'origin/master' into foo
|
2015-08-11 09:51:13 -07:00 |
|
Mini-Chiss
|
18843c2cc6
|
Merge branch 'Bonus'
|
2015-08-11 17:05:59 +02:00 |
|
Mini-Chiss
|
83a010c215
|
enabled summer sale msg
|
2015-08-11 17:05:41 +02:00 |
|
Mini-Chiss
|
89dab7ec85
|
some little fixes
|
2015-08-11 16:33:32 +02:00 |
|
Sarah
|
f7d9476191
|
Hidden egg fix
|
2015-08-11 13:53:36 +02:00 |
|
Sarah
|
5c7d140521
|
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
|
2015-08-11 13:49:53 +02:00 |
|
Sarah
|
e25558fc91
|
Animation improvements.
|
2015-08-11 13:49:06 +02:00 |
|
Mini-Chiss
|
cfcfbbed3b
|
removed double gem
|
2015-08-11 13:34:32 +02:00 |
|
Mini-Chiss
|
49d54d4dd3
|
doesnt count rank thingy as reward if no rank. yknow
|
2015-08-11 13:22:58 +02:00 |
|
Mini-Chiss
|
b348c62a3f
|
Merge branch 'EventGameUpdates'
|
2015-08-11 13:01:33 +02:00 |
|
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 |
|
Sarah
|
fef269b856
|
Fixing /e set.
|
2015-08-10 17:28:27 +02:00 |