Shaun Bennett
db9db558a0
Update GUI slots
2015-12-14 02:56:07 -05:00
Shaun Bennett
98bcd44003
Merge remote-tracking branch 'origin/master'
2015-12-14 02:50:08 -05:00
Shaun Bennett
4afca01ad0
Treasures!
2015-12-14 02:49:51 -05:00
Cheese
fac255db12
art
2015-12-14 18:24:05 +11:00
Cheese
c508b5ea96
chest visuals
2015-12-14 18:13:19 +11:00
Shaun Bennett
063c87c4fe
Merge remote-tracking branch 'origin/master'
2015-12-14 00:29:11 -05:00
Shaun Bennett
cdbcae7e3e
Cosmetic Menu Update
2015-12-14 00:28:28 -05:00
Cheese
048a9a81b8
gadget ammo should no logner be purchasable
2015-12-14 16:20:39 +11:00
Virizion
93c13d138d
Remove some debug stuff I forgot to remove.
2015-12-14 00:10:45 -05:00
Virizion
09643d3e61
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-14 00:08:32 -05:00
Cheese
7f9e5c4ec9
more coal
2015-12-14 16:06:49 +11:00
Cheese
f6f04fe256
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 16:04:05 +11:00
Cheese
55fffdad59
fixed some colors
2015-12-14 16:03:51 +11:00
Virizion
b3b41e453b
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-14 00:01:41 -05:00
Virizion
d8f44434ff
Fixed a bunch of bugs. Still need to fix clicking compass ending game.
2015-12-14 00:00:40 -05:00
Shaun Bennett
e8b0e5dd8e
Fix IntellIJ Files
2015-12-13 23:51:47 -05:00
Shaun Bennett
8e31c79c58
Merge remote-tracking branch 'origin/master'
2015-12-13 23:46:46 -05:00
Cheese
bccade55bc
reduced coal fumes size
2015-12-14 15:43:45 +11:00
Shaun Bennett
85f0f6001e
Merge pull request #96 in MIN/mineplex from project-cosmetics to master
...
* commit '5be91de006ec06a3c3a91dfb74b1eeac493631a9': (37 commits)
Cosmetic Menu Update
Added fake skin data
Small tweaks
BOB ROSS
added a hint to how many more coal you need to your next prize.
fixing up coal things
changed coal item rewards to 3 tier :)
set bonuses item gadget gui update
fixed suits
costume sets
fixed typo
more set stuff
improved cosmetic set implementation
set display in gui
fixed up gui items
gadget gui overhaul
fixed player count
more cosmetic stuff :)
and the mounts
finished cosmetic names
...
2015-12-13 22:41:13 -06:00
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
Virizion
54911bb213
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-13 19:54:57 -05:00
Virizion
12eba41975
Fixed corner stairs.
2015-12-13 19:52:32 -05: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
Shaun Bennett
6c2b40d63a
Cannon work
2015-12-13 15:40:32 -05:00
William Burns
d91e4ab4f7
Another door bug, and a title fix.
2015-12-13 20:27:37 +00:00
Shaun Bennett
677e95a7fd
Update IntellIJ grouping
2015-12-13 14:05:28 -05:00
Sarah
63f5794c79
Only fix Giant facings is prepare Phase
2015-12-13 14:31:21 +01:00
William Burns
e31124e212
Health looks nicer.
2015-12-13 13:29:46 +00:00
William Burns
4fad564e15
Bug fixes. Title shortened.
2015-12-13 12:50:06 +00: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
Virizion
8bcc36adb1
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-13 01:39:42 -05:00
Virizion
ec86cad7ee
Changed descriptions.
2015-12-13 01:38:38 -05:00
libraryaddict
e7213fdb7e
Remove project specific settings
2015-12-13 16:41:37 +13:00
