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

287 Commits

Author SHA1 Message Date
Jonathan Williams
f235f67aa5 Added +20 player buffer for lobbies. 2014-07-29 21:11:07 -07:00
Peter Miller
d7037f1619 Breaking up "/news" commands (like "/npc" sub-commands) using multicommandbase. 2014-07-22 22:18:29 -04:00
Peter Miller
e8d4ab2517 Re-enabled News commands after adding check to "Reset newsIndex if outside of bounds of news array after RefreshNews but before UtilTime.elapsed" in NewsManager.java 2014-07-21 18:06:33 -04:00
Jonathan Williams
5bc7549b8c Disabled news because of console errors. 2014-07-19 14:48:05 -07:00
Jonathan Williams
fc43f434f0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-19 13:56:30 -07:00
Jonathan Williams
2ae3d89496 Fixed issue with RepositoryBase and Friend/MysqlRepo 
Each db call on login gets its own async after the first two account calls are finished.
 2014-07-19 13:56:03 -07:00
Peter Miller
944e7fca40 Finalizing BONUS clickable text hover text and News Entry issue overall. 
Fixing bug with "/news set" command with insufficient command arguments.
 2014-07-16 18:49:49 -04:00
Peter Miller
d9110b4e3b Implementing BONUS: Clickable Chat Links. 2014-07-15 22:31:53 -04:00
Jonathan Williams
cb4d436605 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-14 22:58:58 -07:00
Jonathan Williams
1207ed8199 Added DDOSProtectionSwitcher email functionality 
mineplex.core.Server cleanup.

Refactored RepositoryBase.

Implemented core functionality of Friends
 2014-07-14 22:58:36 -07:00
Peter Miller
2ec8371f98 Implementing /news add and delete commands. 2014-07-10 21:10:35 -04:00
Peter Miller
82ba7bf30f Implementing /news list and set commands. 2014-07-09 20:38:11 -04:00
Jonathan Williams
65b2e14689 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-09 11:15:06 -07:00
Jonathan Williams
193bd82b61 Minor adjustment to rule book. 2014-07-09 11:14:57 -07:00
Peter Miller
f38af4ab8a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-08 22:56:02 -04:00
Peter Miller
58092c914a Initial database access and method stubbing for "news" command. 2014-07-08 22:55:51 -04:00
Jonathan Williams
74817f5f2e Added rule book to Hub. 
Fixed mineplexer bungee internet status.

Fixed up ddosprotectionswitcher.
 2014-07-08 18:01:03 -07:00
Jonathan Williams
963c71f128 Fixed internet status stuff for bungees. 
Fixed new portal arg req.
 2014-07-08 12:44:17 -07:00
Jonathan Williams
ff8c506690 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-04 23:23:30 -07:00
Mini-Chiss
ce8560bdbf hub news 2014-07-04 23:20:46 -07:00
Jonathan Williams
c265c7ce5c Fixed sync db Logger.java 
Added temp test code in player tracker...ignore.

fixed bug in dynamic server sorter.
 2014-07-04 14:23:11 -07:00
Jonathan Williams
d0fafce585 Reverted change to helper only joining full, now ultras can. 
Added check so BETA servers cannot be joined by less than Helper.

Fixed message in AccountAdministrator for rankUpdate
 2014-07-02 16:59:31 -07:00
Jonathan Williams
8eaad57516 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-02 16:05:37 -07:00
Jonathan Williams
f1393ffb33 Fixed rankUpdate changing existing higher ranked players. 
Fixed join limits in arcade and hub.
 2014-07-02 16:05:26 -07:00
Mini-Chiss
82dd94de9b Scoreboard fix 
Unbreakable boats in hub
 2014-07-02 12:50:04 -07:00
Peter Miller
6c67ff9106 Resolving issues from Portal.java conflict resolution 2014-07-02 04:09:41 -04:00
Jonathan Williams
6fd889d8fc Added Player mapping. 
Removed joining full servers for ultra.
 2014-07-01 18:31:17 -07:00
Jonathan Williams
b627e8fdf5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 10:25:12 -07:00
Jonathan Williams
9fd3f14248 Added RankUpdate command. 
Fixed Lobby joinable issue with server monitor.
Changed server monitor to be fully dynamic for us.
 2014-07-01 10:23:22 -07:00
Mini-Chiss
8c461b3e1b Cooldown on Spec Compass 
Hub Forcefield Update
Scoreboard MINEPLEX refactor
 2014-06-30 16:12:42 -07:00
Jonathan Williams
7ff3765ba4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-14 22:11:14 -07:00
Chiss
9a79d0ede7 Fixed CME 
Gadget cost fix
MapParser fix
 2014-06-15 15:10:19 +10:00
Jonathan Williams
04236939d6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-14 21:27:42 -07:00
Jonathan Williams
26e16e8eac Added button file. 2014-06-14 21:27:33 -07:00
Jonathan Williams
264248ecfa Added castle siege quick join menu button. 2014-06-14 21:27:21 -07:00
Chiss
1bfa24cc45 Fixed Fireworks crash bug & portal destroy bug; 
-Only livingentities bounce off portals
-Fireworks cannot be used near portals
 2014-06-15 12:35:09 +10:00
Chiss
2170f743dd Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2014-06-13 08:42:57 +10:00
Jonathan Williams
be8fea8ca9 Changed Chat API key. 
Fixed PreferenceManager not saving asynchronously.
 2014-06-12 08:02:47 -07:00
Chiss
0be4df4531 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-06-11 12:14:45 +10:00
Chiss
6a1ffcd3b7 Fixed some gadget stuff 2014-06-11 12:14:21 +10:00
Jonathan Williams
4fca244812 Made ItemGadgets Free. 
Removed queue dom shop.
 2014-06-10 02:00:53 -05:00
Jonathan Williams
3ae119d88a Fixed hub package unlock bug. 
Fixed Champions build page open bug.

MOved some code around because i'm a boss.
 2014-06-08 11:27:14 -05:00
Chiss
a8dda4ef8b Hub Gem Queueing 2014-06-04 13:02:16 +10:00
Chiss
f2d1709adb Hub update 2014-06-01 18:18:58 +10:00
Chiss
040ffe0ae5 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-06-01 17:56:27 +10:00
Chiss
c2ce84c666 merge 2014-06-01 17:56:15 +10:00
Jonathan Williams
11862f672e Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
 2014-06-01 00:54:15 -07:00
Jonathan Williams
d0e9c41e22 Added moved pet stuff. 2014-06-01 00:53:15 -07:00
Jonathan Williams
bd2804c0d6 Fixed some item slot numbers for gadgets. 2014-06-01 00:53:00 -07:00
Chiss
2a5f3c4502 antistack 2014-06-01 17:47:11 +10:00