c2ce84c666
merge
2014-06-01 17:56:15 +10:00
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
d0e9c41e22
Added moved pet stuff.
2014-06-01 00:53:15 -07:00
bd2804c0d6
Fixed some item slot numbers for gadgets.
2014-06-01 00:53:00 -07:00
2a5f3c4502
antistack
2014-06-01 17:47:11 +10:00
461e1023e3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-06-01 00:39:28 -07:00
f157715174
Merged Pet page into Gadget page.
...
Reworked gadget page.
2014-06-01 00:39:10 -07:00
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
a3a3a87278
Hug update
2014-06-01 15:47:34 +10:00
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
6505819a4b
Removed chat filtering.
...
Implemented user preferences in all required modules.
2014-05-30 13:34:55 -07:00
57c3845df9
Finished up preferences.
...
Each preference saves, loads on login.
GUI working great.
2014-05-30 01:42:43 -07:00
6c9a2d0a01
Hooked up preference manager to Chat.
2014-05-30 00:33:55 -07:00
77f6aac860
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-30 00:26:34 -07:00
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
937f5d8ef2
Hub stuff
2014-05-30 17:17:53 +10:00
1d549e38ff
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-05-30 15:02:22 +10:00
d4465fd8f2
merge
2014-05-30 15:01:08 +10:00
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
0d350da6c0
Added more files and updated ignore list.
2014-05-28 11:23:32 -07:00
b203671de3
Added missing maps.
2014-05-28 11:21:07 -07:00
48975d02c7
Adding some missing files for website.
2014-05-28 11:20:13 -07:00
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
24ccf133af
Fixed bug with Portal where it continuously sent players until queue cleaned up records 15 seconds later.
2014-05-28 10:43:39 -07:00
449fa13cc3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
...
Conflicts:
.gitignore
2014-05-27 02:23:22 -07:00
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
49de140f41
Configured eclipse to use UTF-8
2014-05-25 21:04:14 -04:00
8c19d618b6
Added missing dependency in intellij setup
2014-05-25 20:51:27 -04:00
c45e7d2a80
Converted file encoding from ISO-8859-1 to UTF-8
2014-05-25 19:42:39 -04:00
3859a42f1d
Removed broken and obsolete shifter code
...
Set up more intellij stuff
2014-05-25 19:11:58 -04:00
aa6b5324eb
Set up IntelliJ IDEA
2014-05-20 00:39:50 -04:00
6d19c80af2
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-13 22:15:55 -05:00
6af5d9205b
Added TimeUtil.java
...
Removed double gems.
Removed extra world uninitialize.
Changed AccountAdministrator to use UUID.
2014-05-13 22:13:48 -05:00
002260dce8
better date
2014-05-14 12:57:43 +10:00
12041b0d72
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-13 21:54:58 -05:00
8ea344cacd
fixed a NPE
2014-05-14 12:38:06 +10:00
40ba1a64f8
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-13 14:46:15 -05:00
97abe79ffa
armorgadgets disable fix
2014-05-13 12:23:29 +10:00
8c3deeba49
Hub Commands (/forcefield and /gadget)
2014-05-13 12:08:56 +10:00
fbb0031dc1
fixed bug in dom where endCheck was being called multiple times
...
logging for world stuff
2014-05-13 11:18:17 +10:00
b1514fef5a
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-09 21:18:48 -07:00
0ec08d5208
Fixed chunk load outside borders (disabled for testing right now)
2014-05-09 21:18:38 -07:00
208a78b070
respawning players are tp'd if leave area.
2014-05-10 14:01:02 +10:00
d9225c003e
CS Update
2014-05-10 09:55:27 +10:00
8ee52be8da
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-08 20:01:31 -07:00
eae2d41fad
Fixed party out of bounds exception.
...
Fixed tnt in wrong place in dom shop.
2014-05-08 20:01:21 -07:00
e620618e69
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-05-09 12:58:42 +10:00
56ae8627f5
news changes
2014-05-09 12:58:29 +10:00
b72bcadbf4
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-06 22:38:50 -07:00
ebf40afe75
Fix dom bow shoot in lobby bug.
...
Work on preventing illegal builds.
2014-05-06 22:38:27 -07:00
Chiss
Jonathan Williams
CoderTim