Sarah
dd6d7b1b96
updating denial message
2016-01-02 16:45:15 +01:00
Morten
7e1b0b9110
Love you Sarah <3
2016-01-02 03:19:39 +01:00
Sarah
a06a0060aa
Fixing Disguise File
2016-01-02 01:53:19 +01:00
Sarah
a30c2b0d75
update /Disguise for Hub as well
2016-01-02 00:53:56 +01:00
Shaun Bennett
2e017fa5ca
Fix redis command
2015-12-31 16:11:51 -06:00
Shaun Bennett
8232d11cd1
Remove in game notifications, change sale message
2015-12-31 15:07:26 -06:00
Shaun Bennett
74eb04e5b4
Merge pull request #112 in MIN/mineplex from feature/new-year to develop
...
* commit '6b3a5416643389a7bcac8df93f40f492452971e5':
Accurate timings
Small edits
Flame
Made it activate in all lobbies via command.
Added a new years countdown to the hub.
2015-12-31 14:51:49 -06:00
William Burns
6b3a541664
Accurate timings
2015-12-31 18:53:57 +00:00
Shaun Bennett
456b0dbeb7
Merge pull request #110 in MIN/mineplex from feature/MasterBuilder-Unban to develop
...
* commit 'f83016e0074ce810f727276a0feb127ecd69098f':
Also really quickly fixed the Invisibility in lobby bug (hopefully)
Removed a weird query :/
Finished up the Unban feature...
Added a feature to unban clients across the network But there still a bug when you type a username of a none registered member. Will fix ASAP - likely after Mineware
2015-12-31 11:27:08 -06:00
William Burns
637baed830
Small edits
2015-12-31 01:24:58 +00:00
William Burns
874695cdf6
Flame
2015-12-31 00:50:53 +00:00
William Burns
a64dc6a8d4
Made it activate in all lobbies via command.
2015-12-31 00:46:31 +00:00
William Burns
1b40cece80
Added a new years countdown to the hub.
2015-12-30 20:04:01 +00:00
Keir
5841ab1101
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2015-12-29 23:47:00 +00:00
Shaun Bennett
7ad12d0a6b
Show Host Rank in private servers
2015-12-29 00:50:20 -06:00
Shaun Bennett
25d36b546a
Remove unnecessary files
2015-12-25 01:53:00 -06:00
Shaun Bennett
d08cfa0c4c
Holiday Gifts
2015-12-25 01:51:36 -06:00
Keir
cc421c1435
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2015-12-24 21:19:30 +00:00
Morten
f83016e007
Also really quickly fixed the Invisibility in lobby bug (hopefully)
2015-12-23 00:39:16 +01:00
Shaun Bennett
f4050fb1ff
Adjust GUI, fix beta button
2015-12-21 04:35:57 -05:00
Mysticate
0f5be6444b
Yo shaun debug this m8 ty
2015-12-21 02:23:59 -05:00
Shaun Bennett
f80648bfbc
Update DBPool to load from file
2015-12-18 00:32:07 -05:00
William Burns
2ac28c4fd5
Merge branches 'develop' and 'feature/player-data' of ssh://184.154.0.242:25565/min/mineplex into feature/player-data
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-12-17 21:44:31 +00:00
libraryaddict
66372c397b
First version of ResourcePackManager that handles all resource packs globally
2015-12-18 10:03:03 +13:00
William Burns
4077aa808f
Add to Arcade and Hub
2015-12-16 22:01:51 +00:00
Keir
6f82f8349d
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/.idea/modules.xml
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
2015-12-16 14:07:56 +00:00
Keir
6d9bcb8e66
Reworked serialization and store more data in json files for later parsing.
...
Internally store UUIDs for reports and convert them as needed for display to user.
Many other misc. changes and refactorings.
2015-12-15 21:30:45 +00:00
Shaun Bennett
5be91de006
Merge master
2015-12-13 23:40:18 -05:00
Mysticate
0e9e8c155f
Quick fix that I don't think i caused.
2015-12-13 19:11:06 -05:00
Mysticate
0c383f8bf4
Remove bad message
2015-12-13 18:58:03 -05:00
Mysticate
90145bf8e7
Merge branch 'master' of
...
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
update-xmaschaos
Conflicts:
Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs
Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
2015-12-13 18:57:35 -05:00
Mysticate
35ab40727b
XMAS UPDATE OMG :O
2015-12-13 18:55:21 -05:00
libraryaddict
e7213fdb7e
Remove project specific settings
2015-12-13 16:41:37 +13:00
libraryaddict
9058428484
Change ItemBuilder to have ItemFlag, change hub icons to not display weapon damage
2015-12-13 16:40:46 +13:00
Shaun Bennett
c470ad880d
Merge pull request #77 in MIN/mineplex from foo to master
...
* commit 'd7497ec09881047d7461630fac2c3b51bf37a06c': (23 commits)
Fixed Micro Battle icon not appearing in stats menu
Gravity's icon changed to ENDER_PORTAL_FRAME
world's smallest bugfix - admin->co-host
Fixed advertisement being able to be bypassed by spec and instant join
fixed naming pets non-alphanumeric characters
changed reference to premium ranks
removed important debug thing
fixed ssm enderman always facing south on teleport
fixed bacon blast exloding blocks
fixed shield smash and fissure affecting spectators
fixed slab issue with Assassin's Flash
Re-fixed Barbarian bug
Fixed SG Barbarian bug
SSM bug fix: magma cube flame dash doesn't make player invisible
fixed several smash bugs and one global issue
Slightly bumped Monster Maze jump time value
fixed bridge bug "Death Bomber counts suicides as well"
typo fix in legendary aura description
Update achievement kit reference text
Fixed tnt bug (SG)
...
2015-12-11 18:57:18 -06:00
xGamingDudex
6d1e4b6cab
Merge remote-tracking branch 'origin/master' into project-cosmetics
2015-12-11 18:09:09 +01:00
Cheese
d7f39bdfd8
costume sets
2015-12-11 20:59:55 +11:00
Jonathan Williams
95a81ef368
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
2015-12-11 01:26:20 -05:00
Cheese
66011cde8c
fixed player count
2015-12-11 17:25:23 +11:00
Jonathan Williams
222173ab17
Improved and implemented GameProfile caching.
2015-12-11 01:24:59 -05:00
Cheese
05a80b23a1
converting gadget text. (kill me now)
2015-12-11 16:07:02 +11:00
Shaun Bennett
d6aed5dff7
More work
2015-12-10 21:32:10 -05:00
Shaun Bennett
4d8b8bd58b
Fix errors, update cosmetic menu
2015-12-10 19:27:32 -05:00
Shaun Bennett
a9e6224eca
Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-12-10 19:21:33 -05:00
Shaun Bennett
5d96ceb41e
Let owner+ disguise as staff - easy way to check a player's rank
2015-12-10 19:20:11 -05:00
Shaun Bennett
72a8aaf556
Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-12-10 19:18:49 -05:00
xGamingDudex
5b0909012d
Renamed GadgetActivateEvent to GadgetEnable event
...
Some files didn't make it to prev commit
2015-12-11 01:07:47 +01:00
Shaun Bennett
851b613d2e
Now playing fix
2015-12-10 17:04:15 -05:00
Keir
8459cf0f95
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
2015-12-09 18:13:26 +00:00
Shaun Bennett
2e49611035
LinkedHashMaps, Buttons
2015-12-08 17:45:27 -05:00
Shaun Bennett
ca71f1f64f
Merge remote-tracking branch 'origin/master'
2015-12-08 14:32:17 -05:00
xGamingDudex
b1536547d3
Cosmetic Update 2
...
+ Item Coal
+ Freeze Cannon
+ Party Popper / Party Bomb
+ Snowball
+ Coal Fumes Particle
+ Snowman sneak trail/glide
+ Teaked stuff
2015-12-08 00:50:08 +01:00
Cheese
4ba2e8c96c
fixed old staff being stuck invis.
...
partially changed scoreboard to show playercount
2015-12-08 10:31:11 +11:00
Shaun Bennett
42a0354c9e
Now Playing, Preference to disable ads
2015-12-07 18:28:05 -05:00
Keir
67b3fe1d23
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
2015-12-07 18:11:40 +00:00
Shaun Bennett
3cdf8c4b08
Merge remote-tracking branch 'origin/master'
2015-12-07 04:23:33 -05:00
Shaun Bennett
2afbe23a7c
Load songs from update folder
2015-12-07 04:23:26 -05:00
Cheese
7b11baf24b
Christmas sale bossbars
2015-12-07 20:20:49 +11:00
Cheese
8c4615203c
sale message
2015-12-07 20:07:20 +11:00
Shaun Bennett
7b5db2d4fb
Hub Music, HubMusic Preference
2015-12-07 00:58:44 -05:00
Shaun Bennett
488895ea53
Note block player
2015-12-06 21:12:10 -05:00
Cheese
d095e14b4c
Merge branch 'monster-league'
2015-12-06 16:33:21 +11:00
Cheese
9880e9a3c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-06 16:32:59 +11:00
Shaun Bennett
32a6d572ee
Disable gadgets in arcade for player count > 40
2015-12-05 22:56:15 -05:00
Cheese
5aabd00972
set hub to christmas
...
removed snowball pickup
disabled arrows sticking into players from ALL projectiles
2015-12-06 14:55:28 +11:00
Keir
ef6fd0eaa3
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2015-12-05 00:05:05 +00:00
Cheese
4a53667539
gadget restructure
...
converted frost lord and titan particles into 4 subcategories.
2015-12-05 10:22:00 +11:00
fooify
348f2d8e4c
Merge remote-tracking branch 'origin/master' into foo
2015-12-03 16:31:16 -08:00
fooify
b04f139883
Fixed advertisement being able to be bypassed by spec and instant join
2015-12-01 19:26:52 -08:00
Keir
9508556d57
Refactor.
2015-12-01 22:47:51 +00:00
fooify
48ae23ebff
changed reference to premium ranks
2015-11-30 19:58:41 -08:00
xGamingDudex
509835ea64
Implemented new mount data system replacing instead of entities as data.
...
+ Removed some unnecessary code
+ Made StackManager use new mount system
This system also fixes a bug allowing players "hijack" some of the
mounts as it was not properly persistent.
2015-11-29 19:08:00 +01:00
Cheese
963caae719
Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes'
2015-11-28 16:00:28 +11:00
Sarah
e81aa72c7e
Merge branch 'rankdescriptions' of http://184.154.0.242:7990/scm/min/mineplex
2015-11-27 20:33:18 +01:00
Shaun Bennett
a5ebf9b059
Fixes for release
2015-11-27 05:53:57 -05:00
Cheese
ec0e2d2d64
fixed colors
2015-11-27 21:09:25 +11:00
Cheese
dda0e827e1
FGIXEXFSD
2015-11-27 20:46:33 +11:00
Cheese
936e61de57
gui changes :)
2015-11-27 19:42:04 +11:00
Shaun Bennett
0b0710458f
Hub updates/try to fix chiss stuff
2015-11-27 03:22:17 -05:00
Cheese
4e2f48b37e
Merge branch 'master' into clans-beta
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
2015-11-27 19:16:30 +11:00
Keir
edf93ec43f
Initial ChatSnap implementation.
2015-11-26 16:55:27 +00:00
libraryaddict
3e8a53562e
Add new hologram interaction thingy so holograms can catch interactions that they would normally block
2015-11-26 15:49:28 +13:00
Shaun Bennett
ff5d828dd7
Merge with master, lots of clans fixes/work
2015-11-25 14:50:49 -05:00
xGamingDudex
84fde1c087
Fixed double jump and entity ground tool.
...
Fixed isGrounded so that it doesn't return false positives when too
close to a wall.
Added 500ms recharge to double jump, preventing instant recharge
allowing players to jump twice before having to touch the ground again.
2015-11-25 16:42:32 +01:00
Cheese
7454cf7443
MS + Champs bugs, balance and more
2015-11-24 15:23:37 +11:00
Keir
dcca67e571
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-22 13:54:16 +00:00
Cheese
6eb1bef1c6
Merge branch 'master' into minestrike-update
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
2015-11-21 11:09:28 +11:00
Cheese
0bc64fec16
Proxy limit fixes
2015-11-21 09:28:15 +11:00
Keir
ad16c59ab7
Forgot to commit this crucial part...
2015-11-20 22:05:10 +00:00
AlexTheCoder
386032a4f5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-20 06:03:30 -05:00
AlexTheCoder
f51358552a
-B
2015-11-20 05:57:29 -05:00
Jonathan Williams
700e4c9a1f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-19 22:12:08 -06:00
Cheese
3a5ab3f17c
Merge branch 'master' into monster-league
2015-11-20 11:51:07 +11:00
Keir
bceb69bc12
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
2015-11-19 23:52:02 +00:00
Sarah
ad280c96c9
adding interactive Chat elements.
2015-11-19 20:45:40 +01:00
William Burns
4620a5a162
Hub fix
2015-11-18 21:47:52 +00:00
Keir
cb5672b94c
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-18 20:34:24 +00:00
Jonathan Williams
88dbe261db
Added logging for stacker.
2015-11-15 18:34:35 -06:00
Cheese
e7b86b4462
hub skytext
2015-11-14 13:05:11 +11:00
Cheese
9de3981dec
ms update
2015-11-13 11:24:11 +11:00
