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
Chiss
d4465fd8f2
merge
2014-05-30 15:01:08 +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
0d350da6c0
Added more files and updated ignore list.
2014-05-28 11:23:32 -07:00
Jonathan Williams
b203671de3
Added missing maps.
2014-05-28 11:21:07 -07:00
Jonathan Williams
48975d02c7
Adding some missing files for website.
2014-05-28 11:20:13 -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
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
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
8c19d618b6
Added missing dependency in intellij setup
2014-05-25 20:51:27 -04:00
CoderTim
c45e7d2a80
Converted file encoding from ISO-8859-1 to UTF-8
2014-05-25 19:42:39 -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
6d19c80af2
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-13 22:15:55 -05:00
Jonathan Williams
6af5d9205b
Added TimeUtil.java
...
Removed double gems.
Removed extra world uninitialize.
Changed AccountAdministrator to use UUID.
2014-05-13 22:13:48 -05:00
Chiss
002260dce8
better date
2014-05-14 12:57:43 +10:00
Jonathan Williams
12041b0d72
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-13 21:54:58 -05:00
Chiss
8ea344cacd
fixed a NPE
2014-05-14 12:38:06 +10: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
Chiss
fbb0031dc1
fixed bug in dom where endCheck was being called multiple times
...
logging for world stuff
2014-05-13 11:18:17 +10:00
Jonathan Williams
b1514fef5a
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-09 21:18:48 -07:00
Jonathan Williams
0ec08d5208
Fixed chunk load outside borders (disabled for testing right now)
2014-05-09 21:18:38 -07:00
Chiss
208a78b070
respawning players are tp'd if leave area.
2014-05-10 14:01:02 +10:00
Chiss
d9225c003e
CS Update
2014-05-10 09:55:27 +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
e620618e69
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-05-09 12:58:42 +10:00
Chiss
56ae8627f5
news changes
2014-05-09 12:58:29 +10:00
Jonathan Williams
b72bcadbf4
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-06 22:38:50 -07:00
Jonathan Williams
ebf40afe75
Fix dom bow shoot in lobby bug.
...
Work on preventing illegal builds.
2014-05-06 22:38:27 -07:00
Peter Miller
e0dd0116a2
Beginning changes for stats from PlayerName to PlayerUUID
2014-05-06 17:06:19 -04:00
Jonathan Williams
a9d3d31339
Fixed memory problem with CraftingManager and arcade worlds that should be unloaded but are still referenced.
2014-05-06 09:14:31 -07:00
Jonathan Williams
56c0545659
Added elo files.
2014-05-06 09:08:22 -07:00
Jonathan Williams
5f2b2c251d
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-06 09:06:49 -07:00
Jonathan Williams
8110506ac4
Fixed duplicate login issue with CoreClientManager
...
Added EloRanking and EloStart for elo games in Game.java
Refactored Elo code in Arcade to be based off of above values in Game
Changed Lobby scoreboard in Arcade to just Players at top current/max.
2014-05-06 09:06:39 -07:00
Chiss
f79b3b147c
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-05-06 15:59:20 +10:00
Chiss
223da7bf4d
ResetAll for class skills
2014-05-06 15:55:14 +10:00
Jonathan Williams
2f397e7d2a
Work on elo manager.
...
implemented coreclient cleanup.
2014-05-04 22:40:44 -07:00
Jonathan Williams
f079333d3b
Optimized ChunkBlockChange.
...
Still no dead chunks!
Fixed LobbyManager advertising to an empty lobby.
2014-05-04 18:29:19 -07:00
Jonathan Williams
97e083c1e7
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-04 12:52:14 -07:00
Jonathan Williams
f623026dfc
Fixed projectile order issue..check for dead before collision.
...
Fixed dead chunks in Aracde.
2014-05-04 12:52:04 -07:00
Jonathan Williams
a9f4a900f0
Working on fixing dead chunks.
...
Fixed Blizzard memory issue.
2014-05-04 09:31:04 -07:00
Chiss
3c2fc4c49b
Fixed MAC not being disabled
2014-05-03 17:29:55 +10:00
