Mini-Chiss
534c91c706
remove items from inside soccer
2015-08-13 13:24:55 +02:00
Shaun Bennett
bc8aff31cb
Merge remote-tracking branch 'origin/master'
2015-08-13 06:12:24 -05:00
Shaun Bennett
af15476f19
Use login query to handle logins
2015-08-13 06:12:11 -05:00
Mini-Chiss
878ac82ade
fixed error!
2015-08-13 13:01:41 +02:00
Mini-Chiss
1487692609
completely disabled team armor in arcade. avoids typing it just as game starts.
2015-08-13 12:57:30 +02:00
Mini-Chiss
fc1a8e4e25
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-13 12:52:11 +02:00
Mini-Chiss
f3b58fe9b6
disabled team armor command in games D:
2015-08-13 12:51:57 +02:00
Shaun Bennett
e1d04354fb
Use dummy record for AddPlayer
2015-08-13 05:18:53 -05:00
Shaun Bennett
94c00cdb72
Adding some comments
2015-08-13 04:05:28 -05:00
Shaun Bennett
4d6e827739
Remove vote3!
2015-08-13 04:03:03 -05:00
Shaun Bennett
92c0e1452b
Add vote3
2015-08-13 04:01:53 -05:00
Shaun Bennett
0c68321e81
Global button
2015-08-13 03:58:05 -05:00
Shaun Bennett
11a4805c38
Stat stuff!
2015-08-13 03:54:23 -05:00
Shaun Bennett
4aac057956
Merge remote-tracking branch 'origin/master'
2015-08-13 03:32:40 -05:00
Shaun Bennett
05b1b91686
Carl!
2015-08-13 03:32:31 -05:00
Jonathan Williams
8476578bc0
Merge pull request #28 in MIN/mineplex from Myst_LOBBERS to master
...
* commit 'f8a6a25b46b9336ae8a727e1f3478f3a7a394324':
Various Fixes.
2015-08-13 01:52:16 -05:00
Jonathan Williams
a308244966
Merge pull request #29 in MIN/mineplex from foo to master
...
* commit '07bdbdde46e2a9e7b49f4e8606c9068a0534c18d': (22 commits)
minor grammar issue
remove duplicate method
manually updating something
*crosses fingers* please work!
please work...
Freezes the time using doDayLightCycle instead of using a UpdateEvent.
Fixed double-half-slabs (line 68)
remove custom level to fix merge conflicts
squirrel!
fix getting snowballs from bedrock
add jnr_dev to updaterank
fix this agaaaaain
FOOIFY IS A NOOB OKAY
fix concurrentmodificationexception
fix turfforts bug
prevent STATIONARY_LAVA from breaking in creeper smash
fix creeper smash exploding lava and bedrock
fix spleef lava issue
ishh also wanted this :P (let me know if I should remove it)
ishh wanted it...k
...
2015-08-13 01:49:00 -05:00
Jonathan Williams
0ff7cee229
Merge pull request #32 in MIN/mineplex from Alex_MILKCOW to master
...
* commit 'cc24bb78d3968c0c364164fb43e19724007e3833':
Fixed Cows being able to fly if they had the Rabbit Farmer kit
Fixed new classes not appearing in repository
Milk The Cow: New Gameplay Feature - When a cow charges a farmer, any milk in their bucket will be lost
2015-08-13 01:45:56 -05:00
Mysticate
ed7dbddf4a
Redid how kits are done.
2015-08-13 00:12:28 -04:00
Mysticate
d7e28e9eb8
You can no longer have the option to Evolve if you kill while dead.
2015-08-12 13:28:31 -04:00
Mini-Chiss
4f163af909
fixed a uid problem with maps
2015-08-12 18:36:29 +02:00
Mysticate
a7da10cb34
You no longer remain "charging" when you die.
2015-08-12 12:12:26 -04:00
Mysticate
ad94b63903
Blaze and Enderman now take water damage.
2015-08-12 10:46:12 -04:00
Mysticate
0c3c9702d9
Small fixes.
...
Added holograms to show kit abilities.
Fireworks are now client side only.
Decreased the # of emerald particles.
2015-08-12 09:44:55 -04:00
Mini-Chiss
fcfb2559b8
players cannot grab slime :O
2015-08-12 14:41:33 +02:00
Mini-Chiss
d1302e8dc3
fixed full msg
2015-08-12 12:42:59 +02:00
Mini-Chiss
5293e24469
fixed text
2015-08-12 11:58:40 +02:00
Mini-Chiss
cd5c7e7110
fixed kb
2015-08-12 11:23:19 +02:00
Shaun Bennett
37e5e97020
Fix experience reward displaying as game
2015-08-12 03:08:40 -05:00
Shaun Bennett
f81f5d82d6
Merge remote-tracking branch 'origin/master'
2015-08-12 03:00:16 -05:00
Shaun Bennett
30f20801c7
Lets hope everything works!
2015-08-12 03:00:07 -05:00
Mini-Chiss
860127631c
fixed item insta-despawn
2015-08-12 09:27:05 +02:00
Mini-Chiss
f19efb4a93
renamed football to soccer
2015-08-12 09:23:00 +02:00
Mini-Chiss
ade76791b3
optimized item cleaning
2015-08-12 09:12:49 +02:00
Sarah
a1ba0f6d86
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-12 09:01:20 +02:00
Sarah
2a40eee9e7
Increasing radius of items despawning.
2015-08-12 09:00:13 +02:00
Mini-Chiss
d6f17c609b
carl
2015-08-12 08:58:46 +02:00
Mini-Chiss
7ea148a802
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-12 08:58:36 +02:00
Sarah
e4eb286225
Fixing despawning.
2015-08-12 08:56:20 +02:00
Mini-Chiss
c00f9a7aaa
Merge branch 'Bonus'
2015-08-12 08:39:31 +02:00
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
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
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
Mysticate
463dfc7049
Minor Tweaks.
...
• Fixed wrong evo location
• Added a "Frozen" effect when evolving.
2015-08-10 00:21:48 -04:00
Mysticate
a19cd3559d
Renamed "Shift" to "Crouch"
2015-08-09 23:26:59 -04:00
Mysticate
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
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
Mysticate
d9a8830e75
Few changes
2015-08-09 14:34:55 -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
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
Mysticate
b9edb92c1e
Ready for full on testing.
2015-08-09 01:08:43 -04: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
Mysticate
5298fa341e
Removed the revolving thing.
2015-08-08 16:13:54 -04: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
Mysticate
858e57bb0d
edited a few things
2015-08-07 14:39:29 -04:00
Mysticate
a9350bfacd
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-07 11:58:53 -04: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
fcfb63c47d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-07 02:23:10 -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
Mini-Chiss
ebbc13c0a4
lowered headshot damage
2015-08-06 17:07:52 +02:00
Shaun Bennett
c67f4fa7e6
Votifier fixes
2015-08-06 06:45:47 -05: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
abf12dbbfa
Merge branch 'SarahsAwesomeBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into SarahsAwesomeBugFixes
2015-08-06 08:44:36 +02:00
Sarah
6a3d888f5b
fix git
2015-08-06 08:44:16 +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
Mini-Chiss
fbaec460dc
removed debug
2015-08-05 20:26:50 +02:00
Mini-Chiss
7fbe29d0af
Merge branch 'SarahsAwesomeBugFixes' of ssh://184.154.0.242:7999/min/mineplex into SarahsAwesomeBugFixes
2015-08-05 20:25:38 +02:00
Mini-Chiss
ea0c6075f2
rank sifx
2015-08-05 20:25:23 +02:00
Sarah
a15e8e1b95
Fixing more /disguise bugs.
2015-08-05 15:23:16 +02:00
Sarah
83da6b7a9a
Improving the /disguise command even more. ;D
2015-08-05 13:32:05 +02:00
Mini-Chiss
e86e7b624e
remnvoed special case for me
2015-08-05 10:28:05 +02:00
AlexTheCoder
cc24bb78d3
Fixed Cows being able to fly if they had the Rabbit Farmer kit
2015-08-05 03:07:19 -04:00
Mini-Chiss
cba1c3bcca
disallowed negative stats completely
2015-08-05 09:03:22 +02:00
Mini-Chiss
fa2a585dac
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-05 08:57:47 +02:00
Mini-Chiss
5d7cc59909
fixed cases where negative stats were being uploaded
2015-08-05 08:56:52 +02:00
Sarah
91de6a1852
last fix...
2015-08-05 08:40:09 +02:00
Jonathan Williams
da5387c54f
Fixed ConcurrentModification for ServerManager cooldowns.
2015-08-05 01:33:09 -05:00
Sarah
511c61611a
fixing earlier commit.
2015-08-05 08:32:52 +02:00
Sarah
e55557e1fd
Improving the /disguise command.
2015-08-05 07:57:52 +02:00
Shaun Bennett
bcd4f4f9e2
Open gui through npc
2015-08-05 00:41:50 -05:00
Jonathan Williams
95bb4ab04b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-04 13:56:41 -05:00
Jonathan Williams
b2116cc7e8
Merge branch 'OldServerSelector'
2015-08-04 13:56:23 -05:00
Jonathan Williams
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
Jonathan Williams
e5dd4d1ebf
Updated MOTD
2015-08-04 13:13:31 -05:00
Mini-Chiss
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
Mini-Chiss
1fd5c51f03
DINGO ATE MY BABY
2015-08-04 17:33:23 +02:00
Sarah
ec3bc7cc38
Try fixing the map selection.
2015-08-04 17:04:49 +02:00
William Burns
644d6c9914
Whitelist fixes. Implemented MapSource.
2015-08-04 11:21:58 +01:00
Shaun Bennett
b33b0ac935
More bonus work
2015-08-04 04:00:51 -05:00
Mini-Chiss
13d139d197
team kills/deaths only store for 3 games now
2015-08-04 08:46:00 +02:00
Mysticate
d88a37832b
Work on evolving
2015-08-03 18:22:31 -06:00
AlexTheCoder
a86fdc3c21
Fixed new classes not appearing in repository
2015-08-03 18:45:16 -04:00
AlexTheCoder
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
Mini-Chiss
2d07cc571c
reduced invis in OITQ
2015-08-03 18:53:00 +02:00
Mini-Chiss
2f571aed25
fixed bugs from my vel fixes, WHOOPS. normalisation :(
2015-08-03 18:19:31 +02:00
Jonathan Williams
a623cc16ce
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-03 09:37:12 -05:00
Mini-Chiss
40e2b6216e
oops, was right before, reverting change.
2015-08-03 16:30:38 +02:00
Mini-Chiss
f350e4efe5
further fixed gem stuff!
2015-08-03 16:25:31 +02:00
Mini-Chiss
67fd0e2c1d
fixed MPS awards formatting
2015-08-03 16:24:43 +02:00
Mini-Chiss
ab670a03fb
fixed logic error that was displaying gems wrong
2015-08-03 16:23:50 +02:00
Mini-Chiss
e10d26dae1
reduced respawn time in OITQ
...
removed respawn msg for short respawn times
2015-08-03 16:18:59 +02:00
Mini-Chiss
ccdb859f11
lowered mythical change a little :)
2015-08-03 16:11:11 +02:00
Shaun Bennett
e200ddd777
Merge branch 'master' into Bonus
...
# Conflicts:
# Plugins/.idea/misc.xml
2015-08-03 08:32:45 -05:00
Jonathan Williams
90ea3d4cff
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-03 08:14:20 -05:00
Jonathan Williams
ab20d35917
Wipe personal server groups on restart of monitor.
...
Cleanup of unused code.
2015-08-03 08:08:51 -05:00
Mini-Chiss
5e06f16c0d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-03 15:08:40 +02:00
William Burns
817b8b03f6
Whitelist fixes etc.
2015-08-03 13:40:13 +01:00
Sarah
fc412b0782
Reverting old Server Menus with Team sub-menu dor SSM, Skywars and SG.
2015-08-03 14:36:51 +02:00
William Burns
0c5cc25634
Stuff
2015-08-03 12:48:17 +01:00
Jonathan Williams
eb16cd755a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-03 05:55:57 -05:00
Jonathan Williams
37b779f108
Fixes for servers.
2015-08-03 05:55:33 -05:00
William Burns
5b598009b9
Merge branch 'master' into MPS-Maps
2015-08-03 11:53:03 +01:00
William Burns
bf292ecd39
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# Plugins/.idea/encodings.xml
# Plugins/.idea/modules.xml
2015-08-03 11:51:46 +01:00
Shaun Bennett
bd9d222cff
Fix IntellIJ Files
2015-08-03 05:50:02 -05:00
William Burns
44ee735f4a
Merge branch 'master' into MPS-Maps
2015-08-03 11:46:38 +01:00
William Burns
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
Mini-Chiss
7c028ae936
fixed skywars teams icon in MPS
2015-08-03 11:44:13 +02:00
Mini-Chiss
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
William Burns
1ca3c8527a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-03 10:01:06 +01:00
Mini-Chiss
8d7b7f8c8b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-03 10:56:54 +02:00
Mini-Chiss
1d0bfbdf2d
fixed team sheep displaying in UHC lobby
2015-08-03 10:56:23 +02:00
Jonathan Williams
6c0666c59b
Fix for server groups / teams.
2015-08-03 03:20:27 -05:00
Mini-Chiss
b26e01649b
removed requirement for ach kit
2015-08-03 10:13:46 +02:00
Mini-Chiss
eac8a3cd1c
fixed OITQ kit being unobtainable
2015-08-03 10:12:37 +02:00
Mini-Chiss
a87b3a9284
fixed kits not sharing for team vers
2015-08-03 10:10:29 +02:00
Mini-Chiss
8ec271bd82
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-03 10:06:30 +02:00
Mini-Chiss
472409dc4b
fixed broadcast formatting
2015-08-03 10:06:15 +02:00
Jonathan Williams
302252f193
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-03 02:56:31 -05:00
Jonathan Williams
af0d769d3d
Fixed skywars quick shop.
...
Fixed issue with skywars not opening.
Fixed chest size for MPS
2015-08-03 02:56:24 -05:00
Mini-Chiss
5bb2f80b8e
fixed text
2015-08-03 09:54:34 +02:00
William Burns
6ccc897841
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-03 08:53:38 +01:00
Mini-Chiss
72c473ad6b
removed annoying mineplex thing from subtext in news
2015-08-03 09:51:10 +02:00
Jonathan Williams
530c40ad0c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-03 02:07:31 -05:00
Jonathan Williams
adcd91bf61
Servers with more than 40 max slots always send to largest server.
...
Fixed space in Solo lore.
2015-08-03 02:07:23 -05:00
Mini-Chiss
2e1bccb3ad
DUN ALLOW overful
2015-08-03 09:02:28 +02:00
Mini-Chiss
6a1e5d6bfc
changed item text
2015-08-03 08:23:49 +02:00
Jonathan Williams
c32074e733
Fixed MPS/Event server guis so they open up like old.
...
Changed sticks to player heads in solo/team selection.
2015-08-03 00:53:06 -05:00
Jonathan Williams
bfaa0e6849
Fixed event/mps hardcode.
2015-08-02 23:51:43 -05:00
Ty Sayers
58933fc855
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-02 21:19:00 -04:00
Ty Sayers
944a4a9535
Fix accidental double-queueing bug when left clicking server NPCs and add two second cooldown before attempting to auto-join servers. Fix bug with server groups not properly loading server NPC names into shops. Fix bug with server key/name/npc name not being properly interchangeable during server selection and auto-joining process.
2015-08-02 21:18:24 -04:00
Jonathan Williams
3b090d369d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-02 19:41:49 -05:00
Jonathan Williams
a561bbbf12
Added hardcode for EVENT/MPS :D
2015-08-02 19:41:42 -05:00
Shaun Bennett
38cc318387
Update JOOQ, downcast BigInteger to Long in stats for now
2015-08-02 19:36:24 -05:00
Shaun Bennett
cadd21c18b
More bonus work
2015-08-02 19:12:39 -05:00
Ty Sayers
32a2687991
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-02 20:00:15 -04:00
Jonathan Williams
d9a641fd92
Updated ServerManager to read server npc stuff from redis.
...
Updated ServerGroup to have NPC name in it.
2015-08-02 18:59:43 -05:00
Jonathan Williams
a2250ea343
Fix for blocking logins if redis can't add account cache.
2015-08-02 18:59:13 -05:00
Ty Sayers
4852e69991
Temporary un-finished changes for adding in team/solo UI pages and allowing players to select.
2015-08-02 19:19:40 -04:00
Jonathan Williams
f520908f8d
Added team and portal location info to server group.
2015-08-02 17:52:51 -05:00
Jonathan Williams
41189b9838
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-02 17:23:17 -05:00
Ty Sayers
fa2bcf7f69
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-02 18:21:01 -04:00
Ty Sayers
70c1b883db
Fix bug with NPC server shops not properly calling the central method used for intervening and auto-joining. Also add in base for team/solo separation for specific server groups.
2015-08-02 18:20:52 -04:00
Jonathan Williams
d3ba621e86
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-02 17:00:49 -05:00
Mini-Chiss
0a84bd69d8
fixed some OITQ stuff
2015-08-02 23:17:23 +02:00
Ty Sayers
c2f6c402da
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-02 13:25:09 -04:00
Ty Sayers
612d967aa0
Add ability for auto-joining of gametypes to bypass manual server selection by player.
2015-08-02 13:24:59 -04:00
Mysticate
0a20a04903
Used packets to spectate the rotation bat.
2015-08-02 10:48:00 -06:00
Mini-Chiss
4cc810f1c0
Merge branch 'Myst_KITS'
2015-08-02 17:55:53 +02:00
libraryaddict
4fdd42c599
Mysticate's request: Add PacketPlayOutCamera
2015-08-03 01:51:15 +12:00
Mini-Chiss
8ea967b37e
fixed possible NPE
2015-08-02 12:35:25 +02:00
Shaun Bennett
06be7b2cdd
Fix stats
2015-08-02 05:24:25 -05:00
Shaun Bennett
db15ffad72
Bonus changes + Update jooq
2015-08-02 05:17:51 -05:00
Mini-Chiss
638406254b
refactored a little so theres no data stored in the util
2015-08-02 12:07:00 +02:00
Mini-Chiss
afc41c8831
converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity
2015-08-02 11:50:26 +02:00
Shaun Bennett
11e49b9678
Some updates
2015-08-02 04:28:57 -05:00
Mini-Chiss
ac4755a5a9
Fixed incorrect velocity
2015-08-02 11:24:34 +02:00
Mysticate
9c14e3d35a
Worked on evolution
2015-08-01 17:24:12 -06:00
Mini-Chiss
7910170327
fixed achievemnt amount
2015-08-01 18:39:18 +02:00
William Burns
f361ae94dc
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
# Conflicts:
# Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml
# Plugins/.idea/compiler.xml
# Plugins/.idea/encodings.xml
# Plugins/.idea/misc.xml
# Plugins/.idea/modules.xml
2015-08-01 16:09:15 +01:00
William Burns
a964f343c7
xml files are ew
2015-08-01 14:55:01 +01:00
Mysticate
62072077c1
Fixed evolution rotation
2015-08-01 00:47:44 -06:00
Jonathan Williams
992c0fc36f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-01 01:12:24 -05:00
Jonathan Williams
d3c5d0cbe6
Only store account cache stuff for 6 hours.
...
Update MOtd.
2015-08-01 01:12:01 -05:00
Shaun Bennett
fd65f27f0f
Fix some typos/formatting issues
2015-07-31 10:01:19 -05:00
Mini-Chiss
ae8d351145
Merge branch 'SSM2PlayerTeams'
2015-07-31 14:09:55 +02:00
Sarah
fba10e4cbd
fixing the long term "Kit" bug ;D
2015-07-31 14:08:08 +02:00
Sarah
b2c538b189
little tag fix.
2015-07-31 13:40:39 +02:00
Sarah
60a1768821
Fixing Team display bug on disbanding.
2015-07-31 13:05:28 +02:00
Mini-Chiss
b2a567673c
disabled sale msg
...
added double gem weekend
2015-07-31 09:53:52 +02:00
Mysticate
53a3a29cd2
Extreme revisions. Cheers!
2015-07-31 00:50:32 -06:00
Mini-Chiss
a3d768af6b
added res pack for HH
2015-07-30 15:07:40 +02:00
Mini-Chiss
31fd19aab5
added res pack for CC
2015-07-30 15:07:05 +02:00
Mini-Chiss
8d7c42134b
fixed mounts having nametags
2015-07-30 14:54:23 +02:00
Mini-Chiss
8a5088e181
fixed SGT deathmatch not working
2015-07-30 14:47:59 +02:00
Mini-Chiss
45d117a95a
added armor hotbar to smash
...
fixed scoreboard in snowfight
2015-07-30 14:45:28 +02:00
Mini-Chiss
0cf333ec00
lowered win req
2015-07-30 14:12:17 +02:00
Mysticate
f02924987e
Did things
2015-07-30 04:30:19 -06:00
Mini-Chiss
8ef93c0b33
Merge branch 'SSM2PlayerTeams'
2015-07-30 08:42:50 +02:00
Sarah
30fa3b3309
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams
2015-07-30 03:07:41 +02:00
Sarah
37e432f0b2
Git fix.
2015-07-30 03:07:21 +02:00
Sarah
bf75594853
Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams
2015-07-30 02:33:51 +02:00
Sarah
de4d0a7dc3
Fixing needler, projectiles in SW and "Banannas...".
2015-07-30 02:33:06 +02:00
Mysticate
a5d73d791a
Thing
2015-07-29 16:14:38 -06:00
fooify
b623f025ff
manually updating something
2015-07-29 14:31:11 -07:00
fooify
7c4786e7d2
Merge remote-tracking branch 'origin/master' into foo
2015-07-29 14:15:24 -07:00
fooify
5da23fa322
Merge branch 'foo' of http://Fooify@184.154.0.242:7990/scm/min/mineplex.git into foo
2015-07-29 14:13:07 -07:00
fooify
db5c5a9888
*crosses fingers* please work!
2015-07-29 14:12:52 -07:00
Mini-Chiss
97a144150b
fixed an NPE that was causing games not to end in MS
2015-07-29 21:51:18 +02:00
fooify
389bf7a74c
please work...
2015-07-29 10:55:03 -07:00
Mysticate
ab49407584
Things
2015-07-29 11:52:44 -06:00
Aaron Brock
7065ea7319
Freezes the time using doDayLightCycle instead of using a UpdateEvent.
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-29 10:49:20 -07:00
Aaron Brock
d583598477
Fixed double-half-slabs (line 68)
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-29 10:49:20 -07:00
Mini-Chiss
be910cced9
gamemode color change
2015-07-29 17:00:36 +02:00
Mini-Chiss
0e55ce1879
removed old hint
2015-07-29 16:54:30 +02:00
Mini-Chiss
1004203b34
fixed up some merge issues
2015-07-29 16:48:49 +02:00
William Burns
13af2cec74
Pick highest voting button
2015-07-29 15:44:29 +01:00
Mini-Chiss
52844d7b80
Merge branch 'EventGameUpdates'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
2015-07-29 16:41:35 +02:00
Mini-Chiss
71bedbe0fc
Merge branch 'WitherAssaultUpdate'
2015-07-29 16:37:29 +02:00
Mini-Chiss
c32e959f61
Merge branch 'SnowFightUpdate'
2015-07-29 16:36:33 +02:00
Morten
1a27dea32c
Why was these not added...
2015-07-29 16:35:57 +02:00
Mini-Chiss
d570cce1b0
Merge branch 'WitherAssaultUpdate'
2015-07-29 16:33:06 +02:00
Mini-Chiss
862cdae14f
team modes
2015-07-29 16:32:11 +02:00
Mini-Chiss
e47a343e2e
added mode for team games
2015-07-29 16:20:49 +02:00
Morten
f714bfbb0f
Adding testing achievement lol
2015-07-29 16:06:43 +02:00
Morten
b5d3ad0e0d
Adding perks
2015-07-29 16:05:43 +02:00
Sarah
9c5ca750cf
Improving /e mob command and implementing other commands.
2015-07-29 15:53:45 +02:00
Mini-Chiss
ab2c865ab3
better colors
2015-07-29 15:48:12 +02:00
Mini-Chiss
51cef64554
improved text
2015-07-29 15:29:12 +02:00
Mini-Chiss
deba3f23fa
Merge branch 'MPS-Maps'
2015-07-29 15:27:11 +02:00
William Burns
2b3fec754f
Colour change cause colour!
2015-07-29 14:25:38 +01:00
William Burns
3bc66f16b6
Woo a push
2015-07-29 14:22:49 +01:00
Mini-Chiss
b2db2e988f
Merge branch 'WitherAssaultUpdate'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
2015-07-29 15:13:28 +02:00
Mini-Chiss
1c2bd988f9
fixed spawns for team gameds
2015-07-29 15:10:21 +02:00
William Burns
f6e64d25a2
Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps
2015-07-29 13:27:45 +01:00
William Burns
f82defb1db
Whitelist
2015-07-29 13:27:26 +01:00
Mini-Chiss
30f0b3cb60
fixed close spawn stuff
2015-07-29 14:25:15 +02:00
Mini-Chiss
c9c3db70f3
Merge branch 'SSM2PlayerTeams'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-07-29 14:08:17 +02:00
Mini-Chiss
932fe197b4
Merge branch 'perm-changes'
...
Conflicts:
Plugins/.idea/encodings.xml
reverted it.
2015-07-29 14:06:21 +02:00
Mini-Chiss
ef89b96144
fixed game page bug
2015-07-29 14:02:56 +02:00
Mini-Chiss
b42be044ae
whtielisted MPS will be hidden from GUI
2015-07-29 13:20:20 +02:00
Mini-Chiss
e0ab853e57
Merge branch 'MPS-Maps'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
2015-07-29 13:03:05 +02:00
Mini-Chiss
c3e07522b4
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-07-29 12:22:11 +02:00
Ben Sihota
5af68e5628
Fulfill Shaun's request
2015-07-28 23:55:27 -07:00
Jonathan Williams
10549601f8
Merge pull request #21 in MIN/mineplex from Myst_LOBBERS to master
...
* commit 'd0a45461d07904f70b5e42dee391f69843fb3978':
Fixed bug with direct hit
Final tweaks. this is as good as it's goign to get! ;d
Tweaks
Fixed waller achievement thing
Fixed waller kit bc I was stupid before ;c
Added an exception for a map to make it night.
Various improvements.
Added an achievement, removed team one, touched up another. Swag.
2015-07-29 00:15:41 -05:00
Mysticate
d0a45461d0
Fixed bug with direct hit
2015-07-28 21:25:29 -06:00
Mysticate
3e0eb03112
Final tweaks. this is as good as it's goign to get! ;d
2015-07-28 20:39:55 -06:00
Mysticate
99946ef1f3
Tweaks
2015-07-28 17:29:51 -06:00
Aaron Brock
da94c30c02
Stuff
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-28 18:06:00 -04:00
Aaron Brock
971908d38b
Stuff
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-28 17:52:43 -04:00
Aaron Brock
832fb4638a
More things
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-28 17:42:00 -04:00
