ba1c6ae35f
Champs Balance
2014-04-12 18:22:53 +10:00
eb1d1c1ed2
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-11 03:10:02 -07:00
c8af89dded
Fixed BH and GRavity.
2014-04-11 03:09:21 -07:00
80df2c2944
Bux fixes for 1.7
...
Champions TDM
SSM Domination
2014-04-11 15:33:31 +10:00
71b2931936
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-11 10:34:51 +10:00
2adf0395a1
Merge
2014-04-11 10:33:56 +10:00
0375384fb5
Converted to Spigot's latest 1.7.5
2014-04-10 17:15:44 -07:00
a26894fda6
Added missing file.
2014-04-09 21:38:12 -07:00
84ffd56c82
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-09 02:50:46 -07:00
8460fcc8f6
Added ninja check for bow charge if you just right click quickly.
2014-04-09 02:50:37 -07:00
b64acf524c
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-09 19:07:22 +10:00
b868db0f22
Fixed so you can now charge bow skills in air.
2014-04-09 19:07:12 +10:00
e4ca9084cc
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-09 02:03:41 -07:00
ec29c66d1c
Added arrows sticking in you.
...
Removed bouncing arrows.
2014-04-09 02:03:19 -07:00
146202a52c
Champs Balance + Red Arrow Fix
2014-04-09 18:50:38 +10:00
7d59f43ffa
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-09 16:48:14 +10:00
0ecd38c656
Champs Balance
2014-04-09 16:48:01 +10:00
bedabd84cc
Added silence to kits (UtilEnt.silence)
...
Cleaned up a ton of unused code....
2014-04-08 23:31:32 -07:00
e8260b20f7
Fixed dragon spawn location for text util.
2014-04-07 23:35:45 -04:00
9b4e1aa9eb
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-07 22:25:08 -04:00
109d2cb6f1
Fixed edit build issue.
2014-04-07 22:18:04 -04:00
2eaaa85e04
Fixed /game stop trapping players in dead world.
2014-04-08 12:08:59 +10:00
bb3f2c6281
CHAMPS
2014-04-08 10:53:41 +10:00
85c57f2942
IButton now has Left/Right
...
Added right-click skill removal.
2014-04-06 12:45:52 +10:00
88131836d7
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-05 16:01:07 -04:00
db2ae49074
Fixed saving custom builds.
...
Work on skill tokens.
2014-04-05 15:53:22 -04:00
8214e3b8f4
Lots of little bug fixes
2014-04-05 16:52:23 +11:00
05d916de3c
Fixed custombuild selection not applying armor
2014-04-04 15:57:56 -04:00
ddcc8a26b3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-04 15:02:42 -04:00
edfe23fb01
Fixed collision with Projectiles.
2014-04-04 15:02:13 -04:00
13b8f1e7ea
Champs Update
2014-04-04 13:26:00 +11:00
26fe974b00
More CHamps
2014-04-03 15:48:58 +11:00
80c153095b
Cooldown bar
2014-04-02 22:03:56 +11:00
2f0167ea09
Champs Update
2014-04-02 21:22:21 +11:00
2aaf749414
Champions Update
2014-04-02 15:19:58 +11:00
afc26e21e3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-29 18:46:52 -04:00
06bdc22c89
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-29 18:45:53 -04:00
0f937b165c
skill shop stuff
2014-03-30 09:45:53 +11:00
d227a6bd06
Changed full server message
2014-03-29 18:45:44 -04:00
e1eda749a7
Skill lore changes
2014-03-30 09:05:29 +11:00
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
f4e8879d55
skilly test stuff
2014-03-29 17:07:07 +11:00
195e555a6e
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-29 01:33:18 -04:00
6963f6bacf
Added Player version stat tracking.
...
Added server group stats.
2014-03-29 01:32:24 -04:00
fce249d7d8
fixed some desc stuff
...
castle seige removed OP kit
2014-03-28 18:50:38 +11:00
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
f5ca6408f8
Merge?
2014-03-28 14:51:26 +11:00
aae40d3899
Changed up Skills and SkillsPage for Dom 2 changeover.
...
Fixed CustomBuild stuff.
2014-03-27 22:17:31 -04:00
47feabcad3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-28 10:06:03 +11:00
17e6658437
Fixed up AntiHack database reporting.
2014-03-24 01:16:02 -07:00
2680edbd85
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-24 16:15:29 +11:00
2450265909
Fixed damage rate limiting for mobs.
2014-03-22 00:16:51 -07:00
e4a86e0600
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-22 10:45:01 +11:00
fe09c3fc49
More CS Update
2014-03-22 10:44:31 +11:00
8bf78fe14d
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-21 15:30:06 -07:00
33d342b049
updated 1.7 stuff.
2014-03-21 10:57:31 -07:00
ab2a72ba16
CS Update
2014-03-21 11:59:56 +11:00
f24f81b7c3
Finished conversion.
2014-03-19 04:09:40 -07:00
515a01fd7d
Updated utils.
2014-03-19 02:40:36 -07:00
7f58453688
Updated Particle.
2014-03-19 02:25:28 -07:00
7042159f46
Updated to 1.7 and changed namespaces to 1.7
2014-03-19 02:24:26 -07:00
98baef09bf
Added 1.7 files.
...
Removed 1.6 files.
2014-03-19 00:58:43 -07:00
a7888b0c02
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-19 17:51:48 +11:00
7714ff4a09
CS Update
2014-03-19 17:51:37 +11:00
24f1c6c722
Fixed saving custom builds.
...
Fixed items staying from previous class in game.
2014-03-18 23:40:54 -07:00
9715f5454a
Removed double gems.
...
Removed unused code for ssm time
2014-03-18 12:55:04 -07:00
6830033d8a
PLEASE JUST WORK :(
2014-03-16 10:52:34 +11:00
d6e3f076cd
PLEASE JUST WORK MR TORTOISE
2014-03-16 10:42:30 +11:00
3277a0a2f8
Making sure puushed
2014-03-16 10:35:58 +11:00
d695ec72ca
Added SSM Team Game
2014-03-16 10:28:46 +11:00
3603d3ef8b
Removed afk kick from arcade.
2014-03-14 21:49:01 -07:00
0094c0ebeb
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-14 02:20:01 -07:00
246f28a464
Enabled DoubleGem weekend.
...
Added 3 new maps
updated news
2014-03-14 02:19:52 -07:00
aa206d9c91
Gravity fixes
2014-03-14 20:17:06 +11:00
24efe3d0d8
SQ kit restrictions
2014-03-14 13:24:38 +11:00
de1365b5cf
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-13 17:56:16 -07:00
efee9fdcbf
Fixed Hub class shop.
...
Added chat logging.
Added message with file updater.
2014-03-13 17:56:05 -07:00
f4cd2fcbb9
Staggered game teleports/start
2014-03-13 18:18:22 +11:00
27f554ab61
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-13 16:33:03 +11:00
82644002c5
A little bit o dem ol bug fixles. yknow what im sayin?
2014-03-13 16:32:48 +11:00
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
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
f277b1da23
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-09 19:43:14 -07:00
02a1e68c8c
Fixed kits opening correct page.
2014-03-09 19:42:54 -07:00
105b210afa
mob spawnin'
2014-03-10 13:42:05 +11:00
464fdb1e5e
Renamed Champions to Dominate
2014-03-10 13:35:36 +11:00
8593eb326e
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-10 13:32:52 +11:00
1bc5fef625
Kit npc location change
2014-03-10 13:32:39 +11:00
a565da45e4
Added classes to champions.
...
Added ability to open direct classes page.
2014-03-09 19:32:27 -07:00
f51a6747fd
Moved files into Mineplex.core
...
Removed references to Core project.
2014-03-09 00:50:13 -08:00
2cc50d5725
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-03-06 02:15:46 -08:00
d05c2f906c
Fix for ServerNpc page beta join.
...
Work on Dom 2.0
Added sheep quest map.
2014-03-06 02:15:16 -08:00
60bc3f15bb
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-03-05 14:35:01 -08:00
c9a938d2c5
Sheep Quest Fixes
2014-03-05 14:34:51 -08:00
a09a2aaa30
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-03-05 00:40:51 -08:00
f0b347f97f
Changed beta testing to Ultra and up.
...
Did some work on DOM 2.0
2014-03-05 00:34:20 -08:00
af2cf4e7a9
this is the one change i needed to push
2014-03-04 23:27:37 -08:00
2b56b970fa
Sheep Game?
2014-03-04 22:39:48 -08:00
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
b3f10b9d62
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-03-01 01:59:25 -08:00
750fff32c7
Added Skeletal horse.
2014-03-01 01:58:58 -08:00
b54e4dfbc4
hunger
2014-03-01 11:29:01 +11:00
18880a00f4
fletcher doesnt give to specs
2014-03-01 11:09:15 +11:00
dfa4ea0edc
fix
2014-03-01 11:06:01 +11:00
8d0115f874
News update
2014-03-01 10:40:55 +11:00
bfaa138526
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2014-03-01 10:35:20 +11:00
7cf6391ddd
Sheep Quest
...
Double Gem Weekend
2014-03-01 10:35:06 +11:00
8550307904
Removed unnecessary mysql call on client login.
2014-02-28 13:22:30 -08:00
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
f2570caad5
Swapped default connections to new dns names.
...
Fixed bug with LobbyBalancer and retrieving no lobbies.
2014-02-21 13:32:14 -08:00
55c9a85763
Fixed Dynamic Server monitor stuff.
...
Fixed EnjinTranslator Gem command.
2014-02-18 00:40:41 -08:00
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
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
a75ced170c
Added whitelist check in CoreClientManager
2014-02-10 02:04:20 -08:00
525df6c2b0
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-02-07 09:46:54 -08:00
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
b776c1bf60
spacehelemettts
2014-01-22 08:28:06 +11:00
d868c9b73d
fixed gold blocks being destroyed.
2014-01-22 08:02:01 +11:00
567b7c4a7b
minor fixes
2014-01-21 23:14:23 +11:00
9118e79d9a
Minor fixes
2014-01-21 22:57:49 +11:00
b0ea211ae3
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2014-01-21 22:52:05 +11:00
e124dde006
Finished Gravity
...
INcluded map
2014-01-21 22:48:18 +11:00
6f43d91bcf
Added Vegetate for Bat.
...
Added missing ProcessRunner.java
2014-01-20 21:01:52 -06:00
0fba94f8ae
Derp
2014-01-20 20:22:59 -06:00
f657b8a3ac
Added isFlying and setFlying to DisguiseBat
2014-01-20 20:18:09 -06:00
bdb7f3cc28
UHC season 5
2014-01-21 11:56:35 +11:00
76b2baf626
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2014-01-21 11:28:37 +11:00
7bbfdd1a42
Gravity Update
2014-01-21 11:28:12 +11:00
dea96a9e65
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-01-18 09:08:12 -06:00
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
75669e2333
Hub News Changes
...
AntiHack Autokick for Severe Hackers
2014-01-18 20:33:38 +11:00
1333f2ee9f
SSM Horse Disabled
2014-01-18 12:56:00 +11:00
1031846198
SSM Update
...
Gravity game start
2014-01-18 12:34:24 +11:00
8e51e4061a
Reverted Hub.
...
Fixed server monitor issues.
2014-01-14 02:04:06 -06:00
ea320e7f5b
Removed Client cleanup.
...
Modified server monitor process handling.
2014-01-08 15:18:52 -05:00
6904f9cf3d
Minor verbage "Starting in 1 Second."
...
Fixed NPE in client cleanup.
2014-01-03 05:50:05 -05:00
faea1072a1
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-01-03 01:37:49 -05:00
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
dd7b178a9f
Fixed Hero rank in EnjinTranslator
2013-12-26 19:44:36 -05:00
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
375d689cc6
fixed visual bug with hero gems
2013-12-25 09:06:22 +11:00
3fefc8fa73
Fixed Hero message in Arcade.
2013-12-24 04:13:52 -05:00
f510083e7e
formatting
2013-12-24 19:26:30 +11:00
d25487d545
Rank color
2013-12-24 19:21:21 +11:00
d92515eef9
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-24 19:14:54 +11:00
74e49a3ff1
Hero Rank stuff
...
New SSM Kit
2013-12-24 19:14:40 +11:00
592d49e57c
Added ghost check flag to ender dragon.
...
Re-enabled Dragon Gadget.
2013-12-24 03:09:15 -05:00
6595d33899
Tuned chunk load for disguise manager.
...
Disabled dynamic text in hub.
2013-12-24 00:39:33 -05:00
e60f52ff9c
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-12-23 04:17:06 -05:00
79de7f2bfc
Fixed portal breaking with Frost horse.
...
Added memory clean up for disguises
2013-12-23 04:16:53 -05:00
200504ec8b
made snowman boss a little tougher.
2013-12-22 00:10:15 +11:00
b895c66005
snake even more easy
2013-12-22 00:02:38 +11:00
3bd7a7cd1f
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-22 00:01:24 +11:00
2f063e9f8e
wave 3 snowman invul fix
2013-12-21 23:54:10 +11:00
a02ca4513e
Added undead/batgun and frost to in game shop for gems.
2013-12-21 07:29:04 -05:00
e94784a908
dragon mount removed
2013-12-21 23:09:49 +11:00
d6c37055da
cleaner leak fix.
2013-12-21 23:06:27 +11:00
1c3d90a70f
leak fixes
2013-12-21 23:00:51 +11:00
58e049acf9
snake bit is easier :)
2013-12-21 22:34:04 +11:00
c08b7c7b96
hub news update
2013-12-21 22:21:16 +11:00
bfd76474e8
Dragon particles
2013-12-21 20:44:56 +11:00
a6eb7ea665
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-21 20:07:04 +11:00
0585116e78
Hub Gadgets
...
Hub Dragon (Hero Only)
XMAS block efficiency
2013-12-21 20:05:42 +11:00
793b17e878
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-12-21 03:23:07 -05:00
7574a5972b
Prevented sounds from silenced vegetables.
2013-12-21 03:22:58 -05:00
c969775df3
Hub gadgets for xmas
2013-12-21 19:00:30 +11:00
5fffcf89b6
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-12-21 02:44:20 -05:00
70c14268e1
Fixed Leash issue.
...
Added invis for utilent.ghost
2013-12-21 02:44:12 -05:00
f50ae06dff
NPE fix
2013-12-21 16:52:59 +11:00
50c2b10b50
25% easier boss
2013-12-21 15:10:17 +11:00
c52a7d2fe1
Christmas update
...
Hub Update
2013-12-21 15:06:01 +11:00
bc9c309aa1
Xmas Game
2013-12-21 10:17:22 +11:00
5dc0a7d4d6
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-21 08:43:02 +11:00
ac723c14bd
Push so i can pull :O
...
just some xmas stuff
2013-12-21 08:42:49 +11:00
f504cb5a8d
Added vegetation to horse.
...
Added Leash method to UtilEnt
2013-12-20 03:52:43 -05:00
379b0d0d75
Check for PullWhileLeashed in EntityCreature.
2013-12-20 03:14:18 -05:00
44145e01f0
Removed weather for hub update.
2013-12-18 13:52:44 -05:00
a24e8e233c
Enabled pvp in hub for snowballs.
2013-12-18 05:56:59 -05:00
6b33306755
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-18 21:46:40 +11:00
e55885c85d
itsy
2013-12-18 05:22:40 -05:00
f4edcedce3
push so i can pull :\?
2013-12-18 21:17:28 +11:00
0ba8349e03
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-12-18 04:48:24 -05:00
64dab19003
Cleanup
...
Prep work on leash disable functionality.
2013-12-18 04:48:16 -05:00
54f2cb3467
Christmas hub snowman target cancel
2013-12-18 19:58:39 +11:00
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
938e72b06d
Remove tourney stats.
2013-12-17 11:09:36 -05:00
de99a642d3
Hub tourney text removal
2013-12-17 11:06:04 +11:00
4bef100c6a
Xmas Hub
2013-12-16 14:32:51 +11:00
c582b210b5
Hub + Stats + Tournament
2013-12-14 16:51:08 +11:00
3ca67d60c0
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-14 16:38:46 +11:00
9af8676307
Hub/Stats
2013-12-14 16:38:16 +11:00
ac049e0397
FINE JUST FINE>>>>>> STUPID CHICKENS
2013-12-13 21:36:57 -08:00
69fa9eaba5
Added getters for stats/StatsManager.java
2013-12-13 21:35:04 -08:00
e054b06cc2
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-12-13 21:01:08 -08:00
6b92b6c4a8
Added stats manager.
...
Added lots of missing files.
2013-12-13 21:00:56 -08:00
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
5f2e457362
Minor HG Stuffs ;o
2013-12-13 16:21:39 +11:00
d6544202f0
Added ghost ability for mobs.
2013-12-12 02:19:58 -08:00
97d8923678
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-07 23:04:59 +11:00
2fb4bc4fbc
UHC stuff
2013-12-07 23:04:10 +11:00
Chiss
Jonathan Williams