83218c9a73
Pushing unfinished code for laptop
2014-12-16 11:42:06 -06:00
2e7d101850
added material/data for gametypes
2014-12-16 12:26:37 +11:00
75cf80652c
Remove customnametrue from horse mount
2014-12-16 01:36:42 +13:00
ee363f55a6
re-enabled gems for CC
2014-12-15 15:50:25 +11:00
d7eb01e8f0
fixed CC Bug :D
2014-12-15 15:49:52 +11:00
e02bcd8b84
Revert the revert of the revert.
2014-12-14 22:58:49 -05:00
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
95081a8ab7
Gems cannot be given multiple times for certain things (prevents bugs giving mass gems)
2014-12-15 14:33:38 +11:00
230c6ede13
Disabled gem reward in ChristmasChaos
2014-12-14 22:14:41 -05:00
19dfafe9ed
disabled gems
2014-12-15 13:58:36 +11:00
909c0d9be7
christmas no longer rewards gems
2014-12-15 13:56:48 +11:00
4482e46250
Changed int to atomic for concurrency
2014-12-14 21:53:55 -05:00
eefa4de838
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-14 20:50:35 -05:00
2a58b822a0
Safeguard on connecting vlaues.
2014-12-14 20:50:19 -05:00
d0f8a6a063
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-15 12:26:25 +11:00
9136165d4f
fixed christmas elf name
...
pet names now have limited range
2014-12-15 12:24:40 +11:00
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
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
5b67e2182a
Added disguise to Pet Manager for eventual wither disguised pet.
2014-12-14 02:30:39 -05:00
718e02047e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-13 20:22:48 -05:00
28dc4059a4
Don't reset Lobby index else lower lobby counts can crash due to spam connects.
2014-12-13 20:22:37 -05:00
4e0c91c26d
Adjusted limit on CC game.
2014-12-13 20:22:01 -05:00
80c17c789c
Updated BungeeCord to newest custom version.
2014-12-13 20:21:34 -05:00
0198120c70
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-13 12:39:20 +11:00
78a34b1517
hopefully fixed a bug where pumpking king despawned.
...
removed 11 disc from loot
2014-12-13 11:55:12 +11:00
2f98d95737
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-12 06:47:58 -05:00
fb8b00200c
deep snow no longer slowz
2014-12-12 21:57:43 +11:00
5d1a8af347
fixed arctic armor killing players in hub
2014-12-12 21:53:39 +11:00
514445557b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-12 05:32:13 -05:00
dfd17b1793
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-12 21:29:46 +11:00
3f24325c3c
removed +50% player limit for CC
2014-12-12 21:23:01 +11:00
52fad77297
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-12 05:21:45 -05:00
771c7cba0a
Changed playercount back to current +1
2014-12-12 05:21:23 -05:00
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
56bc8dc232
Trying to do some hacky things!
2014-12-12 04:18:47 -06:00
14c6c1ca4b
Merge pull request #6 from feature/animated-motd to master
...
* commit 'b65ca5f7dd8e07d2d65e59d08a7d907d29b172d6':
Update bungee cord, comment out debug stuff
Fix icon animation + some more tweaks
Some adjustments
Motd stuff for xmas update
pushing this for my laptop. not final code!
2014-12-12 02:54:30 -06:00
b65ca5f7dd
Update bungee cord, comment out debug stuff
2014-12-12 02:53:56 -06:00
4fd6ed80c4
final xmas Updates
...
xmas hub
2014-12-12 19:44:04 +11:00
7b42bd661f
Fix icon animation + some more tweaks
2014-12-12 01:13:02 -06:00
ac02201262
Some adjustments
2014-12-12 00:48:08 -06:00
30a7eea628
Motd stuff for xmas update
2014-12-12 00:28:29 -06:00
9a16616e6c
Add fix for wither bossbar and add a checkpoint hologram for snake bit in xmas
2014-12-12 12:40:23 +13:00
adafc95d3f
boss weaker
2014-12-12 10:26:32 +11:00
2be4d7d6d2
XMAS UPDATE
2014-12-12 10:03:25 +11:00
93dc3c9090
pushing this for my laptop. not final code!
2014-12-11 09:17:19 -06:00
3af8a90d3b
near final xmas push :D
2014-12-11 15:23:01 +11:00
3a8ab0afb0
Uncomment SleighHorse
2014-12-11 15:24:10 +13:00
6b1fa91565
Xmas Updates
2014-12-11 12:42:06 +11:00
86b9d8342f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Sleigh.java
2014-12-11 11:27:47 +11:00
ee8d699bd1
Minor text cleanup in the sleighhorse code because you guys seem to like that
2014-12-11 07:25:40 +13:00
Shaun Bennett
Chiss
libraryaddict
Jonathan Williams