f235f67aa5
Added +20 player buffer for lobbies.
2014-07-29 21:11:07 -07:00
ff5bc3f485
Added file logger to ServerMonitor.
...
Fixed Statifier pulling inactive bungee records.
2014-07-29 21:10:52 -07:00
9c952a7b04
Cleaned up date format creation every call in LobbyBalancer
...
Reduced times to call per second.
2014-07-29 21:10:08 -07:00
d129f722a3
Cleaned up Firework util.
2014-07-29 21:09:16 -07:00
0382afecd8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-29 20:24:04 -04:00
fa91bf0a00
Disable dropping hunger in Sneaky Assassins
2014-07-29 20:22:46 -04:00
46cc2576dd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-26 10:41:04 -07:00
4e1a05e9bd
Fixed whitelist issue with tournament mode.
2014-07-26 10:40:49 -07:00
78b3d3b35c
restored original bridge timer :)
2014-07-26 21:05:12 +10:00
3f4e4b6607
fixed -1 not working
2014-07-26 21:03:50 +10:00
802415be8f
-1 team kills for suicide (only after bridge drop)
2014-07-26 20:57:40 +10:00
f090ed9313
end game fixes
2014-07-26 20:53:48 +10:00
4f46ccc8aa
Winner is decided on bridge tourney timeout
2014-07-26 20:29:01 +10:00
fa73ab5335
Bridges Tourney stuff
2014-07-26 17:40:17 +10:00
21314afabe
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-26 17:03:30 +10:00
107388baa3
Added game flag to allow clicking in inventory during games
2014-07-26 17:03:03 +10:00
a455042c07
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-25 23:38:38 -07:00
12b42cad29
Made tournament changes:
...
Staff can't see team chat
Bridge tournament time is 90 min
Kits are not all free
Removed twitch charity text/motd
If team not picked, you go to spec.
2014-07-25 23:38:21 -07:00
d6e06f4556
Removed some unnecessary logic in Lobby Balancer
...
REmoved unused code in mineplexer.
2014-07-25 23:37:24 -07:00
c747638303
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-25 18:33:34 -04:00
fe46355130
Added missing description to Sneak Assassin revealer items
2014-07-24 21:25:59 -04:00
fe356add41
Restore original blocks when Sneaky Assassin power-up beacon is removed
2014-07-23 15:45:30 -04:00
d7037f1619
Breaking up "/news" commands (like "/npc" sub-commands) using multicommandbase.
2014-07-22 22:18:29 -04:00
e8d4ab2517
Re-enabled News commands after adding check to "Reset newsIndex if outside of bounds of news array after RefreshNews but before UtilTime.elapsed" in NewsManager.java
2014-07-21 18:06:33 -04:00
a6a274069c
Prevent power-up message spam when player is fully powered-up
2014-07-21 17:26:45 -04:00
4460f2e651
Prevent fully powered-up Sneaky Assassin players from using additional power-ups
2014-07-21 16:29:15 -04:00
5bc7549b8c
Disabled news because of console errors.
2014-07-19 14:48:05 -07:00
fc43f434f0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-19 13:56:30 -07:00
1362deca59
More work on FriendManager
2014-07-19 13:56:21 -07:00
2ae3d89496
Fixed issue with RepositoryBase and Friend/MysqlRepo
...
Each db call on login gets its own async after the first two account calls are finished.
2014-07-19 13:56:03 -07:00
de5c0a77ef
Added another requirement for Lobbies in ServerMonitor 1500 available slots
2014-07-19 13:54:27 -07:00
e6818c4c46
Added small tweaks to lobby balancer and sorter for better spread on connect.
2014-07-19 13:54:03 -07:00
8b747a81e1
Fixed filter bypass
2014-07-19 13:53:14 -07:00
d2038670d6
Merge remote-tracking branch 'origin/master'
2014-07-18 02:52:26 -04:00
efa74f509a
Fixed bug where revealer doesn't always work
...
Prevent players from trading with sneaky assassin npcs
Display message when user powers up
2014-07-18 02:48:06 -04:00
944e7fca40
Finalizing BONUS clickable text hover text and News Entry issue overall.
...
Fixing bug with "/news set" command with insufficient command arguments.
2014-07-16 18:49:49 -04:00
d9110b4e3b
Implementing BONUS: Clickable Chat Links.
2014-07-15 22:31:53 -04:00
3636255e8a
Fixed bug with DisguiseManager undisguising players.
...
Temp fix for emeralds not triggering in Perk Revealer.
2014-07-14 23:48:34 -07:00
cb4d436605
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-14 22:58:58 -07:00
1207ed8199
Added DDOSProtectionSwitcher email functionality
...
mineplex.core.Server cleanup.
Refactored RepositoryBase.
Implemented core functionality of Friends
2014-07-14 22:58:36 -07:00
64feaf63ed
Implemented Sneaky Assassin Revealer kit
2014-07-15 00:36:38 -04:00
c547801b7b
Added Sneaky Assassin NPC movement
2014-07-11 22:55:48 -04:00
b15534e1b2
Some work on Sneak Assassins NPCs
...
Added /game start <seconds> to start a game faster
Optimized GameTeam.GetSpawn() by avoiding unnecessary square root calculations
2014-07-11 00:56:25 -04:00
2ec8371f98
Implementing /news add and delete commands.
2014-07-10 21:10:35 -04:00
82ba7bf30f
Implementing /news list and set commands.
2014-07-09 20:38:11 -04:00
65b2e14689
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-09 11:15:06 -07:00
193bd82b61
Minor adjustment to rule book.
2014-07-09 11:14:57 -07:00
f38af4ab8a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-08 22:56:02 -04:00
58092c914a
Initial database access and method stubbing for "news" command.
2014-07-08 22:55:51 -04:00
5cd6bcfc82
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-08 18:08:46 -07:00
03c56535ef
MAPDATA
2014-07-08 18:08:37 -07:00
97422e237f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-08 18:01:30 -07:00
74817f5f2e
Added rule book to Hub.
...
Fixed mineplexer bungee internet status.
Fixed up ddosprotectionswitcher.
2014-07-08 18:01:03 -07:00
bd6b9b8888
so many fix
2014-07-08 17:35:27 -07:00
c5e05523d3
sneakyfix
2014-07-08 17:34:47 -07:00
dd0040086d
Parser Permissions
...
Sneaky Assasssin thingy.
2014-07-08 17:33:22 -07:00
4d40df45d5
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-08 15:14:02 -07:00
1455b4001f
Parser Update
2014-07-08 15:13:30 -07:00
fb5f92df2a
Finalized internet status for bungees
2014-07-08 15:04:59 -07:00
2e5b003cff
More work on internet status stuff.
...
Fixed some buggies with parser.
2014-07-08 13:18:27 -07:00
2ccb27065c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-08 12:44:26 -07:00
963c71f128
Fixed internet status stuff for bungees.
...
Fixed new portal arg req.
2014-07-08 12:44:17 -07:00
848f843fbf
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.MapParser/src/mineplex/mapparser/WorldManager.java
2014-07-08 12:41:25 -07:00
22709b0cd8
merge
2014-07-08 12:40:28 -07:00
39b2ad57be
Fix for map parser zipping.
2014-07-08 12:37:39 -07:00
6ae35f1b37
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-08 12:20:28 -07:00
e6e86c2042
Updated DnsMadeEasy api.
...
Cleaned up some bungee code.
Added InternetStatus to Bungees.
Fixed some portal stuff.
2014-07-08 12:20:19 -07:00
65e7e1e0b3
Parser
2014-07-08 12:18:43 -07:00
cf25bdc44f
Bridges fix being able to break mid chests before gamestart
...
Map parser Updates
2014-07-07 19:04:44 -07:00
082cf98e99
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-07 16:26:08 -07:00
64903ae4b4
Work on DDoS Protection switcher
2014-07-07 16:25:49 -07:00
ef86fe6948
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-07 16:24:43 -07:00
62f6ea815d
Champs Balance Update
...
Map Parser Update
2014-07-07 16:23:55 -07:00
3490db4b6f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-07 19:10:40 -04:00
38e4240a61
Fully implemented Sneaky Assassins Power-Ups
2014-07-07 19:10:29 -04:00
ddf1a8ff74
Pointed "send" command to "AddTransferRecord" method in Portal module.
...
Corrected "serverTarget" to "playerTarget" in "Player...does not exist!" message.
Cleaned up unnecessary references.
2014-07-07 17:30:03 -04:00
fe1bf95342
Fixed code style and updated IntelliJ code style settings
2014-07-07 14:45:02 -04:00
a66e877028
Cleaned up Bungee mineplexer a bit.
...
Refactored send/server commands for Portal.
2014-07-05 10:56:20 -07:00
ff8c506690
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-04 23:23:30 -07:00
c882ab1b34
Fixed portal command stuff.
...
Removed temp code from PlayerTracker
Added temp project for future ddos prot switching.
2014-07-04 23:23:19 -07:00
ce8560bdbf
hub news
2014-07-04 23:20:46 -07:00
df8562e69a
Tourney mode for UHC
2014-07-04 23:11:13 -07:00
c65712c260
UHC fixes
...
Sneaky Assassin listener leak fix
Some map parser stuffs.
2014-07-04 23:04:46 -07:00
e6666932aa
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-04 14:32:41 -07:00
c265c7ce5c
Fixed sync db Logger.java
...
Added temp test code in player tracker...ignore.
fixed bug in dynamic server sorter.
2014-07-04 14:23:11 -07:00
6365ec5351
Started on Sneaky Assassins kits and power-ups
2014-07-04 11:14:34 -04:00
2fb2aadf66
Merge remote-tracking branch 'origin/master'
2014-07-04 11:12:52 -04:00
46c979e088
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-04 11:12:33 -04:00
b56855c33c
Squished remaining concurrency/checking bugs! Happy 4th o'July!
2014-07-04 02:19:20 -04:00
d2caf23ed7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-03 11:19:23 -07:00
b058665e93
Fixed sync db calls for PlayerTracker
...
Fixed name update with new UUID
Skeleton work for Friends
2014-07-03 11:18:11 -07:00
2531dd7a8f
Implementing user/serverName checks
2014-07-03 00:17:49 -04:00
d19b34b0e4
Removed debug
2014-07-02 17:14:52 -07:00
22ceba9841
Fixed Scoreboards!
2014-07-02 17:12:52 -07:00
d0fafce585
Reverted change to helper only joining full, now ultras can.
...
Added check so BETA servers cannot be joined by less than Helper.
Fixed message in AccountAdministrator for rankUpdate
2014-07-02 16:59:31 -07:00
8eaad57516
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-02 16:05:37 -07:00
f1393ffb33
Fixed rankUpdate changing existing higher ranked players.
...
Fixed join limits in arcade and hub.
2014-07-02 16:05:26 -07:00
bea6902198
Spectators can use /tp
2014-07-02 13:09:47 -07:00
82dd94de9b
Scoreboard fix
...
Unbreakable boats in hub
2014-07-02 12:50:04 -07:00
05e116ea0d
Scoreboard flicker fixed!
2014-07-02 12:38:41 -07:00
558f79fe34
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-02 10:58:34 -07:00
17c36026f6
fixed bug where player who comes first was not being added to ranks. (get nothing)
2014-07-02 10:57:30 -07:00
6c67ff9106
Resolving issues from Portal.java conflict resolution
2014-07-02 04:09:41 -04:00
e7832fd06c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
2014-07-02 03:47:14 -04:00
1f515565ff
Moving improved server/send command code to separate command files
2014-07-02 03:24:48 -04:00
9514f6391e
Fixed bug in Arcade with client manager.
2014-07-01 21:42:00 -07:00
44a57a485f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 21:39:03 -04:00
41c4d5a0a8
Changed joining full servers to helper+
2014-07-01 18:33:33 -07:00
081260757d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 18:31:26 -07:00
6fd889d8fc
Added Player mapping.
...
Removed joining full servers for ultra.
2014-07-01 18:31:17 -07:00
31772196a9
More scoreboard stuff (TDM)
...
New Tug game
2014-07-01 18:30:04 -07:00
b627e8fdf5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 10:25:12 -07:00
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
7ea818c0c8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 02:20:45 -04:00
7bc3966feb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-06-30 16:13:15 -07:00
8c461b3e1b
Cooldown on Spec Compass
...
Hub Forcefield Update
Scoreboard MINEPLEX refactor
2014-06-30 16:12:42 -07:00
8e8e66f8c1
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-27 20:25:09 -07:00
0287cfb2f6
Refactored Punish a bit so punishments don't expire early or jack up based on server's time.
2014-06-27 20:24:44 -07:00
ccb17d5ac3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-27 19:33:34 -04:00
60a6f22194
Added functionality for retrieving serverName from Bungee
2014-06-27 17:01:54 -04:00
f10b081473
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-06-26 18:38:28 -07:00
3d12196b17
Merge
...
UHC Public
Small refactor for player ranks in games.
Trimed scoreboard teams to 16 chars.
2014-06-26 18:38:11 -07:00
681dfc5f7c
Added ability to copy in schematics from build server.
...
Added in gametype checking on parse.
2014-06-26 12:09:29 -07:00
210264f25b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-25 20:53:39 -07:00
57c52cb9c8
Improved MapParser to allow world loading/saving for immediate testing.
2014-06-25 20:53:28 -07:00
e25101cd59
Continued enhancements...
2014-06-25 20:28:27 -04:00
f6ad5c5549
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-25 12:07:49 -07:00
4f3ffde892
Added timing/debugging code.
2014-06-25 12:06:24 -07:00
bb5aa8e0f3
Work on /server and /send commands with permissions (more permissions need to be implemented).
2014-06-24 22:34:17 -04:00
46849745c4
Champions TDM Update
2014-06-23 16:20:50 -07:00
f2c82cbf95
Refactored TimeUtil and added totalling option.
2014-06-20 20:42:36 -07:00
6cac04d399
Optimized create scoreboards.
2014-06-19 00:48:04 -07:00
231ffd7234
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-15 17:21:47 -07:00
93fbe70e9c
Added more loggingggggg.
2014-06-15 17:21:40 -07:00
c386023a6f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-06-16 10:18:30 +10:00
fd17c1b254
More staggered teleports on game end
...
Logging teleports.
2014-06-16 10:18:10 +10:00
6515dd13a0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-15 16:25:40 -07:00
0f7885d911
Added safety checks in ClientManager
...
Added logging and teampreference swap fix in arcade.
2014-06-15 16:25:32 -07:00
a756bb88a2
NPE log
2014-06-16 09:25:14 +10:00
7ff3765ba4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-14 22:11:14 -07:00
9a79d0ede7
Fixed CME
...
Gadget cost fix
MapParser fix
2014-06-15 15:10:19 +10:00
04236939d6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-14 21:27:42 -07:00
26e16e8eac
Added button file.
2014-06-14 21:27:33 -07:00
264248ecfa
Added castle siege quick join menu button.
2014-06-14 21:27:21 -07:00
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
d5c96f95c0
Fixed bug that gave items while respawning.
2014-06-15 12:01:58 +10:00
bac071e084
Map Parser
2014-06-15 10:12:08 +10:00
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
7517c0cabc
merge
2014-06-13 08:40:01 +10:00
336c307732
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-12 08:03:02 -07:00
be8fea8ca9
Changed Chat API key.
...
Fixed PreferenceManager not saving asynchronously.
2014-06-12 08:02:47 -07:00
01fbda81ba
More suggested improvements; commented out getEntries method for now.
2014-06-11 02:35:44 -04:00
0be4df4531
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-06-11 12:14:45 +10:00
6a1ffcd3b7
Fixed some gadget stuff
2014-06-11 12:14:21 +10:00
7bdaaa8ae0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-10 16:09:48 -04:00
63f082b424
Implementing suggested code style/locking changes and recommitting (JIRA-76)
2014-06-10 16:09:33 -04:00
d82396d59b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-10 02:06:22 -05:00
4fca244812
Made ItemGadgets Free.
...
Removed queue dom shop.
2014-06-10 02:00:53 -05:00
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
7fc2fbe564
Scoreboard Refactor
2014-06-10 12:51:47 +10:00
6cba6b9b9e
merge
2014-06-10 10:27:25 +10:00
0bf702902e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-08 11:28:25 -05:00
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
cad57b7a74
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-06 09:53:24 -04:00
77dad4b475
JIRA-76: SimpleStats Manager/Repository creation
2014-06-06 09:52:26 -04:00
967ff44d0a
gamecreation fix
2014-06-05 10:15:22 +10:00
644f946f69
error debug
2014-06-04 17:56:21 +10:00
4c72651f86
game creation
2014-06-04 17:55:13 +10:00
a8dda4ef8b
Hub Gem Queueing
2014-06-04 13:02:16 +10:00
f2d1709adb
Hub update
2014-06-01 18:18:58 +10:00
040ffe0ae5
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-06-01 17:56:27 +10:00
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
9695f1bd08
Enabled Git in IntelliJ
2014-05-28 19:29:05 -04:00
fbf59ace67
Fixed server status connection url
2014-05-28 19:13:10 -04:00
1b5b2d21b2
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-28 17:51:38 -04:00
0d350da6c0
Added more files and updated ignore list.
2014-05-28 11:23:32 -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
94e31e36f8
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-27 21:42:01 -04:00
e101c027ce
Created Sneaky Assassins and started work on the kits
2014-05-27 21:38:22 -04:00
091166f090
Refactored disguises to use EntityType
2014-05-27 17:49:45 -04: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
e0dd0116a2
Beginning changes for stats from PlayerName to PlayerUUID
2014-05-06 17:06:19 -04:00
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
56c0545659
Added elo files.
2014-05-06 09:08:22 -07:00
5f2b2c251d
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-06 09:06:49 -07:00
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
f79b3b147c
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-05-06 15:59:20 +10:00
223da7bf4d
ResetAll for class skills
2014-05-06 15:55:14 +10:00
2f397e7d2a
Work on elo manager.
...
implemented coreclient cleanup.
2014-05-04 22:40:44 -07:00
f079333d3b
Optimized ChunkBlockChange.
...
Still no dead chunks!
Fixed LobbyManager advertising to an empty lobby.
2014-05-04 18:29:19 -07:00
97e083c1e7
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-04 12:52:14 -07:00
f623026dfc
Fixed projectile order issue..check for dead before collision.
...
Fixed dead chunks in Aracde.
2014-05-04 12:52:04 -07:00
a9f4a900f0
Working on fixing dead chunks.
...
Fixed Blizzard memory issue.
2014-05-04 09:31:04 -07:00
3c2fc4c49b
Fixed MAC not being disabled
2014-05-03 17:29:55 +10:00
6e8bdfa769
disabled hub clock for tournament
2014-05-03 17:26:21 +10:00
0ce3b3fb2d
Disabled AFK kick during Tournament
2014-05-03 17:23:10 +10:00
fe7ed5c96a
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-02 23:19:05 -07:00
b432c094d9
Misisng ifles
2014-05-03 16:16:52 +10:00
0101531291
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2014-05-02 23:15:08 -07:00
484ba97b23
Updated file delete mechanism so there is no reflection.
...
Removed list block on deleting players from coreclient quit.
2014-05-02 23:12:39 -07:00
4304327bf9
Disallowed /spec during games.
2014-05-03 13:06:15 +10:00
395a5d2c08
MAC disabled with Tournament Mode
...
Bridges TM game desc fix
2014-05-03 11:47:15 +10:00
e818662161
Added /spec toggle, to allow players to not partake in games.
...
Added TeamArmorAddon for games to use, to mark team colors easier.
Minor other changes.
2014-05-03 11:23:10 +10:00
1d4d98b910
Twitch Prep
...
MAC changes
2014-05-02 14:35:41 +10:00
c1360c63f0
More strikes for auto-kick
...
Updated MAC kick message
2014-05-01 09:38:37 +10:00
Jonathan Williams
CoderTim
Chiss
Peter Miller
Mini-Chiss