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
Sarah
8ef1a524c1
updating /disguise
2015-12-31 12:01:24 +01: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
William Burns
f1c7424939
Fixing hotbar
2015-12-29 15:19:09 +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
fooify
fe337986bf
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2015-12-28 16:16:10 -08:00
Virizion
8a8d5b088b
Switch to 7x7 builds.
2015-12-28 16:48:03 -05:00
Virizion
3d9a252868
Added auto pickup and fixed some stuff.
2015-12-27 15:26:43 -05:00
Virizion
162b3eb33f
Stopped a bunch of block events.
2015-12-27 14:34:24 -05:00
Virizion
845014b677
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2015-12-25 15:49:41 -05: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
fooify
41f56e9853
Lots of typo fixes and such
2015-12-24 11:13:54 -08:00
fooify
b356bce177
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2015-12-24 11:09:08 -08:00
Virizion
b0f8edb0f9
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2015-12-23 18:25:52 -05:00
NewGarbo
aa50c4762f
fixes (?)
2015-12-23 18:55:44 +00: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
NewGarbo
369687b5dd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
...
Conflicts:
Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs
2015-12-23 18:31:51 +00:00
NewGarbo
ff24ebc9f4
lots of changes that i can't remember at this point
2015-12-23 18:22:20 +00:00
William Burns
08b5e7b4db
Working loadouts.
2015-12-23 09:21:43 +00: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
fooify
0ac2158988
i before e!
2015-12-22 11:02:57 -08:00
fooify
255dd0bdb3
fixed cosmetic menu item dropping bug
2015-12-22 11:02:37 -08:00
fooify
592fcbd282
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2015-12-22 10:55:11 -08:00
fooify
a8d9956846
more grammatical errors hast been fixed
2015-12-22 10:35:20 -08:00
Virizion
0322ae1217
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-12-22 00:02:21 -05:00
William Burns
b255c58653
Merge branches 'develop' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-21 21:56:08 +00: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
