JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,209 Commits 1 Branch 0 Tags 481 MiB
2e7d101850
Commit Graph

880 Commits

Author SHA1 Message Date
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
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
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
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
Chiss
78a34b1517 hopefully fixed a bug where pumpking king despawned. 
removed 11 disc from loot
 2014-12-13 11:55:12 +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
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
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
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
Shaun Bennett
0759a373da Fix treasure chest hologram 2014-12-07 01:25:36 -06:00
Shaun Bennett
7402eb2f91 Merge remote-tracking branch 'origin/master' 2014-12-06 01:00:40 -06:00
Jonathan Williams
21e80af6cb Fixed Cosmetic menu buttons 
Removed map in wrong location
Removed message for removing armor.
 2014-12-05 01:15:25 -08:00
Jonathan Williams
828e8d4115 Fixed bug with ok buttons still active after clicking ok in confirmation page. 2014-12-04 23:48:22 -08:00
Jonathan Williams
3d3f9012ff Added some base Clans shops. 
Added support for Gold

Refactored failed db call code a bit.
 2014-12-04 23:41:49 -08:00
Chiss
80971c2fe7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-05 16:27:30 +11:00
Chiss
4430efd7be minor updates 2014-12-05 16:25:34 +11:00
Shaun Bennett
f48085d5ca Merge remote-tracking branch 'origin/master' 2014-12-04 17:41:40 -06:00
Shaun Bennett
0bb2d1db5b Some changes *_* 2014-12-04 17:29:47 -06:00
Jonathan Williams
59f93d46ec Refactored IButton 
Added ComplexButton

Added Clans farming.
Added Clans Recipes.
Added Clans gameplay.
Added shop files structure.
 2014-12-04 05:05:27 -08:00
Jonathan Williams
1fd1e5cc34 Removed unused gem booster code. 2014-12-02 12:50:53 -08:00
Jonathan Williams
384f296d60 checkPlayerName returns actual name (casing correct) 
Refactored chests/keys in support server.
Fixed bug with enjin chest/key giver.
 2014-12-01 16:14:02 -08:00
Jonathan Williams
0540168af7 Fixed CCM in AntiHack 2014-12-01 03:01:26 -08:00
Jonathan Williams
e7cf4eb51d Removed use of Gem Boosters 
Cleaned up some unused imports.
 2014-12-01 02:27:39 -08:00
Jonathan Williams
172f4d20b7 Removed gem transaction logging. 2014-12-01 02:22:51 -08:00
Jonathan Williams
5038edc46b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-01 00:07:33 -08:00
Jonathan Williams
171eec5a37 Removed reward logging. 2014-12-01 00:05:57 -08:00
libraryaddict
89892097d0 No one cares about ComplexItemLayout 2014-11-30 16:48:57 +13:00
Jonathan Williams
9d32048b9e Fixed merge conflict problem. 
Added spawn repository.
 2014-11-29 03:17:33 -08:00
Jonathan Williams
f507db7664 Reworked spawn to save to database. 
Work on Clans:
Fixed clan loading/updating/adding.
Refactored some code for Clans.
 2014-11-29 03:16:37 -08:00
Jonathan Williams
4b2998793c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-28 14:16:07 -08:00
Chiss
b3beadf8b5 made recharge look nicer for 1.7 
added missing files
 2014-11-29 09:14:33 +11:00
Jonathan Williams
54aefbf40d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-28 14:10:28 -08:00