Jonathan Williams
f6ad5c5549
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-25 12:07:49 -07:00
Jonathan Williams
4f3ffde892
Added timing/debugging code.
2014-06-25 12:06:24 -07:00
Mini-Chiss
46849745c4
Champions TDM Update
2014-06-23 16:20:50 -07:00
Jonathan Williams
f2c82cbf95
Refactored TimeUtil and added totalling option.
2014-06-20 20:42:36 -07:00
Jonathan Williams
6cac04d399
Optimized create scoreboards.
2014-06-19 00:48:04 -07:00
Jonathan Williams
231ffd7234
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-15 17:21:47 -07:00
Jonathan Williams
93fbe70e9c
Added more loggingggggg.
2014-06-15 17:21:40 -07:00
Chiss
c386023a6f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-06-16 10:18:30 +10:00
Chiss
fd17c1b254
More staggered teleports on game end
...
Logging teleports.
2014-06-16 10:18:10 +10:00
Jonathan Williams
6515dd13a0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-15 16:25:40 -07:00
Jonathan Williams
0f7885d911
Added safety checks in ClientManager
...
Added logging and teampreference swap fix in arcade.
2014-06-15 16:25:32 -07:00
Chiss
a756bb88a2
NPE log
2014-06-16 09:25:14 +10:00
Chiss
9a79d0ede7
Fixed CME
...
Gadget cost fix
MapParser fix
2014-06-15 15:10:19 +10:00
Chiss
d5c96f95c0
Fixed bug that gave items while respawning.
2014-06-15 12:01:58 +10:00
Jonathan Williams
be8fea8ca9
Changed Chat API key.
...
Fixed PreferenceManager not saving asynchronously.
2014-06-12 08:02:47 -07: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
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
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
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
48975d02c7
Adding some missing files for website.
2014-05-28 11:20:13 -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
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
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
eae2d41fad
Fixed party out of bounds exception.
...
Fixed tnt in wrong place in dom shop.
2014-05-08 20:01:21 -07: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
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
