Shaun Bennett
5be91de006
Merge master
2015-12-13 23:40:18 -05:00
Cheese
f26c31b7ec
xmas a little harder
2015-12-14 15:33:09 +11:00
Shaun Bennett
fe3431ba04
Cosmetic Menu Update
2015-12-13 23:31:21 -05:00
Cheese
1073981778
Merge branch 'master' into update-xmaschaos
2015-12-14 15:30:15 +11:00
Cheese
94169a5b8a
it made me push it :(
2015-12-14 15:29:34 +11:00
Cheese
c34ac3ec52
xmas
2015-12-14 15:21:43 +11:00
Jonathan Williams
dcf3c1ea88
Deleted and added new Cache since renaming was jacked up.
2015-12-13 23:14:17 -05:00
Mysticate
42244ae798
Snowman AI fix
2015-12-13 22:43:11 -05:00
Mysticate
a04eaddc42
Fixed bump
2015-12-13 22:25:18 -05:00
libraryaddict
f90484c37f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-12-14 15:43:03 +13:00
libraryaddict
b5bdf7ced4
Remove custom name on players on join and arcade spectator
2015-12-14 15:42:32 +13:00
Mysticate
0dd7db27cd
FIXED FORAMTTING
2015-12-13 19:49:41 -05:00
Mysticate
a827f95eb4
Fixed scoreboard. VIVA LA FIESTA
2015-12-13 19:24:24 -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
xGamingDudex
64fb2b11d8
Added fake skin data
...
+Moved hats to use fake non-changing skin data
+Added Rudolph hat
+Added Grinch hat
+Added suport for fake skins on DisguisePlayer
+Tweaked PartyPopper
2015-12-13 23:09:25 +01:00
Cheese
b095fa9efe
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-13 21:15:32 +11:00
Cheese
011a194dc6
fixed exploit
2015-12-13 21:14:57 +11: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
402530d671
Merge pull request #94 in MIN/mineplex from william-gladiators to master
...
* commit '0d4bd91b573ca251d15471b6454452bd4ebca195':
lag detection thing
Scoreboard change and breaking blocks.
Couple of fixes
2015-12-11 18:57:52 -06: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
William Burns
0d4bd91b57
lag detection thing
2015-12-11 22:47:07 +00:00
xGamingDudex
6d1e4b6cab
Merge remote-tracking branch 'origin/master' into project-cosmetics
2015-12-11 18:09:09 +01:00
xGamingDudex
9af6fd6904
Merge branch 'project-cosmetics' of
...
http://JustSomeDude@184.154.0.242:7990/scm/min/mineplex.git into
project-cosmetics
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPartyPopper.java
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountBabyReindeer.java
2015-12-11 18:06:35 +01:00
William Burns
6456d7bd66
Scoreboard change and breaking blocks.
2015-12-11 16:55:15 +00:00
William Burns
1dcbf5f7fd
Couple of fixes
2015-12-11 16:34:04 +00:00
xGamingDudex
ba087d119a
Small tweaks
2015-12-11 17:31:05 +01:00
Cheese
2ffd1d4595
BOB ROSS
2015-12-11 23:11:33 +11:00
Cheese
d5612a8f27
added a hint to how many more coal you need to your next prize.
2015-12-11 23:09:06 +11:00
Cheese
39f5f70a5f
fixing up coal things
2015-12-11 22:43:34 +11:00
Shaun Bennett
ac6d3c2c8f
merge with master
2015-12-11 06:27:23 -05:00
Cheese
7c432461c9
changed coal item rewards to 3 tier :)
2015-12-11 22:25:14 +11:00
Cheese
e01a5369fd
set bonuses
...
item gadget gui update
2015-12-11 21:53:39 +11:00
Cheese
40c2fdc3fc
fixed suits
2015-12-11 21:11:35 +11:00
Cheese
d7f39bdfd8
costume sets
2015-12-11 20:59:55 +11:00
Cheese
7fc08f34a7
fixed typo
2015-12-11 20:34:01 +11:00
Cheese
f717a5f8cc
more set stuff
2015-12-11 20:30:41 +11:00
Cheese
0cda29e135
improved cosmetic set implementation
2015-12-11 20:08:36 +11:00
Cheese
a6f664006f
set display in gui
2015-12-11 20:01:54 +11:00
Cheese
d8a5edf9e9
fixed up gui items
2015-12-11 19:24:19 +11:00
Cheese
61a8d2825e
gadget gui overhaul
2015-12-11 19:20:13 +11:00
William Burns
523c1875ef
fix
2015-12-11 06:58:11 +00: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
Jonathan Williams
b5c157c123
Changed PlayerCache to Cache
2015-12-11 01:24:16 -05:00
Cheese
98e91d29f6
more cosmetic stuff :)
2015-12-11 17:21:54 +11:00
