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
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
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
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
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
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
1455b4001f
Parser Update
2014-07-08 15:13:30 -07:00
963c71f128
Fixed internet status stuff for bungees.
...
Fixed new portal arg req.
2014-07-08 12:44:17 -07:00
cf25bdc44f
Bridges fix being able to break mid chests before gamestart
...
Map parser Updates
2014-07-07 19:04:44 -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
38e4240a61
Fully implemented Sneaky Assassins Power-Ups
2014-07-07 19:10:29 -04:00
fe1bf95342
Fixed code style and updated IntelliJ code style settings
2014-07-07 14:45:02 -04: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
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
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
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
081260757d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 18:31:26 -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
8c461b3e1b
Cooldown on Spec Compass
...
Hub Forcefield Update
Scoreboard MINEPLEX refactor
2014-06-30 16:12:42 -07:00
ccb17d5ac3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-27 19:33:34 -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
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
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
9a79d0ede7
Fixed CME
...
Gadget cost fix
MapParser fix
2014-06-15 15:10:19 +10:00
d5c96f95c0
Fixed bug that gave items while respawning.
2014-06-15 12:01:58 +10:00
be8fea8ca9
Changed Chat API key.
...
Fixed PreferenceManager not saving asynchronously.
2014-06-12 08:02:47 -07: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
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
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
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
1b5b2d21b2
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-28 17:51:38 -04:00
48975d02c7
Adding some missing files for website.
2014-05-28 11:20:13 -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
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
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
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
eae2d41fad
Fixed party out of bounds exception.
...
Fixed tnt in wrong place in dom shop.
2014-05-08 20:01:21 -07: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
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
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
8240101d60
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
2014-05-01 09:33:59 +10:00
423a355057
Helpers+ wont be kicked yb MAC
2014-05-01 09:31:47 +10:00
f4a92ec07a
Implemented Logger
...
Logger now catches all uncaught exceptions and logs them to DB.
Put in some preventative checks in Hub/Party as they threw a lot of the same errors.
Added autoreconnect to AntiHack as it was spamming errors in DB
2014-04-30 10:57:19 -07:00
7637d94ae0
Added mysql logger.
...
Hooked it up in a few places.
Fixed Asynch crap with AntiHack.
2014-04-30 00:31:22 -07:00
e958a922fe
Fixed Hub chat so it goes through filter.
...
Added back in server name so it tracks correctly.
Fixed PlayerCount in Mineplexer AGAIN.
2014-04-29 12:53:22 -07:00
3ec1653532
Added in chat filtering command and finished up filtration.
2014-04-29 11:54:20 -07:00
66aa7223cc
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-27 21:59:35 -07:00
47417dea6b
Implemented initial SafeChat.
2014-04-27 21:59:18 -07:00
dc6a3da0fa
Added more DMT words
2014-04-28 14:08:40 +10:00
77809b409d
MAC Update
2014-04-28 12:28:48 +10:00
40ef432211
Cannot use skills/items in HubManager
...
Dom CP score rate lowered
Dom items dont use energy
2014-04-28 09:41:00 +10:00
82afefd11a
Quick fix for respawning players not being able to get stuff from creative inventory
2014-04-27 01:09:25 +10:00
95d6ec7f50
Barrage fix
2014-04-26 17:25:35 +10:00
b86b014058
Fixed a whole bunch of bugs
2014-04-26 11:59:11 +10:00
ac1c081bc8
Fixed scoreboard issues.
2014-04-25 17:52:04 -07:00
a37ace7576
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-25 00:44:27 -07:00
9136fa0b15
Upgraded to latest spigot.
...
Fixed npcs being so loud.
Npcs are now ghosted automatically.
Added UUID on login.
2014-04-25 00:44:14 -07:00
9495630bf2
CP rate increase
2014-04-25 11:10:37 +10:00
7fef4adbee
Fixed resupply resetting skills.
2014-04-22 22:19:03 -07:00
7ea601e94b
Cant open bridge chests until bridges are down.
2014-04-23 10:38:59 +10:00
0325892e2a
Champs water fixes
...
First push for Twitch games
2014-04-23 10:21:01 +10:00
e62dfb0dd2
Fix skill/item packs not deducting gems.
...
Fix players not getting spectating flag when dying.
2014-04-22 16:50:44 -07:00
bddc36271d
fixed gems for capture
2014-04-21 17:16:35 +10:00
0f31052d00
cannot shoot arrow in water.
...
less gems for capping
2014-04-21 17:14:23 +10:00
a150249f4f
game will not announce winner multiple times
2014-04-21 17:01:50 +10:00
adf8821a26
more CP changes
2014-04-21 12:55:24 +10:00
b1e082b73a
fixed riposte bug
...
tweaked capture effects
2014-04-21 11:56:14 +10:00
0eaa3110f5
Risposte nerf
2014-04-21 11:18:14 +10:00
b8e573e8f8
redid capture display. much less annoying.
2014-04-21 11:15:49 +10:00
07098b0b82
fixed no damage on weapons
...
items not usable until game is live
fixed proxies not triggering
some skill balance/fixes
players with null kit are now given default knight
2014-04-21 10:48:04 +10:00
ddc8e435e8
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java
2014-04-21 08:49:13 +10:00
3281eb2ed7
Merge
2014-04-21 08:47:07 +10:00
1f225f05ff
Custom build fixes.
2014-04-20 00:27:32 -07:00
dc625726c4
Item Custom Build Fixes.
2014-04-19 22:54:52 -07:00
458f5741d7
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-19 20:54:04 -07:00
e5e9cc7284
Custom Items in custom Builds for dom.
2014-04-19 20:53:55 -07:00
Jonathan Williams
CoderTim
Mini-Chiss
Peter Miller
Chiss