Shaun Bennett
|
6eb3efa0b6
|
More changes
|
2014-12-16 20:37:14 -06:00 |
|
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 |
|
Chiss
|
2e7d101850
|
added material/data for gametypes
|
2014-12-16 12:26:37 +11: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 |
|
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 |
|
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
|
5b67e2182a
|
Added disguise to Pet Manager for eventual wither disguised pet.
|
2014-12-14 02:30:39 -05:00 |
|
Chiss
|
78a34b1517
|
hopefully fixed a bug where pumpking king despawned.
removed 11 disc from loot
|
2014-12-13 11:55:12 +11:00 |
|
Chiss
|
3f24325c3c
|
removed +50% player limit for CC
|
2014-12-12 21:23:01 +11:00 |
|
Chiss
|
4fd6ed80c4
|
final xmas Updates
xmas hub
|
2014-12-12 19:44:04 +11:00 |
|
libraryaddict
|
9a16616e6c
|
Add fix for wither bossbar and add a checkpoint hologram for snake bit in xmas
|
2014-12-12 12:40:23 +13:00 |
|
Chiss
|
adafc95d3f
|
boss weaker
|
2014-12-12 10:26:32 +11:00 |
|
Chiss
|
2be4d7d6d2
|
XMAS UPDATE
|
2014-12-12 10:03:25 +11:00 |
|
Chiss
|
3af8a90d3b
|
near final xmas push :D
|
2014-12-11 15:23:01 +11:00 |
|
libraryaddict
|
3a8ab0afb0
|
Uncomment SleighHorse
|
2014-12-11 15:24:10 +13:00 |
|
Chiss
|
6b1fa91565
|
Xmas Updates
|
2014-12-11 12:42:06 +11:00 |
|
Chiss
|
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 |
|
libraryaddict
|
ee8d699bd1
|
Minor text cleanup in the sleighhorse code because you guys seem to like that
|
2014-12-11 07:25:40 +13:00 |
|
libraryaddict
|
2a13255af3
|
Turn christmas chaos game horses into reindeer
|
2014-12-11 07:23:47 +13:00 |
|
Chiss
|
068a0901f9
|
xmas updatre
|
2014-12-11 00:16:15 +11:00 |
|
Chiss
|
358d5fde44
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-12-10 22:38:19 +11:00 |
|
Chiss
|
450d3eb923
|
merge
|
2014-12-10 22:38:08 +11:00 |
|
Jonathan Williams
|
c4fee8e681
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
Plugins/Mineplex.Hub/.classpath
|
2014-12-10 03:34:53 -08:00 |
|
Jonathan Williams
|
ea034812b9
|
Fixed path finder crap in UtilEnt
Cleaned up unused code in OutfitRaveSuit
Fixed eclipse bug for NotificationManager
Removed christmas/Sleigh columns.
|
2014-12-10 03:32:35 -08:00 |
|
Chiss
|
db8e0484ab
|
missing files + new pet
|
2014-12-10 18:23:22 +11:00 |
|
Chiss
|
0aba82eee6
|
fixed some eclipse java6 stuff with mail
Christmas game update
|
2014-12-10 15:38:57 +11:00 |
|
Chiss
|
bee81ff455
|
lowered coin rewards
|
2014-12-09 20:23:56 +11:00 |
|
Chiss
|
828fabb80a
|
Initial Christmas Chaos update
|
2014-12-09 20:04:59 +11:00 |
|
Chiss
|
50358c0c30
|
removed EULA breach in bridges private blocks
|
2014-12-08 18:23:47 +11:00 |
|
Chiss
|
ef8e5104f1
|
SnD Kits
minor bug fixes
|
2014-12-08 17:28:18 +11:00 |
|
Chiss
|
64c8edc292
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-12-08 17:25:03 +11:00 |
|
libraryaddict
|
048aa40590
|
Remove comments and add comments
|
2014-12-06 03:25:53 +13:00 |
|
libraryaddict
|
307d280534
|
Read merge message
|
2014-12-06 02:22:52 +13:00 |
|
Chiss
|
4430efd7be
|
minor updates
|
2014-12-05 16:25:34 +11:00 |
|
Chiss
|
38639fb58f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Taunt.java
|
2014-12-04 13:34:08 +11:00 |
|
Chiss
|
6cc4ec034b
|
Champs Updates
UHC Y Limit in middle
|
2014-12-04 13:33:31 +11:00 |
|
Jonathan Williams
|
abaf9f4693
|
Refactored IRelation method names
Added support for negative amounts in Support server.
Clans in core testing state.
|
2014-12-03 13:06:50 -08:00 |
|
Chiss
|
a8deee5292
|
fixed a spelling error
|
2014-12-02 18:04:48 +11:00 |
|
Chiss
|
6319bffd42
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-12-02 09:50:47 +11:00 |
|
Chiss
|
185b182061
|
fixed teleports removing you from the game
|
2014-12-02 09:50:30 +11:00 |
|
Jonathan Williams
|
e7cf4eb51d
|
Removed use of Gem Boosters
Cleaned up some unused imports.
|
2014-12-01 02:27:39 -08:00 |
|
Jonathan Williams
|
9d39cb922c
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-12-01 01:22:51 -08:00 |
|
Jonathan Williams
|
433483dcca
|
Fixed error in GameLootManager
|
2014-12-01 01:22:43 -08:00 |
|