NewGarbo
1da04b84b5
test push (change version to 0.17d)
2015-12-15 11:57:33 +00:00
NewGarbo
c63bac6433
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-12-15 11:42:16 +00:00
libraryaddict
47ad563596
Spawn nametags far far away from players
2015-12-15 22:46:30 +13:00
Sarah
cf58fdee4a
trying to fix the spigot Chat spam thingy.
2015-12-15 05:29:59 +01:00
Cheese
871c97f7af
changed chest %'s
2015-12-15 09:25:44 +11:00
Sarah
afa45c47ca
Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into pregametutorial
2015-12-14 14:23:42 +01:00
NewGarbo
9137fcfe40
loads of changes (pvp timer, unsafe stuff)
2015-12-14 12:39:00 +00:00
Cheese
0f38c7b287
increased minimum coal
2015-12-14 22:12:50 +11:00
Cheese
951cd65903
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 22:05:22 +11:00
Cheese
045bc760c2
increassed cooldown, people getting trapped perm
2015-12-14 22:05:08 +11:00
Cheese
809ff649be
lowered rarities a bit
2015-12-14 22:03:09 +11:00
Shaun Bennett
7181a26e58
Remove pointless equals()
2015-12-14 05:56:39 -05:00
Cheese
9e72e5adf1
nicer text
2015-12-14 21:43:11 +11:00
Cheese
daa9f165b1
removed coins from gadgets
2015-12-14 21:41:47 +11:00
Cheese
52394c89dd
fixed skins beign wrong way around
2015-12-14 21:34:27 +11:00
Cheese
0ecd5a05f5
fixed hat ownership
...
reduced coal cost
2015-12-14 21:32:06 +11:00
Cheese
00de6880ba
fixed wrong types
2015-12-14 21:25:30 +11:00
Cheese
342e9f2345
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 20:53:49 +11:00
Cheese
1189535748
icon fixes
2015-12-14 20:53:34 +11:00
Shaun Bennett
816c057eb3
Notify server about opening chest
2015-12-14 04:49:44 -05:00
Shaun Bennett
6ec8ec4c01
Merge pull request #97 in MIN/mineplex from william-gladiators to master
...
* commit 'd91e4ab4f756746b31c7ebdd3e7d33c139ea7d30':
Another door bug, and a title fix.
Health looks nicer.
Bug fixes. Title shortened.
2015-12-14 03:45:55 -06:00
Shaun Bennett
daf1d29ce0
Fix Carl
2015-12-14 04:44:11 -05:00
Shaun Bennett
50bf97ae4a
Fancy treasure changes
2015-12-14 04:19:15 -05:00
Cheese
670eaa1954
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 19:16:03 +11:00
Shaun Bennett
e4fd97467f
More treasure changes
2015-12-14 03:14:52 -05:00
Cheese
288c20fc74
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 19:13:05 +11:00
Cheese
9e35399d1d
rarities tweaked + shards
2015-12-14 19:09:55 +11:00
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
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
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
