Shaun Bennett
962efe4a61
Fix not being able to join games through portals
2016-01-04 16:41:07 -05:00
Shaun Bennett
ed81411373
Fix carl bonus messages
2016-01-04 15:58:27 -05:00
Shaun Bennett
c50fb52a88
Disable New Years Countdown
2016-01-04 14:21:21 -05:00
Shaun Bennett
c739ecc26d
Fix forcefield for YOUTUBE_SMALL
2016-01-04 14:20:39 -05: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
Shaun Bennett
b28ad2dca7
Merge pull request #111 in MIN/mineplex from feature/typewars-monitor to develop
...
* commit 'efbd1c52d28b7d0a0b58663c25ba14345409573a':
Monitoring for josh + the mods
Fix Type Wars stat icon
2015-12-31 11:18:16 -06:00
Mysticate
efbd1c52d2
Merge remote-tracking branch 'origin/master' into feature/typewars-antimacrorekter
2015-12-31 03:01:23 -05:00
Mysticate
5ff9d1985b
Monitoring for josh + the mods
2015-12-31 03:00:40 -05: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
Shaun Bennett
55cdf4148a
Merge branch 'develop'
2015-12-29 03:21:03 -06:00
Shaun Bennett
16ee74885e
Add maintenance line
2015-12-29 02:52:53 -06:00
Shaun Bennett
7ad12d0a6b
Show Host Rank in private servers
2015-12-29 00:50:20 -06:00
Shaun Bennett
7104f1363a
Give YT rank access to extra preferences
2015-12-29 00:34:18 -06:00
Shaun Bennett
c680d91b56
Nerf TypeWars gems (again)
2015-12-25 03:12:04 -06:00
Shaun Bennett
dd8e91e463
Update MOTD
2015-12-25 03:03:53 -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
libraryaddict
1d4a5e5804
Clean up imports, set resource pack on clans.
2015-12-24 07:47:05 +13:00
libraryaddict
000b1f85b7
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop
2015-12-24 07:41:55 +13:00
libraryaddict
67bdc6832f
Tentative beginnings for clans resource packs
2015-12-24 07:40:49 +13:00
Morten
f83016e007
Also really quickly fixed the Invisibility in lobby bug (hopefully)
2015-12-23 00:39:16 +01:00
Morten
8c399f03da
Removed a weird query :/
...
Status: Finished
2015-12-22 21:36:19 +01:00
Morten
9336eb19fa
Finished up the Unban feature...
2015-12-22 21:31:57 +01:00
Shaun Bennett
2ccd7a5de0
Fix Type Wars stat icon
2015-12-21 13:20:04 -05:00
Shaun Bennett
893fea49ab
Merge pull request #108 in MIN/mineplex from develop to master
...
* commit '7a72762c78ff56b3390fef809e3f57f51e755d14': (81 commits)
Update MOTD
Updating Holiday Achievements
Updating Stats GUI
Achievements....
changing Category
adding PM message.
fixing Kit NPEs
Fixing ending Stats.
Wrong iterator!
Update game display
Adjust GUI, fix beta button
Yo shaun debug this m8 ty
Fixing Gems
adjusting some timings
Fixing Tutorial Minion
fixing last commit
adding Tutorial notification
Adding Tutorial notification
nuke delay and Stats
Fixing some nuke stuff, Giant noises only for own Team and "Giant under attack message", spelling fixes
...
2015-12-21 12:19:10 -06:00
Shaun Bennett
7a72762c78
Update MOTD
2015-12-21 12:56:37 -05:00
Shaun Bennett
c63014b51f
Type-Wars merge
2015-12-21 12:49:10 -05:00
Sarah
a5436d63c0
Updating Holiday Achievements
2015-12-21 18:45:26 +01:00
Sarah
7c66bdbbde
Updating Stats GUI
2015-12-21 18:25:44 +01:00
Sarah
010b1b0a5d
Achievements....
2015-12-21 18:08:11 +01:00
Sarah
6e3274ff2f
changing Category
2015-12-21 18:06:00 +01:00
Sarah
f15c318e5c
adding PM message.
2015-12-21 18:02:25 +01:00
Sarah
082b5e156c
fixing Kit NPEs
2015-12-21 17:48:17 +01:00
Sarah
ff5761cc1d
Fixing ending Stats.
2015-12-21 17:44:15 +01:00
Sarah
590da2128c
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
2015-12-21 17:43:51 +01:00
Morten
1726aa2530
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-21 12:58:19 +01:00
Shaun Bennett
5469289d82
Wrong iterator!
2015-12-21 06:57:56 -05:00
Shaun Bennett
fae2a5d2bf
Update game display
2015-12-21 04:40:30 -05:00
Shaun Bennett
a235103066
Merge pull request #106 in MIN/mineplex from update-menu to develop
...
* commit 'f4050fb1ff54dbe4639b0258eff53360d800d0b9':
Adjust GUI, fix beta button
Yo shaun debug this m8 ty
2015-12-21 03:36:46 -06:00
Shaun Bennett
f4050fb1ff
Adjust GUI, fix beta button
2015-12-21 04:35:57 -05:00
Shaun Bennett
99285b2ac8
Merge remote-tracking branch 'remotes/origin/type-wars' into develop
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
2015-12-21 03:50:55 -05:00
Mysticate
0f5be6444b
Yo shaun debug this m8 ty
2015-12-21 02:23:59 -05:00
Sarah
816da0f633
Fixing Gems
2015-12-20 12:00:32 +01:00
