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 |
|
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 |
|
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 |
|
Shaun Bennett
|
6f8d6f8a40
|
Move Bonus and Poll to core
|
2015-08-10 01:55:50 -05:00 |
|
Shaun Bennett
|
a0be3fa964
|
Use atomic mysql operations for modifying tickets
|
2015-08-10 01:19:10 -05:00 |
|
Shaun Bennett
|
511cc76bef
|
Allow servers to process votifier votes, redis command gets sent to all servers (Until I can figure out why EU playertracker isnt working)
|
2015-08-10 00:47:36 -05:00 |
|
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 |
Mysticate
|
f8a6a25b46
|
Various Fixes.
• Merged w/ master
• Changed to William's method of Projectile limiting.
- Prevented TNT hitting Teammates
• Fixed gem count for Sniper
• Added gems for direct hits + TNT Thrown
• Removed assists counting for kills in 6 kill.
|
2015-08-09 15:01:27 -04: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 |
|
Mini-Chiss
|
ee65c72e86
|
and wizards!
|
2015-08-09 18:46:02 +02:00 |
|
Sarah
|
8c66ef7f15
|
changing Hub items and adding Profile GUI.
|
2015-08-09 18:33:44 +02:00 |
|
Mini-Chiss
|
fdfc9ae99d
|
longer games wont announce stay msgs
|
2015-08-09 18:17:29 +02:00 |
|
Sarah
|
ac5ff08fad
|
Git fix
|
2015-08-09 17:23:38 +02:00 |
|
Mini-Chiss
|
5a7de8ef3d
|
hub fixes
|
2015-08-09 17:21:56 +02:00 |
|
Sarah
|
0d70fb6b96
|
removing deop of Admins and adding OP condition to setHost.
|
2015-08-09 16:55:10 +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 |
|
Mini-Chiss
|
b974fcf838
|
map parser fixes
|
2015-08-09 00:09:26 +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 |