Jonathan Williams
d64e8c5162
Added max of 10 connections for db pool.
2014-11-01 02:35:36 -07:00
Jonathan Williams
86fb78e34c
minor Unused code cleanup
2014-10-31 23:32:59 -07:00
Jonathan Williams
fa0049d22a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-31 23:01:15 -07:00
Jonathan Williams
f206441999
Fix partial commit.
2014-10-31 23:00:53 -07:00
Jonathan Williams
c85ba72730
Added null check for dragooon.
...
Added two treasure keys for halloween give away.
2014-10-31 23:00:13 -07:00
CoderTim
f3770933b6
Merge branch 'feature/database-pool'
2014-11-01 01:59:07 -04:00
Chiss
da88d68513
UHC does not record team stats
2014-11-01 15:42:52 +11:00
Jonathan Williams
f1966be6a2
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-31 17:29:57 -07:00
Chiss
7f642673bc
fixed deathbomber achievement
2014-11-01 11:25:08 +11:00
Jonathan Williams
1f26aee006
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-31 17:12:27 -07:00
Chiss
0095a03df7
returned bridges to normal
2014-11-01 11:11:35 +11:00
Jonathan Williams
2aced64191
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-31 17:03:15 -07:00
Jonathan Williams
45da22b0bf
Fixed bug with parkour enchantment checks.
2014-10-31 17:03:06 -07:00
Chiss
de28906aa5
restored 10 min timer for bridges
2014-11-01 09:18:44 +11:00
Chiss
d0a8a86698
disabled tnt water damage before bridges drop
2014-11-01 09:18:25 +11:00
Chiss
58d6cf199b
fixed foodformassesstat kind of? doesnt update db still
2014-11-01 08:59:57 +11:00
Chiss
83d182db2e
Fixed Villager exploit! oops
...
Some balance stuff in champs
2014-11-01 08:38:36 +11:00
Chiss
b5ef46007f
updated npc info
2014-10-31 18:17:12 +11:00
Chiss
bf6e788f36
1 more fix for sheepy
2014-10-31 16:47:20 +11:00
Chiss
c4264dcea1
fixed sheep skill trigger names
2014-10-31 15:58:11 +11:00
Chiss
50a2bcda66
BACK FROM THE DEAD
2014-10-31 15:40:40 +11:00
Chiss
de08456093
fixed error in block restore
2014-10-31 10:47:18 +11:00
Chiss
aca18bb2e7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-31 10:36:06 +11:00
Chiss
aa45f031ac
3 new achievement Kits
...
SSM Balance patch
Champs balance
tons of bug fixes
2014-10-31 10:35:47 +11:00
CoderTim
22daf54f35
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-30 18:20:29 -04:00
CoderTim
cc8912b27e
Added NPC info messages to NpcManager
2014-10-30 18:20:21 -04:00
Jonathan Williams
bd19369ddb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-29 17:16:00 -07:00
Jonathan Williams
2f563f8277
BungeeRotator project.
2014-10-29 17:15:32 -07:00
CoderTim
ee0aa1375d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-29 19:14:57 -04:00
CoderTim
50a457ba51
Database pool tweaks
2014-10-29 19:13:28 -04:00
CoderTim
4fc291ea80
Everything but Mineplexer using database pool
2014-10-29 18:43:21 -04:00
CoderTim
5244f65d8f
All connections to db.mineplex.com/Account use database pool
2014-10-29 17:54:40 -04:00
CoderTim
08f0eb9252
Achievement bug fixes
2014-10-29 01:40:34 -04:00
Shaun Bennett
9819b6c10a
Merge remote-tracking branch 'origin/master'
2014-10-27 20:25:47 -05:00
Shaun Bennett
054c26dfbc
New Coin/Gem Command
2014-10-27 19:59:30 -05:00
Shaun Bennett
01d44cd250
Give Item Command
2014-10-27 19:25:59 -05:00
CoderTim
cd5e4234b7
Fixed a couple more achievement bugs
...
Track damage mods in combat log
2014-10-27 19:00:34 -04:00
CoderTim
f0ba562265
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-27 18:11:29 -04:00
CoderTim
9f8b119fb7
Bug fixes
2014-10-27 18:09:23 -04:00
Jonathan Williams
006e20bb13
Prevent more than 5 players from being processed at a time on server connect.
2014-10-27 04:35:05 -07:00
Jonathan Williams
e926fc1f10
Fixed TransferCommand
2014-10-27 04:34:35 -07:00
Jonathan Williams
0ee9619d3e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-25 14:35:12 -07:00
Jonathan Williams
ead014f65e
Increased server startup time to 30 seconds.
2014-10-25 14:34:38 -07:00
CoderTim
a1c4b8840f
NpcManager no longer uses database connection pool
2014-10-25 16:51:58 -04:00
Chiss
849d5f1471
lowered gem rewards for MS a little
2014-10-25 18:37:18 +11:00
Chiss
66b446f1e6
Added some start-game invis to players.
2014-10-25 15:48:49 +11:00
Chiss
cfcfad610f
Improved recruit/prepare countdown timers
2014-10-25 13:56:23 +11:00
Chiss
bd2e7faf3e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-25 13:40:53 +11:00
Chiss
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
Jonathan Williams
6f541a8d30
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-24 18:00:18 -07:00
Jonathan Williams
04ba68293e
Removed debug.
2014-10-24 18:00:10 -07:00
Shaun Bennett
6138da5f93
Merge remote-tracking branch 'origin/master'
2014-10-24 19:43:06 -05:00
Shaun Bennett
5cf3e6c3a1
Fix for arcade custom tags
2014-10-24 19:36:22 -05:00
Chiss
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
Chiss
92d9fc4ca0
Deleted deprecated firework module and converted to Util
2014-10-25 11:03:45 +11:00
Chiss
01f311a3d6
Added missing requirements for SG Achievement Kit
...
fixed a parkour exploit
2014-10-25 10:38:47 +11:00
Chiss
95937db83a
changed firework color
2014-10-24 19:10:10 +11:00
Chiss
25fc3c0645
Achievement Kits (3 games)
...
Halloween Pumpkins
Youtube command (allows kits)
2014-10-24 19:05:57 +11:00
Jonathan Williams
27dc9f7693
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-23 23:58:24 -07:00
Jonathan Williams
d4900c38b1
Halloween server max.
...
CustomTagFix fix for invis armor stand on your own head.
2014-10-23 23:58:13 -07:00
Chiss
b47dcf12af
remvoed debug rank
2014-10-23 14:06:06 +11:00
Chiss
d4512e464a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-23 14:05:54 +11:00
Chiss
c2bb53c887
Halloween pumpkins
...
Minestrike balance
bug fixes
2014-10-23 14:05:35 +11:00
CoderTim
0472870e78
Fixed bug that prevented the Necromancer purchase menu from displaying
2014-10-21 20:06:13 -04:00
CoderTim
f52a89d2ca
NpcManager teleports slimes correctly
2014-10-20 18:19:19 -04:00
CoderTim
db3354176c
NpcManager stores test server NPCs under a different server name
2014-10-20 18:08:28 -04:00
Shaun Bennett
a47be7a2f6
Merge remote-tracking branch 'origin/master'
2014-10-19 00:08:13 -05:00
Shaun Bennett
1394e33056
Fix for Arcade Kit NPC Names in 1.8
2014-10-18 21:15:53 -05:00
Jonathan Williams
8630a1ba4c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-17 23:39:21 -05:00
Jonathan Williams
daf2dc3903
Purhcased ranks will no longer override staff ranks.
2014-10-17 23:39:14 -05:00
Jonathan Williams
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
Chiss
68009d3013
A little more time to handle wave 5
2014-10-18 13:51:25 +11:00
Chiss
02ea14bcd1
Damaging Boss restores all hunger
2014-10-18 10:50:17 +11:00
Chiss
651791ad83
HH FOod update
2014-10-18 10:40:08 +11:00
Chiss
af0daf4a3d
HH Hunger Update
2014-10-18 10:29:00 +11:00
Chiss
075bc0af1d
Added gem rewards for MS achievements
2014-10-17 21:20:04 +11:00
Jonathan Williams
98ffa53128
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-17 03:34:47 -05:00
Chiss
752537b0f6
missing hubtype
2014-10-17 18:59:04 +11:00
Jonathan Williams
2bbb29c8bb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-17 02:57:30 -05:00
Chiss
f5efea1e9a
Missing files
2014-10-17 18:34:23 +11:00
Jonathan Williams
6d38f4e238
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-17 00:42:01 -05:00
Jonathan Williams
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
Chiss
fea3793fca
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-17 13:31:25 +11:00
CoderTim
248438535b
Preserve pitch and yaw in NpcManager teleportations
2014-10-16 22:31:09 -04:00
CoderTim
930cdf6c07
Hide NpcManager blank custom names
2014-10-16 22:24:24 -04:00
Chiss
5fb4f3324d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-17 13:20:09 +11:00
CoderTim
edb2c4f26a
Merge remote-tracking branch 'origin/master'
2014-10-16 22:15:20 -04:00
CoderTim
1fb21d6143
Fixed some NpcManager bugs
2014-10-16 22:13:41 -04:00
Chiss
727e137cc4
Final HH Update
2014-10-17 12:12:22 +11:00
Shaun Bennett
ec81e9f511
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
2014-10-16 17:51:32 -05:00
Shaun Bennett
c855c46940
Add coin command for online players, better way to handle this soon
2014-10-16 17:46:00 -05:00
Chiss
5db2c072a0
Halloween update
2014-10-16 16:27:09 +11:00
Chiss
c30171d24f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-16 12:03:09 +11:00
CoderTim
233e6d0b46
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-15 20:44:50 -04:00
CoderTim
535506393f
Added ability to customize NPC zombie adulthood, slime size, and villager profession
2014-10-15 20:44:42 -04:00
Shaun Bennett
76dc735b6b
Fix bug I was getting with ShopItem
2014-10-15 15:05:31 -05:00
Shaun Bennett
5cdd502d11
Auto backups for MapParser. (Only tested on mac)
2014-10-15 15:04:44 -05:00
Shaun Bennett
58f69b49d7
Add new chat features to JsonMessage
2014-10-15 11:11:32 -05:00
Shaun Bennett
62d4804aa6
Update Craftbukkit.jar for new chat features
2014-10-15 11:10:28 -05:00
Shaun Bennett
e732523dcd
Merge remote-tracking branch 'origin/master'
2014-10-15 10:31:45 -05:00
Chiss
82e95f714a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-15 16:57:38 +11:00
Chiss
b83b0e61e6
fixed long lines in achievements
...
added night to halloween maps in parser
2014-10-15 16:57:25 +11:00
Jonathan Williams
a6a4808222
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-15 00:27:01 -05:00
Jonathan Williams
a81bdb4e32
Fixed bug with armor stands showing up for customNameVisible = false;
2014-10-15 00:26:36 -05:00
Chiss
c3fdae135e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-15 16:11:08 +11:00
CoderTim
25b10f0925
Added /npc refresh command to NpcManager
2014-10-15 01:04:52 -04:00
CoderTim
ed64c1972d
Update accountStats rows before inserting to prevent id column from skipping on failed inserts
2014-10-15 00:54:23 -04:00
Chiss
d8a8061746
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-15 15:44:41 +11:00
Chiss
eb5af41323
Added halloween reward pet
...
minor bug fixes
2014-10-15 15:44:26 +11:00
CoderTim
2a18888922
Improved NpcManager to work with persistent maps
2014-10-14 22:22:17 -04:00
Shaun Bennett
130b932f40
Fix typo in Free Server Timer
2014-10-14 14:30:44 -05:00
CoderTim
256df99b7b
Added MineStrike to achievement gui
2014-10-13 23:48:38 -04:00
CoderTim
3ba748f2de
Merge branch 'feature/currency-log'
2014-10-13 23:13:44 -04:00
Jonathan Williams
1dd51bcac5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-13 21:07:10 -05:00
Chiss
15b6a80613
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-14 13:02:17 +11:00
Chiss
bf1f28318b
fix for UHC not ending
2014-10-14 13:02:04 +11:00
Chiss
ed9dd6e894
Minor patches
2014-10-14 12:42:53 +11:00
CoderTim
127e12b7c7
Added missing dependency in intellij
2014-10-13 20:49:35 -04:00
CoderTim
8f90c96019
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-13 20:45:55 -04:00
CoderTim
2016ea09cb
Added achievements to games and Achievement enum
2014-10-13 20:38:58 -04:00
Jonathan Williams
0194a041e2
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-12 20:57:32 -07:00
Jonathan Williams
3e7787a354
Fix for customer support GemHunterCommand
...
Fix for UUIDFethcer pulling while player is online.
2014-10-12 20:57:17 -07:00
Chiss
a4b85053d9
fixed bug where blockmorph was crashing hubs.
2014-10-13 14:56:19 +11:00
Chiss
25fbe24d20
improved sound output of coin bomb
2014-10-13 14:13:57 +11:00
Chiss
e41b10ccb8
minor UHC fix
2014-10-13 14:09:58 +11:00
Chiss
9b1c4783ce
lowered UHC win to 8k
2014-10-13 09:57:38 +11:00
Chiss
6e6e0e2ae0
added flags to disable gem multipliers per-game. UHC was giving too much :O
2014-10-13 09:44:30 +11:00
Chiss
a8d1cef933
Minestrike, ensure bomb does not get overridden.
2014-10-12 18:31:05 +11:00
Chiss
623cdb0f2c
Allowed players to rejoin if disconnect within first 10 minutes of UHC.
2014-10-12 18:27:49 +11:00
Chiss
603c0cb66e
Staggered UHC game teleports to help reduce lag.
2014-10-12 18:26:18 +11:00
Chiss
28285ab999
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-12 14:19:52 +11:00
Chiss
9cc28d1ad8
MAC Update
2014-10-12 14:19:35 +11:00
MrTwiggy
a3e6613a94
a
2014-10-11 15:53:43 -04:00
Jonathan Williams
3e92b02bab
Fixed max slot bug with ultra/hero
2014-10-11 05:56:47 -07:00
Chiss
42d22ac38f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-11 23:10:09 +11:00
Chiss
1d3b792ed8
UHC head apple fixes
2014-10-11 23:09:56 +11:00
Jonathan Williams
d3788e8ddc
Fixed redis server time functions.
...
Added kill option for servers with motd Finished in servermonitor
2014-10-11 04:40:53 -07:00
Chiss
9c8ed5360d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-11 21:01:52 +11:00
Chiss
8e071f59d6
missing file
2014-10-11 20:59:36 +11:00
Jonathan Williams
d407cc7c4c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-11 02:57:01 -07:00
Chiss
95a4a34b47
UHC announcement Title
2014-10-11 20:55:48 +11:00
Jonathan Williams
8ace0ce07c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-11 02:55:45 -07:00
Chiss
316ce38056
Changed Utility time to ms
2014-10-11 20:53:39 +11:00
Jonathan Williams
797dd002ad
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-11 02:43:56 -07:00
Jonathan Williams
1a10ddb6a4
Fix for Open in
2014-10-11 02:43:02 -07:00
Jonathan Williams
a54b78fefa
Added Mine-Strike to Quick Game menu.
...
Fixed up CoreClientManager's rank update.
2014-10-11 02:32:02 -07:00
Chiss
a2df64787f
remove players from closed game, on update
2014-10-11 20:30:40 +11:00
Chiss
961163c135
delaying return to hub
2014-10-11 20:26:08 +11:00
Chiss
a7ceb24b15
Hub UHC time log
2014-10-11 20:10:48 +11:00
Chiss
dc0709f17e
HH Update
...
Added UHC to skytext for hub
2014-10-11 19:43:28 +11:00
Jonathan Williams
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
Chiss
e2c72a3ae2
HH update
2014-10-11 14:28:00 +11:00
CoderTim
3422f48325
New acheivements
2014-10-10 21:49:03 -04:00
Chiss
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
Chiss
7d1a62e810
UHC anti-xray visibility update
2014-10-10 18:58:12 +11:00
Chiss
0acaf2e426
removed anti-xray on coal
2014-10-10 18:56:21 +11:00
Chiss
d0d2622ecc
added UHC on-the-fly anti-xray
2014-10-10 18:54:38 +11:00
Chiss
a739712dca
fixed game autostart flag bug.
...
added UHC gem rewards
2014-10-10 15:26:04 +11:00
Chiss
e3747b5183
Minestrike fixes
...
Hub UHC announcer
2014-10-10 13:07:59 +11:00
Chiss
232dd231d0
UHC joinability/MOTD
...
Minestrike spec shop bug fix
2014-10-10 10:49:39 +11:00
Chiss
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
Chiss
4bed45c48c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-09 10:47:47 +11:00
Chiss
8701f9ddcc
Added TabTitle
...
Converted MineStrike to use scoreboard name hiding
2014-10-09 10:35:54 +11:00
Shaun Bennett
4755965808
Merge remote-tracking branch 'origin/master'
2014-10-05 21:18:11 -05:00
Shaun Bennett
1bb3f23ba4
Update craftbukkit.jar with 1.8 scoreboard team nametag visibility
2014-10-05 21:17:32 -05:00
Shaun Bennett
2a2191f23b
Saving some changes to craftbukkit -> adds 1.8 nametag visibility option for teams
2014-10-05 21:16:40 -05:00
Chiss
7a345dce95
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-05 13:40:15 +11:00
Chiss
d3f87dff46
MineStrike update
2014-10-05 13:37:27 +11:00
Jonathan Williams
bf11635616
Fixed GemHunter in StaffServer and added offline stat increment :)
2014-10-04 15:43:33 -07:00
Shaun Bennett
39b03b7533
Change time command to mod+
2014-10-04 00:20:35 -05:00
Shaun Bennett
520ade8249
Merge remote-tracking branch 'origin/master'
2014-10-03 20:41:06 -05:00
Shaun Bennett
ef82aa08b1
Time command for mod+
2014-10-03 20:40:58 -05:00
Jonathan Williams
66457ded60
Fix initial friends date load for offline time.
2014-10-03 02:05:55 -07:00
Jonathan Williams
70122db510
Updated staff server gem hunter packages.
2014-10-03 01:56:02 -07:00
Jonathan Williams
9033843a31
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-03 01:50:35 -07:00
Jonathan Williams
c641eab3c7
Fixed up friends.
2014-10-03 01:50:23 -07:00
CoderTim
b78132ebfc
Renamed NpcManager methods
2014-10-02 22:18:25 -04:00
CoderTim
addc423c2d
Added /npc clear back
2014-10-02 22:15:12 -04:00
CoderTim
f6f484c134
Refactored /npc commands
2014-10-02 22:08:00 -04:00
Chiss
42e60d0856
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-03 11:27:37 +10:00
Shaun Bennett
4253c08682
Fix time
2014-10-02 20:25:50 -05:00
Chiss
8359c9a7b4
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-03 11:17:53 +10:00
Chiss
cda9234ad3
Fixed TimeInGame stat not recording sometimes
2014-10-03 11:17:36 +10:00
Shaun Bennett
825f08b6a7
Merge remote-tracking branch 'origin/master'
2014-10-02 20:01:45 -05:00
Shaun Bennett
a6fea938b9
Fix some duplicate code
2014-10-02 20:01:33 -05:00
Chiss
17e34e2060
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-03 10:49:42 +10:00
Chiss
31ceaad7fe
MineStrike audio update
2014-10-03 10:49:26 +10:00
Shaun Bennett
07576a2b12
Add gamesplayed and timeingame to gui
2014-10-02 19:48:25 -05:00
Jonathan Williams
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
Jonathan Williams
c2b84cc60f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-30 12:20:14 -07:00
Jonathan Williams
0228ef5921
Staff server work to include treasure chests/keys and gem hunter level 8, 12.
2014-09-30 12:20:01 -07:00
CoderTim
a5a2c1a837
Partially done refactoring NpcManager
2014-09-30 11:03:23 -04:00
CoderTim
ce306e88ed
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-30 02:45:28 -04:00
CoderTim
70fd8835ac
Added GamesPlayed and TimeInGame stats
2014-09-30 02:45:20 -04:00
Shaun Bennett
c7d34e70ef
Merge remote-tracking branch 'origin/master'
2014-09-29 17:42:13 -05:00
Shaun Bennett
92f8dc7f61
Add velocity toggle for mod+
2014-09-29 17:17:02 -05:00
Jonathan Williams
552a861c8b
Fixed class path for PvP project.
2014-09-29 12:13:38 -07:00
Jonathan Williams
36cbe55a49
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-29 12:13:08 -07:00
Shaun Bennett
7892c442d0
Add show mac reports user pref for mod+
2014-09-29 11:14:20 -05:00
CoderTim
578b5702bc
Added commons-dbcp2.jar dependency to Mineplex.Core in eclipse
2014-09-27 04:18:19 -04:00
Peter Miller
1bf5debc06
Updating DDoSProtectionSwitcher switchServer() method to launch remote script for IP change instead of local.
2014-09-27 00:45:52 -04:00
Jonathan Williams
eaee6c2733
AWork on FRiends.
2014-09-26 12:38:51 -07:00
Jonathan Williams
34baa8eafb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-25 23:27:19 -07:00
Jonathan Williams
8bca23f0ba
Fixed bug with custom tag fix :P
...
Fixed bug with server group up time check in servermonitor.
2014-09-25 23:27:08 -07:00
Chiss
895878ee40
Removing old items, fix for a larger problemo
2014-09-26 09:33:12 +10:00
Shaun Bennett
7ee4f549f8
Merge remote-tracking branch 'origin/master'
2014-09-25 18:04:06 -05:00
MrTwiggy
fc98cf4f6c
Add callback feature set for cross-server command system to reduce dependencies, clean up old constant references and add in ability to initialize server name on ServerData. Clean up old 'this' references to '_' prefixed variables and standardize field naming.
2014-09-25 17:17:38 -04:00
CoderTim
ba2f0e37ef
Log changes in players' coins to database
2014-09-25 17:03:26 -04:00
Jonathan Williams
91ca7fa6c6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-25 05:37:21 -07:00
Jonathan Williams
e29dd4ff71
Fixes for ServerMonitor.
2014-09-25 05:37:10 -07:00
Chiss
79e808814a
Minestrike cleans up incendiary at the end of rounds
2014-09-25 20:52:13 +10:00
Jonathan Williams
1f0bd462e3
Fix for CustomTagFix leak.
2014-09-24 22:14:26 -07:00
Shaun Bennett
f5c8b2b1ac
Fix renaming pets for 1.8 clients
2014-09-24 22:31:09 -05:00
Shaun Bennett
57487e78cf
Fix Gem Booster display bug
2014-09-24 21:59:25 -05:00
Jonathan Williams
a54a2aadc0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-24 01:32:03 -07:00
Jonathan Williams
d32085f05b
Removed tab list stuff for friends.
...
Implemented rudimentary friends chat list.
removed unused code in server stuff.
Added null check for retrieving server statuses.
2014-09-24 01:31:56 -07:00
Chiss
969c7c0fde
Music gadget fixes
...
Tournament point tally
Removed snow from frosty HorseMount
Added Tournament hub invite messages
2014-09-24 15:46:55 +10:00
Shaun Bennett
efa03945cb
Delete the MapParser zip file from root directory after copied
2014-09-23 17:05:21 -05:00
CoderTim
efb3c26115
Switched back to the latest craftbukkit.jar
2014-09-22 03:59:28 -04:00
CoderTim
acc056d32d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-22 03:56:16 -04:00
Chiss
5774de552d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-22 17:53:39 +10:00
Chiss
a58335d906
Added GameStatManager.java
2014-09-22 17:46:36 +10:00
CoderTim
00c8bfbd61
Changed BungeeSign dependency to bukkit.jar to match dependencies in eclipse
2014-09-22 03:46:05 -04:00
CoderTim
77e21c0d99
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-22 02:53:55 -04:00
MrTwiggy
5c9ee3e79e
Add ServerCommand system for live cross-server commands,. Update Queuer to support Redis based database and functionality. Fix ServerStatus start up dates to synchronize properly with central Redis time. Add new DataRepository's for easier dynamic object storage in redis. Update Portal server-transfers to support new cross-server command system rather than database stored server transfers.
2014-09-21 20:42:47 -04:00
CoderTim
1949de4fd7
Database implementation of NpcManager partially complete
2014-09-21 15:45:15 -04:00
Chiss
7ca4b6830b
added in GameStatManager
2014-09-21 09:28:12 +10:00
Chiss
9fce0b1926
Added small cooldown to be able to click hub clock after your gamestate changes. (prevents accidental clicking)
...
Moved stat stuff to gamemanager.
2014-09-21 09:26:34 +10:00
Chiss
767a0247a6
More change to end game title :)
2014-09-20 16:36:30 +10:00
Chiss
6e60c301cf
fixed Title for end game
2014-09-20 16:33:24 +10:00
Chiss
d9677ddda2
Disabled saving game player log for non-tournament
2014-09-20 16:28:45 +10:00
Chiss
a830c72d22
Jukebox will be removed.
2014-09-20 15:29:59 +10:00
Chiss
be3e10a412
Treasure now reverts BlockRestore changes before changing blocks. Prevents artifact blocks being left behind.
2014-09-20 09:31:06 +10:00
Chiss
0d090d7bdc
fixed issue with MASSSSSSSSSIVE PLANET SIZED gui scale
...
added lore to coins in GUI, to help new players and sell more ranks
slightly lowered hitbox for headshots in minestrike
2014-09-20 09:10:55 +10:00
Chiss
9bbac7578e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
2014-09-20 08:29:06 +10:00
Jonathan Williams
960b0aa69e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
2014-09-19 09:23:52 -10:00
Shaun Bennett
ed85779876
Fix Treasure painball gun issue, fix parkour paintbull gun issue
2014-09-19 14:18:23 -05:00
Jonathan Williams
96498af626
Fixed parkour bug with gadget blocks.
...
Removed a ton of debug messages with inventory close.
2014-09-19 09:06:42 -10:00
Jonathan Williams
d0edde9dbd
Added rank benefit giver 9000
...
Added MineStrike to beta timer.
Updated official craftbukkit.jar
2014-09-19 02:57:35 -10:00
Jonathan Williams
c8e755fe5f
Reverted and merged twigs status update. (Needs fix on startDate.)
2014-09-18 22:22:01 -10:00
Jonathan Williams
239b021b0d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-18 22:03:49 -10:00
Jonathan Williams
18f2ef7564
Re-enabled SNAKE PARKOUR for hub.
2014-09-18 22:03:23 -10:00
Chiss
21c131273e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-19 18:01:52 +10:00
Chiss
91037384f9
Loot tweaks
...
Music fixes
some bug fixes
2014-09-19 18:01:38 +10:00
Jonathan Williams
7906f48262
Updated CoreClientManager to pull all account data via name request.
...
Cleaned up some code with pet administrator.
added logging if 0 rows were being saved in CommitChanges
2014-09-18 21:12:37 -10:00
CoderTim
edce1c9f90
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-19 02:46:12 -04:00
CoderTim
8cb836d5b3
Fixed some achievement bugs
2014-09-19 02:46:04 -04:00
Chiss
ed7eeab1a7
fixed exception
2014-09-19 16:13:11 +10:00
Shaun Bennett
5c791090fc
Open all treasures after 60 seconds
2014-09-19 00:48:11 -05:00
Shaun Bennett
3d04b27898
Prevent Gadget block changes from affecting treasure
2014-09-18 23:03:08 -05:00
Shaun Bennett
1a9f676a61
Merge remote-tracking branch 'origin/master'
2014-09-18 22:41:32 -05:00
Shaun Bennett
3eb61135c9
Fix treasure message
2014-09-18 22:39:42 -05:00
Chiss
01a6ff6069
costume reward fix
...
hub builder including database
2014-09-19 13:01:49 +10:00
Shaun Bennett
1370a0eeac
Clean up RewardRarity
2014-09-18 21:24:14 -05:00
Shaun Bennett
aad3d59177
Merge remote-tracking branch 'origin/master'
2014-09-18 21:03:59 -05:00
Shaun Bennett
5d643c00d5
treasssssurreeeeees
2014-09-18 21:03:46 -05:00
Chiss
27587a2a11
fixed players being able to be pushed into portals by gadgets
2014-09-19 11:15:48 +10:00
Chiss
a0e9d6f6fd
fixed a portal break bug
...
reduced lag from coin bomb
2014-09-19 10:59:26 +10:00
Chiss
4b602c1b83
Inventory Update
...
added Jooq to Hub build
2014-09-19 10:36:41 +10:00
Shaun Bennett
c93fee2b53
Fix typos for pets
2014-09-18 18:10:33 -05:00
Shaun Bennett
ee64ff2bf6
Dispose of Shop if the InventoryOpenEvent gets cancelled
2014-09-18 17:48:35 -05:00
Shaun Bennett
2008dae57b
Adjust treasure message
2014-09-18 17:38:05 -05:00
Shaun Bennett
51ad6d8368
Open Treasure chests through cosmetic gui, purchase treasure keys, some bug fixes
2014-09-18 17:33:05 -05:00
Shaun Bennett
b8d157f99f
Add costumes to RewardManager
2014-09-18 14:47:22 -05:00
Shaun Bennett
76df00978a
Add music discs to RewardManager
2014-09-18 14:43:07 -05:00
Shaun Bennett
88a8e3a896
Hackyish way to log rewards given out in a database
2014-09-18 14:35:59 -05:00
Chiss
ed59e03795
Loot update
2014-09-18 17:05:56 +10:00
CoderTim
8b14c85572
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-18 01:57:04 -04:00
CoderTim
f8ee20c433
Record server name in basic game stats
2014-09-18 01:56:46 -04:00
Shaun Bennett
e5d5cda9fd
Merge remote-tracking branch 'origin/master'
2014-09-18 00:46:41 -05:00
Shaun Bennett
87bd5d8f7f
Add coin party bomb to rare rewards, fix reward values from last commit
2014-09-18 00:46:33 -05:00
Chiss
3fd312ff95
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-18 15:45:01 +10:00
Chiss
fed3d31374
MineStrike fixes
2014-09-18 15:44:48 +10:00
Shaun Bennett
6c4479298d
Fix RewardManager bug, fooling around with animations
2014-09-18 00:41:56 -05:00
Shaun Bennett
9d0b99b7fc
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
2014-09-17 23:56:42 -05:00
Chiss
09a3cc16b0
Reward stuffs
2014-09-18 14:36:22 +10:00
Chiss
bb8e481c7f
More Reward stuff
2014-09-18 14:25:39 +10:00
Chiss
c625fb4121
Restructured rewards for Post-Game rewards
2014-09-18 13:21:30 +10:00
Shaun Bennett
33d33f84b4
More treasure animation touches + fixes
2014-09-17 15:22:54 -05:00
Shaun Bennett
da680359d0
Change formatting of treasure announcements
2014-09-17 14:50:34 -05:00
Shaun Bennett
90e402bf69
Fix menu slots
2014-09-17 14:43:58 -05:00
Shaun Bennett
0139e40957
Re-enable Coin Party Bomb reward for rare treasures
2014-09-17 14:35:43 -05:00
Shaun Bennett
cc5db5939d
Add Music and Costume pages to cosmetic menu
2014-09-17 14:34:57 -05:00
Chiss
8780d5e4ee
MS fixes
2014-09-17 11:18:59 +10:00
Chiss
16214613fe
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-17 08:59:23 +10:00
Chiss
e6797582f9
Minor fixes
2014-09-17 08:59:09 +10:00
Shaun Bennett
50fa8b02f1
Use explosion particles instead of createExplosion
2014-09-16 17:57:34 -05:00
Shaun Bennett
918a817283
More treasure bug fixes and animation touches
2014-09-16 15:04:42 -05:00
CoderTim
6eed36f0ee
Accidentally committed with line of code commented out
2014-09-15 23:46:44 -04:00
CoderTim
d3b541dc27
Updated Arcade .classpath
2014-09-15 23:43:13 -04:00
CoderTim
d5313540d7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-15 23:32:04 -04:00
CoderTim
c5ff9da552
Record basic game stats (game type, timestamp, duration, winners, losers)
2014-09-15 23:31:53 -04:00
CoderTim
c550e59d45
Renamed jooq database record classes
2014-09-15 23:30:24 -04:00
Shaun Bennett
5b77fa09a4
Merge remote-tracking branch 'origin/master'
2014-09-15 19:37:28 -05:00
CoderTim
1b416d3e6f
Added database tables to record basic game stats
2014-09-15 16:36:59 -04:00
Shaun Bennett
63b3621ae3
Fix treasure open chest bug, added some animation touches
2014-09-15 13:34:21 -05:00
MrTwiggy
abea4223ab
Recommit up-time checking to prevent brand new empty servers from being prematurely killed by ServerMonitor.
2014-09-15 13:22:11 -04:00
Shaun Bennett
7c18e89249
Send chest open packets for new players that join in the middle of a treasure
2014-09-15 10:37:40 -05:00
Jonathan Williams
c7e0ebefd1
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-13 20:52:13 -10:00
Jonathan Williams
a395cae764
Fixes for Custom tag
...
Fix for Bridge time
Fix for tournament auto whitelist.
Added UI stuf for tourney
Added build files for arcade.
2014-09-13 20:50:27 -10:00
Shaun Bennett
8659422877
Merge remote-tracking branch 'origin/master'
2014-09-14 00:29:37 -05:00
Shaun Bennett
c1bc9fca2e
Small treasure tweaks
2014-09-14 00:29:30 -05:00
Chiss
26a51f4ef2
Re-allowed opening of chests (for GUIs) during games.
2014-09-14 15:28:43 +10:00
Chiss
f3df86a5a9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-14 14:10:51 +10:00
Chiss
7e3b9b4b3a
some 1.8 title stuff
2014-09-14 14:10:40 +10:00
Shaun Bennett
fc44592edf
Merge remote-tracking branch 'origin/master'
2014-09-13 23:07:21 -05:00
Shaun Bennett
228cca4805
fix bug with reward amounts
2014-09-13 23:07:15 -05:00
Jonathan Williams
7ad7dd939d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-12 22:00:18 -10:00
Jonathan Williams
1c3326333d
Fix for crash.
2014-09-12 21:59:12 -10:00
Jonathan Williams
4f5430e390
Added tournament stuff.
2014-09-12 21:52:44 -10:00
Chiss
e31ab1b37a
disabled treasure again!
2014-09-13 16:44:51 +10:00
Chiss
054709a859
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
2014-09-13 16:44:11 +10:00
Chiss
31c4a95da5
Disabled Treasure Chests
2014-09-13 16:43:18 +10:00
Shaun Bennett
1e7ed8d491
Treasure rewards + some minor fixes
2014-09-13 01:25:14 -05:00
Jonathan Williams
a196e43fde
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
2014-09-12 19:46:19 -10:00
Shaun Bennett
0afb0f061c
Changes to fireworks animation
2014-09-12 23:43:38 -05:00
Shaun Bennett
aafdc555b1
Oops, accidentally removed some code!
2014-09-12 23:41:50 -05:00
Shaun Bennett
0f44850367
Treasure stuff
2014-09-12 23:30:00 -05:00
Shaun Bennett
5e9cbcef75
Merge remote-tracking branch 'origin/master'
2014-09-12 23:15:58 -05:00
Shaun Bennett
71f42c6e7b
Treasure updates
2014-09-12 23:15:53 -05:00
Chiss
a31e20d709
treasure styles
2014-09-13 14:09:50 +10:00
Chiss
4454627b32
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-13 13:41:48 +10:00
Chiss
e511df4605
Merge treasure
2014-09-13 13:41:37 +10:00
Shaun Bennett
fc6a2633c9
Remove debug message, make sure player is far enough from spawn to open treasure
2014-09-12 22:41:10 -05:00
Shaun Bennett
88ef0ce35b
Merge remote-tracking branch 'origin/master'
2014-09-12 22:33:28 -05:00
Shaun Bennett
a8eeef02dd
Adjustments to how treasure rewards are selected
2014-09-12 22:33:22 -05:00
Chiss
e36f843feb
Fixed bug in MineStrike
2014-09-13 12:29:35 +10:00
Chiss
f0fa3469df
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-13 09:17:50 +10:00
Chiss
58f784187b
UHC Manager for Hub
2014-09-13 09:13:46 +10:00
Jonathan Williams
14c4152248
Fixed CustomTagFix.
...
Updated ServerData ServerGroup and SErverMonitor for new flags in Arcade.
2014-09-12 10:03:33 -10:00
Shaun Bennett
20680acea0
More treasure rewards + tweaks
2014-09-12 14:24:30 -05:00
Shaun Bennett
dea6c98fc9
Merge remote-tracking branch 'origin/master'
2014-09-12 14:08:22 -05:00
Shaun Bennett
4ea786a1a5
Fix fireworks for 1.8 client, a bunch more treasure stuff
2014-09-12 14:08:10 -05:00
Chiss
5de59b6e0e
Hub UHC countdown basics
...
UHC MOTD timer stuff
2014-09-12 18:06:51 +10:00
Chiss
b5152bd621
removed some redundant repeated color stuff
2014-09-12 11:59:32 +10:00
Chiss
b507571403
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Database/.classpath
2014-09-12 11:49:18 +10:00
Chiss
fba1d0e430
Required for merge
2014-09-12 11:48:32 +10:00
Chiss
0dff0412d1
Fixed game flag for not allowing inventory opens
...
Removed some redundant flags in game
Lots of MineStrike updates
Fixed NPE in WinWithoutLosingTeammateStatTracker
2014-09-12 11:47:39 +10:00
CoderTim
f5f9ba6bdf
Added .project and .classpath for Mineplex.Database
2014-09-11 17:10:24 -04:00
Chiss
092e9ba479
Modified UHC borders for release
2014-09-11 17:44:57 +10:00
Chiss
2791d54040
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-11 13:43:34 +10:00
Chiss
56263718d7
Fix for BossBar
2014-09-11 13:17:57 +10:00
Shaun Bennett
b910c5098c
Cross version Holograms (Alignment might be a tad off)
...
A bunch of stuff for Treasure Chests
2014-09-10 12:16:31 -05:00
Shaun Bennett
32bbecd01a
Merge remote-tracking branch 'origin/master'
2014-09-09 19:27:16 -05:00
Shaun Bennett
c4ad00bef1
add armor stand hologram, just to send code to laptop
2014-09-09 19:27:05 -05:00
CoderTim
235cf8cae7
Fixed win stats on solo games
2014-09-09 02:18:20 -04:00
Chiss
7bbb7ca545
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-09 10:53:03 +10:00
Chiss
1943dbeaab
Removing PermissionsEx dependency for MapParser
2014-09-09 10:52:51 +10:00
CoderTim
b341089cfe
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-08 16:28:50 -04:00
CoderTim
90d88ebd0b
Fixed "The Longest Shot" achievement bug
2014-09-08 16:27:09 -04:00
Shaun Bennett
652075138e
More treasure rewards work
2014-09-08 13:26:18 -05:00
Chiss
347e2b1bf5
Changed FIRE items to Blaze Powder
2014-09-08 10:14:55 +10:00
CoderTim
3e5b827a7f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-07 18:10:31 -04:00
CoderTim
201782a7cd
Added leaderboard.php
2014-09-07 18:09:46 -04:00
Shaun Bennett
6441b110b4
Treasure stuff from laptop
2014-09-07 13:35:49 -05:00
Chiss
aa77821c20
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-06 22:01:17 +10:00
Chiss
f138a4108b
Deregister stat trackers from listener
2014-09-06 22:01:05 +10:00
Jonathan Williams
558231457c
Fixed disguises leaving extra tags
...
Fixed memory problem in Arcade.
2014-09-06 03:39:20 -07:00
Shaun Bennett
86d063dafb
Merge remote-tracking branch 'origin/master'
2014-09-06 01:07:49 -05:00
Shaun Bennett
15b46e8f96
Fix displaying on stats on achievement gui
2014-09-06 01:07:40 -05:00
Chiss
644d3da050
JOOQ for Eclipse
2014-09-06 11:31:55 +10:00
Chiss
a3545d074d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-06 10:58:23 +10:00
Shaun Bennett
eb27c1dfbe
Add Util class for sending titles to players
2014-09-05 19:46:11 -05:00
Jonathan Williams
1ea660df3a
Update craftbukkit with new patch file
2014-09-05 16:59:29 -05:00
Jonathan Williams
c0e4539e53
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-05 14:38:28 -07:00
Jonathan Williams
2f8b53f771
Fix for customer support server.
...
Fix for Boss bar junk.
Fix for Disguises.
2014-09-05 14:36:10 -07:00
Shaun Bennett
0ad844d1b5
Merge remote-tracking branch 'origin/master'
2014-09-05 16:35:26 -05:00
Shaun Bennett
b96ba09857
Update CraftBukkit to latest spigot changes. Includes title and tab packets
2014-09-05 16:35:00 -05:00
Chiss
892b67beb2
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-05 21:43:33 +10:00
Jonathan Williams
d01529a344
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2014-09-05 04:38:23 -07:00
Jonathan Williams
1c6790b611
Fixed for DisguiseManager
...
Rewrote packet handling
Fixed up CustomTagFix
Removed swapping kits in Block Hunt
Removed Stacked entities for 1.8 players.
2014-09-05 04:36:01 -07:00
Chiss
4064c5238c
bridges volcano fix
...
minestrike npe fix
2014-09-05 21:35:26 +10:00
CoderTim
3830ab8e0f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-05 06:06:13 -04:00
CoderTim
91a2266a04
Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking
2014-09-05 04:00:51 -04:00
Chiss
4e94bcfd98
Block Hunt winners fix (team/solo)
2014-09-05 17:29:23 +10:00
Chiss
abc95853f7
sulhpur bomb fix
2014-09-05 15:47:35 +10:00
Chiss
8c1e0c3e9e
Fletcher data fix
...
Minestrike stuff
2014-09-05 15:45:14 +10:00
Chiss
b691b1bad0
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-05 12:51:59 +10:00
Chiss
f6ce9abed8
Minestrike
...
- added mixed slow/instant mode
- added accurate hitboxes for slow bullets
- added many new weapons
- removed speed from knife
- adjusted gun balance
2014-09-05 12:28:29 +10:00
Jonathan Williams
b28fc8ee6b
Added custom name tag fix for mobs for 1.8 players
...
Worked on boss bar display.
Bug with <=50% hp.
2014-09-04 11:33:51 -07:00
CoderTim
aae46bdeda
Removed unused intellij module
2014-09-03 16:58:53 -04:00
CoderTim
74e012a811
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-03 16:54:41 -04:00
CoderTim
39b46bc8f5
Fixed some NPEs
2014-09-03 16:53:29 -04:00
Shaun Bennett
e7f79aa5bf
Update IntelliJ files for latest changes
2014-09-03 11:42:50 -05:00
Jonathan Williams
92191dc19a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R4/PlayerConnection.java
2014-09-03 03:47:15 -07:00
Jonathan Williams
a4871b5509
Updated to latest spigot with 1.8 support.
...
Tweaked disguise manager for 1.8 support.
Work on CUstomer support server + admin stuff.
2014-09-03 03:46:24 -07:00
Chiss
21225d7b65
Minor Fixes
2014-09-03 15:09:14 +10:00
Chiss
50140ef92d
Minestrike update
2014-09-03 14:49:38 +10:00
Chiss
246f2e91d9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-03 12:38:57 +10:00
Chiss
58f98881f2
Minestrike Update
2014-09-03 12:38:44 +10:00
Chiss
1dec79c0fa
Minestrike update
2014-09-03 12:28:45 +10:00
Shaun Bennett
4dbe7003b2
Update Arcade Icon in the game menu
2014-09-02 21:09:12 -05:00
Shaun Bennett
8d06cddfb2
Remove Chiss' debug message for shop
2014-09-02 20:36:25 -05:00
Shaun Bennett
9168de20da
Update PlayerConnection method to latest spigot (Fixes right click bug, caused from old spigot code)
2014-09-02 20:33:00 -05:00
Shaun Bennett
08e6b73b1f
Disable Treasure stuff for now
2014-09-02 19:04:43 -05:00
Shaun Bennett
2b3f6c9dbc
Prevent minecart mounts from being broken by others
2014-09-02 19:03:14 -05:00
Shaun Bennett
2d5c676e1b
Merge remote-tracking branch 'origin/master'
2014-09-02 18:57:35 -05:00
Shaun Bennett
4ad034b8d9
more treasure stuff, really basic holograms
2014-09-02 18:33:40 -05:00
Chiss
d5766d62ae
nerf p90
2014-09-02 16:49:45 +10:00
Chiss
449281501f
MineStrike Update
2014-09-02 16:49:15 +10:00
Jonathan Williams
006c7d1e65
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-01 20:04:02 -07:00
Jonathan Williams
a568631df8
Work on AccountAdministrator
2014-09-01 20:03:08 -07:00
Chiss
5d6834633f
MineStrike update
2014-09-02 11:16:17 +10:00
Shaun Bennett
df882012e5
When items are dropped in The Bridges, only the player that broke the block can pickup the item for 8 seconds. (Only applies to specific item types)
2014-09-01 15:38:07 -05:00
Chiss
05623b7522
Initial MineStrike push
...
fixed frames being breakable in games
2014-09-01 21:37:39 +10:00
Chiss
492b3cc0a4
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-01 17:57:17 +10:00
Jonathan Williams
8198bb31c8
Added sneaking to player disguise.
...
Did work on DDoSProtectionSwitcher
Work on AccountAdministrator to fix rank issues.
2014-09-01 00:56:32 -07:00
Shaun Bennett
5905ef5ef7
Treasure Stuff
2014-08-30 14:27:11 -05:00
Chiss
116c54352b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-30 20:49:46 +10:00
Chiss
207de0e67a
fixed MAC kicking players on lillypads
2014-08-30 20:49:32 +10:00
Jonathan Williams
c8bc697888
Fixed mounts and gadgets for rank messages...no Purchase.
2014-08-30 02:37:27 -07:00
Jonathan Williams
f6dcebc3dc
Fixed extra spacing in cosmetic menu.
2014-08-30 02:33:37 -07:00
Jonathan Williams
72aa05f73e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-30 02:26:16 -07:00
Jonathan Williams
829736ed07
Fixed purchase info.
2014-08-30 02:26:07 -07:00
Shaun Bennett
e52f6deab4
Merge remote-tracking branch 'origin/master'
2014-08-30 04:24:34 -05:00
Shaun Bennett
6a58b86a19
Don't display wins and losses to other players on Achievement Gui
2014-08-30 04:24:25 -05:00
Chiss
2b333859d1
PUUSH
2014-08-30 19:24:04 +10:00
Chiss
f58aca7990
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-30 19:07:55 +10:00
Chiss
3767911718
updated game desc output
2014-08-30 19:07:43 +10:00
Jonathan Williams
b07670f6af
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-30 02:04:32 -07:00
Jonathan Williams
1bd0209b39
Added multi-server tags for npcs
...
Fixed Customer support packages.
Fixed Account rank expire for Hero
Added SNR mod to update Rank
Changed SNR mod color to gray.
2014-08-30 02:04:04 -07:00
Chiss
7696349187
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-30 16:34:10 +10:00
Chiss
2c30cc3ef4
Implemented new servers flags
...
Removed OP from Admisn in HUB, gave them /gm command instead
2014-08-30 16:33:56 +10:00
CoderTim
b7baa1b2f4
Count disconnecting from the server as a loss
2014-08-30 02:30:07 -04:00
CoderTim
34f04ad4e3
Fixed Champions Assassination and Longshot achievements
2014-08-29 21:09:51 -04:00
Chiss
41daba98c4
Background work for Minestrike
...
Admins no longer have OP in hubs. They have /gm command to gamemode.
2014-08-29 18:21:08 +10:00
Chiss
1f6b9374eb
disable le minestrike
2014-08-29 11:55:06 +10:00
Chiss
c3bb0ddbcb
Chest example gadget for shauny
2014-08-29 11:00:16 +10:00
Jonathan Williams
fa56aa0843
Fixed regular players not able to join Beta servers.
2014-08-28 14:02:55 -07:00
Jonathan Williams
5281558cdb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-28 14:01:49 -07:00
Jonathan Williams
409e2c6141
Tweaked menus for quick game, Cosmetic menu.
...
Removed debug for Hub
Output a little debug info in LobbyBalancer
Added duplicate check to ServerMonitor
updated Customer SUpport server to have changeable password, added logging of command executors, added lifetime perks for hero/ultra
2014-08-28 14:01:37 -07:00
CoderTim
cc57ddf4bc
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-28 06:54:36 -04:00
CoderTim
bdef9acecd
Fixed DragonEscape win stat tracker
2014-08-28 00:53:54 -04:00
Chiss
ec4cb91a1c
Poll changes
...
Achievement output double space fix
2014-08-28 11:50:09 +10:00
Jonathan Williams
7829188c32
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-27 12:48:35 -07:00
Jonathan Williams
526ca42add
Fixed Gem booster problem.
...
FIxed stat problem.
2014-08-27 12:48:24 -07:00
Shaun Bennett
b67e127902
Merge remote-tracking branch 'origin/master'
2014-08-27 14:08:47 -05:00
Shaun Bennett
573f71164f
Add a way to view poll statistics in game, load polls that aren't enabled for stat tracking
2014-08-27 14:07:22 -05:00
Chiss
311711f2f0
Disabled fireworks for non-gadget enderpearls.
2014-08-27 15:24:10 +10:00
Chiss
9cde497a5c
Fixed ethereal pearl text
2014-08-27 15:20:55 +10:00
Chiss
4e43a2ca73
Extended range of snake parkour, ensuring people tp back to it when they fall.
2014-08-27 15:19:08 +10:00
Chiss
9439daa852
Fixed bug where spectators could trigger anti-cheat in bridges
2014-08-27 15:16:20 +10:00
Chiss
d9ef5f50be
disabled minestrike
2014-08-27 14:23:31 +10:00
Chiss
596bcbfae6
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-27 14:23:01 +10:00
Chiss
da5f953212
Fixed BlockMorph leaving blocks behind when player was teleported.
2014-08-27 14:22:35 +10:00
CoderTim
5ef2772abd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-26 20:27:51 -04:00
CoderTim
7d6572ff4d
Fixed SheepGame Selfish achievement
2014-08-26 20:27:39 -04:00
Shaun Bennett
8e89dfa1ab
Merge remote-tracking branch 'origin/master'
2014-08-26 19:02:08 -05:00
Shaun Bennett
8439838328
After years of research and experimenting, we settled on an achievement icon
2014-08-26 19:01:59 -05:00
Chiss
f25f7d3aa2
Fixed 1v3 achievement not giving achievement if players quit (required 4 at END)
2014-08-27 09:52:33 +10:00
Shaun Bennett
48ed5e2cba
Merge remote-tracking branch 'origin/master'
2014-08-26 18:39:10 -05:00
Shaun Bennett
78eee68592
Change achievement icons, fix another typo
2014-08-26 18:39:01 -05:00
Shaun Bennett
b508cd036c
Lazy fix so that polls award gems instead of coins
2014-08-26 18:36:40 -05:00
Chiss
5540835052
removed micro debug
...
fixed a bug in achievement output
2014-08-27 09:09:06 +10:00
Chiss
dbf441dd0d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-27 08:57:24 +10:00
Chiss
f9ce0d353c
Achievements now need 75%+ players at START of game
2014-08-27 08:57:11 +10:00
Shaun Bennett
c04319345a
Merge remote-tracking branch 'origin/master'
2014-08-26 17:41:07 -05:00
Shaun Bennett
507d356346
Fix last achievement typo
2014-08-26 17:40:58 -05:00
CoderTim
d9e1f35985
Fixed BadHiderStatTracker and limited stat recording to when games are at least 75% full
2014-08-26 16:30:55 -04:00
Jonathan Williams
232785a7dd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-26 04:56:34 -07:00
Jonathan Williams
417d398195
Swapped Morph and Pet active slot.
...
Fixed a couple things on Staff server.
2014-08-26 04:56:23 -07:00
Chiss
17649ce36c
Fixed bug where desc for past-completed achievements was still showing
2014-08-26 21:51:59 +10:00
Shaun Bennett
99951bc573
Fix achievement typos
2014-08-26 04:20:33 -05:00
Jonathan Williams
5fdf466722
Fixed bug in server monitor.
...
re-enabled animal spawn in hub.
2014-08-26 02:02:31 -07:00
Jonathan Williams
064b0e8b36
Removed sheep mount and fixed up server monitor.
2014-08-26 01:31:57 -07:00
Chiss
81e92c0e8e
changed wording in achi GUI
2014-08-26 18:24:20 +10:00
Chiss
6f1204c844
Set gem reward for all achievements
2014-08-26 18:20:33 +10:00
Chiss
ab29a5fa29
Fixed text output in Achi GUI for completed
2014-08-26 18:06:01 +10:00
Chiss
3eae26ef80
Updated Achievement Output
2014-08-26 18:03:29 +10:00
Chiss
d62b59776f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-26 17:54:50 +10:00
Chiss
116fe496a8
Changed post game achievement output
...
Added Reward to Achi GUI
2014-08-26 17:53:54 +10:00
Jonathan Williams
7a8ab5c96a
Comment for weirdness.
2014-08-26 00:53:41 -07:00
Jonathan Williams
a4cf9e2f4b
Fixed stat bugs.
2014-08-26 00:52:51 -07:00
Chiss
7e7906865f
Fixed some stats being added after send-off
2014-08-26 17:45:35 +10:00
Jonathan Williams
526b5c333a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-26 00:34:00 -07:00
Jonathan Williams
137b8692e4
Added Gem booster use.
2014-08-26 00:33:48 -07:00
Chiss
0546c9e175
Fixed so only Supply drop chests trigger achievement
2014-08-26 17:33:23 +10:00
Chiss
1b15a57fc8
Added Gem Rewards for Achievements
2014-08-26 17:10:20 +10:00
Jonathan Williams
162a86d4b2
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/CosmeticShop.java
2014-08-25 23:58:54 -07:00
Jonathan Williams
b8b6c031cd
Re-did and added a game to the quick game menu.
...
Fixed npc triggers with non npcs named the same.
Fixed naming pet longer than 16 chars.
Added sugar cane to restricted block type for paintball gun
Properly hooked in gadget block event for paitnball gun.
Added auto purchase page on item gadget ammo empty.
Added check on rank for customer support command.
Fixed ConcurrentModificationException problem with spigot.
2014-08-25 23:56:58 -07:00
Chiss
95e7517a9e
disabled debug cmd for rave suit
2014-08-26 16:17:38 +10:00
Chiss
8fc6013ff3
Disabled Chest GUI
2014-08-26 16:12:01 +10:00
Chiss
dd61077850
Added missing Achievements
2014-08-26 14:46:10 +10:00
Chiss
1b3e32ca26
Added Arcade Achievements
2014-08-26 14:42:17 +10:00
Chiss
f0e01aa257
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-26 13:42:54 +10:00
Chiss
28d523d696
Added Achievements
2014-08-26 13:42:42 +10:00
Shaun Bennett
905d4db6f1
Use emerald instead of bed
2014-08-25 21:32:30 -05:00
Shaun Bennett
2e0b074053
More achievement gui changes
2014-08-25 20:56:21 -05:00
Chiss
86930de23e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/AssistsStatTracker.java
2014-08-26 08:19:50 +10:00
Chiss
07ee44508e
Missing Gadgets
2014-08-26 08:17:41 +10:00
CoderTim
933d32d8f8
Fixed team death/kills stats
2014-08-25 18:06:50 -04:00
CoderTim
9acc7d8496
Added team kill and death achievement trackers
2014-08-25 17:43:49 -04:00
CoderTim
4ce537a3a7
Fixed some NPEs and achievement bugs
2014-08-25 16:27:02 -04:00
Chiss
0e3cf67402
Some new cosmetics
2014-08-25 12:59:29 +10:00
Chiss
13eb3da0fa
Achievment gui changes
2014-08-25 09:26:01 +10:00
Chiss
7669998ad3
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-25 08:38:29 +10:00
Shaun Bennett
ff441f2262
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2014-08-24 16:14:29 -05:00
Shaun Bennett
2cb87b23e6
Stat Gui, Start of Treasure Gui (disabled)
2014-08-24 16:08:19 -05:00
Chiss
23f6d0ae1a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-24 16:46:00 +10:00
Chiss
3f5cff3e21
Killing cheaters for a few things in bridges
2014-08-24 16:45:47 +10:00
CoderTim
c89461628b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-23 16:00:26 -04:00
CoderTim
fb90336d4e
Finished stats/achievements
2014-08-23 16:00:15 -04:00
Chiss
642f8b46b9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-23 18:01:35 +10:00
Chiss
7348a26951
fixed damage dealt npe
2014-08-23 18:00:23 +10:00
Chiss
af9bf0727a
Fixed damage taken stat NPE
...
Added tournament team auto-rejoin
2014-08-23 17:55:28 +10:00
Jonathan Williams
70beb58bd6
Enabled debugging in Hub/Arcade
2014-08-23 01:49:48 -05:00
Jonathan Williams
fd0c4745f8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-23 00:40:17 -05:00
Jonathan Williams
931cb5ece8
Removed MineKart code.
...
Fixed up DisguisePlayer
Added ProfileLoader
Fixed up Notch gadget.
2014-08-23 00:40:07 -05:00
Chiss
0700b9df12
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-23 15:04:55 +10:00
Chiss
3ec43f90e8
GameAchievementManager now utilises TaskManager to record whether or not people have previously completed Achievements
2014-08-23 15:04:43 +10:00
Jonathan Williams
3a47a161c5
Enabled snake parkour
...
Updated servermanager/serverNpcPage to handle free and beta timers.
2014-08-22 22:53:15 -05:00
CoderTim
4afafe2d51
Some stats fixes
2014-08-22 21:54:08 -04:00
Jonathan Williams
a84468157c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-22 18:21:38 -05:00
Jonathan Williams
ebb4c44bdc
Tweaked player disguise.
2014-08-22 18:21:23 -05:00
Chiss
e40cb17e47
Updated tutorial locations
2014-08-23 08:52:50 +10:00
Chiss
e5944ff872
Spawn location fix
2014-08-23 08:40:02 +10:00
Chiss
340be68ef8
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-23 08:39:39 +10:00
Chiss
9fad775f73
More cosmetics
2014-08-23 07:50:07 +10:00
CoderTim
b2b208bdba
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-22 17:30:08 -04:00
CoderTim
02bb53578a
Registered stat listeners with each game
2014-08-22 17:20:02 -04:00
Chiss
11597285b8
Changed so it music will never be 'active'.
2014-08-23 05:36:57 +10:00
Chiss
2e031f1e4a
Added Music Gadget
2014-08-23 05:35:07 +10:00
Jonathan Williams
b67b2f04b7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-22 13:32:50 -05:00
Jonathan Williams
13b90e1142
Preliminary work on help desk integration with Customer Support server.
...
Updated DisguiseSheep with values from craftbukkit.jar
2014-08-22 13:32:22 -05:00
Chiss
a159f04d50
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-23 04:30:52 +10:00
Chiss
231ef2bbe1
Cosmetic Update
2014-08-23 04:30:41 +10:00
Jonathan Williams
83b3e49151
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-22 10:48:27 -05:00
Jonathan Williams
70217fe957
Finished first release of Customer Support plugin.
2014-08-22 10:47:46 -05:00
Chiss
0022586e3e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-22 17:08:29 +10:00
Chiss
97c087a28d
Allowed commands to specify specific ranks
...
allowed youtube/build to start/set games
2014-08-22 17:05:14 +10:00
CoderTim
591b5c026c
Almost all achievements done
2014-08-21 18:55:40 -04:00
Jonathan Williams
5e47a12531
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-21 15:56:02 -05:00
Jonathan Williams
99d15d3ece
Work on Customer support server.
2014-08-21 15:55:09 -05:00
CoderTim
94f2aade08
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-21 15:01:22 -04:00
Jonathan Williams
1398543490
Fixed bug with Projectile
...
Changed tp out of game to 1 per tick.
2014-08-21 02:07:54 -05:00
Chiss
ac088e85b2
Added some game flags
...
Dragon escape changes
2014-08-21 13:35:31 +10:00
Jonathan Williams
830eeca835
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-20 20:14:32 -05:00
Jonathan Williams
315da32518
Removed unused code in Party
...
Fixed path var in Core.Common
2014-08-20 20:14:23 -05:00
CoderTim
f266f4e016
More achievements
2014-08-20 19:20:11 -04:00
Chiss
60869d114e
Dragon Escape changes
2014-08-20 15:45:10 +10:00
Jonathan Williams
217ab51b40
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-19 22:24:16 -05:00
Shaun Bennett
1912d2c23e
Update EntityPlayer with recent craftbukkit changes
2014-08-19 21:43:12 -05:00
Shaun Bennett
a7bb84be0b
Revert chris' revert
2014-08-19 21:24:49 -05:00
Shaun Bennett
f60a818e6a
Update craftbukkit to remove the extra _INVALID mappings
2014-08-19 21:22:04 -05:00
Chiss
adf617000d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-20 12:07:15 +10:00
Chiss
65c880b300
Parser changes
2014-08-20 12:06:24 +10:00
Jonathan Williams
24f984a365
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-19 21:37:11 -04:00
Jonathan Williams
9ee25c6292
Did some cleanup in Pvp project.
...
Did work in Coreclient manager and added StaffServer (still in progress)
2014-08-19 21:36:23 -04:00
CoderTim
18ca7d5656
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-19 21:16:44 -04:00
CoderTim
599277b88e
More work on achievements
2014-08-19 21:16:28 -04:00
Chiss
2ffcfb7737
Parser changes
2014-08-20 11:02:12 +10:00
Chiss
94e5eb03da
Fixed errors for new getPlayers method.
2014-08-20 10:43:56 +10:00
Chiss
7535f39d18
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-20 10:39:58 +10:00
Chiss
afea0ba87f
Parser Merge
2014-08-20 10:39:41 +10:00
CoderTim
09c01d90ad
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-19 19:07:37 -04:00
Shaun Bennett
e1a57a673e
Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors
2014-08-19 16:58:55 -05:00
Jonathan Williams
33a1699fce
Minor enjin tweak.
...
Reverted to nullable gem column because sql db wants to take forever converting.
2014-08-18 17:35:03 -04:00
CoderTim
05686cb584
Work on achievements
2014-08-18 16:41:16 -04:00
Jonathan Williams
d73ffcccfd
Added performance logging in ServerMonitor
...
Added date tracking for gem/coin/account transactions in preparation for Customer Support server.
2014-08-18 15:46:23 -04:00
Shaun Bennett
b99e9d3f70
Simplified poll system, derp
2014-08-18 14:15:32 -05:00
Shaun Bennett
36d5c2c3af
Don't add player's current poll to the queue
2014-08-17 18:11:55 -05:00
Shaun Bennett
34ffc06166
Add functionality to skip polls
2014-08-17 18:07:16 -05:00
Shaun Bennett
6e9d2b3244
Allow setting a time when it should poll again
2014-08-17 17:53:38 -05:00
Shaun Bennett
43fd604695
Queue up polls for players instead of constantly checking for next poll
2014-08-17 17:47:38 -05:00
Shaun Bennett
4ba7da9a54
Polls! Still needs tweaks
...
Hub artifact stuff for IntelliJ
2014-08-17 17:30:35 -05:00
Shaun Bennett
e5340238b6
IntelliJ Hub Configurations
2014-08-17 13:57:20 -05:00
Shaun Bennett
6793deffd0
Copy Command
...
Small Fixes
Single Imports IntellIJ config
2014-08-16 20:17:21 -05:00
Shaun Bennett
b6c31294c7
Parse map properly, bug fixes
2014-08-16 16:19:33 -05:00
Shaun Bennett
e286a45de8
Code cleanup for spawn location, remove JoinCommand
2014-08-16 16:01:00 -05:00
Shaun Bennett
18e1265afd
Remove join list, adjust intellij import style to be more like eclipse
2014-08-16 15:55:29 -05:00
Shaun Bennett
eac0f9fd6a
MapParser refactoring/changes
2014-08-16 15:50:33 -05:00
Shaun Bennett
4193ee53ea
Merge remote-tracking branch 'origin/master'
2014-08-16 12:13:11 -05:00
Shaun Bennett
ef6871491d
Add MapParser IntellIj configurations
2014-08-16 12:12:59 -05:00
Jonathan Williams
8aec9e345e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-16 01:37:17 -05:00
Jonathan Williams
df97873d32
Fixed index issue with lobby balancer
...
Added performance output for server monitor.
Removed logging of debug stuff.
2014-08-16 01:37:06 -05:00
Chiss
d8123795aa
changed the way disguises show rank.
2014-08-16 16:33:18 +10:00
Jonathan Williams
686203ed8a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-16 00:39:36 -05:00
Chiss
a888d4f14b
Fixed leaks
2014-08-16 15:39:02 +10:00
Jonathan Williams
249a56360e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-15 23:19:13 -05:00
Chiss
508ef65fcf
Added missing file
2014-08-16 14:17:15 +10:00
Jonathan Williams
f98dc0c66d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-15 23:03:34 -05:00
CoderTim
ae6cb4aa22
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-15 15:56:44 -04:00
CoderTim
19222c6815
Updated IntelliJ environment to be compatible with latest changes
2014-08-15 15:51:29 -04:00
Ty
5c0e1ad484
Fix issue where null MinecraftServer entries were being returned in getServerStatuses() method in RedisServerRepository.
2014-08-15 15:32:01 -04:00
Ty
3c4c537998
Fix issue where broken Jedis instances were returned as functional instances.
2014-08-15 14:49:01 -04:00
Jonathan Williams
3f827a310a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-15 11:54:19 -05:00
Jonathan Williams
efdaa21ae7
Proper cleanup on lobby menu update.
2014-08-15 11:52:57 -05:00
Ty
0d38ac4e96
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.ServerData/src/mineplex/serverdata/RedisServerRepository.java
2014-08-15 11:40:15 -04:00
Ty
da8aa3f1e3
Fix issue where broken Jedis resources were not being properly handled.
2014-08-15 11:33:34 -04:00
Chiss
29db90837d
Spleef Update
...
Map parser block stuff
2014-08-15 15:28:50 +10:00
Chiss
697897b967
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-15 09:49:12 +10:00
Chiss
85522cddca
Debug (will clean once fixed)
...
Game stats
2014-08-15 09:49:00 +10:00
Jonathan Williams
846c75453c
Revamping Redis Server status so it uses a consistent time value from redis database.
2014-08-14 07:41:04 -05:00
Jonathan Williams
cacf736f4f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-14 04:10:21 -05:00
Jonathan Williams
682735e994
Added build fixes for ServerMonitor.java
...
Added redis fixes for ServerMonitor
Added ServerStatusManager fixes.
2014-08-14 04:10:11 -05:00
Chiss
282219fb4c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-14 17:31:27 +10:00
Chiss
74435bac12
fixed bug where players kept inventory open, to be able to enable morphs ingame.
2014-08-14 17:31:14 +10:00
Jonathan Williams
f524ffb093
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-13 21:53:15 -05:00
Jonathan Williams
d1e69a34f1
Fix chiss path errorrrrrrrrrrrrrrrrrrrrs.
2014-08-13 21:53:03 -05:00
Chiss
c72f4b6057
Dragon target cancel fix
2014-08-14 12:35:49 +10:00
Chiss
5f80d9c57a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2014-08-14 11:24:51 +10:00
Chiss
b6ba142c5a
Mineplex in scoreboard is fancier.
2014-08-14 11:23:48 +10:00
Shaun Bennett
b9534bd245
Merge remote-tracking branch 'origin/master'
2014-08-13 20:07:01 -05:00
Shaun Bennett
cfe45139b6
Adjust lobby text for the removal of premium kits
2014-08-13 19:56:47 -05:00
Shaun Bennett
83f04273fa
Sort kits properly when a game uses NullKit
2014-08-13 19:45:38 -05:00
Chiss
b21ae8ef72
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-14 10:32:52 +10:00
Chiss
7a3bba45a7
Mergey!
2014-08-14 10:32:41 +10:00
Jonathan Williams
27032ac2ed
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
Plugins/Mineplex.Core/src/mineplex/core/portal/PortalRepository.java
2014-08-13 18:59:59 -05:00
Jonathan Williams
6039168601
Updated code base to build #1604 spigot
2014-08-13 18:57:37 -05:00
Ty
5c5a57b048
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-13 16:37:20 -04:00
Ty
4b4f43ac16
Convert PortalRepository's redis host fetch to ServerManager constant, and remove debug code section.
2014-08-13 16:37:05 -04:00
Jonathan Williams
93811b200d
Small adjustment to lobby balancer code.
2014-08-12 17:01:54 -05:00
Jonathan Williams
5363f686e5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-12 13:00:24 -05:00
Jonathan Williams
5618a3edad
Removed extra free version generator in server monitor.
2014-08-12 13:00:17 -05:00
Ty
1bbb42214d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-12 11:14:53 -04:00
Ty
5b059e96ca
Commit missing PortalRepository.java file and finish clean() method.
2014-08-12 11:14:31 -04:00
Chiss
95394c51cc
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-12 11:24:12 +10:00
Chiss
2d67d4ce36
Achievement fix + active
2014-08-12 11:23:53 +10:00
Ty
36d6a58e0a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
2014-08-11 15:39:56 -04:00
Shaun Bennett
d63137ead2
Merge remote-tracking branch 'origin/master'
2014-08-11 12:44:28 -05:00
Shaun Bennett
4006c454c3
Change order of events when enabling a gadget (Fixes bug where switching gadgets while a gadget is enabled doesn't show up on gadget page)
2014-08-11 12:39:26 -05:00
Shaun Bennett
482b964580
Display particles when shouldDisplay() is true instead of false
2014-08-11 12:30:03 -05:00
Shaun Bennett
7e93ed657f
Display boss bar properly while a dragon mount is spawned in arcade
2014-08-11 12:26:56 -05:00
Chiss
02270a9d25
TNT effect only triggers off self tnt.
2014-08-11 15:33:45 +10:00
Chiss
7191d48bd0
fixed paintball pre-game bug
2014-08-11 14:25:11 +10:00
Chiss
e4871c4988
Disabling cosmetics 5s before game starts, was having some carryover due to lag.
2014-08-11 11:55:00 +10:00
Chiss
d81b32bd3a
Sneaky Assassins balance+polish
2014-08-10 21:05:41 +10:00
Chiss
06bcf5079b
Disabled Gem hunter (bugged?)
...
Disabled chicken morph letting people fly
2014-08-10 18:36:18 +10:00
Chiss
25b525837f
Fixed TNT blowing up lobby when it changed to prepare.
2014-08-10 11:07:05 +10:00
Chiss
9057246ab8
Arcade Inventory fixes
2014-08-10 10:50:31 +10:00
Chiss
3533ce1b7e
Particles dont play in stealth games.
2014-08-10 01:04:53 +10:00
Chiss
53221e267e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-10 00:57:17 +10:00
Chiss
7aa017772f
Spectators will not play particle effects
...
ALL rank no longer displays on morphs.
2014-08-10 00:55:51 +10:00
Jonathan Williams
e50c179e8d
Fixed pet tag price.
2014-08-09 09:49:00 -05:00
Jonathan Williams
43862ea6bf
Moved Particles to Admin and up only.
2014-08-09 09:44:00 -05:00
Jonathan Williams
cfd1d868b5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-09 09:41:07 -05:00
Jonathan Williams
f15e539841
Added showing of only 3 full servers in server menu.
2014-08-09 09:40:59 -05:00
Chiss
616a0ecf11
Staff get all kits unlocked.
2014-08-10 00:32:50 +10:00
Chiss
38fd85335f
Fixes disguises being disabled.
2014-08-10 00:21:45 +10:00
Chiss
62cc422f42
FINAL FIX
2014-08-10 00:13:04 +10:00
Chiss
c95cf79aa6
fxied more
2014-08-10 00:10:08 +10:00
Chiss
a43a5b2c0e
bacon brawl fix
...
signel game ultra shows in hub scoreboard
2014-08-10 00:09:39 +10:00
Chiss
21b89d2771
removed particle debug
2014-08-09 23:36:36 +10:00
Chiss
59859b168f
Fixed multi-morphs
2014-08-09 23:34:12 +10:00
Chiss
1a6540b4d0
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-09 23:25:26 +10:00
Chiss
3d1ddecffb
Smash Kit fix
...
Gem Booster (dragons) fix
2014-08-09 23:25:13 +10:00
Jonathan Williams
dffc56e3e0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-09 08:11:01 -05:00
Chiss
cac7f85410
Single game ultra kit unlock
2014-08-09 23:10:40 +10:00
Jonathan Williams
dbf59a032b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-09 08:08:41 -05:00
Jonathan Williams
0cdfda7765
Fixed message on free timer.
2014-08-09 08:08:24 -05:00
Chiss
175d9f9886
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-09 23:00:07 +10:00
Chiss
23f93e55cf
fixed dragons destroying pregame lobby
2014-08-09 22:59:54 +10:00
Jonathan Williams
3ea2567079
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-09 07:41:09 -05:00
Jonathan Williams
9b75ef4f96
Fixed purchasing -2 cost gadgets.
2014-08-09 07:41:00 -05:00
Chiss
066dfbc9a9
Morph helmet fix
2014-08-09 22:38:58 +10:00
Jonathan Williams
800658ff48
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-09 07:26:05 -05:00
Jonathan Williams
2c75bcbdfe
Added ability to store gem boosters in enjin.
2014-08-09 07:25:58 -05:00
Chiss
e558796268
fixed TNT not being able to hit anyone
2014-08-09 22:16:49 +10:00
Chiss
a34ce75252
price fix
2014-08-09 22:02:40 +10:00
Chiss
6c847e78b7
Gem Hunter exp change
2014-08-09 20:16:21 +10:00
Chiss
06a444bae6
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-09 19:55:35 +10:00
Chiss
ff6ea3c798
Added Cosmetics to Arcade
...
Set prices on cosmetics
2014-08-09 19:55:05 +10:00
Jonathan Williams
b0f6435661
Fixed items not updating immediately.
2014-08-09 04:29:34 -05:00
Chiss
951e1df3d5
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-09 19:05:34 +10:00
Jonathan Williams
8fe4e39207
Split up Cosmetic shop and Inventory
...
Added Ammo purchase for item gadgets.
2014-08-09 03:57:56 -05:00
Jonathan Williams
4e93707f0d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-09 00:06:53 -05:00
Jonathan Williams
0de8d22e62
Changed invis in hub to only be on server npc shops
...
Fixed /a for senior mods and developers.
2014-08-09 00:06:44 -05:00
Chiss
62eccbcc1e
Snr Mod
...
Creeper knockbak changes
2014-08-09 15:06:00 +10:00
Chiss
91a79f0345
Pig Morph
...
Morphs have tags/
2014-08-09 14:57:01 +10:00
Jonathan Williams
3d909b7cbe
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-08 23:06:26 -05:00
Jonathan Williams
3f54881a3e
Fixed multiple purchase of Gem Booster.
2014-08-08 23:06:16 -05:00
Chiss
fb19e93992
Gem text
2014-08-09 13:46:41 +10:00
Chiss
c93a49add2
More gem boosty!
2014-08-09 13:42:29 +10:00
Chiss
2e95548b6e
Gem Boosters!
2014-08-09 13:39:57 +10:00
Chiss
3a220b6f1c
Micro Update
...
SGTeams inv click fix.
2014-08-09 13:11:32 +10:00
Jonathan Williams
7fd40b38dd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-08 22:10:09 -05:00
Jonathan Williams
6bd9273edf
Refactored getting item count for ClientInventory
...
Fixed up Arcade gem boosters so they are hooked into inventory.
Cleaned up unused code.
2014-08-08 22:10:02 -05:00
Chiss
97cf02eb37
Hub changes
2014-08-09 12:35:36 +10:00
Chiss
db90bcc958
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-09 12:16:53 +10:00
Chiss
313f675ae4
Hub Parkour update
...
Smash kit prices
2014-08-09 12:16:37 +10:00
Jonathan Williams
e7847cc495
Tweaked Gem booster description.
2014-08-08 20:50:07 -05:00
Jonathan Williams
26c4045bc3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/inventory/ui/page/Menu.java
2014-08-08 20:49:27 -05:00
Jonathan Williams
bed2545b04
Added back buttons for sub menus.
...
Added Gem booster pack and booster count display.
Added reason and admin to mute message
Fixed inventory tracking.
2014-08-08 20:48:15 -05:00
Ty
ecb0b2d3bb
Fix LobbyBalancer merge issue and convert PortalRepository to a redis-based system instead of MySQL.
2014-08-08 17:35:37 -04:00
Chiss
02dd579844
Text change for Inventory Menu
2014-08-08 17:16:20 +10:00
Jonathan Williams
e1be732202
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java
2014-08-08 02:07:20 -05:00
Jonathan Williams
9f2a83c956
Added Coins to donation.
...
Fixed order of gadgets, mounts, pets, morphs, particles.
Fixed display of active pet in Menu
Fixed coins purchase for most items.
Added Coins reward for ENjinTranslator.
Added Coin transactions.
2014-08-08 02:05:58 -05:00
Chiss
b36b1cb007
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-08 17:05:23 +10:00
Chiss
fa3695be4e
Gem Booster In Lobby
...
Achievement Stuff
2014-08-08 17:05:11 +10:00
Shaun Bennett
9395711dcb
Merge remote-tracking branch 'origin/master'
2014-08-08 01:51:50 -05:00
Shaun Bennett
b7ecf5eb04
GET MINEPLEX ULTRA FOR AMAZING FUN TIMES
2014-08-08 01:51:11 -05:00
Chiss
8f72ba4ab7
Hooked in statchangeevent
2014-08-08 13:53:58 +10:00
Chiss
1a33dbb5ee
Achievement Module
...
Gem Booster/Achivement
2014-08-08 13:46:35 +10:00
Jonathan Williams
57cf3e4da6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-07 21:22:28 -05:00
Jonathan Williams
e051c1d62c
Work on inventoryManager and Enjin translator.
2014-08-07 21:22:18 -05:00
Shaun Bennett
2fd7621a81
Display proper team in Arcade Lobby (Fixes bug where a player connecting will break scoreboards)
2014-08-07 18:44:27 -05:00
Jonathan Williams
5d89d1f728
Fixed gadget adding/removing from hotbar
...
Fixed stats manager _stats not initializing
Optimized saving call.
2014-08-07 01:46:10 -07:00
Jonathan Williams
2a31bbee95
Added new gadget stuff to core.
...
Hooked up particle page.
2014-08-07 01:20:19 -07:00
Jonathan Williams
c01fbd279d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/GadgetManager.java
2014-08-07 00:48:32 -07:00
Jonathan Williams
055e4c5895
Converted PreferencesManager to RepositoryBase
2014-08-07 00:43:54 -07:00
Jonathan Williams
6d86f403ac
Added coins Currency to web api
...
Added coins purchase for all cosmetic items
Added Stats manager
Added Inventory Manager
Redesigned gadgets/morph/particle/pets/mounts page and inventory.
2014-08-07 00:33:24 -07:00
Chiss
0317795a04
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-07 17:31:01 +10:00
Chiss
dc1a37a92e
Gadget STuff
2014-08-07 17:30:46 +10:00
CoderTim
8d05938306
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-07 00:00:01 -04:00
CoderTim
8a74b08b0d
Fixed silly mistake I made
2014-08-06 23:59:52 -04:00
Shaun Bennett
04487fae3e
Only show 5 open servers on Server Gui
2014-08-06 21:31:53 -05:00
Shaun Bennett
0b942e5180
Stop DragonMount from causing the news bar to flicker
2014-08-06 21:03:48 -05:00
CoderTim
f7f9d3e703
Sneaky assassin power-up maximum is 5 and hanging entities cannot be damaged
2014-08-06 21:35:11 -04:00
Chiss
c647e6b48d
Missing morphs
...
Bacon brawl knockback increase over time
Parse color error fix
2014-08-07 09:47:11 +10:00
Chiss
a737aa8624
Game desc
2014-08-06 19:16:17 +10:00
Chiss
c4768a8a9c
Smokebomb doesnt end instantly :o
2014-08-06 19:13:25 +10:00
Chiss
f68586cca4
Micro Battle
2014-08-06 19:00:18 +10:00
Chiss
248111749f
Sneaky Changes
2014-08-06 17:14:07 +10:00
CoderTim
bea6eabb95
Sneaky Assassins: Revealed players have wither effect. Fireworks are yellow. Additional announce messages
2014-08-06 01:41:50 -04:00
CoderTim
16353c4bc9
Changes to Sneaky Assassin power-ups, including addition of compass power-up.
2014-08-06 01:23:06 -04:00
Chiss
9e047847c2
scoreboard fix
2014-08-06 12:42:07 +10:00
Chiss
4108a02f50
Sneaky scoreboard order
2014-08-06 12:37:41 +10:00
Chiss
a0010668c6
Sneaky Assassins changes
2014-08-06 12:23:02 +10:00
Chiss
f09506e436
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/SneakyAssassins.java
2014-08-06 11:09:16 +10:00
Chiss
c8dfb2f02e
Parser Fixes
...
Sneaky Stuff
2014-08-06 11:07:49 +10:00
CoderTim
3ee0b271b6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-05 01:23:37 -04:00
CoderTim
0240d50029
Sneaky Assassins Changes:
...
- when you get a kill, give an armor upgrade and 1 smoke bomb
- Revealer range increased to 12 blocks
- NPC dies once every 2 seconds
- Lose 1 hunger every second. Gain 8 when damaging player or NPC
- Reveal all players every 60 seconds, for 2 seconds
- Added cloaking back to smoke bomb
- Power-up is always green and type alternates per player. Power-ups always include smoke bomb and mushroom soup.
- NPC speed slightly decreased
- Corrected sword power-up progression
2014-08-05 01:23:24 -04:00
Ty
2e43d565bd
Resolve merge conflicts.
2014-08-04 19:14:04 -04:00
Ty
1b7c762942
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancer.java
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/Repository.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerGroupData.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
2014-08-04 18:47:49 -04:00
Shaun Bennett
e8d14e9fbf
Remove created by comment
2014-08-04 00:33:34 -05:00
Shaun Bennett
1c5b3919e1
Merge remote-tracking branch 'origin/master'
2014-08-04 00:31:56 -05:00
Shaun Bennett
0edb0d74a7
Fix bugs with kit sorting + cost of kits
2014-08-04 00:31:46 -05:00
CoderTim
e7d3cf9e02
Sneaky Assassins previous commit bug fix
2014-08-04 01:06:11 -04:00
CoderTim
012382ec48
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-04 01:02:27 -04:00
CoderTim
8a727e1365
Smarter Sneaky Assassins AI
2014-08-04 01:02:05 -04:00
Shaun Bennett
e4662ab563
Update my SneakyAssassinKit change to work with Tim's changes
2014-08-03 23:41:54 -05:00
Shaun Bennett
34dfe8dacd
Merge remote-tracking branch 'origin/master'
2014-08-03 23:32:37 -05:00
Shaun Bennett
fe32cf5444
Remove KitAvailability.Blue
2014-08-03 23:31:55 -05:00
CoderTim
39e23c16f0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-04 00:00:12 -04:00
CoderTim
482f48f994
Prevent players in Sneaky Assassins from breaking paintings and item frames
2014-08-04 00:00:04 -04:00
CoderTim
ec48a59301
Added option DISGUISE_TYPE:<ENTITY_TYPE> in WorldConfig.dat for Sneaky Assassins to configure which entity players are disguised as.
2014-08-03 23:59:10 -04:00
Shaun Bennett
35b16e026c
Blue kits cost gems instead of being premium kits
2014-08-03 22:44:01 -05:00
Jonathan Williams
7408afa697
Reverted Free/Premium split in Server Monitor.
2014-08-03 20:01:37 -07:00
Shaun Bennett
6d7e8072d5
Remove premium server restriction in ServerCommand
2014-08-03 13:41:14 -05:00
Shaun Bennett
69b709b3ab
Change clock timer to be 35 seconds
2014-08-03 13:28:56 -05:00
Shaun Bennett
69aa881ba2
Remove reference to server split in clock text
2014-08-03 13:27:04 -05:00
Shaun Bennett
db61a10c7f
Remove server split from server selection pages
...
Select any server with portals
2014-08-03 13:24:13 -05:00
Jonathan Williams
cb1a466a5b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-02 03:01:53 -07:00
Jonathan Williams
51faf5cd15
Reduced free timer.
2014-08-02 03:01:36 -07:00
Ty
6a9255e97b
Add new Mineplex.ServerData library for interfacing with the ServerRepository, and modify Mineplex.ServerMonitor, Mineplex.Bungee.Mineplexer and Mineplex.Core to integrate changes.
2014-08-01 17:56:29 -04:00
Shaun Bennett
5d1ab654b9
Merge remote-tracking branch 'origin/master'
2014-08-01 03:57:57 -05:00
Shaun Bennett
232088cd55
Make sure servers are in progress before counting them
2014-08-01 03:57:34 -05:00
Jonathan Williams
874c1413a3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-01 00:46:34 -07:00
Jonathan Williams
f2d1380478
Fixed bug with Server monitor.
2014-08-01 00:46:00 -07:00
Chiss
fb1f4ed5ac
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-01 17:45:35 +10:00
Chiss
07fe476fd3
fix for stuff that jon broke
2014-08-01 17:45:22 +10:00
Jonathan Williams
b056733ba1
Removed duration code and replaced with 60000L
2014-08-01 00:09:35 -07:00
Jonathan Williams
53ce70488f
Merge pull request #1 from premium-server-menu to master
...
* commit '95a45409a98c141a115e463e56e440b204ae2029':
Use UtilPlayer and F.main for messaging
Fix flashing clock (oops!)
Sound effects and knockbacks!
Flashing wool instead of clock for the timer
Change duration of timer. Don't punish a party if the leader has ultra
Lighten load on our servers, not free servers!
Lore edit on clock item
Place players on correct server corresponding to their rank via portals
Visual clock update
Fix lore messages not displaying correctly under certain circumstances
Use constants for lore messages on server page
Prevent free players from joining servers before time limit
Deny joining Premium servers through server command without premium
Fix "Click to Spectate" formatting
Identify free servers from server name
Add Server Menu for Premium Servers. Item lore still needs some work
2014-08-01 02:05:39 -05:00
Jonathan Williams
a608783580
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-01 00:03:42 -07:00
Chiss
b6fe33e6fb
Ultra/hero gems removed
2014-08-01 17:03:07 +10:00
Shaun Bennett
95a45409a9
Use UtilPlayer and F.main for messaging
2014-08-01 01:43:50 -05:00
Jonathan Williams
46fb27afbb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-31 23:39:08 -07:00
Jonathan Williams
eae4bed630
Removed unused ServerManagerUpdater.java
...
Tweaked ServerMonitor to handle Free/Premium
2014-07-31 23:37:39 -07:00
Shaun Bennett
15d48d2867
Fix flashing clock (oops!)
2014-08-01 01:25:11 -05:00
Shaun Bennett
fbe6ab2fdb
Sound effects and knockbacks!
2014-08-01 01:22:01 -05:00
Shaun Bennett
fd01b4933b
Flashing wool instead of clock for the timer
2014-08-01 00:39:38 -05:00
Shaun Bennett
6b18fdf396
Change duration of timer. Don't punish a party if the leader has ultra
2014-08-01 00:38:26 -05:00
Shaun Bennett
ccf5893051
Lighten load on our servers, not free servers!
2014-08-01 00:04:12 -05:00
Shaun Bennett
5ea6eaeb9e
Lore edit on clock item
2014-08-01 00:03:26 -05:00
Shaun Bennett
c01e9abf29
Place players on correct server corresponding to their rank via portals
2014-07-31 23:56:51 -05:00
Shaun Bennett
7d1da7114f
Visual clock update
2014-07-31 23:49:52 -05:00
Chiss
0f9e72d623
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-01 14:06:13 +10:00
Chiss
599a6eb1f7
Changed kit availability to be based on free/premium.
2014-08-01 14:05:53 +10:00
CoderTim
c36242cc47
Added stained glass around power-up beacon base in sneaky assassins to identify power-up more easily.
...
Added workaround to make revealer fireworks explode consistently
Power-ups use UtilPlayer.message and have a sound effect is player when a power-up is aqcuired
Power-up bug fixes
2014-07-31 23:35:50 -04:00
CoderTim
6ac00cde99
Move Sneaky Assassins NPCs during Prepare and Live
2014-07-31 23:32:26 -04:00
CoderTim
22748eb225
Updated KitRevealer description
2014-07-31 23:31:42 -04:00
Shaun Bennett
cf724272dd
Fix lore messages not displaying correctly under certain circumstances
2014-07-31 17:30:02 -05:00
Shaun Bennett
41128cbc9d
Use constants for lore messages on server page
2014-07-31 17:17:05 -05:00
Shaun Bennett
4c74ce60eb
Prevent free players from joining servers before time limit
2014-07-31 15:36:00 -05:00
Shaun Bennett
c2b1f2a52f
Deny joining Premium servers through server command without premium
2014-07-31 13:47:51 -05:00
CoderTim
77b6f0250e
Play zombie_unfect sound when PerkRevealer explodes
...
PerkSmokeBomb also applies effects to NPCs
PerkSmokeBomb now uses HUGE_EXPLOSION effect
Set Sneaky Assassins PrepareFreeze flag to false
2014-07-30 23:56:40 -04:00
Chiss
308c2e1b91
Kit availability
2014-07-31 13:00:05 +10:00
Chiss
a4d579789c
Sneaky Assassins changes :)
2014-07-31 12:58:33 +10:00
Peter Miller
fb0469adfa
Chat filter API changes from TwoHat/PottyMouth to Inversoft/CleanSpeak.
2014-07-30 20:09:58 -04:00
Shaun Bennett
b93d6b9cb1
Fix "Click to Spectate" formatting
2014-07-30 17:44:09 -05:00
Shaun Bennett
3e9aebdb87
Identify free servers from server name
2014-07-30 17:30:46 -05:00
Shaun Bennett
dcc8eaaa21
Add Server Menu for Premium Servers. Item lore still needs some work
2014-07-30 17:19:51 -05:00
Jonathan Williams
4d397438be
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-29 21:11:15 -07:00
Jonathan Williams
f235f67aa5
Added +20 player buffer for lobbies.
2014-07-29 21:11:07 -07:00
Jonathan Williams
ff5bc3f485
Added file logger to ServerMonitor.
...
Fixed Statifier pulling inactive bungee records.
2014-07-29 21:10:52 -07:00
Jonathan Williams
9c952a7b04
Cleaned up date format creation every call in LobbyBalancer
...
Reduced times to call per second.
2014-07-29 21:10:08 -07:00
Jonathan Williams
d129f722a3
Cleaned up Firework util.
2014-07-29 21:09:16 -07:00
CoderTim
0382afecd8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-29 20:24:04 -04:00
CoderTim
fa91bf0a00
Disable dropping hunger in Sneaky Assassins
2014-07-29 20:22:46 -04:00
Jonathan Williams
46cc2576dd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-26 10:41:04 -07:00
Jonathan Williams
4e1a05e9bd
Fixed whitelist issue with tournament mode.
2014-07-26 10:40:49 -07:00
Chiss
78b3d3b35c
restored original bridge timer :)
2014-07-26 21:05:12 +10:00
Chiss
3f4e4b6607
fixed -1 not working
2014-07-26 21:03:50 +10:00
Chiss
802415be8f
-1 team kills for suicide (only after bridge drop)
2014-07-26 20:57:40 +10:00
Chiss
f090ed9313
end game fixes
2014-07-26 20:53:48 +10:00
Chiss
4f46ccc8aa
Winner is decided on bridge tourney timeout
2014-07-26 20:29:01 +10:00
Chiss
fa73ab5335
Bridges Tourney stuff
2014-07-26 17:40:17 +10:00
Chiss
21314afabe
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-26 17:03:30 +10:00
Chiss
107388baa3
Added game flag to allow clicking in inventory during games
2014-07-26 17:03:03 +10:00
Jonathan Williams
a455042c07
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-25 23:38:38 -07:00
Jonathan Williams
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
Jonathan Williams
d6e06f4556
Removed some unnecessary logic in Lobby Balancer
...
REmoved unused code in mineplexer.
2014-07-25 23:37:24 -07:00
CoderTim
c747638303
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-25 18:33:34 -04:00
CoderTim
fe46355130
Added missing description to Sneak Assassin revealer items
2014-07-24 21:25:59 -04:00
CoderTim
fe356add41
Restore original blocks when Sneaky Assassin power-up beacon is removed
2014-07-23 15:45:30 -04:00
Peter Miller
d7037f1619
Breaking up "/news" commands (like "/npc" sub-commands) using multicommandbase.
2014-07-22 22:18:29 -04:00
Peter Miller
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
CoderTim
a6a274069c
Prevent power-up message spam when player is fully powered-up
2014-07-21 17:26:45 -04:00
CoderTim
4460f2e651
Prevent fully powered-up Sneaky Assassin players from using additional power-ups
2014-07-21 16:29:15 -04:00
Jonathan Williams
5bc7549b8c
Disabled news because of console errors.
2014-07-19 14:48:05 -07:00
Jonathan Williams
fc43f434f0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-19 13:56:30 -07:00
Jonathan Williams
1362deca59
More work on FriendManager
2014-07-19 13:56:21 -07:00
Jonathan Williams
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
Jonathan Williams
de5c0a77ef
Added another requirement for Lobbies in ServerMonitor 1500 available slots
2014-07-19 13:54:27 -07:00
Jonathan Williams
e6818c4c46
Added small tweaks to lobby balancer and sorter for better spread on connect.
2014-07-19 13:54:03 -07:00
Jonathan Williams
8b747a81e1
Fixed filter bypass
2014-07-19 13:53:14 -07:00
CoderTim
d2038670d6
Merge remote-tracking branch 'origin/master'
2014-07-18 02:52:26 -04:00
CoderTim
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
Peter Miller
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
Peter Miller
d9110b4e3b
Implementing BONUS: Clickable Chat Links.
2014-07-15 22:31:53 -04:00
Jonathan Williams
3636255e8a
Fixed bug with DisguiseManager undisguising players.
...
Temp fix for emeralds not triggering in Perk Revealer.
2014-07-14 23:48:34 -07:00
Jonathan Williams
cb4d436605
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-14 22:58:58 -07:00
Jonathan Williams
1207ed8199
Added DDOSProtectionSwitcher email functionality
...
mineplex.core.Server cleanup.
Refactored RepositoryBase.
Implemented core functionality of Friends
2014-07-14 22:58:36 -07:00
CoderTim
64feaf63ed
Implemented Sneaky Assassin Revealer kit
2014-07-15 00:36:38 -04:00
CoderTim
c547801b7b
Added Sneaky Assassin NPC movement
2014-07-11 22:55:48 -04:00
CoderTim
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
Peter Miller
2ec8371f98
Implementing /news add and delete commands.
2014-07-10 21:10:35 -04:00
Peter Miller
82ba7bf30f
Implementing /news list and set commands.
2014-07-09 20:38:11 -04:00
Jonathan Williams
65b2e14689
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-09 11:15:06 -07:00
Jonathan Williams
193bd82b61
Minor adjustment to rule book.
2014-07-09 11:14:57 -07:00
Peter Miller
f38af4ab8a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-08 22:56:02 -04:00
Peter Miller
58092c914a
Initial database access and method stubbing for "news" command.
2014-07-08 22:55:51 -04:00
Mini-Chiss
5cd6bcfc82
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-08 18:08:46 -07:00
Mini-Chiss
03c56535ef
MAPDATA
2014-07-08 18:08:37 -07:00
Jonathan Williams
97422e237f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-08 18:01:30 -07:00
Jonathan Williams
74817f5f2e
Added rule book to Hub.
...
Fixed mineplexer bungee internet status.
Fixed up ddosprotectionswitcher.
2014-07-08 18:01:03 -07:00
Mini-Chiss
bd6b9b8888
so many fix
2014-07-08 17:35:27 -07:00
Mini-Chiss
c5e05523d3
sneakyfix
2014-07-08 17:34:47 -07:00
Mini-Chiss
dd0040086d
Parser Permissions
...
Sneaky Assasssin thingy.
2014-07-08 17:33:22 -07:00
Mini-Chiss
4d40df45d5
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-08 15:14:02 -07:00
Mini-Chiss
1455b4001f
Parser Update
2014-07-08 15:13:30 -07:00
Jonathan Williams
fb5f92df2a
Finalized internet status for bungees
2014-07-08 15:04:59 -07:00
Jonathan Williams
2e5b003cff
More work on internet status stuff.
...
Fixed some buggies with parser.
2014-07-08 13:18:27 -07:00
Jonathan Williams
2ccb27065c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-08 12:44:26 -07:00
Jonathan Williams
963c71f128
Fixed internet status stuff for bungees.
...
Fixed new portal arg req.
2014-07-08 12:44:17 -07:00
Mini-Chiss
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
Mini-Chiss
22709b0cd8
merge
2014-07-08 12:40:28 -07:00
Jonathan Williams
39b2ad57be
Fix for map parser zipping.
2014-07-08 12:37:39 -07:00
Jonathan Williams
6ae35f1b37
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-08 12:20:28 -07:00
Jonathan Williams
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
Mini-Chiss
65e7e1e0b3
Parser
2014-07-08 12:18:43 -07:00
Mini-Chiss
cf25bdc44f
Bridges fix being able to break mid chests before gamestart
...
Map parser Updates
2014-07-07 19:04:44 -07:00
Jonathan Williams
082cf98e99
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-07 16:26:08 -07:00
Jonathan Williams
64903ae4b4
Work on DDoS Protection switcher
2014-07-07 16:25:49 -07:00
Mini-Chiss
ef86fe6948
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-07 16:24:43 -07:00
Mini-Chiss
62f6ea815d
Champs Balance Update
...
Map Parser Update
2014-07-07 16:23:55 -07:00
CoderTim
3490db4b6f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-07 19:10:40 -04:00
CoderTim
38e4240a61
Fully implemented Sneaky Assassins Power-Ups
2014-07-07 19:10:29 -04:00
Peter Miller
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
CoderTim
fe1bf95342
Fixed code style and updated IntelliJ code style settings
2014-07-07 14:45:02 -04:00
Jonathan Williams
a66e877028
Cleaned up Bungee mineplexer a bit.
...
Refactored send/server commands for Portal.
2014-07-05 10:56:20 -07:00
Jonathan Williams
ff8c506690
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-04 23:23:30 -07:00
Jonathan Williams
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
Mini-Chiss
ce8560bdbf
hub news
2014-07-04 23:20:46 -07:00
Mini-Chiss
df8562e69a
Tourney mode for UHC
2014-07-04 23:11:13 -07:00
Mini-Chiss
c65712c260
UHC fixes
...
Sneaky Assassin listener leak fix
Some map parser stuffs.
2014-07-04 23:04:46 -07:00
Jonathan Williams
e6666932aa
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-04 14:32:41 -07:00
Jonathan Williams
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
CoderTim
6365ec5351
Started on Sneaky Assassins kits and power-ups
2014-07-04 11:14:34 -04:00
CoderTim
2fb2aadf66
Merge remote-tracking branch 'origin/master'
2014-07-04 11:12:52 -04:00
CoderTim
46c979e088
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-04 11:12:33 -04:00
Peter Miller
b56855c33c
Squished remaining concurrency/checking bugs! Happy 4th o'July!
2014-07-04 02:19:20 -04:00
Jonathan Williams
d2caf23ed7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-03 11:19:23 -07:00
Jonathan Williams
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
Peter Miller
2531dd7a8f
Implementing user/serverName checks
2014-07-03 00:17:49 -04:00
Mini-Chiss
d19b34b0e4
Removed debug
2014-07-02 17:14:52 -07:00
Mini-Chiss
22ceba9841
Fixed Scoreboards!
2014-07-02 17:12:52 -07:00
Jonathan Williams
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
Jonathan Williams
8eaad57516
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-02 16:05:37 -07:00
Jonathan Williams
f1393ffb33
Fixed rankUpdate changing existing higher ranked players.
...
Fixed join limits in arcade and hub.
2014-07-02 16:05:26 -07:00
Mini-Chiss
bea6902198
Spectators can use /tp
2014-07-02 13:09:47 -07:00
Mini-Chiss
82dd94de9b
Scoreboard fix
...
Unbreakable boats in hub
2014-07-02 12:50:04 -07:00
Mini-Chiss
05e116ea0d
Scoreboard flicker fixed!
2014-07-02 12:38:41 -07:00
Mini-Chiss
558f79fe34
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-02 10:58:34 -07:00
Mini-Chiss
17c36026f6
fixed bug where player who comes first was not being added to ranks. (get nothing)
2014-07-02 10:57:30 -07:00
Peter Miller
6c67ff9106
Resolving issues from Portal.java conflict resolution
2014-07-02 04:09:41 -04:00
Peter Miller
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
Peter Miller
1f515565ff
Moving improved server/send command code to separate command files
2014-07-02 03:24:48 -04:00
Jonathan Williams
9514f6391e
Fixed bug in Arcade with client manager.
2014-07-01 21:42:00 -07:00
CoderTim
44a57a485f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 21:39:03 -04:00
Jonathan Williams
41c4d5a0a8
Changed joining full servers to helper+
2014-07-01 18:33:33 -07:00
Jonathan Williams
081260757d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 18:31:26 -07:00
Jonathan Williams
6fd889d8fc
Added Player mapping.
...
Removed joining full servers for ultra.
2014-07-01 18:31:17 -07:00
Mini-Chiss
31772196a9
More scoreboard stuff (TDM)
...
New Tug game
2014-07-01 18:30:04 -07:00
Jonathan Williams
b627e8fdf5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 10:25:12 -07:00
Jonathan Williams
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
CoderTim
7ea818c0c8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 02:20:45 -04:00
Mini-Chiss
7bc3966feb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-06-30 16:13:15 -07:00
Mini-Chiss
8c461b3e1b
Cooldown on Spec Compass
...
Hub Forcefield Update
Scoreboard MINEPLEX refactor
2014-06-30 16:12:42 -07:00
Jonathan Williams
8e8e66f8c1
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-27 20:25:09 -07:00
Jonathan Williams
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
CoderTim
ccb17d5ac3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-27 19:33:34 -04:00
Peter Miller
60a6f22194
Added functionality for retrieving serverName from Bungee
2014-06-27 17:01:54 -04:00
Mini-Chiss
f10b081473
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-06-26 18:38:28 -07:00
Mini-Chiss
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
Jonathan Williams
681dfc5f7c
Added ability to copy in schematics from build server.
...
Added in gametype checking on parse.
2014-06-26 12:09:29 -07:00
Jonathan Williams
210264f25b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-25 20:53:39 -07:00
Jonathan Williams
57c52cb9c8
Improved MapParser to allow world loading/saving for immediate testing.
2014-06-25 20:53:28 -07:00
Peter Miller
e25101cd59
Continued enhancements...
2014-06-25 20:28:27 -04:00
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
Peter Miller
bb5aa8e0f3
Work on /server and /send commands with permissions (more permissions need to be implemented).
2014-06-24 22:34:17 -04: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
Jonathan Williams
7ff3765ba4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-14 22:11:14 -07:00
Chiss
9a79d0ede7
Fixed CME
...
Gadget cost fix
MapParser fix
2014-06-15 15:10:19 +10:00
Jonathan Williams
04236939d6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-14 21:27:42 -07:00
Jonathan Williams
26e16e8eac
Added button file.
2014-06-14 21:27:33 -07:00
Jonathan Williams
264248ecfa
Added castle siege quick join menu button.
2014-06-14 21:27:21 -07:00
Chiss
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
Chiss
d5c96f95c0
Fixed bug that gave items while respawning.
2014-06-15 12:01:58 +10:00
Chiss
bac071e084
Map Parser
2014-06-15 10:12:08 +10:00
Chiss
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
Chiss
7517c0cabc
merge
2014-06-13 08:40:01 +10:00
Jonathan Williams
336c307732
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-12 08:03:02 -07:00
Jonathan Williams
be8fea8ca9
Changed Chat API key.
...
Fixed PreferenceManager not saving asynchronously.
2014-06-12 08:02:47 -07:00
Peter Miller
01fbda81ba
More suggested improvements; commented out getEntries method for now.
2014-06-11 02:35:44 -04:00
Chiss
0be4df4531
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-06-11 12:14:45 +10:00
Chiss
6a1ffcd3b7
Fixed some gadget stuff
2014-06-11 12:14:21 +10:00
Peter Miller
7bdaaa8ae0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-10 16:09:48 -04:00
Peter Miller
63f082b424
Implementing suggested code style/locking changes and recommitting (JIRA-76)
2014-06-10 16:09:33 -04:00
Jonathan Williams
d82396d59b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-10 02:06:22 -05:00
Jonathan Williams
4fca244812
Made ItemGadgets Free.
...
Removed queue dom shop.
2014-06-10 02:00:53 -05: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
0bf702902e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-08 11:28:25 -05: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
Peter Miller
cad57b7a74
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-06 09:53:24 -04:00
Peter Miller
77dad4b475
JIRA-76: SimpleStats Manager/Repository creation
2014-06-06 09:52:26 -04: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
a8dda4ef8b
Hub Gem Queueing
2014-06-04 13:02:16 +10:00
Chiss
f2d1709adb
Hub update
2014-06-01 18:18:58 +10:00
Chiss
040ffe0ae5
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-06-01 17:56:27 +10:00
Chiss
c2ce84c666
merge
2014-06-01 17:56:15 +10:00
Jonathan Williams
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
Jonathan Williams
d0e9c41e22
Added moved pet stuff.
2014-06-01 00:53:15 -07:00
Jonathan Williams
bd2804c0d6
Fixed some item slot numbers for gadgets.
2014-06-01 00:53:00 -07:00
Chiss
2a5f3c4502
antistack
2014-06-01 17:47:11 +10:00
Jonathan Williams
461e1023e3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-06-01 00:39:28 -07:00
Jonathan Williams
f157715174
Merged Pet page into Gadget page.
...
Reworked gadget page.
2014-06-01 00:39:10 -07:00
Chiss
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
Chiss
a3a3a87278
Hug update
2014-06-01 15:47:34 +10:00
Jonathan Williams
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
Jonathan Williams
6505819a4b
Removed chat filtering.
...
Implemented user preferences in all required modules.
2014-05-30 13:34:55 -07:00
Jonathan Williams
57c3845df9
Finished up preferences.
...
Each preference saves, loads on login.
GUI working great.
2014-05-30 01:42:43 -07:00
Jonathan Williams
6c9a2d0a01
Hooked up preference manager to Chat.
2014-05-30 00:33:55 -07:00
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
CoderTim
9695f1bd08
Enabled Git in IntelliJ
2014-05-28 19:29:05 -04:00
CoderTim
fbf59ace67
Fixed server status connection url
2014-05-28 19:13:10 -04:00
CoderTim
1b5b2d21b2
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-28 17:51:38 -04:00
Jonathan Williams
0d350da6c0
Added more files and updated ignore list.
2014-05-28 11:23:32 -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
CoderTim
94e31e36f8
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-27 21:42:01 -04:00
CoderTim
e101c027ce
Created Sneaky Assassins and started work on the kits
2014-05-27 21:38:22 -04:00
CoderTim
091166f090
Refactored disguises to use EntityType
2014-05-27 17:49:45 -04: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
Chiss
6e8bdfa769
disabled hub clock for tournament
2014-05-03 17:26:21 +10:00
Chiss
0ce3b3fb2d
Disabled AFK kick during Tournament
2014-05-03 17:23:10 +10:00
Jonathan Williams
fe7ed5c96a
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-02 23:19:05 -07:00
Chiss
b432c094d9
Misisng ifles
2014-05-03 16:16:52 +10:00
Jonathan Williams
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
Jonathan Williams
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
Chiss
4304327bf9
Disallowed /spec during games.
2014-05-03 13:06:15 +10:00
Chiss
395a5d2c08
MAC disabled with Tournament Mode
...
Bridges TM game desc fix
2014-05-03 11:47:15 +10:00
Chiss
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
Chiss
1d4d98b910
Twitch Prep
...
MAC changes
2014-05-02 14:35:41 +10:00
Chiss
c1360c63f0
More strikes for auto-kick
...
Updated MAC kick message
2014-05-01 09:38:37 +10:00
Chiss
a17c1aca44
Allow more for lag in MAC
2014-05-01 09:36:30 +10:00
Chiss
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
Chiss
423a355057
Helpers+ wont be kicked yb MAC
2014-05-01 09:31:47 +10:00
Jonathan Williams
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
Jonathan Williams
7637d94ae0
Added mysql logger.
...
Hooked it up in a few places.
Fixed Asynch crap with AntiHack.
2014-04-30 00:31:22 -07:00
Jonathan Williams
42e9fe879c
Fix for party filtered party messages going to everyone.
2014-04-29 13:45:38 -07:00
Jonathan Williams
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
Jonathan Williams
cee2883786
Added some verbage around command center block.
...
Fixed async chat connection stuff.
2014-04-29 12:13:32 -07:00
Jonathan Williams
3ec1653532
Added in chat filtering command and finished up filtration.
2014-04-29 11:54:20 -07:00
Jonathan Williams
1bcdc71c14
Added ping logging to Antihack reports.
2014-04-28 01:53:02 -07:00
Jonathan Williams
fd372b8418
Changed skills to 2k gems each.
...
Changed power/booster to 2k gems each.
Added AntiHack perm storage of kicks.
Commented out SafeChat stuff for now.
2014-04-28 01:05:08 -07:00
Jonathan Williams
66aa7223cc
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-27 21:59:35 -07:00
Jonathan Williams
47417dea6b
Implemented initial SafeChat.
2014-04-27 21:59:18 -07:00
Chiss
dc6a3da0fa
Added more DMT words
2014-04-28 14:08:40 +10:00
Chiss
77809b409d
MAC Update
2014-04-28 12:28:48 +10:00
Chiss
c5509f870f
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-28 09:43:18 +10:00
Chiss
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
Jonathan Williams
62740b6f5b
Tweaked ServerMonitor to keep track of servers started/restarted and to handle us/eu in same build.
2014-04-26 23:26:56 -07:00
Jonathan Williams
0e72d1c1eb
Added extra sleep to monitor because servers take longer to startup with spigot.
2014-04-26 09:21:51 -07:00
Jonathan Williams
7b264b0867
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-26 09:21:11 -07:00
Chiss
82afefd11a
Quick fix for respawning players not being able to get stuff from creative inventory
2014-04-27 01:09:25 +10:00
Jonathan Williams
2b4c0135bf
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-26 02:47:19 -07:00
Jonathan Williams
7c9017f184
Fixed Bungee issue with ServerPing in MOTD.
...
UPdated to latest spigot again.
Removed useless 1.7 stat tracking.
Fixed Party issue in hub
2014-04-26 02:47:04 -07:00
Chiss
95d6ec7f50
Barrage fix
2014-04-26 17:25:35 +10:00
Chiss
07ca3a83ca
Arrows shouldnt bounce
2014-04-26 13:37:01 +10:00
Chiss
b86b014058
Fixed a whole bunch of bugs
2014-04-26 11:59:11 +10:00
Jonathan Williams
9a3b73a137
Add new file, removed insentient a(groupdata call
2014-04-25 17:53:31 -07:00
Jonathan Williams
ac1c081bc8
Fixed scoreboard issues.
2014-04-25 17:52:04 -07:00
Jonathan Williams
a37ace7576
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-25 00:44:27 -07:00
Jonathan Williams
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
Chiss
8229925fca
HUB NEWS
2014-04-25 17:37:42 +10:00
Chiss
9495630bf2
CP rate increase
2014-04-25 11:10:37 +10:00
Jonathan Williams
7fef4adbee
Fixed resupply resetting skills.
2014-04-22 22:19:03 -07:00
Jonathan Williams
97c8573926
Added logging to proxy Plugin.
...
Changed tracking to async logging so it doesn't stop players from connecting if stats is down or slow.
2014-04-22 22:10:25 -07:00
Chiss
7ea601e94b
Cant open bridge chests until bridges are down.
2014-04-23 10:38:59 +10:00
Chiss
0325892e2a
Champs water fixes
...
First push for Twitch games
2014-04-23 10:21:01 +10:00
Jonathan Williams
e62dfb0dd2
Fix skill/item packs not deducting gems.
...
Fix players not getting spectating flag when dying.
2014-04-22 16:50:44 -07:00
Jonathan Williams
7680eaaedc
Fixed non-Ultra being able to unlock spells/skills.
...
Fixed Items that weren't free.
2014-04-22 11:20:00 -07:00
Jonathan Williams
2378df6191
Fixed builds losing tokens.
2014-04-22 10:35:56 -07:00
Chiss
923d2455d0
Stampede ends immediately on taking damage
2014-04-21 17:21:52 +10:00
Chiss
bddc36271d
fixed gems for capture
2014-04-21 17:16:35 +10:00
Chiss
6ee516ba4a
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-21 17:14:34 +10:00
Chiss
0f31052d00
cannot shoot arrow in water.
...
less gems for capping
2014-04-21 17:14:23 +10:00
Jonathan Williams
2e0e033ba3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-21 00:12:17 -07:00
Jonathan Williams
75b44953bf
Fixed arrow bounce.
2014-04-21 00:12:00 -07:00
Chiss
62c245d728
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-21 17:06:08 +10:00
Chiss
0f0b66a8cf
Stampede cancel on damage taken
2014-04-21 17:04:51 +10:00
Chiss
a150249f4f
game will not announce winner multiple times
2014-04-21 17:01:50 +10:00
Jonathan Williams
9ce6d4866d
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-20 23:37:01 -07:00
Jonathan Williams
e012129427
Fixed edit custom build bugs.
...
Fixed vehicle exit event not firing.
Fixed item info not showing once you have the item.
2014-04-20 23:36:45 -07:00
Chiss
adf8821a26
more CP changes
2014-04-21 12:55:24 +10:00
Chiss
b1e082b73a
fixed riposte bug
...
tweaked capture effects
2014-04-21 11:56:14 +10:00
Chiss
0eaa3110f5
Risposte nerf
2014-04-21 11:18:14 +10:00
Chiss
b8e573e8f8
redid capture display. much less annoying.
2014-04-21 11:15:49 +10:00
Chiss
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
Chiss
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
Chiss
3281eb2ed7
Merge
2014-04-21 08:47:07 +10:00
Jonathan Williams
60039d5b76
More missing files.
2014-04-20 01:07:59 -07:00
Jonathan Williams
8bf40169f3
Added missing files.
2014-04-20 01:06:55 -07:00
Jonathan Williams
65e94e59cc
Changed item tokens to 10 for non bow classes.
...
Fixed token prices on power/booster items.
Removed You already have this item message on items in CustomBuild.
2014-04-20 01:06:17 -07:00
Jonathan Williams
1f225f05ff
Custom build fixes.
2014-04-20 00:27:32 -07:00
Jonathan Williams
dc625726c4
Item Custom Build Fixes.
2014-04-19 22:54:52 -07:00
Jonathan Williams
458f5741d7
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-19 20:54:04 -07:00
Jonathan Williams
e5e9cc7284
Custom Items in custom Builds for dom.
2014-04-19 20:53:55 -07:00
Chiss
845d45bd4d
fixed some skill bugs
...
players quitting during recruit will no longer remain on a team, caused unbalance
GiveClock flag added to game, to stop giving clock.
2014-04-20 13:50:15 +10:00
Chiss
de2b42e190
fixed tnt bug
2014-04-19 15:18:13 +10:00
Chiss
b720a6433c
Explosions crack carved stone brick
2014-04-19 15:10:30 +10:00
Chiss
1bf1f04d53
Champs Stuff
2014-04-19 14:50:14 +10:00
Chiss
424f915388
Champs Merge
2014-04-18 13:24:30 +10:00
Jonathan Williams
6b07541b3b
DERP JONLONS
2014-04-15 18:40:43 -07:00
Chiss
5ac48a02fb
Stripped indicator func out of Condition
...
Class Combat skills arent usable before game starts
Silence re-enabled for class combat skills
2014-04-15 17:53:24 +10:00
Jonathan Williams
81ab27cd83
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-14 17:09:47 -07:00
Jonathan Williams
6c8651d2c7
Fixed classes not being added.
2014-04-14 17:09:37 -07:00
Chiss
1c23cf7b4e
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-14 09:27:44 +10:00
Chiss
e5ea7483db
Merge
2014-04-14 09:27:31 +10:00
Jonathan Williams
d3a3cc278f
Fixed ultra custom builds not saving.
...
Fixed default builds.
Fixed armor bug.
2014-04-13 04:24:22 -07:00
Jonathan Williams
591caa1589
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-13 01:36:46 -07:00
Jonathan Williams
cac59afed4
Fixed bug with missing default skill and kit page opening.
2014-04-13 01:36:34 -07:00
Chiss
5df8d34426
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java
2014-04-13 18:01:55 +10:00
Chiss
9874dae60f
Merge
2014-04-13 18:00:53 +10:00
Jonathan Williams
5efaf9bd36
Fixed inf loop.
2014-04-13 00:59:55 -07:00
Chiss
b22be81cbb
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-13 17:49:44 +10:00
Jonathan Williams
8b159557b2
Added PvpClass set in default customBuild.
2014-04-13 00:49:16 -07:00
Chiss
d087b379d1
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-13 17:21:02 +10:00
Chiss
85aa748218
Champs Bug Fixes
2014-04-13 17:20:49 +10:00
Jonathan Williams
d84c234f47
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-13 00:16:07 -07:00
Jonathan Williams
1b25dce2c5
Added default application on setGameClass.
...
Removed print info on custom build saving.
2014-04-13 00:15:44 -07:00
Chiss
081da93bbd
blocked /bukkit:me
2014-04-13 11:19:16 +10:00
Chiss
f25a6c26c9
Champs Update
2014-04-13 11:06:10 +10:00
Chiss
154479d1b7
Fixed TDM health
2014-04-13 09:29:22 +10:00
Chiss
f73d4d3e23
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-13 09:29:12 +10:00
Chiss
2e4bc587b1
Champs Update
2014-04-13 09:26:31 +10:00
Jonathan Williams
1cb35262ac
Fixed skill tokens not being returned.
2014-04-12 14:02:40 -07:00
Jonathan Williams
98430be09e
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-12 01:45:01 -07:00
Jonathan Williams
8f42d91d8a
Fixed ban kick bug.
...
Fixed Hub right click mount crash bug.
Fix for custom builds not saving.
Fixed Bridges not starting/hanging.
Updated to 1.7.8 spigot support.
Removed logging on HS.
2014-04-12 01:28:33 -07:00
Chiss
ecc40bda47
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-12 18:25:59 +10:00
Chiss
ba1c6ae35f
Champs Balance
2014-04-12 18:22:53 +10:00
Jonathan Williams
eb1d1c1ed2
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-11 03:10:02 -07:00
Jonathan Williams
c8af89dded
Fixed BH and GRavity.
2014-04-11 03:09:21 -07:00
Chiss
80df2c2944
Bux fixes for 1.7
...
Champions TDM
SSM Domination
2014-04-11 15:33:31 +10:00
Chiss
71b2931936
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-11 10:34:51 +10:00
Chiss
2adf0395a1
Merge
2014-04-11 10:33:56 +10:00
Jonathan Williams
0375384fb5
Converted to Spigot's latest 1.7.5
2014-04-10 17:15:44 -07:00
Jonathan Williams
a26894fda6
Added missing file.
2014-04-09 21:38:12 -07:00
Jonathan Williams
84ffd56c82
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-09 02:50:46 -07:00
Jonathan Williams
8460fcc8f6
Added ninja check for bow charge if you just right click quickly.
2014-04-09 02:50:37 -07:00
Chiss
b64acf524c
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-09 19:07:22 +10:00
Chiss
b868db0f22
Fixed so you can now charge bow skills in air.
2014-04-09 19:07:12 +10:00
Jonathan Williams
e4ca9084cc
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-09 02:03:41 -07:00
Jonathan Williams
ec29c66d1c
Added arrows sticking in you.
...
Removed bouncing arrows.
2014-04-09 02:03:19 -07:00
Chiss
146202a52c
Champs Balance + Red Arrow Fix
2014-04-09 18:50:38 +10:00
Chiss
7d59f43ffa
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-09 16:48:14 +10:00
Chiss
0ecd38c656
Champs Balance
2014-04-09 16:48:01 +10:00
Jonathan Williams
bedabd84cc
Added silence to kits (UtilEnt.silence)
...
Cleaned up a ton of unused code....
2014-04-08 23:31:32 -07:00
Jonathan Williams
e8260b20f7
Fixed dragon spawn location for text util.
2014-04-07 23:35:45 -04:00
Jonathan Williams
9b4e1aa9eb
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-07 22:25:08 -04:00
Jonathan Williams
109d2cb6f1
Fixed edit build issue.
2014-04-07 22:18:04 -04:00
Chiss
2eaaa85e04
Fixed /game stop trapping players in dead world.
2014-04-08 12:08:59 +10:00
Chiss
bb3f2c6281
CHAMPS
2014-04-08 10:53:41 +10:00
Chiss
85c57f2942
IButton now has Left/Right
...
Added right-click skill removal.
2014-04-06 12:45:52 +10:00
Jonathan Williams
88131836d7
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-05 16:01:07 -04:00
Jonathan Williams
db2ae49074
Fixed saving custom builds.
...
Work on skill tokens.
2014-04-05 15:53:22 -04:00
Chiss
8214e3b8f4
Lots of little bug fixes
2014-04-05 16:52:23 +11:00
Jonathan Williams
05d916de3c
Fixed custombuild selection not applying armor
2014-04-04 15:57:56 -04:00
Jonathan Williams
ddcc8a26b3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-04 15:02:42 -04:00
Jonathan Williams
edfe23fb01
Fixed collision with Projectiles.
2014-04-04 15:02:13 -04:00
Chiss
13b8f1e7ea
Champs Update
2014-04-04 13:26:00 +11:00
Chiss
26fe974b00
More CHamps
2014-04-03 15:48:58 +11:00
Chiss
80c153095b
Cooldown bar
2014-04-02 22:03:56 +11:00
Chiss
2f0167ea09
Champs Update
2014-04-02 21:22:21 +11:00
Chiss
2aaf749414
Champions Update
2014-04-02 15:19:58 +11:00
Jonathan Williams
afc26e21e3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-29 18:46:52 -04:00
Jonathan Williams
06bdc22c89
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-29 18:45:53 -04:00
Chiss
0f937b165c
skill shop stuff
2014-03-30 09:45:53 +11:00
Jonathan Williams
d227a6bd06
Changed full server message
2014-03-29 18:45:44 -04:00
Chiss
e1eda749a7
Skill lore changes
2014-03-30 09:05:29 +11:00
Jonathan Williams
b7857ef20c
Fixes for Skill level desc.
...
Fix for level staying same across skill changes.
Removed logging statements in ClientClass
2014-03-29 02:49:57 -04:00
Chiss
f4e8879d55
skilly test stuff
2014-03-29 17:07:07 +11:00
Jonathan Williams
195e555a6e
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-29 01:33:18 -04:00
Jonathan Williams
6963f6bacf
Added Player version stat tracking.
...
Added server group stats.
2014-03-29 01:32:24 -04:00
Chiss
fce249d7d8
fixed some desc stuff
...
castle seige removed OP kit
2014-03-28 18:50:38 +11:00
Chiss
4386ce0b96
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/ISkill.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java
2014-03-28 14:55:13 +11:00
Chiss
f5ca6408f8
Merge?
2014-03-28 14:51:26 +11:00
Jonathan Williams
aae40d3899
Changed up Skills and SkillsPage for Dom 2 changeover.
...
Fixed CustomBuild stuff.
2014-03-27 22:17:31 -04:00
Chiss
47feabcad3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-28 10:06:03 +11:00
Jonathan Williams
17e6658437
Fixed up AntiHack database reporting.
2014-03-24 01:16:02 -07:00
Chiss
2680edbd85
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-24 16:15:29 +11:00
Jonathan Williams
2450265909
Fixed damage rate limiting for mobs.
2014-03-22 00:16:51 -07:00
Chiss
e4a86e0600
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-22 10:45:01 +11:00
Chiss
fe09c3fc49
More CS Update
2014-03-22 10:44:31 +11:00
Jonathan Williams
8bf78fe14d
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-21 15:30:06 -07:00
Jonathan Williams
33d342b049
updated 1.7 stuff.
2014-03-21 10:57:31 -07:00
Chiss
ab2a72ba16
CS Update
2014-03-21 11:59:56 +11:00
Jonathan Williams
f24f81b7c3
Finished conversion.
2014-03-19 04:09:40 -07:00
Jonathan Williams
515a01fd7d
Updated utils.
2014-03-19 02:40:36 -07:00
Jonathan Williams
7f58453688
Updated Particle.
2014-03-19 02:25:28 -07:00
Jonathan Williams
7042159f46
Updated to 1.7 and changed namespaces to 1.7
2014-03-19 02:24:26 -07:00
Jonathan Williams
98baef09bf
Added 1.7 files.
...
Removed 1.6 files.
2014-03-19 00:58:43 -07:00
Chiss
a7888b0c02
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-19 17:51:48 +11:00
Chiss
7714ff4a09
CS Update
2014-03-19 17:51:37 +11:00
Jonathan Williams
24f1c6c722
Fixed saving custom builds.
...
Fixed items staying from previous class in game.
2014-03-18 23:40:54 -07:00
Jonathan Williams
9715f5454a
Removed double gems.
...
Removed unused code for ssm time
2014-03-18 12:55:04 -07:00
Chiss
6830033d8a
PLEASE JUST WORK :(
2014-03-16 10:52:34 +11:00
Chiss
d6e3f076cd
PLEASE JUST WORK MR TORTOISE
2014-03-16 10:42:30 +11:00
Chiss
3277a0a2f8
Making sure puushed
2014-03-16 10:35:58 +11:00
Chiss
d695ec72ca
Added SSM Team Game
2014-03-16 10:28:46 +11:00
Jonathan Williams
3603d3ef8b
Removed afk kick from arcade.
2014-03-14 21:49:01 -07:00
Jonathan Williams
0094c0ebeb
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-14 02:20:01 -07:00
Jonathan Williams
246f28a464
Enabled DoubleGem weekend.
...
Added 3 new maps
updated news
2014-03-14 02:19:52 -07:00
Chiss
aa206d9c91
Gravity fixes
2014-03-14 20:17:06 +11:00
Chiss
24efe3d0d8
SQ kit restrictions
2014-03-14 13:24:38 +11:00
Jonathan Williams
de1365b5cf
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-13 17:56:16 -07:00
Jonathan Williams
efee9fdcbf
Fixed Hub class shop.
...
Added chat logging.
Added message with file updater.
2014-03-13 17:56:05 -07:00
Chiss
f4cd2fcbb9
Staggered game teleports/start
2014-03-13 18:18:22 +11:00
Chiss
27f554ab61
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-13 16:33:03 +11:00
Chiss
82644002c5
A little bit o dem ol bug fixles. yknow what im sayin?
2014-03-13 16:32:48 +11:00
Jonathan Williams
b6ee99596a
Work on Dom shop page.
...
Removed unused shops
Removed unnecessary include of Core project files in build xml
2014-03-12 01:06:56 -07:00
Jonathan Williams
c4b7cd19c8
Added default builds for kits in Champions/Dominate
...
Added default build selection in lobby when only hitting kit and not selecting a build.
2014-03-11 03:29:11 -07:00
Jonathan Williams
f277b1da23
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-09 19:43:14 -07:00
Jonathan Williams
02a1e68c8c
Fixed kits opening correct page.
2014-03-09 19:42:54 -07:00
Chiss
105b210afa
mob spawnin'
2014-03-10 13:42:05 +11:00
Chiss
464fdb1e5e
Renamed Champions to Dominate
2014-03-10 13:35:36 +11:00
Chiss
8593eb326e
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-10 13:32:52 +11:00
Chiss
1bc5fef625
Kit npc location change
2014-03-10 13:32:39 +11:00
Jonathan Williams
a565da45e4
Added classes to champions.
...
Added ability to open direct classes page.
2014-03-09 19:32:27 -07:00
Jonathan Williams
f51a6747fd
Moved files into Mineplex.core
...
Removed references to Core project.
2014-03-09 00:50:13 -08:00
Jonathan Williams
2cc50d5725
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-03-06 02:15:46 -08:00
Jonathan Williams
d05c2f906c
Fix for ServerNpc page beta join.
...
Work on Dom 2.0
Added sheep quest map.
2014-03-06 02:15:16 -08:00
Chisstop
60bc3f15bb
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-03-05 14:35:01 -08:00
Chisstop
c9a938d2c5
Sheep Quest Fixes
2014-03-05 14:34:51 -08:00
Jonathan Williams
a09a2aaa30
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-03-05 00:40:51 -08:00
Jonathan Williams
f0b347f97f
Changed beta testing to Ultra and up.
...
Did some work on DOM 2.0
2014-03-05 00:34:20 -08:00
Chisstop
af2cf4e7a9
this is the one change i needed to push
2014-03-04 23:27:37 -08:00
Chisstop
2b56b970fa
Sheep Game?
2014-03-04 22:39:48 -08:00
Jonathan Williams
d99a3c9253
Optimized mysql queries with server status' address/updated fields.
...
Removed double gems.
Added BETA check for Hero only beta games.
2014-03-03 12:47:57 -08:00
Jonathan Williams
b3f10b9d62
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-03-01 01:59:25 -08:00
Jonathan Williams
750fff32c7
Added Skeletal horse.
2014-03-01 01:58:58 -08:00
Chiss
b54e4dfbc4
hunger
2014-03-01 11:29:01 +11:00
Chiss
18880a00f4
fletcher doesnt give to specs
2014-03-01 11:09:15 +11:00
Chiss
dfa4ea0edc
fix
2014-03-01 11:06:01 +11:00
Chiss
8d0115f874
News update
2014-03-01 10:40:55 +11:00
Chiss
bfaa138526
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2014-03-01 10:35:20 +11:00
Chiss
7cf6391ddd
Sheep Quest
...
Double Gem Weekend
2014-03-01 10:35:06 +11:00
Jonathan Williams
8550307904
Removed unnecessary mysql call on client login.
2014-02-28 13:22:30 -08:00
Jonathan Williams
c2044f7e8a
Added horse disguise.
...
Added Hub redirect on full.
Fixed Repo for ServerMonitor.
Fixed Bridge QuitOut/AutoBalance issue.
Removed unnecessary region folder create in dominate.
2014-02-28 01:18:32 -08:00
Jonathan Williams
f2570caad5
Swapped default connections to new dns names.
...
Fixed bug with LobbyBalancer and retrieving no lobbies.
2014-02-21 13:32:14 -08:00
Jonathan Williams
55c9a85763
Fixed Dynamic Server monitor stuff.
...
Fixed EnjinTranslator Gem command.
2014-02-18 00:40:41 -08:00
Jonathan Williams
ac8748312f
Fixed Account login issues....Nasty LoadNavigationProperties()
...
Tweaked dynamic server monitor sleep ordering to prevent multiple duplicate starts on boxes.
2014-02-14 13:39:24 -06:00
Jonathan Williams
95210de788
Added auto restart for Dominate if startup errored.
...
Added extra check for <= 1 players in Dom game to shutdown.
Added 5 second delay to Dom kick after game finish.
2014-02-12 02:31:35 -08:00
Jonathan Williams
a75ced170c
Added whitelist check in CoreClientManager
2014-02-10 02:04:20 -08:00
Jonathan Williams
525df6c2b0
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-02-07 09:46:54 -08:00
Jonathan Williams
516e5f7f99
Moved Rejoin ability into TeamGame.
...
Added autobalance flag for game.
Punish only does exact name lookup.
2014-02-07 08:50:13 -08:00
Chiss
b776c1bf60
spacehelemettts
2014-01-22 08:28:06 +11:00
Chiss
d868c9b73d
fixed gold blocks being destroyed.
2014-01-22 08:02:01 +11:00
Chiss
567b7c4a7b
minor fixes
2014-01-21 23:14:23 +11:00
Chiss
9118e79d9a
Minor fixes
2014-01-21 22:57:49 +11:00
Chiss
b0ea211ae3
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2014-01-21 22:52:05 +11:00
Chiss
e124dde006
Finished Gravity
...
INcluded map
2014-01-21 22:48:18 +11:00
Jonathan Williams
6f43d91bcf
Added Vegetate for Bat.
...
Added missing ProcessRunner.java
2014-01-20 21:01:52 -06:00
Jonathan Williams
0fba94f8ae
Derp
2014-01-20 20:22:59 -06:00
Jonathan Williams
f657b8a3ac
Added isFlying and setFlying to DisguiseBat
2014-01-20 20:18:09 -06:00
Chiss
bdb7f3cc28
UHC season 5
2014-01-21 11:56:35 +11:00
Chiss
76b2baf626
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2014-01-21 11:28:37 +11:00
Chiss
7bbfdd1a42
Gravity Update
2014-01-21 11:28:12 +11:00
Jonathan Williams
dea96a9e65
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-01-18 09:08:12 -06:00
Jonathan Williams
177f4a878b
Removed bad eventhandler line
...
Refactored StatsManager
Removed Pvp Table add for StatsManager
Added commented out hooks for HG stats
2014-01-18 09:02:56 -06:00
Chiss
75669e2333
Hub News Changes
...
AntiHack Autokick for Severe Hackers
2014-01-18 20:33:38 +11:00
Chiss
1333f2ee9f
SSM Horse Disabled
2014-01-18 12:56:00 +11:00
Chiss
1031846198
SSM Update
...
Gravity game start
2014-01-18 12:34:24 +11:00
Jonathan Williams
8e51e4061a
Reverted Hub.
...
Fixed server monitor issues.
2014-01-14 02:04:06 -06:00
Jonathan Williams
ea320e7f5b
Removed Client cleanup.
...
Modified server monitor process handling.
2014-01-08 15:18:52 -05:00
Jonathan Williams
6904f9cf3d
Minor verbage "Starting in 1 Second."
...
Fixed NPE in client cleanup.
2014-01-03 05:50:05 -05:00
Jonathan Williams
faea1072a1
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-01-03 01:37:49 -05:00
Jonathan Williams
93c0575fe2
Fixed naming in some hub modules.
...
Fixed StatusManager ip and DynamicServer comparison.
Tweaked Bungee Lobby selection so it doesn't select a Lobby with < 10 slots left
Added client cleanup in CoreClientManager
Added Paintball cleanup
Added AntiHack ignore list cleanup.
Added clearDisguises call in DisguiseManager
Added ServerMonitor tracking based on Private Address.
2014-01-03 01:37:39 -05:00
Jonathan Williams
dd7b178a9f
Fixed Hero rank in EnjinTranslator
2013-12-26 19:44:36 -05:00
Chiss
fa2e24d686
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
2013-12-25 09:08:03 +11:00
Chiss
375d689cc6
fixed visual bug with hero gems
2013-12-25 09:06:22 +11:00
Jonathan Williams
3fefc8fa73
Fixed Hero message in Arcade.
2013-12-24 04:13:52 -05:00
Chiss
f510083e7e
formatting
2013-12-24 19:26:30 +11:00
Chiss
d25487d545
Rank color
2013-12-24 19:21:21 +11:00
Chiss
d92515eef9
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-24 19:14:54 +11:00
Chiss
74e49a3ff1
Hero Rank stuff
...
New SSM Kit
2013-12-24 19:14:40 +11:00
Jonathan Williams
592d49e57c
Added ghost check flag to ender dragon.
...
Re-enabled Dragon Gadget.
2013-12-24 03:09:15 -05:00
Jonathan Williams
6595d33899
Tuned chunk load for disguise manager.
...
Disabled dynamic text in hub.
2013-12-24 00:39:33 -05:00
Jonathan Williams
e60f52ff9c
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-12-23 04:17:06 -05:00
Jonathan Williams
79de7f2bfc
Fixed portal breaking with Frost horse.
...
Added memory clean up for disguises
2013-12-23 04:16:53 -05:00
Chiss
200504ec8b
made snowman boss a little tougher.
2013-12-22 00:10:15 +11:00
Chiss
b895c66005
snake even more easy
2013-12-22 00:02:38 +11:00
Chiss
3bd7a7cd1f
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-22 00:01:24 +11:00
Chiss
2f063e9f8e
wave 3 snowman invul fix
2013-12-21 23:54:10 +11:00
Jonathan Williams
a02ca4513e
Added undead/batgun and frost to in game shop for gems.
2013-12-21 07:29:04 -05:00
Chiss
e94784a908
dragon mount removed
2013-12-21 23:09:49 +11:00
Chiss
d6c37055da
cleaner leak fix.
2013-12-21 23:06:27 +11:00
Chiss
1c3d90a70f
leak fixes
2013-12-21 23:00:51 +11:00
Chiss
58e049acf9
snake bit is easier :)
2013-12-21 22:34:04 +11:00
Chiss
c08b7c7b96
hub news update
2013-12-21 22:21:16 +11:00
Chiss
bfd76474e8
Dragon particles
2013-12-21 20:44:56 +11:00
Chiss
a6eb7ea665
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-21 20:07:04 +11:00
Chiss
0585116e78
Hub Gadgets
...
Hub Dragon (Hero Only)
XMAS block efficiency
2013-12-21 20:05:42 +11:00
Jonathan Williams
793b17e878
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-12-21 03:23:07 -05:00
Jonathan Williams
7574a5972b
Prevented sounds from silenced vegetables.
2013-12-21 03:22:58 -05:00
Chiss
c969775df3
Hub gadgets for xmas
2013-12-21 19:00:30 +11:00
Jonathan Williams
5fffcf89b6
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-12-21 02:44:20 -05:00
Jonathan Williams
70c14268e1
Fixed Leash issue.
...
Added invis for utilent.ghost
2013-12-21 02:44:12 -05:00
Chiss
f50ae06dff
NPE fix
2013-12-21 16:52:59 +11:00
Chiss
50c2b10b50
25% easier boss
2013-12-21 15:10:17 +11:00
Chiss
c52a7d2fe1
Christmas update
...
Hub Update
2013-12-21 15:06:01 +11:00
Chiss
bc9c309aa1
Xmas Game
2013-12-21 10:17:22 +11:00
Chiss
5dc0a7d4d6
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-21 08:43:02 +11:00
Chiss
ac723c14bd
Push so i can pull :O
...
just some xmas stuff
2013-12-21 08:42:49 +11:00
Jonathan Williams
f504cb5a8d
Added vegetation to horse.
...
Added Leash method to UtilEnt
2013-12-20 03:52:43 -05:00
Jonathan Williams
379b0d0d75
Check for PullWhileLeashed in EntityCreature.
2013-12-20 03:14:18 -05:00
Jonathan Williams
44145e01f0
Removed weather for hub update.
2013-12-18 13:52:44 -05:00
Jonathan Williams
a24e8e233c
Enabled pvp in hub for snowballs.
2013-12-18 05:56:59 -05:00
Chiss
6b33306755
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-18 21:46:40 +11:00
Jonathan Williams
e55885c85d
itsy
2013-12-18 05:22:40 -05:00
Chiss
f4edcedce3
push so i can pull :\?
2013-12-18 21:17:28 +11:00
Jonathan Williams
0ba8349e03
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-12-18 04:48:24 -05:00
Jonathan Williams
64dab19003
Cleanup
...
Prep work on leash disable functionality.
2013-12-18 04:48:16 -05:00
Chiss
54f2cb3467
Christmas hub snowman target cancel
2013-12-18 19:58:39 +11:00
Jonathan Williams
ab8013091d
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2013-12-17 11:10:11 -05:00
Jonathan Williams
938e72b06d
Remove tourney stats.
2013-12-17 11:09:36 -05:00
Chiss
de99a642d3
Hub tourney text removal
2013-12-17 11:06:04 +11:00
Chiss
4bef100c6a
Xmas Hub
2013-12-16 14:32:51 +11:00
Chiss
c582b210b5
Hub + Stats + Tournament
2013-12-14 16:51:08 +11:00
Chiss
3ca67d60c0
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-14 16:38:46 +11:00
Chiss
9af8676307
Hub/Stats
2013-12-14 16:38:16 +11:00
Jonathan Williams
ac049e0397
FINE JUST FINE>>>>>> STUPID CHICKENS
2013-12-13 21:36:57 -08:00
Jonathan Williams
69fa9eaba5
Added getters for stats/StatsManager.java
2013-12-13 21:35:04 -08:00
Jonathan Williams
e054b06cc2
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-12-13 21:01:08 -08:00
Jonathan Williams
6b92b6c4a8
Added stats manager.
...
Added lots of missing files.
2013-12-13 21:00:56 -08:00
Chiss
1eebed737e
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
2013-12-13 18:05:08 +11:00
Chiss
5f2e457362
Minor HG Stuffs ;o
2013-12-13 16:21:39 +11:00
Jonathan Williams
d6544202f0
Added ghost ability for mobs.
2013-12-12 02:19:58 -08:00
Chiss
97d8923678
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-07 23:04:59 +11:00
Chiss
2fb4bc4fbc
UHC stuff
2013-12-07 23:04:10 +11:00
Jonathan Williams
9382271315
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-12-06 01:57:18 -08:00
Jonathan Williams
03627eb0c3
Changed all mysql connections to be persistent.
2013-12-06 01:57:09 -08:00
Chiss
db7b4f3a40
more draw words
2013-12-04 15:25:18 +11:00
Chiss
00bccdc1f7
More draw words
...
UHC complete! probably not :'(
2013-12-04 13:31:23 +11:00
Chiss
a29cc4664f
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
2013-12-04 12:48:12 +11:00
Chiss
28c928b4c3
Xmas + UHC changes
2013-12-04 12:45:17 +11:00
Jonathan Williams
8984309c56
Cleaned up portal cancellation.
2013-12-03 17:41:58 -08:00
Jonathan Williams
022c343a98
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
2013-12-03 13:58:28 -08:00
Jonathan Williams
09a77e98cc
Prevent Enderdragon from creating portal.
2013-12-03 13:57:43 -08:00
Chiss
36a98d5e41
UHC changes
2013-12-03 21:31:02 +11:00
Chiss
f972418fd1
UHC!
2013-12-03 17:13:29 +11:00
Chiss
d10871abd9
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-03 16:27:12 +11:00
Chiss
43196dd7af
UHC Update
2013-12-03 16:26:47 +11:00
Jonathan Williams
ce4eb43145
UHC end transfer.
2013-12-02 21:20:28 -08:00
Jonathan Williams
27c79e7c92
Turned lobby balancer back to US
...
Added Draw map
2013-11-30 16:38:02 -08:00
Chiss
f4e3b6efdc
hub news/skytext for draw game
2013-11-30 22:11:26 +11:00
Chiss
c8fc792fdd
UHC prep for s4
...
Draw updates
2013-11-30 20:40:09 +11:00
Chiss
8807854b57
Added Draw
2013-11-29 23:38:38 +11:00
Chiss
f927f2c1be
wolf tackle fix
...
HG furnace no use
2013-11-27 12:48:16 +11:00
Chiss
0d811272cc
final HG fix :D
2013-11-27 11:52:20 +11:00
Chiss
6f06ac2018
HG lag fixes
...
item frames cannot be broken
creep damage messages
2013-11-26 23:54:02 +11:00
Jonathan Williams
25782813f4
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-26 02:35:05 -08:00
Jonathan Williams
9a7a815a21
Added multiblock packets only for sg.
...
RE-tweaked loot.
Fixed blocks pawns in lobby.
2013-11-26 02:34:54 -08:00
Chiss
e57722ed0b
HG snowball fix
2013-11-26 12:02:03 +11:00
Chiss
48e392fdf0
HG;
...
-compass
-deathmatch
-various fixes
2013-11-25 20:59:46 +11:00
Chiss
e469c5705b
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-25 10:23:28 +11:00
Chiss
b941359840
HG
2013-11-25 10:23:10 +11:00
Jonathan Williams
2ebf13aba6
Added commented out chunk change stuff.
2013-11-24 15:22:29 -08:00
Jonathan Williams
e2646a982f
Added MultiBlock packet.
...
Tweaked performance for chunks that are < 64 changes for HungerGames.
2013-11-24 04:54:41 -08:00
Jonathan Williams
0a1f4ecfd5
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-24 03:04:07 -08:00
Chiss
276898dced
HG
2013-11-24 21:58:55 +11:00
Jonathan Williams
8d19f3ecac
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-24 02:44:59 -08:00
Jonathan Williams
dbd7820279
Loot tweak.
2013-11-24 02:44:52 -08:00
Chiss
4c7e42760b
debugz
2013-11-24 21:44:43 +11:00
Chiss
83bec39aef
game not end
2013-11-24 21:36:35 +11:00
Chiss
c9e1c0a0f4
HG lag fix
2013-11-24 21:29:49 +11:00
Chiss
fd63a0a0b1
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-23 23:59:04 +11:00
Chiss
2a41979277
HG Lag Fixes!
2013-11-23 23:58:51 +11:00
Jonathan Williams
e04815f077
Removed Beta ultra only checking in server NPc page.
2013-11-23 02:40:56 -08:00
Jonathan Williams
b0bfa860c7
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-23 02:04:30 -08:00
Jonathan Williams
ae779d063e
Added quick menu buttons for Block Hunt and Survival Games
2013-11-23 02:04:22 -08:00
Chiss
f299b4f650
hub changes
2013-11-23 20:55:01 +11:00
Jonathan Williams
7752d0e8a2
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-23 00:57:54 -08:00
Jonathan Williams
11378f967f
Fixed npc page ultra beta stuff.
2013-11-23 00:39:32 -08:00
Chiss
0d7444f35a
TNT Damage off
2013-11-23 19:38:58 +11:00
Chiss
e6080c9192
drop fixes
2013-11-23 18:39:26 +11:00
Chiss
d5ae42910f
OOPDOOTS
2013-11-23 18:19:26 +11:00
Chiss
11bd4804f4
skeleton/wolf removal on death
2013-11-23 11:03:52 +11:00
Chiss
8752a7a6ac
HG Ice Speed + TNT Delay
2013-11-23 10:21:06 +11:00
Chiss
3a3ac9f8ce
redblockstore
2013-11-23 10:04:37 +11:00
Chiss
189b22ab4c
Pushed fixes
2013-11-23 09:55:48 +11:00
Chiss
6e1f88c14f
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-23 09:28:39 +11:00
Chiss
42cab3a39c
HG STUFF
2013-11-23 09:28:27 +11:00
Jonathan Williams
8a5e9e2f48
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-22 14:17:07 -08:00
Jonathan Williams
affc9eeb9c
Added inventory click for creative users in Hub
...
Added Ultra/Survival games beta stuff do servernpcpage
2013-11-22 14:17:00 -08:00
Chiss
a5a80378f7
Loot fixes
2013-11-23 09:15:13 +11:00
Chiss
3d13fb0dc9
HG Fixes
2013-11-22 23:12:39 +11:00
Jonathan Williams
9c9e5f1ae0
Added goal selector clear for entities in UtilEntity
2013-11-22 00:38:24 -08:00
Chiss
0b7bf00ca7
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-22 18:41:31 +11:00
Chiss
0a683416ff
SG Update
2013-11-22 18:40:38 +11:00
Jonathan Williams
7885df35ae
Added spectating flag for EntityTNTPrimed
2013-11-21 23:32:41 -08:00
Jonathan Williams
9e8cd9db7d
Disabled painting in parkour areas.
2013-11-21 12:38:16 -08:00
Jonathan Williams
44416001b3
Disabled Bat Blaster near Parkour.
...
Disabled Painting blocks near cactus.
2013-11-21 12:16:24 -08:00
Jonathan Williams
be7ea65033
Website bin/obj cleanup
...
Fixed Pet Rename problem.
Fixed Extra Pet tag problem.
Added ServerStatus for dedicated servers.
2013-11-21 12:08:58 -08:00
Jonathan Williams
4bd4943bd8
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-17 17:00:20 -08:00
Jonathan Williams
9ba122a4cb
Added recursive retrieval for Bungees
2013-11-17 17:00:12 -08:00
Chiss
7aec2d572b
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-17 21:04:51 +11:00
Chiss
18c70901ca
gem kit fix
2013-11-17 21:04:27 +11:00
Jonathan Williams
0fa953715e
Fixed interact cancel in Hub.
2013-11-16 18:49:17 -08:00
Chiss
fff13a14bf
Gem lowered on firework/meow
2013-11-17 12:31:13 +11:00
Chiss
0aae7d24ed
BH Gem Fixes
2013-11-17 12:30:14 +11:00
Chiss
85a3edc75e
Mute should now correctly block all command input too.
2013-11-17 11:04:54 +11:00
Chiss
be4de5f7bb
Europe server in news
2013-11-17 10:59:02 +11:00
Chiss
e91ed271c2
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-17 09:54:06 +11:00
Chiss
630281c663
SSM Hunger Fix
2013-11-17 09:53:53 +11:00
Jonathan Williams
3a725246dc
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-16 02:59:35 -08:00
Jonathan Williams
c1de12a8e7
Added autoreconnect to bungee repos
...
Fixed up disguise for block hunt.
2013-11-16 02:59:28 -08:00
Chiss
07d9610bf7
Hub sky text
2013-11-16 21:21:04 +11:00
Chiss
2a9c11d700
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-16 21:10:23 +11:00
Chiss
1e0a456286
hub changes
2013-11-16 21:09:59 +11:00
Jonathan Williams
a9241bc7f3
Changed Hub to normal.
2013-11-16 02:07:51 -08:00
Jonathan Williams
3f93e6daf1
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/CreatureForm.java
2013-11-16 01:56:22 -08:00
Jonathan Williams
75c2a5fd6e
Added sound disguises
...
Removed purchasable batgun.
2013-11-16 01:55:10 -08:00
Chiss
9c6ebcea52
shocking nerf
2013-11-16 18:25:19 +11:00
Chiss
37ed58cea9
axe boost nerf
2013-11-16 17:57:21 +11:00
Chiss
690811dd05
cased SG debug properly
2013-11-16 17:54:30 +11:00
Chiss
b8e1c22967
BH updates
2013-11-16 17:53:42 +11:00
Chiss
d71a8002d3
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-16 17:11:05 +11:00
Chiss
ea8d28abc1
Formula
2013-11-16 17:10:54 +11:00
Chiss
ef54732531
DISGUISE THEM CATS
2013-11-16 16:43:03 +11:00
Jonathan Williams
39384470e7
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-15 21:41:23 -08:00
Jonathan Williams
84acc952fa
Added DisguiseCat.
...
Added CookieTown Block Hunt.
2013-11-15 21:41:14 -08:00
Chiss
2e6758e23c
BH Updates
2013-11-16 13:15:16 +11:00
Chiss
29ce493f64
Hide and SEEEEEEK (block honts)
2013-11-15 18:52:46 +11:00
Chiss
99c97d1ecd
Block Hunt changes
2013-11-14 16:28:29 +11:00
Chiss
0013b1bacf
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-14 16:28:06 +11:00
Jonathan Williams
115109e5b8
Added sound disguise for DisguiseBase
...
Small desc tweak on server monitor.
2013-11-14 00:01:41 -05:00
Chiss
6ebda931fd
Fixed bug where backtracking players could be in the scoreboard twice.
2013-11-11 07:27:41 +11:00
Jonathan Williams
980ce0a5a3
Block disguise velocity tweak.
2013-11-08 16:06:17 -08:00
Chiss
255307088c
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
2013-11-09 10:03:49 +11:00
Chiss
3c5b1fe74f
H&S Updates
...
some punish fixes
hub toggles no longer pulse on pressure plate
2013-11-09 09:48:40 +11:00
Jonathan Williams
ef0d233512
Dynamic server tinkering again.
2013-11-08 14:46:05 -08:00
Jonathan Williams
cae10fe7b4
Fixes to DynamicServer Monitor
...
Fixed SSM disguise clunky movement.
2013-11-08 10:52:56 -08:00
Chiss
dc062c7bb6
H&S Push
2013-11-07 19:49:21 +11:00
Jonathan Williams
79b739fc14
Project for servermonitor
2013-11-07 00:22:42 -08:00
Jonathan Williams
7cc880afd1
ServerMonitor tweaks.
2013-11-07 00:22:04 -08:00
Chiss
8fa7b9f283
Helpers can use WARNINGS
2013-11-07 17:03:34 +11:00
Jonathan Williams
e27f01e916
Fixed punish constructor bugs for dom/mk
2013-11-06 21:36:00 -08:00
Jonathan Williams
079a58d2cd
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-06 20:38:41 -08:00
Jonathan Williams
f8567dcfa6
Fix for scoreboard uppercase issue in hub.
2013-11-06 20:38:33 -08:00
Chiss
8e7b5ac6fe
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-07 15:26:37 +11:00
Chiss
6b577af7b4
Punish Update
...
H&S Additions
2013-11-07 15:25:46 +11:00
Jonathan Williams
49e796c39d
Fixed Game.Core build issue.
...
Cleaned up a lot.
Added missing files for Mineplexer
2013-11-06 20:19:56 -08:00
Jonathan Williams
e0d10f6550
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-06 19:48:27 -08:00
Jonathan Williams
41e9ffb018
Removed BungeeSigns
...
Updated Bungee plugin to pull US servers only.
Added dynamic MOTD from mysql for BungeeCord.jar
Fixed crash for disguise block arm animation.
2013-11-06 19:48:00 -08:00
Chiss
0d5b174ebe
Stacker/Party exceptions for YouTubers
2013-11-07 10:33:39 +11:00
Chiss
9f11352f10
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-07 10:19:30 +11:00
Chiss
03731de7f8
Rank changes
...
MAC no longer kicks lag/fly
some H&S stuff :O
2013-11-07 10:18:36 +11:00
Jonathan Williams
70dae64389
added missing file.
2013-11-06 10:26:33 -08:00
Jonathan Williams
0a50d9b127
ServerMonitor files.
2013-11-06 09:14:08 -08:00
Jonathan Williams
9327e71519
MOre work on dynamic server baby!
2013-11-06 01:03:02 -08:00
Jonathan Williams
ff6488b371
safe file separators
2013-11-05 16:10:14 -08:00
Jonathan Williams
43d5b6441b
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-05 10:19:17 -08:00
Jonathan Williams
2064c58d1b
Fixed up ServerStatusRepository to insert into specific columns
...
Fixed Dominate shop.
Some work on Server Monitor
2013-11-05 10:19:04 -08:00
Chiss
bcb86fc911
PB gem for healing remove
2013-11-04 09:46:09 +11:00
Chiss
e14bc76639
arcade map directory up up right left down up right update!
...
some paintball fixes
H&S start
2013-11-04 08:59:29 +11:00
Jonathan Williams
6999d7979f
Added paintball to LobbyMenu
...
Fixed Lobby count in lobby menu
Fixed ultra/green kits in Paintball
2013-11-02 12:26:28 -07:00
Jonathan Williams
a468ac1ae0
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-02 00:59:39 -07:00
Jonathan Williams
b9560cf4da
Work on Dynamic server monitor.
2013-11-02 00:56:31 -07:00
Chiss
1545873f62
news feed for hub
2013-11-02 18:56:21 +11:00
Chiss
0cbefc1280
Paintball update!
2013-11-02 15:42:37 +11:00
Chiss
24723cd5e5
paintball update
2013-11-02 10:09:07 +11:00
Chiss
c72f1337e8
fixed memory leak in antihack
2013-11-01 10:40:33 +11:00
Chiss
08497e474d
mobs no longer move as soon as they spawn. GET IN LINE BOYS!
2013-11-01 08:34:32 +11:00
Chiss
7dcd58ec2d
HH debug prints
2013-11-01 08:27:45 +11:00
Chiss
d41338b76a
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/Champions.java
2013-10-31 17:38:44 +11:00
Chiss
ae4bf75485
Champs update
2013-10-31 17:36:41 +11:00
Jonathan Williams
7b8608de95
Rah Rah, Custom Class Combat in Arcade!
2013-10-30 23:35:24 -07:00
Jonathan Williams
bac425235d
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-30 20:26:08 -07:00
Chiss
52ac670f3f
More dom changes
2013-10-31 12:43:54 +11:00
Chiss
386e2e3067
Added Champs
...
MAC update
2013-10-31 09:45:11 +11:00
Jonathan Williams
a307a4854f
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-28 18:45:19 -05:00
Chiss
33c7d594a0
robin hood regen nerf
2013-10-29 10:43:04 +11:00
Chiss
ad487e48bd
THIS IS HALLOWEEN THIS IS HALLOWEEN
2013-10-29 10:41:53 +11:00
Jonathan Williams
7279f58b92
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-28 08:53:36 -05:00
Jonathan Williams
c70b5c712b
Fixed crash items in Server Game Menu for Hub
2013-10-28 08:52:32 -05:00
Chiss
ab9cce3910
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-28 22:31:03 +11:00
Chiss
91ec162c88
slightly easier
2013-10-28 22:30:51 +11:00
Chiss
3142bd517d
Fixed regen aura... wasnt working at all
2013-10-28 21:35:16 +11:00
Jonathan Williams
9d47864503
Fixed player count in bungee plugin
2013-10-28 03:24:18 -05:00
Jonathan Williams
afee32257d
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-28 02:22:30 -05:00
Chiss
f0f7a4156f
saving heads to file
2013-10-28 17:53:25 +11:00
Jonathan Williams
4306d2444f
Updated bungee library
...
Fixed server ping Event.java
Removed crash item in hub.
2013-10-28 01:37:23 -05:00
Chiss
980b6420fe
fixed stacker item for 1.7
2013-10-28 15:48:06 +11:00
Chiss
09a8cbe558
re-enabled waves
2013-10-28 14:08:55 +11:00
Chiss
1d4f902298
HH CPU fixes
2013-10-28 13:54:10 +11:00
Chiss
505dd57715
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-27 15:25:12 +11:00
Chiss
4974fc17aa
Halloween balance (slightly easier)
...
Giant hitbox improved
2013-10-27 15:24:28 +11:00
Jonathan Williams
845535991d
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-26 16:37:07 -05:00
Jonathan Williams
0aee445e00
Added timeout check for status retrieval
2013-10-26 16:36:48 -05:00
Chiss
7948fa6f71
cpu fix ;o
2013-10-27 06:21:43 +11:00
Chiss
3892cd13f7
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-27 05:32:34 +11:00
Chiss
c9a295d56e
Halloween event changes final
2013-10-27 05:32:21 +11:00
Jonathan Williams
1781ed15c4
Fixed some drop item stuff.
2013-10-26 12:02:18 -05:00
Jonathan Williams
95449fec26
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-26 11:06:19 -05:00
Chiss
64e98c4a30
text now has glowstone behind it (for darkness)
2013-10-27 03:05:19 +11:00
Jonathan Williams
7d8e79a234
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-26 11:01:22 -05:00
Jonathan Williams
88eab4b1a3
Fixed gadget item slot.
...
Fixed some desc on mounts
2013-10-26 11:01:01 -05:00
Chiss
d4affc8bb6
paintballs wont change near portals.
2013-10-27 02:53:38 +11:00
Jonathan Williams
df36145800
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ItemGadget.java
Plugins/Mineplex.Hub/src/mineplex/hub/mount/types/Mule.java
2013-10-26 10:47:14 -05:00
Jonathan Williams
0b0fa383f6
Finished up Gadget shop.
2013-10-26 10:45:41 -05:00
Chiss
935599030b
moved witch (so its not default kit)
2013-10-27 02:44:14 +11:00
Chiss
9a025eb540
Potion rename
2013-10-27 02:37:11 +11:00
Chiss
55de25fded
removed testing toggle for mount
...
changed item gadget slot from 2 to 3
2013-10-27 02:22:38 +11:00
Chiss
f838452b5c
uncommented waves
2013-10-27 01:46:46 +11:00
Chiss
19e2946ce4
mule rename
2013-10-27 01:44:18 +11:00
Chiss
b4e2145ad7
giant speed decrease
...
ghast teleports back if it flies too far away.
2013-10-27 01:43:41 +11:00
Chiss
cd2c9dcdda
more tips
2013-10-27 01:20:10 +11:00
Jonathan Williams
9bc9cc2bb8
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_Helmet.java
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ArmorGadget.java
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/Gadget.java
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ItemGadget.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/creatures/MobGhast.java
2013-10-26 08:53:38 -05:00
Jonathan Williams
39cf5c3ed1
Tweaking on ghast.
...
Added gadget costs
Working on Gadget shop.
2013-10-26 08:50:12 -05:00
Chiss
c672e68713
some help during boss fight.
2013-10-27 00:14:38 +11:00
Chiss
7eb1cc6519
Halloween game additions
2013-10-27 00:06:44 +11:00
Chiss
01cb69d28b
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-26 19:01:41 +11:00
Chiss
723b57cd46
Added paintball gun Gadget
...
Added bat blaster Gadget
Halloween Game near-completed
Added SSM Witch
2013-10-26 19:01:26 +11:00
Jonathan Williams
ca3979f4fa
Added witch disguise hurt sound
2013-10-25 20:12:01 -05:00
Chiss
8958b8998f
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-26 11:35:02 +11:00
Chiss
a52bd69558
Witch SSM
2013-10-26 11:34:05 +11:00
Jonathan Williams
5470f847a9
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-25 19:06:43 -05:00
Jonathan Williams
8883855297
Added witch disguise
...
Added missing files.
2013-10-25 19:05:26 -05:00
Chiss
49e8c15f44
important update
2013-10-25 22:56:28 +11:00
Chiss
e8ddfc266e
fsd6gty72 tjn6g wgh
2013-10-25 22:20:46 +11:00
Chiss
61b7a86b67
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-25 21:25:36 +11:00
Chiss
b74b8e3915
Halloween event changes
2013-10-25 21:25:23 +11:00
Jonathan Williams
e5f99331dd
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-25 05:16:15 -05:00
Jonathan Williams
c3754d766b
Added in vegetate check for EntityGhast.
2013-10-25 05:15:17 -05:00
Chiss
5563d94111
Halloween event update
...
hub News
hub mounts
hub gadgets
2013-10-25 19:20:14 +11:00
Jonathan Williams
21128eb153
Prepping filterChat and CoreClientManager for mysql
...
Removed get all clients at server start.
2013-10-23 16:36:13 -05:00
Chiss
1977572ced
Added Halloween Minigame
...
Updated gadgets and other minor things.
2013-10-22 15:46:31 +11:00
Chiss
7cec55713c
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-19 16:52:27 +11:00
Chiss
1944c0003c
Hub gadgets
2013-10-19 16:52:15 +11:00
Jonathan Williams
985ce795d2
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-18 00:50:49 -07:00
Jonathan Williams
90fbc397ff
Converted gem rewards to boolean return from website.
...
Implemented gem transactions and source.
2013-10-18 00:46:06 -07:00
Chiss
02258b9fd3
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-18 09:12:19 +11:00
Chiss
882ede9a21
tp ah exception
2013-10-18 09:09:29 +11:00
Jonathan Williams
7e77f78d2f
Removed all client list pull.
2013-10-17 00:54:14 -07:00
Jonathan Williams
43b42f771a
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
2013-10-17 00:40:06 -07:00
Jonathan Williams
f88c202e07
Added AntiHack to Arcade/Hub
...
Added AntiHack Offense uploading.
Fixed memory leaks in PreparedStatments
Added Ultra tag in hub chat.
2013-10-17 00:37:57 -07:00
Chiss
410e08b06a
Clearer MAC reporting to staff
2013-10-17 09:05:03 +11:00
Chiss
4d6a0e2133
Ah no kick
2013-10-17 09:02:52 +11:00
Chiss
d9ecbf4037
AH Update
2013-10-17 09:01:36 +11:00
Chiss
d23f72567a
fixed bug.
2013-10-16 17:22:28 +11:00
Chiss
9cdcbed086
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-16 12:24:02 +11:00
Chiss
2a836f3464
Added anti-hack
2013-10-16 12:23:23 +11:00
Jonathan Williams
483f8ffde3
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-15 14:20:45 -07:00
Jonathan Williams
9569c3906e
Starting work on dynamic server.
2013-10-15 14:19:14 -07:00
Jonathan Williams
1a5f6a9b74
Coreclient fix.
2013-10-15 14:18:13 -07:00
Chiss
40e49dd3d4
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-16 08:11:04 +11:00
Chiss
ec80d8a568
added AntiHack
...
added dragonrider coolness
2013-10-16 08:10:45 +11:00
Jonathan Williams
c68bfce21a
Fix for null pointer in core client cleanup
2013-10-14 12:20:49 -07:00
Jonathan Williams
922d269a52
Added core client cleanup in case of weird glitch from bungee
2013-10-13 22:40:06 -07:00
Jonathan Williams
1cdb89f4bf
Derp, missing arcade.
2013-10-13 21:51:38 -07:00
Jonathan Williams
6c568cb7a9
Added MemoryFix to Arcade
...
Added Dipose override and task cancellation to Confirmationpage
Cleaned up unused code in Updater
2013-10-13 21:51:25 -07:00
Chiss
230ad4aa7b
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-14 10:29:48 +11:00
Chiss
9ffc793f61
added Dragon Rider
...
anti-stack changes (dont anti-stack mined blocks)
2013-10-14 10:29:20 +11:00
Jonathan Williams
6dee9c983f
Increased interval between sending restart commands from server monitor.
2013-10-13 02:25:17 -07:00
Jonathan Williams
1c1fb056a6
Memory leak fix for explosion blocks.
2013-10-13 01:27:41 -07:00
Jonathan Williams
25dec6fb46
Fixed player arm animation bug.
...
Added EnderDragon AI control and vegetation
2013-10-12 20:31:43 -07:00
Chiss
36b825d36d
Snake update (woo)
2013-10-13 10:33:16 +11:00
Chiss
d784a0b017
snake speed ramp up decrease
2013-10-13 09:38:03 +11:00
Chiss
a34b6da238
even less blocks
2013-10-13 09:20:00 +11:00
Chiss
bb39f18573
Explosion creates less blocks.
2013-10-13 09:18:49 +11:00
Chiss
e12477c4b6
snake max speed decrease
2013-10-13 08:46:02 +11:00
Chiss
1fd894934a
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-13 08:43:06 +11:00
Chiss
377f4b0680
Gem fix, now correctly displays scaled gems.
...
UHC public changes
Snake fixes.
2013-10-13 08:42:49 +11:00
Jonathan Williams
c5385ee7dc
Fixed ultra join in arcade manager.
2013-10-12 02:53:22 -07:00
Jonathan Williams
e723075298
Increased lobby menu size.
...
Fixed memory leak in Explosion
2013-10-12 02:52:35 -07:00
Jonathan Williams
03c74aa419
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-12 01:55:52 -07:00
Jonathan Williams
42b932e612
Added inventory move prevention for all inventories
...
Prevent bone from being turned into bonemeal and being fed to pet wolf.
Fixed Dominate shop in hub.
2013-10-12 01:55:32 -07:00
Chiss
c8386bbc40
blue kit for snake
2013-10-12 18:22:20 +11:00
Chiss
a315064a3f
snake fix
...
parkour radius increase
2013-10-12 18:21:19 +11:00
Chiss
0564bd740a
SSM wolf balance
2013-10-12 17:17:24 +11:00
Chiss
4eecca3063
Wolf fixes
2013-10-12 17:13:28 +11:00
Chiss
8766767d96
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-12 16:59:38 +11:00
Chiss
27fb3b4262
Snake changes
...
SSM Wolf fixes
2013-10-12 16:59:23 +11:00
Jonathan Williams
f2c295c391
Fixed global ultra joining full games.
2013-10-11 22:03:17 -07:00
Chiss
0b2dcc2617
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-12 09:34:59 +11:00
Chiss
8376316994
Added Paintball
...
Added SSM Kit: Wolf
UPDATES.
2013-10-12 09:34:46 +11:00
Jonathan Williams
923a066013
Added ServerMonitor
2013-10-10 09:02:21 -07:00
Jonathan Williams
fc18d0fbb1
Added null check logging to arcade custom kit name.
...
Removed wolf kit in SSM for release
Cleaned up PlayerAccountController
Fixed connection leak for mysql connections.
Added server shutdown if server is empty for dominate.
2013-10-10 09:01:48 -07:00
Chiss
ed804e3336
Dragon escape update
2013-10-09 21:50:39 +11:00
Jonathan Williams
ca4760a7d6
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-10-08 02:22:29 -07:00
Jonathan Williams
3999f80a79
Fixed Lobby balancer issue and null bungee connect.
...
Optimized lobby balancing based on connects per second.
Added Pet deactivation.
Possibly fixed asynchronous pet spawning as well.
TODO : Realized we are doing a lot of async stuff....stupid jon jon.
2013-10-08 02:22:04 -07:00
Chiss
1fc446ae13
Lobby text now displays map
2013-10-08 17:56:57 +11:00
Chiss
b64803e499
Smash Wolf
2013-10-08 17:44:04 +11:00
Chiss
e7de90c267
Bridge changes to allow for 12 team map
...
Bridge timer fix
Smash wolf remove
World parser allows more than 4 teams.
2013-10-05 22:14:57 +10:00
Jonathan Williams
c9af91fcd6
Tweak on lobby to show number instead of player count in item.
2013-10-05 01:49:55 -07:00
Jonathan Williams
1431961b39
Fixed issues with Pet menu.
...
Fixed typo in Welcome Tutorial
2013-10-05 00:59:45 -07:00
Jonathan Williams
f389378bd2
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-10-04 23:57:58 -07:00
Jonathan Williams
4ed1d97a33
Added missing pet buttons.
2013-10-04 23:56:16 -07:00
Jonathan Williams
59d7a78086
Revamped pet purchase and added pet menu to player hotbar.
...
Fixed ServerStatusManager still firing errors if IgnoreUpdates was in.
2013-10-04 23:55:05 -07:00
Chiss
ab45c717dd
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-10-05 07:49:21 +10:00
Chiss
3ba848567c
paintball added
...
hg additions
minor changes to other games
2013-10-05 07:49:05 +10:00
Jonathan Williams
57b0d06786
Added DisguiseWolf
...
Added lobby menu (disabled autogive for testing)
Removed unused commands.
2013-10-02 22:23:01 -07:00
Jonathan Williams
44da981cf4
Fixed dominate bug again.
...
Fixed quick game menu bug.
2013-09-27 23:06:53 -07:00
Jonathan Williams
86199d2795
Fix for dominate.
2013-09-27 20:05:30 -07:00
Jonathan Williams
f9400a0eb4
Fixed multiple finishes for parkours
2013-09-27 12:45:24 -07:00
Jonathan Williams
b6d33010ca
- Lava parkour fire ticks are no more
...
- Lava gem rewards on npcs reflect actual value (1000 and 4000)
- Can't carry people into parkour areas now
Removed unused code with Portal
Added portal functionality for server quick join
Disabled SG text
Updated quick game menu text.
2013-09-27 12:40:09 -07:00
Chiss
894a121a2e
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-27 17:08:52 +10:00
Chiss
34521eef8f
minor game fixes
...
portal method in StackerManager.java
2013-09-27 17:08:32 +10:00
Jonathan Williams
7c0e3bcc53
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-26 21:20:38 -07:00
Jonathan Williams
b71ff09fb5
Fixed double server status manager in MK
...
Fixed tps of 0.
Fixed couple bugs in Shop/Conf page.
2013-09-26 21:18:31 -07:00
Chiss
2a3d7426d5
Some scoreboard fixes
2013-09-26 12:38:32 +10:00
Chiss
f0e6a7294e
squid hitbox larger
2013-09-24 09:18:36 +10:00
Chiss
0390d4f63b
desc update suqid
2013-09-24 08:56:51 +10:00
Chiss
064dd97d00
HitBox support for disguises
...
Squid hitbox added
Changed squid swimming!
2013-09-24 08:56:09 +10:00
Chiss
ea5cc7161a
pigssss
2013-09-24 08:19:07 +10:00
Chiss
d8d4b69dda
baby pig to pig
2013-09-24 08:15:48 +10:00
Chiss
82f5fcb963
Pig Fix!
2013-09-24 08:12:51 +10:00
Jonathan Williams
68e068092f
Fix for ageable.
2013-09-23 15:09:52 -07:00
Jonathan Williams
6d5acd29db
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
...
Conflicts:
Plugins/Libraries/craftbukkit.jar
2013-09-23 13:53:28 -07:00
Jonathan Williams
10994924c2
Fixes for Bungee lobby balancer.
...
Exception handling in PlayerJoinEvents for hub (tracking a bug)
Fix in pages for shop.
Support eth1 private address setting in server status.
Fix for bug in ClientClass.
2013-09-23 13:30:40 -07:00
Chiss
d4775a91a1
hitbox reduction
2013-09-23 17:45:14 +10:00
Chiss
0f9f28dcc2
fixed weapon names in pigs, + baby pig on platform
2013-09-23 17:36:53 +10:00
Chiss
5ba494c381
Made player names more visible in squid
2013-09-23 16:05:05 +10:00
Chiss
ce89108aea
Fixed disguises in bacon brawl
2013-09-23 16:00:35 +10:00
Chiss
eae38dfa22
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
...
Conflicts:
Plugins/Libraries/craftbukkit.jar
2013-09-23 15:50:30 +10:00
Chiss
bf4dc35b5f
Added pig Game
...
added squid game
added recharged skill event
2013-09-23 15:48:35 +10:00
Jonathan Williams
8aad215475
Added sheep color/shear for disguise
2013-09-22 21:12:08 -07:00
Jonathan Williams
e098d93155
Added baby disguise ability.
...
Added Stacker recharge.
Fixed issue with ServerGameMenu Champions button.
SuperSmash decreased hunger gain on attack.
Code cleanup.
2013-09-22 20:53:24 -07:00
Jonathan Williams
cc63fdccfc
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-21 15:02:14 -07:00
Jonathan Williams
558d9b4cc6
Added shop link to kits.
...
REmoved client cache.
Added random messages.
Fixed problem with Confirmation Page.
2013-09-21 15:01:40 -07:00
Chiss
b3a78112be
Fixed gem display bug
2013-09-21 13:53:12 +10:00
Chiss
eb6bbceecd
Slowed hunger degen a little, increased regen to damage dealt.
2013-09-21 13:40:04 +10:00
Chiss
9064272a38
Prepared SSM for 200 player Game (added hunger)
2013-09-21 13:34:14 +10:00
Chiss
9da18ea43f
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-21 08:34:24 +10:00
Chiss
a92c74a28a
HG Updates
...
Other minor fixes
2013-09-21 08:34:07 +10:00
Jonathan Williams
85cc6e5b2b
Updated to 1.6.4
2013-09-20 01:50:56 -07:00
Jonathan Williams
3622808e09
Fix for task cancelling.
2013-09-19 02:39:53 -07:00
Jonathan Williams
d2ab872856
Added some code for Global bungee communication.
...
Fixed up LobbyBalancer
2013-09-19 00:05:23 -07:00
Jonathan Williams
7329cc0aea
Implemented quick game menu.
...
Fixed dom team size at 1.
Removed old server update code from server manager.
2013-09-18 22:11:49 -07:00
Jonathan Williams
7d31b24c75
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-18 05:20:58 -07:00
Jonathan Williams
978254c16c
Fixed dominate start issues.
...
Fixed issue with server status manager and config for server tracker.
Changed minekart mob name.
Updated Minekart with new server status stuff.
Updated Dominate with new server status stuff.
2013-09-18 05:16:29 -07:00
Chiss
91ce36d6e4
Hub refactor
...
Hub parkour module
2013-09-18 19:46:45 +10:00
Jonathan Williams
ae00d3df18
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-17 15:52:16 -07:00
Jonathan Williams
f31a734a0d
Fixed server pages to show 5 servers.
...
Added in creeper explode block list for UHC.java
Added task assignment/reward message only on return confirm call.
Hide players in hub when they have an inventory open.
Added gem command into donation manager.
Revamped bungee player count method.
Revamped server status method.
2013-09-17 15:50:23 -07:00
Chiss
f280fb51f2
Mute now blocks commands too.
2013-09-17 14:54:50 +10:00
Chiss
c6a9d4675f
MTC changes
...
Barbarians changes
OITQ enchanter desc improvement
renamed Turf Forts
Added 2.5x gems for bridges
2013-09-17 10:37:45 +10:00
Chiss
c6b3a8a56c
Added Minigames to hub TextCreator.java
...
Milk the cow changes!
2013-09-16 12:23:57 +10:00
Chiss
118d52e106
Slime Buff
2013-09-16 12:03:04 +10:00
Chiss
7bd13b416e
Some turf forts fixes/changes
...
Fixed SSM lobby
2013-09-16 11:52:27 +10:00
Chiss
616ba6312c
fixed bug with bomber not giving tnt
2013-09-15 15:27:50 +10:00
Chiss
6f03c57c22
Farmers lose 5 milk when dying.
2013-09-15 14:21:10 +10:00
Chiss
6b5373c20c
Fixed Turf Forts arrow bug
2013-09-15 13:57:13 +10:00
Chiss
7894f95aab
Milk Cow now has 3 cows
...
dragon escape backtrack fix
2013-09-15 13:43:56 +10:00
Chiss
d51599de28
HG start
...
Added /hub and /leave to return to hub
2013-09-15 11:12:11 +10:00
Chiss
cc39abfd7f
UHC fixes
...
IdleManager NPE fix
2013-09-14 20:03:24 +10:00
Chiss
44b82f90b1
Shredder buff
2013-09-14 19:05:07 +10:00
Jonathan Williams
c5f239baba
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-14 02:02:57 -07:00
Jonathan Williams
817fa5737c
Added nether teleportation to game world.
2013-09-14 02:02:34 -07:00
Chiss
5ad627decb
SSM Creeper shield nerf by 50% duration
2013-09-14 16:13:24 +10:00
Chiss
743c8e9978
SSM Blaze slight buff
...
Dragons: Removed knockback (based on feedback)
Dragons: added 3 mroe dragons :D
2013-09-14 16:09:30 +10:00
Chiss
72718ff7b4
nerfed farmer in milk teh cow
...
fixed some UHC bugs
made party tutorial return you to spawn
2013-09-14 15:20:28 +10:00
Chiss
34c333dac9
added announcement logging
...
fixed creeper explosion disable for uhc
fixed player logout thing for UHC?
2013-09-14 12:27:40 +10:00
Chiss
e49b92d280
UHC fixes
...
Game inventory disable doesnt disable punish anymore
2013-09-14 11:33:33 +10:00
Chiss
9cac72dc1e
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-14 09:36:05 +10:00
Chiss
3ae6ba709d
smash kit display update
2013-09-14 09:34:05 +10:00
Jonathan Williams
c976a46f1f
Optimized UtilText/MapUtil.java
...
Added quick game menu. Still needs work.
2013-09-13 15:25:01 -07:00
Chiss
2fb200119e
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-14 08:13:37 +10:00
Chiss
35c10f22a1
Fixed gems in a few games
...
Milk Cow; cannot pickup water, cannot drink milk after end
2013-09-14 08:13:21 +10:00
Jonathan Williams
35728ce4d3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-12 22:33:43 -07:00
Jonathan Williams
c4c81085c5
Added ignore check for bungee updating.
...
Fixed PlayerCount for bungee's
Fixed bug with Party.
2013-09-12 22:33:03 -07:00
Chiss
20090406a6
missing kit
2013-09-13 12:25:45 +10:00
Chiss
b1744e86d8
many UHC bug fixes
...
dragon escape bug fixes
barbarians bug fixes
death tag fixes
2013-09-13 12:24:33 +10:00
Chiss
60dd6c84d0
Updated World Parser / Data to account for Y of corner blocks.
...
Use same height to have no height limits.
2013-09-12 09:01:37 +10:00
Chiss
9490549a96
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-12 09:01:04 +10:00
Chiss
2a65086b70
Added Milk the Cow
...
Maps now set Min/Max Y
2013-09-12 08:57:51 +10:00
Jonathan Williams
4ec728d6cb
Fixed party bug with expiring invitees.
2013-09-11 13:59:26 -07:00
Jonathan Williams
a02b726303
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
2013-09-11 13:54:41 -07:00
Jonathan Williams
d6bd962768
Added in dynamic servermanager updating.
...
Added updating of bungeeServers/servers list.
Combined all bungee plugins to Mineplexer
Fixed arcade bug on player quit.
Fixed ServersUI page errors.
2013-09-11 13:53:24 -07:00
Chiss
ea81e558ea
Added;
...
- Death Tag
- Dragon Escape
- Barbarians
Spleef; added hunger
Dragons; added knockback
Turf Forts; buffed shredder + fixed infil on respawn
Added knockack to 1 damage attacks.
Removed 'hit sound' from hitting mobs (just plays animal sound)
2013-09-11 12:22:55 +10:00
Jonathan Williams
0d98868a1f
Fixed comparison issue in server page UI.
...
Added DisguiseBlock for disguises.
2013-09-09 18:42:20 -07:00
Jonathan Williams
a6a32e45e0
Fixed player tag going on others.
2013-09-09 17:30:50 -07:00
Jonathan Williams
0f577c3f8c
Added ultra tag in hub.
2013-09-09 17:17:55 -07:00
Jonathan Williams
645ae4cad8
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-09 17:10:43 -07:00
Jonathan Williams
b90a6617f5
Fixed shops not opening and only showing 1 full green server.
2013-09-09 17:10:24 -07:00
Jonathan Williams
77a6c4c658
Fix for confirmation page NPE
2013-09-09 17:07:45 -07:00
Chiss
c46a550282
restructured games in arcade
2013-09-10 07:56:55 +10:00
Jonathan Williams
ecaca5d6fd
just a little cleanup.
2013-09-09 02:07:20 -07:00
Jonathan Williams
6b7b6c9fdf
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2013-09-09 01:30:28 -07:00
Jonathan Williams
d4b3c5d461
Fixed memory leaks.
...
Added in party joining for servers in Hub
Modified server status's in server UI.
2013-09-09 01:28:35 -07:00
Chiss
9fe33bab84
Added UHC
...
Added pig disguise
Added func to Game base to support UHC
Moved map to Core
2013-09-09 18:06:44 +10:00
Chiss
8b2cc7993f
Added UHC
...
Disabled Join Maps
2013-09-08 19:31:58 +10:00
Chiss
64f4302008
More hub fix
2013-09-08 12:09:50 +10:00
Chiss
e93a8c5a23
Map fix
2013-09-08 11:39:01 +10:00
Chiss
4419fe54c6
Hub Map update
2013-09-08 11:34:00 +10:00
Chiss
8dec407f16
SSM: wither image dies when you die
...
Turf Forts: you retain infil slow if you go onto enemy spawn
Hub Maps
2013-09-08 10:16:39 +10:00
Chiss
f612826787
SSM: dont give passive item descs in game.
2013-09-07 19:30:06 +10:00
Chiss
ff0e39067a
Added Mount Manager
2013-09-07 16:01:10 +10:00
Chiss
a24a80e5a5
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2013-09-07 14:13:08 +10:00
Chiss
7ab04be00c
Added Hub Parties
...
Re-did Hub Tutorials
Added Party Tutorial
2013-09-07 14:09:12 +10:00
Jonathan Williams
7a9a3fea4f
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-06 17:43:59 -07:00
Jonathan Williams
2266cc4556
Added stop override and player redirect to Hub
...
Added prevention of items going into inventory for ServerNpcPage
Fixed issue with ClientClass and Competitive ULTRA
Fixed issue with CustomBuildPage and Competitive ULTRA
Added ULTRA joining full servers for Arcade.
Added ULTRA packs displaying in Arcade chat/tab.
Removed IChat from TeamGameEngine and Dominate.
2013-09-06 17:43:45 -07:00
Chiss
213b1efb0c
Added Dragon Escape
...
fixed kit availability for runner
SSM: wither skel projectile continues after releasing block
SSM: nerfed blizzard
SSM: reduced gem price of a few kits
2013-09-06 15:58:58 +10:00
Jonathan Williams
9fcda443e1
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-05 02:12:24 -07:00
Jonathan Williams
4b1d6756e2
Added missing PlayerCount project.
2013-09-05 02:12:12 -07:00
Jonathan Williams
22ee1522c1
Added DynamicServer for bungee.
...
Added reload commands for balancer, dynamicserver, playercount.
Added depends for lboby on dynamic server.
2013-09-05 02:11:47 -07:00
Chiss
768f57ae5e
SSM: Added Wither Skeleton and Creeper kits
...
Compass: no longer teleports if not holding compass (on click)
SSM: various balance changes.
2013-09-05 13:55:42 +10:00
Jonathan Williams
9121d429c2
Added armor show/hide for insentient disguises.
2013-09-04 19:56:43 -07:00
Jonathan Williams
97405f6cfa
Fixed NPE in SkillPage
...
Added some timing debug text // for now
Changed utiltext setting method.
2013-09-04 18:52:08 -07:00
Chiss
f29b844798
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
resolved
2013-09-05 07:50:13 +10:00
Chiss
87fa103711
WHITE SPACE CHANGES!
2013-09-05 07:44:53 +10:00
Jonathan Williams
34dd5a1af3
Added broadcast command.
...
Added Chat to hub.
Disabled /me
Fixed Pets not returning when pushed off into the void.
Prevented eggs from spawning in hub.
2013-09-04 11:35:59 -07:00
Jonathan Williams
55b6bd6e95
Fixed memory leaks in SSM kits.
2013-09-04 10:46:33 -07:00
Jonathan Williams
552675b1bf
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-04 10:36:13 -07:00
Chiss
010336983a
SSM: fixed fissure not working
...
Hub: fixed invisibility for tutorial players (others could still see them and throw em)
2013-09-04 18:03:01 +10:00
Jonathan Williams
2a2c48087f
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-03 23:31:44 -07:00
Jonathan Williams
d5ef0208a1
Added lag meter to hub and arcade.
2013-09-03 23:31:29 -07:00
Chiss
93e59c1c43
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
...
Conflicts:
Plugins/Libraries/craftbukkit.jar
2013-09-04 16:13:12 +10:00
Chiss
ca6131d1d5
SSM Minor patches
2013-09-04 16:11:50 +10:00
Chiss
48c4ca0e24
SSM minor changes
2013-09-04 15:40:02 +10:00
Jonathan Williams
37897037a3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-03 20:46:48 -07:00
Jonathan Williams
63b4776893
Garrrr, fixed craftbukkit building.
2013-09-03 20:43:32 -07:00
Chiss
f07c23b99b
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-04 11:57:36 +10:00
Chiss
e3eae200ae
arcade: fixed kit material NPE
...
SSM: added knight
SSM: added placeholder for wither skel
2013-09-04 11:55:19 +10:00
Jonathan Williams
e63b4b8d66
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-03 17:30:25 -07:00
Jonathan Williams
5a30173aba
Updated craftbukkit.
2013-09-03 17:29:50 -07:00
Chiss
23ac045a41
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-04 08:14:20 +10:00
Chiss
6b57a87285
SSM Kit Item Lore
2013-09-04 08:13:59 +10:00
Jonathan Williams
346bdb030e
Cleaned warning.
...
Fixed punish command on web side.
2013-09-03 14:10:14 -07:00
Jonathan Williams
c2ec238af5
Fixed kit purchase in SuperSmashMobs
2013-09-03 12:13:15 -07:00
Jonathan Williams
b894aea72a
Fixed login speeds.
...
Implemented Tasks for Tutorial
Removed compiled files for website.
2013-09-03 11:34:28 -07:00
Jonathan Williams
cec476c72d
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-03 08:52:20 -07:00
Jonathan Williams
d16b674f46
Memory cleanup (Recharge, ClassCombatShop)
...
Implemented Tasks.
2013-09-03 08:51:44 -07:00
Chiss
564c1720bd
SSM Balances
2013-09-03 19:18:56 +10:00
Chiss
83567fce50
SSM slime nerf
...
disguise 0 velocity packet fix
2013-09-03 10:47:15 +10:00
Chiss
f2a58ab029
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-03 10:17:06 +10:00
Chiss
835d78e0e7
added hub tutorial
2013-09-03 10:16:44 +10:00
Jonathan Williams
74dba53e32
Fixed ignore update.
2013-09-02 16:24:04 -07:00
Jonathan Williams
5aec6509ca
Fixed shop inventory loss bug.
...
Added IgnoreUpdate.dat file check for testing with FileUPdater.
Fixed bug in SkillPage
Fixed bug in ClassCombatShop
Disabled dragon spawning in hub.
2013-09-02 16:20:14 -07:00
Jonathan Williams
59f2b9ebc8
Memory cleanup with all MiniPlugins.
...
Added Dragon.
Cleanup memory with Class Restore
2013-09-02 05:37:33 -07:00
Jonathan Williams
66131ad0b0
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-02 04:20:18 -07:00
Jonathan Williams
8840f04977
Fixed FileUpdater.
...
Added FileUpdater to DOM and Arcade.
2013-09-02 04:19:56 -07:00
Chiss
ad26c519ba
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-02 18:45:31 +10:00
Chiss
45d28569e0
Added idle fix
...
fixed hub Dragon.java
ate the rabbit stew.
2013-09-02 18:45:12 +10:00
Jonathan Williams
d0098b8a46
Removed double jump effect for surrounding players in hub.
...
Disabled Dragon spawning in HubManager.java(pending fix)
Fixed priority on MOTD for FileUPdater.
2013-09-02 01:16:29 -07:00
Jonathan Williams
af7a41ae71
Implemented ServerRestart event on FileUpdate check.
...
Implemented cancels in arcade/dom/mk
Implemented Restart updates in server manager page.
Implemented lobby removal is restarting.
2013-09-02 01:09:28 -07:00
Jonathan Williams
43c3f8cc87
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-01 23:28:22 -07:00
Jonathan Williams
63d2563f92
Added Disguise hurt sounds.
...
Enabled disguised hurt sounds in DamageManager
2013-09-01 23:28:07 -07:00
Chiss
441e6d80b7
lobby kit disguises :D
...
slime NPE fix
2013-09-02 16:01:14 +10:00
Chiss
ee20174d80
lobby adv messagfe
2013-09-02 15:47:08 +10:00
Chiss
d5fd95c53b
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-02 15:07:27 +10:00
Chiss
98b285d819
turf forts self kill fix.
2013-09-02 15:07:07 +10:00
Jonathan Williams
a49f67b33c
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-01 22:06:35 -07:00
Jonathan Williams
f0b0c72ddb
Fixed arcade packethandler problem.
...
Fixed skill page issue for class combat.
2013-09-01 22:06:20 -07:00
Chiss
c483d869a5
Added SSM Spider and Squid Kit
...
prepared DamageManager.java for disguise sounds
minor SSM balance changes
fixed compass targetting self.
2013-09-02 14:40:06 +10:00
Chiss
789a26471d
smash stats Perk
2013-09-02 09:51:53 +10:00
Jonathan Williams
3041cacb26
Renamed disguise methods to lowercase.
2013-09-01 16:38:32 -07:00
Chiss
4607b2fdcd
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-02 09:35:44 +10:00
Chiss
3384d8e057
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-02 09:35:27 +10:00
Jonathan Williams
07ad83fa41
Added getDisguise
...
Renamed new methods to lowercase.
2013-09-01 16:35:17 -07:00
Chiss
668a6e4854
changed utilplayer health method to double
...
spleef eventhandelr removal
turf forts kit green/blue
added kit stats for smash
nerfed flap in smash
2013-09-02 09:35:04 +10:00
Jonathan Williams
181f3d4746
Added to DisguiseManager:
...
-ReApplyDisguise
-UpdateDisguise
-IsDisguised
2013-09-01 16:30:17 -07:00
Jonathan Williams
e4e861d568
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-01 16:18:39 -07:00
Jonathan Williams
148c288d4f
Fixed shop bug affecting server menu and class setup in hub.
2013-09-01 16:17:44 -07:00
Chiss
75ced1a033
hub animals die in void
...
hub invis doesnt remove from list
2013-09-02 08:24:37 +10:00
Chiss
96f6862bd1
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-02 08:17:08 +10:00
Chiss
9149cc565e
Hub turns off flight (people were staying in flying somehow)
...
Spleef block damage fix
Smash kit balances
2013-09-02 08:16:35 +10:00
Jonathan Williams
5380899cfe
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2013-08-31 20:30:18 -07:00
Jonathan Williams
d14b21d29f
Removed VoteHub.java
...
Added commons codec to all build paths for Ant
Fixed pet shop new name.
Added send all for Portal.
Updated Hubmanager
2013-08-31 20:28:35 -07:00
Chiss
07dcfeb266
Compass in smash
...
can break windows in OITQ
block toss cannot dig tunnels, or take from walls.
chicken missile fixes
remove fire ticks from players on respawn
2013-09-01 12:18:48 +10:00
Chiss
72bec77237
Queueing now works with less players than teams.
...
Added DragonName text-input for hub
Fixed smash bug, where spectators were causing lightning effect
2013-09-01 08:34:53 +10:00
Chiss
30c5267da2
removed castel siege
2013-08-31 21:31:09 +10:00
Chiss
329953b2b7
dragon update
2013-08-31 20:49:20 +10:00
Jonathan Williams
2174c958d9
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-08-31 02:57:12 -07:00
Jonathan Williams
9d56abdcbc
Fixed hub build file.
2013-08-31 02:56:58 -07:00
Chiss
1a929082a1
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-08-31 19:52:12 +10:00
Chiss
dd44b982f9
Added hub dragon
2013-08-31 19:51:59 +10:00
Jonathan Williams
86f47cbd9e
Fixed sterling npc.
...
Enabled champion shops.
2013-08-31 02:36:31 -07:00
Jonathan Williams
300981524d
Added owner disguises
2013-08-31 02:25:06 -07:00
Jonathan Williams
ff75bc1207
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-08-31 02:01:55 -07:00
Jonathan Williams
e3fa648fc9
HUb minekart rider disguise....
2013-08-31 02:01:41 -07:00
Chiss
b74c11cd36
Minor text hub changes
2013-08-31 18:57:33 +10:00
Jonathan Williams
c0198b1b1f
Fixed vegetate...derp.
2013-08-31 01:36:40 -07:00
Jonathan Williams
0f4facd407
whitespace gone.
2013-08-31 01:29:52 -07:00
Jonathan Williams
e530e3b5a8
Fix for npc vegetate.
2013-08-31 01:29:32 -07:00
Chiss
e18239f89a
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-08-31 18:19:55 +10:00
Chiss
dab3f33cbf
Hub text changes
...
Hub animal spawns
Hub spawn invisibility
Smash kit balances
2013-08-31 18:19:23 +10:00
Jonathan Williams
50ea1867e9
Added slime vegetate.
...
Fixed dominate changes.
2013-08-31 01:16:39 -07:00
Jonathan Williams
68b7e0e3fa
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-08-30 20:59:23 -07:00
Chiss
6ee2e427b5
Changed TeamEntity from Creature to LivingEntity
2013-08-31 13:58:40 +10:00
Jonathan Williams
63b3cf501f
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-08-30 20:58:27 -07:00
Jonathan Williams
0f7828092c
Added missing craftbukkit files.
2013-08-30 20:57:46 -07:00
Chiss
fb592640a1
Fixed various merge errors.
...
(Updates)
2013-08-31 13:47:48 +10:00
Chiss
81f8503180
Merge commit '13110356aabbcc69d83ce29d8f9e5bec27812009'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/deathtag/kits/KitArcher.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitCoward.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitMarksman.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitPyrotechnic.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitDefenceArcher.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitHorseKnight.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitBrawler.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitElementalist.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitLeaper.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitInfiltrator.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitMarksman.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitShredder.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanElementalist.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanKnight.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanMarksman.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanPeasant.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorArcher.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorKnight.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorRogue.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitUndeadAlpha.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2013-08-31 13:41:58 +10:00
Chiss
e17368a9ac
>.< Updates
2013-08-31 13:15:16 +10:00
Jonathan Williams
13110356aa
Added Enjin Translator poll ability.
...
Fixed up kits for arcade.
Fixed disguise for enderman to not teleport on fire ticks.
2013-08-30 16:37:21 -07:00
Jonathan Williams
da08321de4
Added possible second option for pulling purchases to Enjin plugin.
2013-08-30 09:45:25 -07:00
Jonathan Williams
6302869c02
Fixed up lobby balancer.
2013-08-30 02:24:39 -07:00
Jonathan Williams
90de0c3ed2
Added LobbyBalancer for BungeeCord
...
Added EnjinTranslator for automatic shop.
Removed enjin module from Hub
Tweaked donation/punish/accountadministrator for shop automation.
2013-08-30 01:36:55 -07:00
Jonathan Williams
bb2af17856
Cleaned up files.
2013-08-30 01:26:12 -07:00
Jonathan Williams
57d1d8058c
DOM-12
2013-08-29 10:04:39 -07:00
Jonathan Williams
606f631559
Fixed up MK
2013-08-28 23:21:59 -07:00
Chiss
7dbfe9d0dc
Moremissing stuff.
2013-08-29 16:20:36 +10:00
Chiss
aad017690e
FIREFLY
2013-08-29 16:17:52 +10:00
Chiss
a198d0d3cb
Added events...
2013-08-29 16:16:22 +10:00
Chiss
8559e77a24
"UPDATES!"loooooooool
2013-08-29 16:13:05 +10:00
Jonathan Williams
873c32c359
Added missing files.
2013-08-28 22:57:27 -07:00
Jonathan Williams
b638957517
Removed more class files.
...
Fixed DOM-22, DOM-20, DOM-19, DOM-17, DOM-14, DOM-7, DOM-3, DOM-1
2013-08-28 22:26:40 -07:00
Jonathan Williams
a1d622c790
Tweaked disguise movement to cut out jitters.
2013-08-28 15:00:39 -07:00
Jonathan Williams
cb48c2a037
Test for git push.
2013-08-27 16:47:58 -07:00
Jonathan Williams
1b7b549647
Removed class files from source control.
2013-08-27 16:21:57 -07:00
Jonathan Williams
c9dd8d87eb
Fixed DOm crash issue on game start.
...
Added Teleport to Hub
Fixed DisguiseManager bleeding over.
Fixed Teleport sub commands
2013-08-27 16:03:04 -07:00
Jonathan Williams
3fb52c5c71
Initial Commit
2013-08-27 08:14:08 -07:00