Shaun Bennett
|
fe153bee11
|
Fix revert issues
|
2015-08-11 03:19:27 -05:00 |
Mini-Chiss
|
65b51a137c
|
new party tute room
|
2015-08-10 14:50:44 +02:00 |
|
Mini-Chiss
|
bd2c9aa5e6
|
hub stuff
|
2015-08-10 14:00:02 +02: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 |
|
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 |
Sarah
|
8c66ef7f15
|
changing Hub items and adding Profile GUI.
|
2015-08-09 18:33:44 +02:00 |
|
Mini-Chiss
|
5a7de8ef3d
|
hub fixes
|
2015-08-09 17:21:56 +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 |
|
Mini-Chiss
|
cbb0cb96c8
|
ensured white
|
2015-08-08 13:54:35 +02:00 |
|
Mini-Chiss
|
e030331565
|
fixed some bugs
|
2015-08-08 13:51:37 +02:00 |
|
Mini-Chiss
|
fa7f19bde5
|
removed debug
|
2015-08-08 13:47:30 +02:00 |
|
Mini-Chiss
|
328c31de88
|
hub Update
fixed bad gameid
|
2015-08-08 13:47:09 +02: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 |
|
Mini-Chiss
|
eab7aa59f2
|
hub update!
|
2015-08-08 09:27:49 +02:00 |
|
Mini-Chiss
|
47cb98066d
|
Hub fixes
|
2015-08-08 08:19:07 +02:00 |
|
Mini-Chiss
|
33c96f51ae
|
fixed some stuff
|
2015-08-07 22:59:50 +02:00 |
|
Mini-Chiss
|
090c1f135d
|
Merge branch 'SarahsAwesomeBugFixes'
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
|
2015-08-07 21:48:35 +02:00 |
|
Mini-Chiss
|
b22706e649
|
hub update part 1
|
2015-08-07 21:45:38 +02: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 |
Jonathan Williams
|
320a3efe5b
|
Remove some debug code.
|
2015-08-07 02:22:58 -05:00 |
|
Jonathan Williams
|
e8c60e6e84
|
Added storage of pets in mysql. Going to have live while backend process is copying data over.
Updated ServerTypePage to resolve clicking issues with solo/team pages.
|
2015-08-07 02:22:13 -05:00 |
|
Sarah
|
181b778a9c
|
Fixing some bugs and disallow MPS while disguised.
|
2015-08-07 07:39:40 +02:00 |
Morten
|
f37e25e9d7
|
Finish push for today <3
|
2015-08-07 07:03:15 +02:00 |
|
Morten
|
608e8bf693
|
For Sarah <3
|
2015-08-07 05:40:16 +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 |
|
Morten
|
1680b652db
|
Added Hat layer skin
Added Sneak animation
With love from Morten <3
|
2015-08-07 03:10:17 +02: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 |
|
Sarah
|
d8041ba582
|
Fixing Players can disguise as disguised Players.
|
2015-08-06 20:57:56 +02:00 |
|
Sarah
|
4a10f8d71a
|
fixing very last bugs. Ready to push!!!
|
2015-08-06 13:23:38 +02: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 |
|
Sarah
|
6947b54e66
|
16 char limit and Steve Skin.
|
2015-08-06 09:45:02 +02:00 |
|
Sarah
|
5809359449
|
Random Player disguises.
|
2015-08-06 09:19:19 +02:00 |
|
Sarah
|
208ce95c97
|
No youtuber Disguise.
|
2015-08-06 09:11:39 +02:00 |
|
Sarah
|
b52a9477fe
|
No Staff disguises!
|
2015-08-06 09:07:30 +02:00 |
|
Sarah
|
16a8164030
|
Fixing last bugs and disabling coin bombs while diguised.
|
2015-08-06 08:42:09 +02:00 |
|
Shaun Bennett
|
4cad99eb76
|
Lots of bonus work, start adding Votifier plugin
|
2015-08-06 00:45:39 -05:00 |
|
Jonathan Williams
|
da5387c54f
|
Fixed ConcurrentModification for ServerManager cooldowns.
|
2015-08-05 01:33:09 -05:00 |