Shaun Bennett
|
62a621270e
|
More work on private server gui. Still need to do a bunch of refactoring
|
2014-12-16 13:43:01 -06:00 |
|
Shaun Bennett
|
83218c9a73
|
Pushing unfinished code for laptop
|
2014-12-16 11:42:06 -06:00 |
|
libraryaddict
|
5b1f4f16fb
|
Modify giveGems for new give gems
|
2014-12-16 21:58:17 +13:00 |
|
Chiss
|
a433ad764d
|
Wither Morph
Legend Particle
|
2014-12-16 16:18:09 +11:00 |
|
Jonathan Williams
|
c43ee95c55
|
Added 1.8 hooks for disguise setName and getName
Refactored method names in some disguise classes.
|
2014-12-15 21:46:14 -05:00 |
|
Jonathan Williams
|
0cb5939794
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-12-15 21:30:20 -05:00 |
|
Jonathan Williams
|
6941c1c827
|
Added a few more items for BuildingShop in Clans.
|
2014-12-15 21:29:50 -05:00 |
|
Chiss
|
1907014db4
|
disguise wither update
|
2014-12-16 13:28:59 +11:00 |
|
libraryaddict
|
7e6b6bd1b2
|
Add evolve effect
|
2014-12-16 15:23:31 +13:00 |
|
libraryaddict
|
6d3a1116b9
|
Changes to SnD
|
2014-12-16 15:14:10 +13:00 |
|
libraryaddict
|
913f827ced
|
Changes to SnD
|
2014-12-16 15:14:09 +13:00 |
|
libraryaddict
|
da6b4b6a79
|
Current work for SnD
|
2014-12-16 15:14:09 +13:00 |
|
libraryaddict
|
0026127647
|
More work done on SnD
|
2014-12-16 15:14:08 +13:00 |
|
libraryaddict
|
f5d9d8dcf0
|
Modify scoreboard to use teams to support duplicate lines and up to 32 in length
|
2014-12-16 15:14:08 +13:00 |
|
libraryaddict
|
715862b365
|
Commit current changes
|
2014-12-16 15:14:07 +13:00 |
|
libraryaddict
|
6d7a71d043
|
Modifications for SnD test
|
2014-12-16 15:14:07 +13:00 |
|
Chiss
|
2e7d101850
|
added material/data for gametypes
|
2014-12-16 12:26:37 +11:00 |
|
libraryaddict
|
75cf80652c
|
Remove customnametrue from horse mount
|
2014-12-16 01:36:42 +13:00 |
|
Chiss
|
ee363f55a6
|
re-enabled gems for CC
|
2014-12-15 15:50:25 +11:00 |
|
Chiss
|
d7eb01e8f0
|
fixed CC Bug :D
|
2014-12-15 15:49:52 +11:00 |
|
Jonathan Williams
|
e02bcd8b84
|
Revert the revert of the revert.
|
2014-12-14 22:58:49 -05:00 |
|
Chiss
|
d1be64d7e7
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
|
2014-12-15 14:56:09 +11:00 |
|
Chiss
|
95081a8ab7
|
Gems cannot be given multiple times for certain things (prevents bugs giving mass gems)
|
2014-12-15 14:33:38 +11:00 |
|
Jonathan Williams
|
230c6ede13
|
Disabled gem reward in ChristmasChaos
|
2014-12-14 22:14:41 -05:00 |
|
Chiss
|
19dfafe9ed
|
disabled gems
|
2014-12-15 13:58:36 +11:00 |
|
Chiss
|
909c0d9be7
|
christmas no longer rewards gems
|
2014-12-15 13:56:48 +11:00 |
|
Jonathan Williams
|
4482e46250
|
Changed int to atomic for concurrency
|
2014-12-14 21:53:55 -05:00 |
|
Jonathan Williams
|
eefa4de838
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-12-14 20:50:35 -05:00 |
|
Jonathan Williams
|
2a58b822a0
|
Safeguard on connecting vlaues.
|
2014-12-14 20:50:19 -05:00 |
|
Chiss
|
d0f8a6a063
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-12-15 12:26:25 +11:00 |
|
Chiss
|
9136165d4f
|
fixed christmas elf name
pet names now have limited range
|
2014-12-15 12:24:40 +11:00 |
|
Jonathan Williams
|
0111db5610
|
Added safe check for server monitor so it doesn't go off the rails during a network reboot.
|
2014-12-14 05:54:49 -05:00 |
|
Jonathan Williams
|
9fb2231d76
|
Added connecting clients as a factor for status snapshot.
Added online check for DonationManager rewarding local info.
|
2014-12-14 02:32:52 -05:00 |
|
Jonathan Williams
|
5b67e2182a
|
Added disguise to Pet Manager for eventual wither disguised pet.
|
2014-12-14 02:30:39 -05:00 |
|
Jonathan Williams
|
718e02047e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-12-13 20:22:48 -05:00 |
|
Jonathan Williams
|
28dc4059a4
|
Don't reset Lobby index else lower lobby counts can crash due to spam connects.
|
2014-12-13 20:22:37 -05:00 |
|
Jonathan Williams
|
4e0c91c26d
|
Adjusted limit on CC game.
|
2014-12-13 20:22:01 -05:00 |
|
Jonathan Williams
|
80c17c789c
|
Updated BungeeCord to newest custom version.
|
2014-12-13 20:21:34 -05:00 |
|
Chiss
|
0198120c70
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-12-13 12:39:20 +11:00 |
|
Chiss
|
78a34b1517
|
hopefully fixed a bug where pumpking king despawned.
removed 11 disc from loot
|
2014-12-13 11:55:12 +11:00 |
|
Jonathan Williams
|
2f98d95737
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-12-12 06:47:58 -05:00 |
|
Chiss
|
fb8b00200c
|
deep snow no longer slowz
|
2014-12-12 21:57:43 +11:00 |
|
Chiss
|
5d1a8af347
|
fixed arctic armor killing players in hub
|
2014-12-12 21:53:39 +11:00 |
|
Jonathan Williams
|
514445557b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-12-12 05:32:13 -05:00 |
|
Chiss
|
dfd17b1793
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-12-12 21:29:46 +11:00 |
|
Chiss
|
3f24325c3c
|
removed +50% player limit for CC
|
2014-12-12 21:23:01 +11:00 |
|
Jonathan Williams
|
52fad77297
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-12-12 05:21:45 -05:00 |
|
Jonathan Williams
|
771c7cba0a
|
Changed playercount back to current +1
|
2014-12-12 05:21:23 -05:00 |
|
Shaun Bennett
|
e19c76575b
|
Merge pull request #7 from feature/animated-motd to master
* commit '56bc8dc2325d00cbd95247bcc1d270ba0ed703a1':
Trying to do some hacky things!
|
2014-12-12 04:19:38 -06:00 |
|
Shaun Bennett
|
56bc8dc232
|
Trying to do some hacky things!
|
2014-12-12 04:18:47 -06:00 |
|