Commit Graph

2052 Commits

Author SHA1 Message Date
Chiss
a756bb88a2 NPE log 2014-06-16 09:25:14 +10: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
d5c96f95c0 Fixed bug that gave items while respawning. 2014-06-15 12:01:58 +10:00
Chiss
bac071e084 Map Parser 2014-06-15 10:12:08 +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
Chiss
7517c0cabc merge 2014-06-13 08:40:01 +10:00
Jonathan Williams
336c307732 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-12 08:03:02 -07:00
Jonathan Williams
be8fea8ca9 Changed Chat API key.
Fixed PreferenceManager not saving asynchronously.
2014-06-12 08:02:47 -07:00
Peter Miller
01fbda81ba More suggested improvements; commented out getEntries method for now. 2014-06-11 02:35:44 -04: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
Peter Miller
7bdaaa8ae0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-10 16:09:48 -04:00
Peter Miller
63f082b424 Implementing suggested code style/locking changes and recommitting (JIRA-76) 2014-06-10 16:09:33 -04:00
Jonathan Williams
d82396d59b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-10 02:06:22 -05:00
Jonathan Williams
4fca244812 Made ItemGadgets Free.
Removed queue dom shop.
2014-06-10 02:00:53 -05:00
Chiss
661a869116 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-10 13:02:17 +10:00
Chiss
7fc2fbe564 Scoreboard Refactor 2014-06-10 12:51:47 +10:00
Chiss
6cba6b9b9e merge 2014-06-10 10:27:25 +10:00
Jonathan Williams
0bf702902e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-08 11:28:25 -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
Peter Miller
cad57b7a74 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-06 09:53:24 -04:00
Peter Miller
77dad4b475 JIRA-76: SimpleStats Manager/Repository creation 2014-06-06 09:52:26 -04:00
Chiss
967ff44d0a gamecreation fix 2014-06-05 10:15:22 +10:00
Chiss
644f946f69 error debug 2014-06-04 17:56:21 +10:00
Chiss
4c72651f86 game creation 2014-06-04 17:55:13 +10: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
Chiss
1d549e38ff Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-05-30 15:02:22 +10:00