Commit Graph

262 Commits

Author SHA1 Message Date
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
Jonathan Williams
461e1023e3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-06-01 00:39:28 -07:00
Jonathan Williams
f157715174 Merged Pet page into Gadget page.
Reworked gadget page.
2014-06-01 00:39:10 -07:00
Chiss
37c5654e13 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2014-06-01 15:50:11 +10:00
Chiss
a3a3a87278 Hug update 2014-06-01 15:47:34 +10:00
Jonathan Williams
7f87043f7b Removed unused buttons.
Fixed pref inv placement.

Refactored queue code so its not stupid.

Fixed issue with queuer.
2014-05-31 22:46:43 -07:00
Jonathan Williams
6505819a4b Removed chat filtering.
Implemented user preferences in all required modules.
2014-05-30 13:34:55 -07:00
Jonathan Williams
57c3845df9 Finished up preferences.
Each preference saves, loads on login.
GUI working great.
2014-05-30 01:42:43 -07:00
Jonathan Williams
6c9a2d0a01 Hooked up preference manager to Chat. 2014-05-30 00:33:55 -07:00
Jonathan Williams
77f6aac860 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-30 00:26:34 -07:00
Jonathan Williams
b8908ada4b Removed unused connection info in RetrieveClientInformationEvent
Added required method for miniclientplugin
Implemented Preferences module...repo/manager/gui
2014-05-30 00:25:48 -07:00
Chiss
937f5d8ef2 Hub stuff 2014-05-30 17:17:53 +10:00
Jonathan Williams
c38e60456b OMG THIS THING IS SO COMPLICATED MY BRAIN FIZZZLED...fixed some queuer issues.
Fixed bug with forcefield in hub.

Fixed symbol for connecting to dbs in connection strings.
2014-05-29 19:47:57 -07:00
Jonathan Williams
d5ea6c5377 Removed dead project ServerStatus
Tweaked connection strings so they autoreconnect.

Added dragon sound to pre-queue prompt.

Added rest of missing files.
2014-05-28 11:18:30 -07:00
Jonathan Williams
449fa13cc3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
Conflicts:
	.gitignore
2014-05-27 02:23:22 -07:00
Jonathan Williams
0634ee5543 Removed unused global stuff in Mineplexer.
Did some edits in GroupManager...need to pick that up.

Changed TimeUtil to pop last entry when stopping.
Fixed WorldUtil's dimension thing for UHC.
Fixed Exception with AntihackRepository and no static lock object on _connection

Work on Elo manager.
Work on Queue.

Added checking for player to server transfer records.

Added option for rejoin time in TeamGame (UHC...yay)
2014-05-27 02:10:29 -07:00
CoderTim
49de140f41 Configured eclipse to use UTF-8 2014-05-25 21:04:14 -04:00
CoderTim
3859a42f1d Removed broken and obsolete shifter code
Set up more intellij stuff
2014-05-25 19:11:58 -04:00
CoderTim
aa6b5324eb Set up IntelliJ IDEA 2014-05-20 00:39:50 -04:00
Jonathan Williams
40ba1a64f8 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-13 14:46:15 -05:00
Chiss
97abe79ffa armorgadgets disable fix 2014-05-13 12:23:29 +10:00
Chiss
8c3deeba49 Hub Commands (/forcefield and /gadget) 2014-05-13 12:08:56 +10:00
Jonathan Williams
8ee52be8da Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-08 20:01:31 -07:00
Jonathan Williams
eae2d41fad Fixed party out of bounds exception.
Fixed tnt in wrong place in dom shop.
2014-05-08 20:01:21 -07:00
Chiss
56ae8627f5 news changes 2014-05-09 12:58:29 +10:00
Jonathan Williams
ebf40afe75 Fix dom bow shoot in lobby bug.
Work on preventing illegal builds.
2014-05-06 22:38:27 -07:00