f81f5d82d6
Merge remote-tracking branch 'origin/master'
2015-08-12 03:00:16 -05:00
30f20801c7
Lets hope everything works!
2015-08-12 03:00:07 -05:00
860127631c
fixed item insta-despawn
2015-08-12 09:27:05 +02:00
f19efb4a93
renamed football to soccer
2015-08-12 09:23:00 +02:00
ade76791b3
optimized item cleaning
2015-08-12 09:12:49 +02:00
a1ba0f6d86
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-12 09:01:20 +02:00
2a40eee9e7
Increasing radius of items despawning.
2015-08-12 09:00:13 +02:00
d6f17c609b
carl
2015-08-12 08:58:46 +02:00
7ea148a802
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-12 08:58:36 +02:00
e4eb286225
Fixing despawning.
2015-08-12 08:56:20 +02:00
c00f9a7aaa
Merge branch 'Bonus'
2015-08-12 08:39:31 +02:00
be699558f1
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-12 08:38:18 +02:00
af19754bcd
Implementing Carl to Arcade.
2015-08-12 08:37:54 +02:00
7cda53cb28
carl spinner in arcade/
...
tutorial fixes
2015-08-12 08:36:21 +02:00
e8963cc2af
fixed paintbrush
2015-08-12 08:10:43 +02:00
2ed388552b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-12 07:59:39 +02:00
99a94251fd
Fixes
2015-08-12 00:56:20 -05:00
8e4ae35256
Merge remote-tracking branch 'remotes/origin/master' into Bonus
2015-08-12 00:56:04 -05:00
4549c810d4
Fix for voting
2015-08-11 22:59:59 -05:00
a7cc3e1aa6
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-11 21:13:59 +02:00
d41ab3432f
remove paintbrush when moved away
2015-08-11 21:13:45 +02:00
72adf21bff
Gadget Paintball: Add particles on impact, change block break effect to stone break sound.
2015-08-12 06:23:13 +12:00
07bdbdde46
minor grammar issue
2015-08-11 09:55:10 -07:00
ddc663cc75
remove duplicate method
2015-08-11 09:52:04 -07:00
10f979772b
Merge remote-tracking branch 'origin/master' into foo
2015-08-11 09:51:13 -07:00
18843c2cc6
Merge branch 'Bonus'
2015-08-11 17:05:59 +02:00
83a010c215
enabled summer sale msg
2015-08-11 17:05:41 +02:00
89dab7ec85
some little fixes
2015-08-11 16:33:32 +02:00
f7d9476191
Hidden egg fix
2015-08-11 13:53:36 +02:00
5c7d140521
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-11 13:49:53 +02:00
e25558fc91
Animation improvements.
2015-08-11 13:49:06 +02:00
cfcfbbed3b
removed double gem
2015-08-11 13:34:32 +02:00
49d54d4dd3
doesnt count rank thingy as reward if no rank. yknow
2015-08-11 13:22:58 +02:00
b348c62a3f
Merge branch 'EventGameUpdates'
2015-08-11 13:01:33 +02:00
2d7d7f6dde
Improving messages, animations and some Items.
2015-08-11 13:01:20 +02:00
f3558b144c
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-11 12:05:23 +02:00
c821523240
removed vote broadcast.
2015-08-11 12:04:54 +02:00
1c484367a1
Add hasPoll
2015-08-11 04:57:45 -05:00
3eb7e91fbb
Removing the magical 3
2015-08-11 04:38:37 -05:00
8abefaf856
The magical +3.
2015-08-11 11:31:51 +02:00
4c32f32ced
removed game reward type
2015-08-11 11:17:20 +02:00
74b83d6851
fixed!
2015-08-11 10:56:07 +02:00
184feec875
cleany and logic
2015-08-11 10:54:24 +02:00
f66a0439e8
no need to gen so many
2015-08-11 10:34:33 +02:00
a1c10a7ec5
clean up
2015-08-11 10:33:44 +02:00
1c40478e6e
SPIN DOGGY SPIN
2015-08-11 10:32:49 +02:00
fe153bee11
Fix revert issues
2015-08-11 03:19:27 -05:00
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
13e7e58986
Creeper visual!
2015-08-11 03:09:21 -05:00
c177307f70
Votifier fixes
2015-08-11 02:53:54 -05:00
2c30d20cb1
changing OP method, setHost permissions and /e command.
2015-08-11 09:26:01 +02:00
b99c526169
Implementing Carl message.
2015-08-11 09:09:16 +02:00
5d3503b733
Carl rewards
2015-08-11 01:55:27 -05:00
d457e3a955
changing the setOP Event.
2015-08-11 08:36:39 +02:00
d2983b831e
Merge remote-tracking branch 'origin/Bonus' into Bonus
2015-08-11 00:35:44 -06:00
d833385df4
Fix carl spinner and ticket command, Fix polls not displaying in available count, Visual fixes
2015-08-11 00:35:02 -06:00
66f2a5df5e
renamed GAME
2015-08-11 08:32:12 +02:00
b4e8b4f1ac
cant go spinnin while its a countin!
2015-08-11 08:24:28 +02:00
3bedc4ce84
Improving animation timing.
2015-08-11 05:37:58 +02:00
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
873a2f3c56
Changed slowness from 255 - 2
2015-08-10 19:45:40 -04:00
e81a3f7ecd
Added a method to UtilAlg.
2015-08-10 14:32:49 -04:00
a618b19b73
Small changes
2015-08-10 14:32:35 -04:00
fef269b856
Fixing /e set.
2015-08-10 17:28:27 +02:00
186e3028c2
removing temp fix "there was an error processing your request" for the Spinner.
2015-08-10 17:15:56 +02:00
3be811e480
Fixing Spinner announcements.
2015-08-10 17:08:03 +02:00
ed7b8949bb
Adding SpinnerFiller and SpinnerRewards.
2015-08-10 17:04:47 +02:00
2253a63e96
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-10 16:43:05 +02:00
c6beb122e3
Adding firework animations for spinner.
2015-08-10 16:42:43 +02:00
ad8781fd84
Merge branch 'Bonus' of ssh://184.154.0.242:7999/min/mineplex into Bonus
2015-08-10 16:14:24 +02:00
18d11f7d68
new enums
2015-08-10 16:13:17 +02:00
7492ed310e
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-10 15:33:26 +02:00
65fc81a2aa
improving animations again.
2015-08-10 15:33:00 +02:00
db70df1bf4
Merge branch 'Bonus' of ssh://184.154.0.242:7999/min/mineplex into Bonus
2015-08-10 14:51:39 +02:00
65b51a137c
new party tute room
2015-08-10 14:50:44 +02:00
1804d668e1
A few small tweaks. Removed the "Frozen" effect.
2015-08-10 08:42:03 -04:00
aea081c292
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-10 14:01:12 +02:00
5781009f4e
Improving animations and some text.
2015-08-10 14:00:40 +02:00
bd2c9aa5e6
hub stuff
2015-08-10 14:00:02 +02:00
aa13bcf5c6
Bug fix!
2015-08-10 04:54:01 -05:00
adb76b0681
Fix giving out gold
2015-08-10 04:51:46 -05:00
8745884153
Various fixes
2015-08-10 04:51:11 -05:00
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
6f8d6f8a40
Move Bonus and Poll to core
2015-08-10 01:55:50 -05:00
a0be3fa964
Use atomic mysql operations for modifying tickets
2015-08-10 01:19:10 -05:00
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
28806aaf0a
Update Bonus amounts, Attempting to fix Votifier plugin for EU/US
2015-08-10 00:33:54 -05:00
463dfc7049
Minor Tweaks.
...
• Fixed wrong evo location
• Added a "Frozen" effect when evolving.
2015-08-10 00:21:48 -04:00
a19cd3559d
Renamed "Shift" to "Crouch"
2015-08-09 23:26:59 -04:00
158dcdc01e
Created a new way to Evolve.
...
• Getting a kill presents you the option "Hold Shift to Evolve"
• Holding shift for about 5 seconds evolves you as normal.
2015-08-09 23:25:26 -04:00
d20fe54010
Disable carl features when carl can't be found
2015-08-09 16:36:48 -05:00
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
d9a8830e75
Few changes
2015-08-09 14:34:55 -04:00
c2d066a576
ui fixes
2015-08-09 19:31:24 +02:00
41dcc564c9
polish polish polish
...
MAKE IT SHINE!
2015-08-09 19:02:07 +02:00
ee65c72e86
and wizards!
2015-08-09 18:46:02 +02:00
8c66ef7f15
changing Hub items and adding Profile GUI.
2015-08-09 18:33:44 +02:00
fdfc9ae99d
longer games wont announce stay msgs
2015-08-09 18:17:29 +02:00
ac5ff08fad
Git fix
2015-08-09 17:23:38 +02:00
5a7de8ef3d
hub fixes
2015-08-09 17:21:56 +02:00
0d70fb6b96
removing deop of Admins and adding OP condition to setHost.
2015-08-09 16:55:10 +02:00
941e746ca9
Finalizing Poll GUI in Carl's GUI.
2015-08-09 16:47:03 +02:00
85c8e42f53
Finalizing and improving the Carl spinner and adding creeper explosion animations.
2015-08-09 15:00:54 +02:00
b9edb92c1e
Ready for full on testing.
2015-08-09 01:08:43 -04:00
b974fcf838
map parser fixes
2015-08-09 00:09:26 +02:00
e6519206af
Add event to be called when a player tries to buy a carl spin
2015-08-08 16:29:03 -05:00
5298fa341e
Removed the revolving thing.
2015-08-08 16:13:54 -04:00
cbb0cb96c8
ensured white
2015-08-08 13:54:35 +02:00
e030331565
fixed some bugs
2015-08-08 13:51:37 +02:00
fa7f19bde5
removed debug
2015-08-08 13:47:30 +02:00
328c31de88
hub Update
...
fixed bad gameid
2015-08-08 13:47:09 +02:00
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
eab7aa59f2
hub update!
2015-08-08 09:27:49 +02:00
47cb98066d
Hub fixes
2015-08-08 08:19:07 +02:00
33c96f51ae
fixed some stuff
2015-08-07 22:59:50 +02:00
090c1f135d
Merge branch 'SarahsAwesomeBugFixes'
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
2015-08-07 21:48:35 +02:00
b22706e649
hub update part 1
2015-08-07 21:45:38 +02:00
858e57bb0d
edited a few things
2015-08-07 14:39:29 -04:00
a9350bfacd
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-07 11:58:53 -04:00
f76d9b0d37
Replace Consumers with Callbacks
2015-08-07 04:20:54 -05:00
5ebc7080ee
Push fixes
2015-08-07 04:13:09 -05:00
fcfb63c47d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-07 02:23:10 -05:00
320a3efe5b
Remove some debug code.
2015-08-07 02:22:58 -05:00
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
181b778a9c
Fixing some bugs and disallow MPS while disguised.
2015-08-07 07:39:40 +02:00
f37e25e9d7
Finish push for today <3
2015-08-07 07:03:15 +02:00
608e8bf693
For Sarah <3
2015-08-07 05:40:16 +02:00
5f435a079e
Update vote button
2015-08-06 21:59:21 -05:00
be18dc1bf5
Add experience rewards to reward manager
2015-08-06 21:41:56 -05:00
6311ceaa0f
Reward work for new Game reward rarity and setup for carl, work on carl spinner
2015-08-06 21:15:17 -05:00
1680b652db
Added Hat layer skin
...
Added Sneak animation
With love from Morten <3
2015-08-07 03:10:17 +02:00
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
d8041ba582
Fixing Players can disguise as disguised Players.
2015-08-06 20:57:56 +02:00
ebbc13c0a4
lowered headshot damage
2015-08-06 17:07:52 +02:00
c67f4fa7e6
Votifier fixes
2015-08-06 06:45:47 -05:00
4a10f8d71a
fixing very last bugs. Ready to push!!!
2015-08-06 13:23:38 +02:00
35d999d747
Remove some debug messages
2015-08-06 05:56:31 -05:00
9e9f9862d0
Bonus bonus bonus!
2015-08-06 05:47:32 -05:00
6947b54e66
16 char limit and Steve Skin.
2015-08-06 09:45:02 +02:00
5809359449
Random Player disguises.
2015-08-06 09:19:19 +02:00
208ce95c97
No youtuber Disguise.
2015-08-06 09:11:39 +02:00
b52a9477fe
No Staff disguises!
2015-08-06 09:07:30 +02:00
abf12dbbfa
Merge branch 'SarahsAwesomeBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into SarahsAwesomeBugFixes
2015-08-06 08:44:36 +02:00
6a3d888f5b
fix git
2015-08-06 08:44:16 +02:00
16a8164030
Fixing last bugs and disabling coin bombs while diguised.
2015-08-06 08:42:09 +02:00
4cad99eb76
Lots of bonus work, start adding Votifier plugin
2015-08-06 00:45:39 -05:00
fbaec460dc
removed debug
2015-08-05 20:26:50 +02:00
7fbe29d0af
Merge branch 'SarahsAwesomeBugFixes' of ssh://184.154.0.242:7999/min/mineplex into SarahsAwesomeBugFixes
2015-08-05 20:25:38 +02:00
ea0c6075f2
rank sifx
2015-08-05 20:25:23 +02:00
a15e8e1b95
Fixing more /disguise bugs.
2015-08-05 15:23:16 +02:00
83da6b7a9a
Improving the /disguise command even more. ;D
2015-08-05 13:32:05 +02:00
e86e7b624e
remnvoed special case for me
2015-08-05 10:28:05 +02:00
cc24bb78d3
Fixed Cows being able to fly if they had the Rabbit Farmer kit
2015-08-05 03:07:19 -04:00
cba1c3bcca
disallowed negative stats completely
2015-08-05 09:03:22 +02:00
fa2a585dac
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-05 08:57:47 +02:00
5d7cc59909
fixed cases where negative stats were being uploaded
2015-08-05 08:56:52 +02:00
91de6a1852
last fix...
2015-08-05 08:40:09 +02:00
da5387c54f
Fixed ConcurrentModification for ServerManager cooldowns.
2015-08-05 01:33:09 -05:00
511c61611a
fixing earlier commit.
2015-08-05 08:32:52 +02:00
e55557e1fd
Improving the /disguise command.
2015-08-05 07:57:52 +02:00
bcd4f4f9e2
Open gui through npc
2015-08-05 00:41:50 -05:00
95bb4ab04b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-04 13:56:41 -05:00
b2116cc7e8
Merge branch 'OldServerSelector'
2015-08-04 13:56:23 -05:00
813dfb26b3
Finalized revert to old server menus.
...
Tied in solo/team buttons to use old server menu as well.
2015-08-04 13:54:06 -05:00
e5dd4d1ebf
Updated MOTD
2015-08-04 13:13:31 -05:00
88fe5b3ec6
Merge branch 'MPS-Maps'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
2015-08-04 17:37:32 +02:00
1fd5c51f03
DINGO ATE MY BABY
2015-08-04 17:33:23 +02:00
ec3bc7cc38
Try fixing the map selection.
2015-08-04 17:04:49 +02:00
644d6c9914
Whitelist fixes. Implemented MapSource.
2015-08-04 11:21:58 +01:00
b33b0ac935
More bonus work
2015-08-04 04:00:51 -05:00
13d139d197
team kills/deaths only store for 3 games now
2015-08-04 08:46:00 +02:00
d88a37832b
Work on evolving
2015-08-03 18:22:31 -06:00
a86fdc3c21
Fixed new classes not appearing in repository
2015-08-03 18:45:16 -04:00
b53b98d6e3
Milk The Cow:
...
New Gameplay Feature - When a cow charges a farmer, any milk in their bucket will be lost
New Perk - Steady Hands:
- Lowers the amount of milk lost by a dead player to 3
- Removes losing milk in farmer's bucket when a cow charges into them
New Kit - Sturdy Farmhand:
- Iron skin damage reduction of 2.0
- Implements Steady Hands perk
- 2000 gems
2015-08-03 18:30:42 -04:00
2d07cc571c
reduced invis in OITQ
2015-08-03 18:53:00 +02:00
2f571aed25
fixed bugs from my vel fixes, WHOOPS. normalisation :(
2015-08-03 18:19:31 +02:00
a623cc16ce
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-03 09:37:12 -05:00
40e2b6216e
oops, was right before, reverting change.
2015-08-03 16:30:38 +02:00
f350e4efe5
further fixed gem stuff!
2015-08-03 16:25:31 +02:00
67fd0e2c1d
fixed MPS awards formatting
2015-08-03 16:24:43 +02:00
ab670a03fb
fixed logic error that was displaying gems wrong
2015-08-03 16:23:50 +02:00
e10d26dae1
reduced respawn time in OITQ
...
removed respawn msg for short respawn times
2015-08-03 16:18:59 +02:00
ccdb859f11
lowered mythical change a little :)
2015-08-03 16:11:11 +02:00
e200ddd777
Merge branch 'master' into Bonus
...
# Conflicts:
# Plugins/.idea/misc.xml
2015-08-03 08:32:45 -05:00
90ea3d4cff
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-03 08:14:20 -05:00
ab20d35917
Wipe personal server groups on restart of monitor.
...
Cleanup of unused code.
2015-08-03 08:08:51 -05:00
5e06f16c0d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-03 15:08:40 +02:00
817b8b03f6
Whitelist fixes etc.
2015-08-03 13:40:13 +01:00
fc412b0782
Reverting old Server Menus with Team sub-menu dor SSM, Skywars and SG.
2015-08-03 14:36:51 +02:00
0c5cc25634
Stuff
2015-08-03 12:48:17 +01:00
eb16cd755a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-03 05:55:57 -05:00
37b779f108
Fixes for servers.
2015-08-03 05:55:33 -05:00
5b598009b9
Merge branch 'master' into MPS-Maps
2015-08-03 11:53:03 +01:00
bf292ecd39
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# Plugins/.idea/encodings.xml
# Plugins/.idea/modules.xml
2015-08-03 11:51:46 +01:00
bd9d222cff
Fix IntellIJ Files
2015-08-03 05:50:02 -05:00
44ee735f4a
Merge branch 'master' into MPS-Maps
2015-08-03 11:46:38 +01:00
4ad19e4579
Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps
2015-08-03 10:52:00 +01:00
7c028ae936
fixed skywars teams icon in MPS
2015-08-03 11:44:13 +02:00
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
1ca3c8527a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-03 10:01:06 +01:00
Shaun Bennett
Mini-Chiss
Sarah
libraryaddict
fooify
Mysticate
Jonathan Williams
AlexTheCoder
William Burns