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
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
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
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
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
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
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
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
8d7b7f8c8b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-03 10:56:54 +02:00
1d0bfbdf2d
fixed team sheep displaying in UHC lobby
2015-08-03 10:56:23 +02:00
6c0666c59b
Fix for server groups / teams.
2015-08-03 03:20:27 -05:00
b26e01649b
removed requirement for ach kit
2015-08-03 10:13:46 +02:00
eac8a3cd1c
fixed OITQ kit being unobtainable
2015-08-03 10:12:37 +02:00
a87b3a9284
fixed kits not sharing for team vers
2015-08-03 10:10:29 +02:00
8ec271bd82
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-03 10:06:30 +02:00
472409dc4b
fixed broadcast formatting
2015-08-03 10:06:15 +02:00
302252f193
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-03 02:56:31 -05:00
af0d769d3d
Fixed skywars quick shop.
...
Fixed issue with skywars not opening.
Fixed chest size for MPS
2015-08-03 02:56:24 -05:00
5bb2f80b8e
fixed text
2015-08-03 09:54:34 +02:00
6ccc897841
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-03 08:53:38 +01:00
72c473ad6b
removed annoying mineplex thing from subtext in news
2015-08-03 09:51:10 +02:00
530c40ad0c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-03 02:07:31 -05:00
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
2e1bccb3ad
DUN ALLOW overful
2015-08-03 09:02:28 +02:00
6a1e5d6bfc
changed item text
2015-08-03 08:23:49 +02:00
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
bfaa0e6849
Fixed event/mps hardcode.
2015-08-02 23:51:43 -05:00
58933fc855
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-02 21:19:00 -04:00
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
3b090d369d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-02 19:41:49 -05:00
a561bbbf12
Added hardcode for EVENT/MPS :D
2015-08-02 19:41:42 -05:00
38cc318387
Update JOOQ, downcast BigInteger to Long in stats for now
2015-08-02 19:36:24 -05:00
cadd21c18b
More bonus work
2015-08-02 19:12:39 -05:00
32a2687991
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-02 20:00:15 -04:00
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
a2250ea343
Fix for blocking logins if redis can't add account cache.
2015-08-02 18:59:13 -05:00
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
f520908f8d
Added team and portal location info to server group.
2015-08-02 17:52:51 -05:00
41189b9838
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-02 17:23:17 -05:00
fa2bcf7f69
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-02 18:21:01 -04:00
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
d3ba621e86
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-02 17:00:49 -05:00
0a84bd69d8
fixed some OITQ stuff
2015-08-02 23:17:23 +02:00
c2f6c402da
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-02 13:25:09 -04:00
612d967aa0
Add ability for auto-joining of gametypes to bypass manual server selection by player.
2015-08-02 13:24:59 -04:00
4cc810f1c0
Merge branch 'Myst_KITS'
2015-08-02 17:55:53 +02:00
8ea967b37e
fixed possible NPE
2015-08-02 12:35:25 +02:00
06be7b2cdd
Fix stats
2015-08-02 05:24:25 -05:00
db15ffad72
Bonus changes + Update jooq
2015-08-02 05:17:51 -05:00
638406254b
refactored a little so theres no data stored in the util
2015-08-02 12:07:00 +02:00
afc41c8831
converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity
2015-08-02 11:50:26 +02:00
11e49b9678
Some updates
2015-08-02 04:28:57 -05:00
ac4755a5a9
Fixed incorrect velocity
2015-08-02 11:24:34 +02:00
7910170327
fixed achievemnt amount
2015-08-01 18:39:18 +02:00
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
a964f343c7
xml files are ew
2015-08-01 14:55:01 +01:00
992c0fc36f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-01 01:12:24 -05:00
d3c5d0cbe6
Only store account cache stuff for 6 hours.
...
Update MOtd.
2015-08-01 01:12:01 -05:00
fd65f27f0f
Fix some typos/formatting issues
2015-07-31 10:01:19 -05:00
ae8d351145
Merge branch 'SSM2PlayerTeams'
2015-07-31 14:09:55 +02:00
fba10e4cbd
fixing the long term "Kit" bug ;D
2015-07-31 14:08:08 +02:00
b2c538b189
little tag fix.
2015-07-31 13:40:39 +02:00
60a1768821
Fixing Team display bug on disbanding.
2015-07-31 13:05:28 +02:00
b2a567673c
disabled sale msg
...
added double gem weekend
2015-07-31 09:53:52 +02:00
a3d768af6b
added res pack for HH
2015-07-30 15:07:40 +02:00
31fd19aab5
added res pack for CC
2015-07-30 15:07:05 +02:00
8d7c42134b
fixed mounts having nametags
2015-07-30 14:54:23 +02:00
8a5088e181
fixed SGT deathmatch not working
2015-07-30 14:47:59 +02:00
45d117a95a
added armor hotbar to smash
...
fixed scoreboard in snowfight
2015-07-30 14:45:28 +02:00
0cf333ec00
lowered win req
2015-07-30 14:12:17 +02:00
8ef93c0b33
Merge branch 'SSM2PlayerTeams'
2015-07-30 08:42:50 +02:00
30fa3b3309
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams
2015-07-30 03:07:41 +02:00
37e432f0b2
Git fix.
2015-07-30 03:07:21 +02:00
bf75594853
Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams
2015-07-30 02:33:51 +02:00
de4d0a7dc3
Fixing needler, projectiles in SW and "Banannas...".
2015-07-30 02:33:06 +02:00
b623f025ff
manually updating something
2015-07-29 14:31:11 -07:00
7c4786e7d2
Merge remote-tracking branch 'origin/master' into foo
2015-07-29 14:15:24 -07:00
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
db5c5a9888
*crosses fingers* please work!
2015-07-29 14:12:52 -07:00
97a144150b
fixed an NPE that was causing games not to end in MS
2015-07-29 21:51:18 +02:00
389bf7a74c
please work...
2015-07-29 10:55:03 -07:00
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
d583598477
Fixed double-half-slabs (line 68)
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-29 10:49:20 -07:00
be910cced9
gamemode color change
2015-07-29 17:00:36 +02:00
0e55ce1879
removed old hint
2015-07-29 16:54:30 +02:00
1004203b34
fixed up some merge issues
2015-07-29 16:48:49 +02:00
13af2cec74
Pick highest voting button
2015-07-29 15:44:29 +01:00
52844d7b80
Merge branch 'EventGameUpdates'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
2015-07-29 16:41:35 +02:00
71bedbe0fc
Merge branch 'WitherAssaultUpdate'
2015-07-29 16:37:29 +02:00
c32e959f61
Merge branch 'SnowFightUpdate'
2015-07-29 16:36:33 +02:00
Sarah
Mini-Chiss
Shaun Bennett
Mysticate
Jonathan Williams
AlexTheCoder
William Burns
Ty Sayers
fooify
Aaron Brock