3a6968a60b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-04 19:17:21 +11:00
f6df7705b1
- Added 3 kits for DMT
...
- Added achievement kit for OITQ/Sneaky Assassins/DMT
- Fixed stats/achievements not working (Keen Eye, I See You, Incompetence, DMT Wins)
- Various improvements/fixes for Champions
- Nerfed trollability of Digger kit in DE
2014-11-04 19:17:06 +11:00
a2f7a84120
Fix Hub Rule Book
2014-11-03 18:46:49 -06:00
174b1f43c4
GiveItem Fixes
2014-11-03 18:24:56 -06:00
50ea13910a
Change GiveItem command to Dev+
2014-11-03 10:26:08 -06:00
ab62708883
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-03 16:34:20 +11:00
20fe69b596
added skills to lore of custom builds
...
fixed skeleton not having enough arrows
2014-11-02 11:09:20 +11:00
30a1df1473
Fix for null pointer in particle foot.
2014-11-01 02:38:59 -07:00
d64e8c5162
Added max of 10 connections for db pool.
2014-11-01 02:35:36 -07:00
86fb78e34c
minor Unused code cleanup
2014-10-31 23:32:59 -07:00
fa0049d22a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-31 23:01:15 -07:00
f206441999
Fix partial commit.
2014-10-31 23:00:53 -07:00
c85ba72730
Added null check for dragooon.
...
Added two treasure keys for halloween give away.
2014-10-31 23:00:13 -07:00
f3770933b6
Merge branch 'feature/database-pool'
2014-11-01 01:59:07 -04:00
da88d68513
UHC does not record team stats
2014-11-01 15:42:52 +11:00
f1966be6a2
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-31 17:29:57 -07:00
7f642673bc
fixed deathbomber achievement
2014-11-01 11:25:08 +11:00
1f26aee006
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-31 17:12:27 -07:00
0095a03df7
returned bridges to normal
2014-11-01 11:11:35 +11:00
2aced64191
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-31 17:03:15 -07:00
45da22b0bf
Fixed bug with parkour enchantment checks.
2014-10-31 17:03:06 -07:00
de28906aa5
restored 10 min timer for bridges
2014-11-01 09:18:44 +11:00
d0a8a86698
disabled tnt water damage before bridges drop
2014-11-01 09:18:25 +11:00
58d6cf199b
fixed foodformassesstat kind of? doesnt update db still
2014-11-01 08:59:57 +11:00
83d182db2e
Fixed Villager exploit! oops
...
Some balance stuff in champs
2014-11-01 08:38:36 +11:00
b5ef46007f
updated npc info
2014-10-31 18:17:12 +11:00
bf6e788f36
1 more fix for sheepy
2014-10-31 16:47:20 +11:00
c4264dcea1
fixed sheep skill trigger names
2014-10-31 15:58:11 +11:00
50a2bcda66
BACK FROM THE DEAD
2014-10-31 15:40:40 +11:00
de08456093
fixed error in block restore
2014-10-31 10:47:18 +11:00
aca18bb2e7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-31 10:36:06 +11:00
aa45f031ac
3 new achievement Kits
...
SSM Balance patch
Champs balance
tons of bug fixes
2014-10-31 10:35:47 +11:00
22daf54f35
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-30 18:20:29 -04:00
cc8912b27e
Added NPC info messages to NpcManager
2014-10-30 18:20:21 -04:00
bd19369ddb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-29 17:16:00 -07:00
2f563f8277
BungeeRotator project.
2014-10-29 17:15:32 -07:00
ee0aa1375d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-29 19:14:57 -04:00
50a457ba51
Database pool tweaks
2014-10-29 19:13:28 -04:00
4fc291ea80
Everything but Mineplexer using database pool
2014-10-29 18:43:21 -04:00
5244f65d8f
All connections to db.mineplex.com/Account use database pool
2014-10-29 17:54:40 -04:00
08f0eb9252
Achievement bug fixes
2014-10-29 01:40:34 -04:00
9819b6c10a
Merge remote-tracking branch 'origin/master'
2014-10-27 20:25:47 -05:00
054c26dfbc
New Coin/Gem Command
2014-10-27 19:59:30 -05:00
01d44cd250
Give Item Command
2014-10-27 19:25:59 -05:00
cd5e4234b7
Fixed a couple more achievement bugs
...
Track damage mods in combat log
2014-10-27 19:00:34 -04:00
f0ba562265
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-27 18:11:29 -04:00
9f8b119fb7
Bug fixes
2014-10-27 18:09:23 -04:00
006e20bb13
Prevent more than 5 players from being processed at a time on server connect.
2014-10-27 04:35:05 -07:00
e926fc1f10
Fixed TransferCommand
2014-10-27 04:34:35 -07:00
0ee9619d3e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-25 14:35:12 -07:00
ead014f65e
Increased server startup time to 30 seconds.
2014-10-25 14:34:38 -07:00
a1c4b8840f
NpcManager no longer uses database connection pool
2014-10-25 16:51:58 -04:00
849d5f1471
lowered gem rewards for MS a little
2014-10-25 18:37:18 +11:00
66b446f1e6
Added some start-game invis to players.
2014-10-25 15:48:49 +11:00
cfcfad610f
Improved recruit/prepare countdown timers
2014-10-25 13:56:23 +11:00
bd2e7faf3e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-25 13:40:53 +11:00
4002528c51
Updated GUI text.
...
- recharges/etc now use bottom text
- uses appropriate bottom/top for 1.7 or 1.8
- fixed 1.7 dragon bar so it works as it did pre-1.8
- dragon bar in 1.8 will now send dragon+wither, for more reliability
- renamed utils to be more clear
2014-10-25 13:40:34 +11:00
6f541a8d30
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-24 18:00:18 -07:00
04ba68293e
Removed debug.
2014-10-24 18:00:10 -07:00
6138da5f93
Merge remote-tracking branch 'origin/master'
2014-10-24 19:43:06 -05:00
5cf3e6c3a1
Fix for arcade custom tags
2014-10-24 19:36:22 -05:00
7dbba0a1f9
Added teleport for map parser
...
Fixed new method in UtilFirework always being BALL_LARGE
Updated lazer
2014-10-25 11:17:32 +11:00
92d9fc4ca0
Deleted deprecated firework module and converted to Util
2014-10-25 11:03:45 +11:00
01f311a3d6
Added missing requirements for SG Achievement Kit
...
fixed a parkour exploit
2014-10-25 10:38:47 +11:00
95937db83a
changed firework color
2014-10-24 19:10:10 +11:00
25fc3c0645
Achievement Kits (3 games)
...
Halloween Pumpkins
Youtube command (allows kits)
2014-10-24 19:05:57 +11:00
27dc9f7693
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-23 23:58:24 -07:00
d4900c38b1
Halloween server max.
...
CustomTagFix fix for invis armor stand on your own head.
2014-10-23 23:58:13 -07:00
b47dcf12af
remvoed debug rank
2014-10-23 14:06:06 +11:00
d4512e464a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-23 14:05:54 +11:00
c2bb53c887
Halloween pumpkins
...
Minestrike balance
bug fixes
2014-10-23 14:05:35 +11:00
0472870e78
Fixed bug that prevented the Necromancer purchase menu from displaying
2014-10-21 20:06:13 -04:00
f52a89d2ca
NpcManager teleports slimes correctly
2014-10-20 18:19:19 -04:00
db3354176c
NpcManager stores test server NPCs under a different server name
2014-10-20 18:08:28 -04:00
a47be7a2f6
Merge remote-tracking branch 'origin/master'
2014-10-19 00:08:13 -05:00
1394e33056
Fix for Arcade Kit NPC Names in 1.8
2014-10-18 21:15:53 -05:00
8630a1ba4c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-17 23:39:21 -05:00
daf2dc3903
Purhcased ranks will no longer override staff ranks.
2014-10-17 23:39:14 -05:00
e3cd6f0e69
Fixed Mem leak in CustomTagFix
...
Changed to ServerGameMenu
Fix for overfilling HH servers
Added staff ability to join all servers.
2014-10-17 23:29:24 -05:00
68009d3013
A little more time to handle wave 5
2014-10-18 13:51:25 +11:00
02ea14bcd1
Damaging Boss restores all hunger
2014-10-18 10:50:17 +11:00
651791ad83
HH FOod update
2014-10-18 10:40:08 +11:00
af0daf4a3d
HH Hunger Update
2014-10-18 10:29:00 +11:00
075bc0af1d
Added gem rewards for MS achievements
2014-10-17 21:20:04 +11:00
98ffa53128
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-17 03:34:47 -05:00
752537b0f6
missing hubtype
2014-10-17 18:59:04 +11:00
2bbb29c8bb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-17 02:57:30 -05:00
f5efea1e9a
Missing files
2014-10-17 18:34:23 +11:00
6d38f4e238
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-17 00:42:01 -05:00
8466b8e2dd
Fixed building issues with EnjinTranslator
...
MAde mysql repo always record rank change even if windows return rank is different.
Added rough single player replay functionality.
2014-10-17 00:41:23 -05:00
fea3793fca
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-17 13:31:25 +11:00
248438535b
Preserve pitch and yaw in NpcManager teleportations
2014-10-16 22:31:09 -04:00
930cdf6c07
Hide NpcManager blank custom names
2014-10-16 22:24:24 -04:00
5fb4f3324d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-17 13:20:09 +11:00
edb2c4f26a
Merge remote-tracking branch 'origin/master'
2014-10-16 22:15:20 -04:00
1fb21d6143
Fixed some NpcManager bugs
2014-10-16 22:13:41 -04:00
727e137cc4
Final HH Update
2014-10-17 12:12:22 +11:00
ec81e9f511
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
2014-10-16 17:51:32 -05:00
c855c46940
Add coin command for online players, better way to handle this soon
2014-10-16 17:46:00 -05:00
5db2c072a0
Halloween update
2014-10-16 16:27:09 +11:00
c30171d24f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-16 12:03:09 +11:00
233e6d0b46
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-15 20:44:50 -04:00
535506393f
Added ability to customize NPC zombie adulthood, slime size, and villager profession
2014-10-15 20:44:42 -04:00
76dc735b6b
Fix bug I was getting with ShopItem
2014-10-15 15:05:31 -05:00
5cdd502d11
Auto backups for MapParser. (Only tested on mac)
2014-10-15 15:04:44 -05:00
58f69b49d7
Add new chat features to JsonMessage
2014-10-15 11:11:32 -05:00
62d4804aa6
Update Craftbukkit.jar for new chat features
2014-10-15 11:10:28 -05:00
e732523dcd
Merge remote-tracking branch 'origin/master'
2014-10-15 10:31:45 -05:00
82e95f714a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-15 16:57:38 +11:00
b83b0e61e6
fixed long lines in achievements
...
added night to halloween maps in parser
2014-10-15 16:57:25 +11:00
a6a4808222
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-15 00:27:01 -05:00
a81bdb4e32
Fixed bug with armor stands showing up for customNameVisible = false;
2014-10-15 00:26:36 -05:00
c3fdae135e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-15 16:11:08 +11:00
25b10f0925
Added /npc refresh command to NpcManager
2014-10-15 01:04:52 -04:00
ed64c1972d
Update accountStats rows before inserting to prevent id column from skipping on failed inserts
2014-10-15 00:54:23 -04:00
d8a8061746
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-15 15:44:41 +11:00
eb5af41323
Added halloween reward pet
...
minor bug fixes
2014-10-15 15:44:26 +11:00
2a18888922
Improved NpcManager to work with persistent maps
2014-10-14 22:22:17 -04:00
130b932f40
Fix typo in Free Server Timer
2014-10-14 14:30:44 -05:00
256df99b7b
Added MineStrike to achievement gui
2014-10-13 23:48:38 -04:00
3ba748f2de
Merge branch 'feature/currency-log'
2014-10-13 23:13:44 -04:00
1dd51bcac5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-13 21:07:10 -05:00
15b6a80613
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-14 13:02:17 +11:00
bf1f28318b
fix for UHC not ending
2014-10-14 13:02:04 +11:00
ed9dd6e894
Minor patches
2014-10-14 12:42:53 +11:00
127e12b7c7
Added missing dependency in intellij
2014-10-13 20:49:35 -04:00
8f90c96019
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-13 20:45:55 -04:00
2016ea09cb
Added achievements to games and Achievement enum
2014-10-13 20:38:58 -04:00
0194a041e2
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-12 20:57:32 -07:00
3e7787a354
Fix for customer support GemHunterCommand
...
Fix for UUIDFethcer pulling while player is online.
2014-10-12 20:57:17 -07:00
a4b85053d9
fixed bug where blockmorph was crashing hubs.
2014-10-13 14:56:19 +11:00
25fbe24d20
improved sound output of coin bomb
2014-10-13 14:13:57 +11:00
e41b10ccb8
minor UHC fix
2014-10-13 14:09:58 +11:00
9b1c4783ce
lowered UHC win to 8k
2014-10-13 09:57:38 +11:00
6e6e0e2ae0
added flags to disable gem multipliers per-game. UHC was giving too much :O
2014-10-13 09:44:30 +11:00
a8d1cef933
Minestrike, ensure bomb does not get overridden.
2014-10-12 18:31:05 +11:00
623cdb0f2c
Allowed players to rejoin if disconnect within first 10 minutes of UHC.
2014-10-12 18:27:49 +11:00
603c0cb66e
Staggered UHC game teleports to help reduce lag.
2014-10-12 18:26:18 +11:00
28285ab999
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-12 14:19:52 +11:00
9cc28d1ad8
MAC Update
2014-10-12 14:19:35 +11:00
a3e6613a94
a
2014-10-11 15:53:43 -04:00
3e92b02bab
Fixed max slot bug with ultra/hero
2014-10-11 05:56:47 -07:00
42d22ac38f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-11 23:10:09 +11:00
1d3b792ed8
UHC head apple fixes
2014-10-11 23:09:56 +11:00
d3788e8ddc
Fixed redis server time functions.
...
Added kill option for servers with motd Finished in servermonitor
2014-10-11 04:40:53 -07:00
9c8ed5360d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-11 21:01:52 +11:00
8e071f59d6
missing file
2014-10-11 20:59:36 +11:00
d407cc7c4c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-11 02:57:01 -07:00
95a4a34b47
UHC announcement Title
2014-10-11 20:55:48 +11:00
8ace0ce07c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-11 02:55:45 -07:00
316ce38056
Changed Utility time to ms
2014-10-11 20:53:39 +11:00
797dd002ad
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-11 02:43:56 -07:00
1a10ddb6a4
Fix for Open in
2014-10-11 02:43:02 -07:00
a54b78fefa
Added Mine-Strike to Quick Game menu.
...
Fixed up CoreClientManager's rank update.
2014-10-11 02:32:02 -07:00
a2df64787f
remove players from closed game, on update
2014-10-11 20:30:40 +11:00
961163c135
delaying return to hub
2014-10-11 20:26:08 +11:00
a7ceb24b15
Hub UHC time log
2014-10-11 20:10:48 +11:00
dc0709f17e
HH Update
...
Added UHC to skytext for hub
2014-10-11 19:43:28 +11:00
19afebe53d
Added in mysql hooks for coins/gems/ranks for database conversion preperation.
...
Added in failover database calls in CoreClient/DonationManager
2014-10-11 01:32:22 -07:00
e2c72a3ae2
HH update
2014-10-11 14:28:00 +11:00
3422f48325
New acheivements
2014-10-10 21:49:03 -04:00
b61979a31f
UHC anti-xray; veins can now contain multiple ores. prevents veins occluded by other veins being removed.
2014-10-10 19:05:04 +11:00
7d1a62e810
UHC anti-xray visibility update
2014-10-10 18:58:12 +11:00
0acaf2e426
removed anti-xray on coal
2014-10-10 18:56:21 +11:00
d0d2622ecc
added UHC on-the-fly anti-xray
2014-10-10 18:54:38 +11:00
a739712dca
fixed game autostart flag bug.
...
added UHC gem rewards
2014-10-10 15:26:04 +11:00
e3747b5183
Minestrike fixes
...
Hub UHC announcer
2014-10-10 13:07:59 +11:00
232dd231d0
UHC joinability/MOTD
...
Minestrike spec shop bug fix
2014-10-10 10:49:39 +11:00
ffc2ff5058
Modifided output of friends list
...
- buttons to left side for alignment
- sorted by sent>offline>pending>online
- improved 'no friends' message
2014-10-09 12:15:45 +11:00
4bed45c48c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-09 10:47:47 +11:00
8701f9ddcc
Added TabTitle
...
Converted MineStrike to use scoreboard name hiding
2014-10-09 10:35:54 +11:00
4755965808
Merge remote-tracking branch 'origin/master'
2014-10-05 21:18:11 -05:00
1bb3f23ba4
Update craftbukkit.jar with 1.8 scoreboard team nametag visibility
2014-10-05 21:17:32 -05:00
2a2191f23b
Saving some changes to craftbukkit -> adds 1.8 nametag visibility option for teams
2014-10-05 21:16:40 -05:00
7a345dce95
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-05 13:40:15 +11:00
d3f87dff46
MineStrike update
2014-10-05 13:37:27 +11:00
bf11635616
Fixed GemHunter in StaffServer and added offline stat increment :)
2014-10-04 15:43:33 -07:00
39b03b7533
Change time command to mod+
2014-10-04 00:20:35 -05:00
520ade8249
Merge remote-tracking branch 'origin/master'
2014-10-03 20:41:06 -05:00
ef82aa08b1
Time command for mod+
2014-10-03 20:40:58 -05:00
66457ded60
Fix initial friends date load for offline time.
2014-10-03 02:05:55 -07:00
70122db510
Updated staff server gem hunter packages.
2014-10-03 01:56:02 -07:00
9033843a31
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-03 01:50:35 -07:00
c641eab3c7
Fixed up friends.
2014-10-03 01:50:23 -07:00
b78132ebfc
Renamed NpcManager methods
2014-10-02 22:18:25 -04:00
addc423c2d
Added /npc clear back
2014-10-02 22:15:12 -04:00
f6f484c134
Refactored /npc commands
2014-10-02 22:08:00 -04:00
42e60d0856
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-03 11:27:37 +10:00
4253c08682
Fix time
2014-10-02 20:25:50 -05:00
8359c9a7b4
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-03 11:17:53 +10:00
cda9234ad3
Fixed TimeInGame stat not recording sometimes
2014-10-03 11:17:36 +10:00
825f08b6a7
Merge remote-tracking branch 'origin/master'
2014-10-02 20:01:45 -05:00
a6fea938b9
Fix some duplicate code
2014-10-02 20:01:33 -05:00
17e34e2060
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-03 10:49:42 +10:00
31ceaad7fe
MineStrike audio update
2014-10-03 10:49:26 +10:00
07576a2b12
Add gamesplayed and timeingame to gui
2014-10-02 19:48:25 -05:00
9b2a2cbbd6
Fixed mounting blocks on yourself in 1.8
...
Added temp fix so 1.8 players can ride dragons again.
Removed Block form in parkour and fly for block form.
2014-10-01 02:12:11 -07:00
c2b84cc60f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-30 12:20:14 -07:00
0228ef5921
Staff server work to include treasure chests/keys and gem hunter level 8, 12.
2014-09-30 12:20:01 -07:00
a5a2c1a837
Partially done refactoring NpcManager
2014-09-30 11:03:23 -04:00
Chiss
Shaun Bennett
Jonathan Williams
CoderTim
Shaun Bennett
MrTwiggy