Shaun Bennett
c7a9ae8cd5
[Arcade] Attempt at fixing spectator gui bugs
2015-05-12 06:23:32 -05:00
Shaun Bennett
06a0f3d0d5
Merge remote-tracking branch 'origin/master'
2015-05-12 00:37:40 -05:00
Shaun Bennett
270ef37a7c
[MB] More words and more ground types
2015-05-12 00:37:13 -05:00
Mini-Chiss
ed90e97c68
removed border attack stuff
2015-05-11 21:00:38 -05:00
Shaun Bennett
9d959ee7a3
Fix/Enable Look at me Button
2015-05-11 20:46:37 -05:00
Mini-Chiss
643ed2c047
Fixed most enchants not working
...
added commands to event
minor update to snowfight to make it more fun
2015-05-11 19:55:26 -05:00
libraryaddict
214a750f6e
UHC: Add borders from SG
2015-05-12 11:01:04 +12:00
libraryaddict
a558995e12
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-12 09:52:21 +12:00
Shaun Bennett
d57bab7430
Merge remote-tracking branch 'origin/master'
2015-05-11 15:17:50 -05:00
Shaun Bennett
e799ea0909
[MB] Look at me Button (Disabled - not working properly), Villager profession button, Small bug fixes
2015-05-11 15:17:35 -05:00
Mini-Chiss
e3f2c02836
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-11 14:11:00 -05:00
Mini-Chiss
5e73441b9a
UHC world loading
2015-05-11 14:10:51 -05:00
Mini-Chiss
123af16bd2
UHC map gen
2015-05-11 13:25:05 -05:00
Shaun Bennett
c0dc531252
[MB] Allow Item Frames and Paintings
2015-05-11 12:38:21 -05:00
Mini-Chiss
5ec60d234a
UHC changes
2015-05-11 12:27:43 -05:00
Mini-Chiss
9b0736816b
UHC changes
...
abstracted out some common attribs
2015-05-11 12:21:32 -05:00
Jonathan Williams
b1a46d0f0d
Converted TaskManager
2015-05-11 01:21:27 -07:00
Shaun Bennett
46c07665e1
Merge remote-tracking branch 'origin/master'
2015-05-11 00:44:34 -05:00
Shaun Bennett
2e7428e79a
Temporary fletcher fix
2015-05-11 00:42:55 -05:00
libraryaddict
5ee3f48754
Wizards: Nerf rumble max level from level 5 to level 3
2015-05-11 14:08:40 +12:00
Mini-Chiss
3e64115f05
vote colors
2015-05-09 17:45:08 -05:00
Mini-Chiss
41599de06f
build vote update
2015-05-09 17:34:07 -05:00
Mini-Chiss
6e2b437e55
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-09 12:28:16 -05:00
Mini-Chiss
822718095d
cannot PM from spawn
...
first push of cards game
2015-05-09 12:23:07 -05:00
libraryaddict
7faee918af
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-09 14:13:03 +12:00
libraryaddict
0751876622
Wizards: Do a null check and event is cancelled check on damage
2015-05-09 14:12:46 +12:00
Shaun Bennett
ef86f8bb6f
merge
2015-05-08 12:22:58 -05:00
libraryaddict
689ca94c57
Wizards: Nerf rainbow beam damage, rebalance gust spell, raise armor effectiveness
2015-05-08 18:57:33 +12:00
libraryaddict
3e02806b75
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-07 02:57:20 +12:00
libraryaddict
47acf7fb85
DrawMyThing: Ignore guesses containing more than two answers.
2015-05-07 02:54:55 +12:00
Shaun Bennett
ae03743c63
Build sort of bug fix for teleported into block
2015-05-04 19:27:16 -05:00
Mini-Chiss
7505bbc1a2
gravity fix
2015-05-04 15:34:57 -05:00
Mini-Chiss
b959bcaa90
fixed 1.8 req
2015-05-04 00:56:12 -05:00
Mini-Chiss
50cd692c62
fixed wither morph damaging blocks in grav lobby
2015-05-04 00:34:03 -05:00
Mini-Chiss
fa1ac52f78
grav balance
2015-05-03 20:21:00 -05:00
Mini-Chiss
838c369b7c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-03 20:12:13 -05:00
Mini-Chiss
95c9be47b6
missing kit
2015-05-03 20:12:06 -05:00
Shaun Bennett
cb2666c4a5
Merge remote-tracking branch 'origin/master'
2015-05-03 20:06:19 -05:00
Shaun Bennett
af1f735a43
Add lightning packets, various gui improvements
2015-05-03 20:06:10 -05:00
Mini-Chiss
58671fa229
more words
2015-05-03 19:36:50 -05:00
Mini-Chiss
6978a176b1
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-03 19:10:55 -05:00
Mini-Chiss
7f0e175ba1
build update
2015-05-03 19:10:49 -05:00
Shaun Bennett
044d1098f4
Merge remote-tracking branch 'origin/master'
2015-05-03 19:10:22 -05:00
Shaun Bennett
a435ed5bae
More build changes
2015-05-03 19:10:13 -05:00
Mini-Chiss
1576085d87
more words
2015-05-03 18:33:31 -05:00
Mini-Chiss
73132d96b9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-03 18:33:03 -05:00
Mini-Chiss
f36d7774cc
Gravity update
2015-05-03 18:32:57 -05:00
Shaun Bennett
de1f432be4
Build bug fixes
2015-05-03 18:31:56 -05:00
Shaun Bennett
74474c6227
Use itemstackfactory for formatted name
2015-05-03 18:26:20 -05:00
Shaun Bennett
f98ac0874c
Merge remote-tracking branch 'origin/master'
2015-05-03 18:22:14 -05:00
Shaun Bennett
83ff3c96aa
Close inventory when game starts
2015-05-03 18:21:59 -05:00
Shaun Bennett
fbfb5e637e
Mob Gui + Ground Change Gui + UtilSkull for special mob skulls
2015-05-03 18:18:16 -05:00
Mini-Chiss
a42c71ebb8
more 1.8 stuff
2015-05-03 16:54:02 -05:00
Mini-Chiss
bd8bd2dfd6
Abstracted kicking non-1.8 players
...
Abstracted resource pack msg
2015-05-03 16:51:13 -05:00
Mini-Chiss
40d56c3500
Converted all code to updated UtilParticle methods
...
/suicide
2015-05-03 16:37:00 -05:00
Mini-Chiss
97a86fde90
builds!
2015-05-03 15:39:15 -05:00
Mini-Chiss
a07132df49
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-03 15:39:04 -05:00
Shaun Bennett
73719e0df3
Fix world particles issues
2015-05-03 15:30:58 -05:00
Mini-Chiss
40c838b030
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-03 14:50:56 -05:00
Mini-Chiss
8224450b44
Build Update
2015-05-03 14:50:50 -05:00
Shaun Bennett
74dbf7e827
Merge remote-tracking branch 'origin/master'
2015-05-03 14:41:18 -05:00
Shaun Bennett
ff6da92fb7
Some Build world, support for far rendered particles
2015-05-03 14:41:09 -05:00
libraryaddict
b58bef1bd8
ResourcePack: Lengthen timeout from 10 seconds to 20 seconds
2015-05-04 04:13:23 +12:00
libraryaddict
9986bd6ee5
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-04 04:10:05 +12:00
libraryaddict
3fcec13e68
Wizards: Melee with wands should say it was wands that did it
2015-05-04 04:09:49 +12:00
Shaun Bennett
11b36e6b44
[Build] Show message to players to open inventory until they click something in their inventory
2015-05-02 22:50:27 -05:00
Mini-Chiss
9c08e57602
fixed NPE
2015-05-02 22:45:14 -05:00
Mini-Chiss
122dbad45c
added time setting and framework for lightning strikes
2015-05-02 22:26:03 -05:00
Mini-Chiss
6ad09f0ade
Master Builder update
2015-05-02 22:05:12 -05:00
Mini-Chiss
5b04d43400
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-02 17:45:39 -05:00
libraryaddict
08140f8863
ResourcePack: Resource pack refused now links to a forum guide
2015-05-03 08:10:25 +12:00
libraryaddict
8cb9493125
Wizards: Rainbow Road no longer lasts more than 20 seconds, cooldown never decreases
2015-05-02 16:39:20 +12:00
libraryaddict
9c268786aa
Wizards: Nerfed lightning strike damage
2015-05-02 16:22:59 +12:00
libraryaddict
efed6e129b
Wizards: Removed fishing rod from loot, fixed overtime locations not permitted to touch the highest block.
2015-05-02 16:11:57 +12:00
libraryaddict
3e9b64db66
Wizards Implode: Don't cast spell if no blocks are effected
2015-05-02 15:26:23 +12:00
libraryaddict
cd1a5793fa
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-02 15:24:16 +12:00
Jonathan Williams
707772d58b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-05-01 22:07:33 -05:00
Jonathan Williams
2902e6075f
Fix for n positive bug.
2015-05-01 22:05:03 -05:00
libraryaddict
05c9174491
Wizards: Prevent using keyboard shortcuts to drop hotbar locked items
2015-05-02 14:59:15 +12:00
Mini-Chiss
ab6937a525
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-01 18:05:55 -05:00
Shaun Bennett
e04b61a91d
Give build item when game starts
2015-05-01 18:03:56 -05:00
Shaun Bennett
244ffece8a
Fixes for build game + fix clans compile
2015-05-01 18:02:06 -05:00
Shaun Bennett
910cdff935
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
2015-05-01 17:54:00 -05:00
Shaun Bennett
37f1f7eabb
Master Builders changes for chiss
2015-05-01 17:46:42 -05:00
libraryaddict
b136be0d47
ResourcePack: Removed code that demanded a enum and changed to boolean
2015-05-02 03:03:53 +12:00
libraryaddict
e8cbb2fc29
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-01 21:26:56 +12:00
libraryaddict
93a25d5a67
ResourcePack: Fixed links and declined message
2015-05-01 21:26:42 +12:00
Jonathan Williams
fb634c190e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-05-01 02:29:54 -05:00
Jonathan Williams
e800d74976
Disabled Double Gems.
2015-05-01 02:29:20 -05:00
libraryaddict
c240a1752f
GameType: Update resource pack to use https not http
2015-05-01 19:28:42 +12:00
libraryaddict
f85d27db1a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-01 19:25:11 +12:00
libraryaddict
cc65830f9b
ResourcePack: Ignore ServerGroup's resource pack and set MineStrike to use new ResourcePack code
2015-05-01 19:24:20 +12:00
Mini-Chiss
1b8ab13160
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-01 00:51:52 -05:00
Mini-Chiss
ba5802cc14
wizards kit availability
2015-05-01 00:47:51 -05:00
Jonathan Williams
fa4466b6a9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-05-01 00:13:39 -05:00
libraryaddict
88bd99e11f
Wizards: Update UtilTextBottom text for the custom method
2015-05-01 16:57:11 +12:00
Jonathan Williams
af86586d74
Added 'Sloth' to draw my thing list.
2015-04-30 23:57:11 -05:00
Jonathan Williams
d161d62773
Added chat filtering to private messages.
2015-04-30 23:56:08 -05:00
Mini-Chiss
21800d83c6
Build fixes
2015-04-30 23:16:30 -05:00
libraryaddict
319cde5c46
Wizards: Update resource pack url
2015-05-01 16:14:59 +12:00
libraryaddict
fbafeca150
Wizards: Remove block burn flag true
2015-05-01 15:44:11 +12:00
libraryaddict
82cd4208bd
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
2015-05-01 14:22:53 +12:00
libraryaddict
c660e0e3c7
Wizards: Re-sorted spells
2015-05-01 14:19:13 +12:00
libraryaddict
7bd133f704
Wizards: Temporary resource pack
2015-05-01 13:04:05 +12:00
Mini-Chiss
ed1c7e2336
Master Builders initial push (dont worry jon it doesnt effect anything for the update!)
2015-04-30 18:20:35 -05:00
libraryaddict
23ea7bbce4
Spectators: Set fire ticks to 0 on damage
2015-04-30 20:55:30 +12:00
libraryaddict
33bbe96964
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards
2015-04-30 01:33:43 +12:00
libraryaddict
497550549b
ResourcePackCode: Fixed the return to hub sender displaying the wrong message. Bad downloads are now sent back to hub.
2015-04-30 01:33:21 +12:00
libraryaddict
c2b7001fcc
Wizards: Current progress
2015-04-30 01:32:22 +12:00
Mini-Chiss
45b801ba81
hitbox changes
2015-04-27 19:21:33 -05:00
libraryaddict
1c1ab9bbe3
Throwing TNT: Fixed tnt not being movable from other inventories
2015-04-23 08:30:23 +12:00
libraryaddict
2aaa93e58f
ResourcePack: Add constructors to GameType for resource pack urls, sorted the enum's by name
2015-04-22 05:38:32 +12:00
libraryaddict
b29893ff60
Merge branch 'ResourcePack' into Wizards
2015-04-22 03:46:25 +12:00
libraryaddict
9f8fe3bf78
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into ResourcePack
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-04-22 03:45:59 +12:00
libraryaddict
aeff6bf4b9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards
2015-04-22 00:25:56 +12:00
libraryaddict
0196a5c359
Wizards: Latest changes by Chiss
2015-04-21 13:54:19 +12:00
libraryaddict
cd47da179a
Wizards: Added new food Cheese, removed other foods and raised spawn chance of remaining
2015-04-18 06:12:34 +12:00
libraryaddict
9db8aff37a
Wizards: Changed spell icons for resource pack
2015-04-18 06:10:23 +12:00
libraryaddict
25dfeacb09
Wizards: Spell levels are now viewable on items in chest as item amount
2015-04-16 16:20:01 +12:00
libraryaddict
8803941bd8
Wizards: More changes as per demand.
2015-04-16 05:51:08 +12:00
libraryaddict
073c7d16c2
Wizards Napalm: Make glazed blocks more common, raise damage
2015-04-13 15:06:52 +12:00
libraryaddict
e0b0975195
Bridge: Prevent hoppers being crafted to prevent abuse
2015-04-13 14:38:32 +12:00
libraryaddict
03fb8c203e
Wizards: Balancing
2015-04-12 23:20:15 +12:00
libraryaddict
81aeff86bf
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards
2015-04-12 20:15:28 +12:00
Cheese
1378dcb815
Properly fixed MS spec bug
2015-04-11 11:45:27 +10:00
Cheese
9b2c4662c3
fixed minestrike bug where newly joined specs could buy/drop items
...
removed easter baskets
2015-04-11 11:25:25 +10:00
libraryaddict
afa372dca7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/SpellButton.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellLightningStrike.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellSpeedBoost.java
2015-04-11 12:20:29 +12:00
libraryaddict
fc7c6e5831
Wizards changes
2015-04-11 12:11:50 +12:00
Cheese
3d95a5cfa4
bloock toss fix
2015-04-10 14:09:21 +10:00
Cheese
e0a58ba165
champions exploit fix update
2015-04-06 19:57:33 +10:00
Cheese
cdb86d3ebb
champions exploit fixes and balance
2015-04-06 17:17:36 +10:00
Cheese
6c3fc3009b
fixed sheep quest bug where players were unable to pick up sheep rapidly
...
fixed bug where falling blocks were instantly hitting players
2015-04-06 13:03:59 +10:00
Cheese
93abca0c01
can no logner break levers and other usables in SG
2015-04-04 16:12:33 +11:00
Cheese
c79432c8b9
Fixed projectile hitboxes and specific values
2015-04-04 10:54:03 +11:00
Cheese
23df6daab0
Added Easter Morph
...
Added Eggs Baskets in games
Added double gem for 1.8
2015-04-03 20:31:23 +11:00
libraryaddict
23abf92722
IcePathData: Compare Material instead of integers
2015-04-03 19:37:27 +13:00
libraryaddict
6faf5011a8
Wizards: Add spells: Gust, RainbowPath, SpectralArrow, IcePrison. Remove spells: ExplosiveRune, HealingRune, LaunchRune, Launch, TeleportRune. Explosions now launch blocks. Other changes done such as modified spells.
2015-04-03 19:33:49 +13:00
Cheese
d4e8c0c9a6
Added Respawn middle screen text
...
Added Champs capture point mid screen text
Fixed hitbox mults for projectiles
Fixed inconsistent arrow damage
Lots of Champions balance
2015-04-03 15:28:10 +11:00
Cheese
f682bb8f9c
fixed kit items not spawning
...
horse pet doesnt spawn when dead
2015-04-03 12:10:02 +11:00
libraryaddict
bb821996b1
Wizard modifications
2015-04-03 09:22:31 +13:00
Cheese
43c58bd31c
removed april fools from arcade :(
2015-04-01 20:22:13 +11:00
Cheese
3355d2b457
disabled aprilfools cow for team games
2015-04-01 19:15:11 +11:00
Cheese
5737df8d6a
final fixes for bacon brawl
2015-04-01 18:07:45 +11:00
Cheese
da9e7892f0
fixed aprilfools bugs
...
mamapig debug :(
2015-04-01 18:01:09 +11:00
Cheese
24ba42cb16
fixed armor stands blocking attacks in bacon brawl
2015-04-01 17:49:49 +11:00
Cheese
8bd883cb26
fixed damage transfer for mama pigglez kit
2015-04-01 17:43:46 +11:00
Cheese
59fce1cd88
adding some mmoooo text
...
changed pig kit for baconbrawl
2015-04-01 17:15:56 +11:00
Cheese
ed35d2a992
April Fools update
2015-04-01 16:56:13 +11:00
libraryaddict
b84756ef7a
Revert wizard commits
2015-03-27 22:13:50 +13:00
libraryaddict
a772d4cbf2
BlockHunt: Use new setInvisible method in DisguiseChicken
2015-03-27 22:05:16 +13:00
libraryaddict
a27e6fba5c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
2015-03-27 06:00:14 +13:00
Cheese
821c7f0cb6
Replaced bebe piggles kit with a new kit
2015-03-26 17:43:22 +11:00
Jonathan Williams
f4061854cd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-25 15:11:17 -07:00
Jonathan Williams
6472194d44
Optimized queries to retrieve and update player information by removing inner join calls on the account.
...
Added account id retrieval on login.
Added account id caching in redis.
2015-03-25 15:10:59 -07:00
libraryaddict
db5e6ad745
Wizards: Summoned wolves are one-hittable, and one per spell level
2015-03-25 19:25:32 +13:00
libraryaddict
be5086e2a5
Wizards: Give warning before lightning spell hits
2015-03-25 19:22:08 +13:00
libraryaddict
be542b9ce4
Rebalance wizard spell SpeedBoost
2015-03-25 19:21:38 +13:00
libraryaddict
853e6420dd
Add instant-casting to wizards
2015-03-25 19:21:20 +13:00
Cheese
4a25265c7c
Added utility methods to check for players within a sight pyramid
2015-03-25 17:13:22 +11:00
libraryaddict
4988b90d0e
Prevent TNT from being moved in inventories in PerkBomberHG
2015-03-25 16:56:37 +13:00
libraryaddict
63c55a1449
SurvivalGames: Prevent wood dropping, add mushroom soup to base loot and change bowl to soup. Add throwing tnt to loot.
2015-03-25 16:56:05 +13:00
libraryaddict
ad967a092a
Remove TNT from SG placeable and breakable
2015-03-25 16:19:56 +13:00
Cheese
9142227dd4
updates to SG border
...
balanced cleave for SG and Champs
2015-03-25 14:16:09 +11:00
Cheese
5fded981d9
Timings for Visibility
2015-03-23 16:38:17 +11:00
Cheese
46dfb532fb
Bridges scoreboard fix
...
SG balance
DONT QUIT msg improvement
2015-03-23 11:50:09 +11:00
Cheese
3f2b7444a3
made SG scoreboard display individual player names once there's less then 8
2015-03-22 10:06:11 +11:00
libraryaddict
f99edecba0
Change deathmatch color to red
2015-03-22 00:05:24 +13:00
Cheese
2bbf035d4c
SG borders now have audio and attack nearby players.
2015-03-21 12:22:47 +11:00
libraryaddict
ee7ae77311
Use VisibilityManager instead of hidePlayer showPlayer in SG Deathmatch
2015-03-21 01:38:20 +13:00
Cheese
0a766cd7bb
increased food and weapons
2015-03-20 22:23:25 +11:00
Cheese
376824edfc
slowly tnt explosion by 0.5s
2015-03-20 20:46:11 +11:00
Cheese
446951d8af
balance changes for SG
2015-03-20 20:43:42 +11:00
Cheese
57502c226f
changed slasher to barb
2015-03-20 19:39:23 +11:00
Cheese
392a648f8e
fixed cleave hurting self
2015-03-20 18:43:44 +11:00
Cheese
810517b142
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-20 18:22:10 +11:00
Cheese
cdd9400ec2
added slasher kit to SG
2015-03-20 18:21:56 +11:00
libraryaddict
f2ffc57ae2
Fix error, allow snowball and egg to do damage
2015-03-20 20:15:10 +13:00
libraryaddict
baaebd3662
Chiss wants a shorter Assassin Description
2015-03-20 19:43:27 +13:00
libraryaddict
11dcc4af8b
Fix description of Assassin Kit
2015-03-20 19:41:56 +13:00
libraryaddict
83b18129f2
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
2015-03-20 19:33:27 +13:00
libraryaddict
7bf9c13fd8
Kit Assassin in SG has nametag visiblity set to 8 blocks, normal set to 24
2015-03-20 19:30:08 +13:00
Cheese
6c78bc6f8f
added 10s delay on getting bow in block hunt
2015-03-20 16:51:24 +11:00
Cheese
746fa9e11b
stealer kit for SG
2015-03-20 16:20:55 +11:00
libraryaddict
6c257c1e7d
Store killed players in a hashmap in SG
2015-03-20 18:17:34 +13:00
libraryaddict
19cc6dc12b
Minor bug-fix in the hopes it fixes a major bug for SG
2015-03-20 17:51:03 +13:00
libraryaddict
6e30834565
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-03-20 17:35:42 +13:00
libraryaddict
03bcb120fc
Change border damage from Void to Border Damage
2015-03-20 17:35:27 +13:00
libraryaddict
3e7346618b
Change border creep speed, boats only placeable on water
2015-03-20 17:34:44 +13:00
Cheese
e4475eb7b1
allowed mapleads to stop games
...
removed nametag (long range) on wolf pet, and lowered damage from 4 to 3
2015-03-20 12:37:18 +11:00
libraryaddict
7b41649d94
Removed debug logging in SurvivalGames
2015-03-18 22:10:03 +13:00
Cheese
ee237c9f5b
re-enabled SG in gamefactory
2015-03-17 22:20:40 +11:00
libraryaddict
1f0e204eb3
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SurvivalGames
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/subclasses/HealingRune.java
2015-03-18 00:04:41 +13:00
libraryaddict
261b18fcf0
Add GameType options
2015-03-17 23:59:59 +13:00
libraryaddict
52f0941fb9
Add resourcepack options
2015-03-17 23:59:24 +13:00
libraryaddict
733134f709
Update SurvivalGames
2015-03-17 23:53:43 +13:00
libraryaddict
f12d0bf9ef
Allow disabling of game start sounds, and changing of the game PrepareTime.
2015-03-17 23:52:58 +13:00
libraryaddict
340441edbe
SG kit fletcher no longer can pickup fletched arrows
2015-03-17 18:30:48 +13:00
libraryaddict
06ebbbbc73
Remove SG wolf pet on quit
2015-03-17 18:30:17 +13:00
libraryaddict
41469b198a
Change wizards spells to use conditions for potion effects
2015-03-17 18:07:43 +13:00
Cheese
3eba559b01
fixed merge error
2015-03-17 15:02:41 +11:00
Cheese
73c66fa93f
Merge branch 'SpecRemoveCreative'
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
2015-03-17 14:57:17 +11:00
Cheese
e3eb62887d
fixed an eventgame bug
2015-03-17 14:50:56 +11:00
Cheese
28c683a37a
fixed display for effects
2015-03-16 15:16:17 +11:00
Cheese
c941c383e7
fixed hosts not being able to use creative inventroy
2015-03-16 15:01:35 +11:00
Cheese
efa2b649bd
updated eventserver not expiring
2015-03-16 14:19:43 +11:00
Cheese
a700b61613
added WE permissions to event servers.
2015-03-16 14:10:58 +11:00
Cheese
420c4e7229
More work on Event game
2015-03-16 13:39:33 +11:00
libraryaddict
bead4a7626
No longer need to constantly set the durability of items in the sheep game
2015-03-15 13:13:06 +13:00
libraryaddict
ba04c5e834
Fixed GameScoreboard demanding strings are shortened to 15 chars when the max is 16
2015-03-15 12:35:39 +13:00
libraryaddict
e9fe1fb423
Formatted SpellType, fixed lightning spell description
2015-03-15 12:34:45 +13:00
Cheese
98960b6ce7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-13 15:40:41 +11:00
Cheese
6762e4b537
Merge branch 'SpecRemoveCreative' of ssh://184.154.0.242:7999/min/Mineplex into SpecRemoveCreative
2015-03-13 11:34:57 +11:00
Cheese
c5d48a82a3
Fixed invisibility bug
2015-03-13 11:34:45 +11:00
Shaun Bennett
b18ea22df4
Fix spectator gui bug
2015-03-12 15:50:46 -04:00
Cheese
3ceb0ff678
Converted spec away from CREATIVE
2015-03-12 15:31:40 +11:00
Shaun Bennett
f660620e4b
Revert "Pre-Frost changes"
...
This reverts commit dbeea5bf69
.
2015-03-11 22:18:29 -04:00
Cheese
bf901b2280
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-12 12:15:48 +11:00
Cheese
8e77d1fc21
more event server updates
2015-03-12 12:14:49 +11:00
libraryaddict
9cf0e4d1e8
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-03-11 13:17:16 +13:00
libraryaddict
f47447134e
Cleanup hologram class, remove witherskull option for 1.8 and fix duplicate nametags and non-invisibility on armorstands
2015-03-11 13:16:00 +13:00
Tim Ziankoski
759db08679
Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex"
...
This reverts commit 2e06a272b4
, reversing
changes made to e443b41e15
.
2015-03-09 17:24:01 -04:00
Tim Ziankoski
2e06a272b4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-09 16:43:00 -04:00
Cheese
e443b41e15
removed unfinished code
2015-03-09 22:16:08 +11:00
Cheese
3a0e597276
more event server stuff
2015-03-09 22:15:24 +11:00
libraryaddict
dbeea5bf69
Pre-Frost changes
2015-03-09 05:17:04 +13:00
Tim Ziankoski
ac4b495301
Created internationalization helper class and began i18n process
2015-03-07 20:50:47 -05:00
Cheese
e0ba667613
old chests drop a little more frequently
2015-03-07 11:53:18 +11:00
Cheese
f2a71b2ea9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-07 11:13:30 +11:00
Cheese
683f86bd89
event server fixes and parser gamtypes
2015-03-07 11:13:17 +11:00
Jonathan Williams
2d7f65588c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-06 01:36:38 -08:00
Jonathan Williams
09ecb994f6
Pooled Friend/Ignore/Preferences/Poll/Elo repositories.
...
Removed ArcadeRepository as its unused.
Removed target server check for RedisCommand because it breaks other commands.
2015-03-06 01:36:25 -08:00
Cheese
0336df55aa
Event update
2015-03-06 19:43:17 +11:00
Cheese
e62d9774a9
Initial Event Game push
2015-03-06 19:11:26 +11:00
Jonathan Williams
5e78b43860
Added StaffOnly code to ServerConfiguration
2015-03-02 12:33:04 -08:00
libraryaddict
1fbadfa4f4
Don't compare player world to a plugin fetched world, instead compare the name.
2015-03-01 18:18:53 +13:00
Shaun Bennett
90ebbd9962
More refactors
2015-02-27 22:53:55 -05:00
Shaun Bennett
efce714375
DEVP-66 Refactor commonly used classes to Java conventions
...
Refactoring + testing jira
2015-02-26 00:07:07 -05:00
Shaun Bennett
cf7e2eed69
Merge with MPS Update
2015-02-24 21:11:16 -05:00
Shaun Bennett
ad5481ef9c
Revert "Remove arcade repository stuff"
...
This reverts commit a5f7050e40
.
2015-02-24 21:04:19 -05:00
libraryaddict
bfb0c157a2
Update jooq libraries in common.xml and EnjinTranslator.xml and eclispe classpaths
2015-02-25 13:56:32 +13:00
Shaun Bennett
be591c7d09
Disallow start/stop/kick/setgame while a game is in progress for Donor ranks
2015-02-24 17:22:47 -05:00
Shaun Bennett
857052992d
Increase max player cap to 100 for SnrMod+/Youtube
2015-02-24 14:47:10 -05:00
Shaun Bennett
570374fbb4
Add Wither Assault and Wizards gametypes to legend+ private servers
2015-02-24 14:45:31 -05:00
Shaun Bennett
48dd5639d2
Kick banned players from games
2015-02-24 14:38:12 -05:00
CoderTim
0bf6866ad7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-23 20:56:34 -05:00
libraryaddict
fc5771b33c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-24 13:04:06 +13:00
libraryaddict
56e03221ad
Improve party system
2015-02-24 13:03:51 +13:00
Jonathan Williams
87558eb01a
Merge pull request #10 in MIN/mineplex from leaderboards_dev to master
...
* commit 'e1f7e2dbcc91bb79d393b09ea5b250fe895cfe11':
Remove old lines of debug code.
Add in hooks to update statistical events log for leaderboards. Modify leaderboard PHP script for new updated leaderboard table formats.
2015-02-21 01:55:59 -06:00
libraryaddict
53bb67ec4f
Magic missile nerfed to no cooldown decrease, nerfed rumble dmg, nerfed lance multihits
2015-02-21 20:41:07 +13:00
Ty Sayers
def101cc8d
Add in hooks to update statistical events log for leaderboards.
...
Modify leaderboard PHP script for new updated leaderboard table formats.
2015-02-19 18:53:46 -05:00
CoderTim
44f453c56e
Updated jOOQ and database tables
2015-02-18 18:51:36 -05:00
libraryaddict
d29b43d645
Parties now persist cross-server, staff messages now display on the sending server for other staff for staff cross-messages.
2015-02-17 15:17:14 +13:00
Mini-Chiss
cdbf6c450e
fixed mis-named gameloot chests
2015-02-15 17:35:58 +13:00
Shaun Bennett
a5f7050e40
Remove arcade repository stuff
2015-02-13 07:33:50 -05:00
libraryaddict
9bdf248643
Add cross-server message and adminmessage commands. Fixed casing on messagecommands package.
2015-02-12 04:08:06 +13:00
Shaun Bennett
e21e27f07f
Merge remote-tracking branch 'origin/master'
2015-02-10 13:33:59 -05:00
Shaun Bennett
6b3f2114f2
Holy debug code!
2015-02-10 13:27:29 -05:00
Mini-Chiss
884df48695
disguise command (not yet working fully)
2015-02-10 19:08:54 +13:00
libraryaddict
29f3241098
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-10 02:32:13 +13:00
libraryaddict
ce7db289a7
Add commands /ignore and /unignore. Fixed mutes not working with private messaging
2015-02-10 02:31:33 +13:00
Shaun Bennett
ed8638ae9f
Tablist thingy for 1.8, sort of helps the situation a bit but doesnt perfectly solve it
2015-02-06 23:39:22 -05:00
Chiss
417122b7a7
reduced rate that smash crystal spawns
2015-02-06 14:47:34 +11:00
Chiss
09b78fccd7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-06 14:16:26 +11:00
Chiss
14fc6f2145
Chest Update
2015-02-06 14:16:10 +11:00
libraryaddict
f549402712
Modify wizards to use | for bossbar displays
2015-02-05 23:42:26 +13:00
libraryaddict
6f8d39b630
Fixed spiders climbing liquids
2015-02-05 22:34:06 +13:00
Shaun Bennett
939c6189a7
Merge energy and war with master
2015-02-03 14:16:07 -05:00
Shaun Bennett
6cefeb1b74
More work on War
2015-02-03 14:02:45 -05:00
libraryaddict
9118aef60f
Even if death is not the end, refuse players re-entry if they were in the lobby when they quit.
2015-02-01 16:03:29 +13:00
libraryaddict
f9cbab6fd8
SuperSmash no longer restores hunger unless you damage a player, not a entity
2015-02-01 09:47:00 +13:00
libraryaddict
6f369cbcdb
Sort players in spectator menu by name
2015-02-01 08:25:38 +13:00
Chiss
f03c9d5bab
Fixed damage rate on barrage
2015-01-30 20:48:46 +11:00
Chiss
115f9b58ab
Spider nest :)
2015-01-30 17:02:28 +11:00
Chiss
5b112caa4a
Bone Storm buff
2015-01-30 16:10:03 +11:00
Chiss
c066cb5185
Fixed Bugs
2015-01-30 16:08:22 +11:00
Chiss
3fdf914d63
Smash Wolf Update!
2015-01-30 15:18:50 +11:00
Chiss
76b76cd38c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 14:42:51 +11:00
Chiss
c8afa151d9
SSM Zombie + Spider Update
2015-01-30 14:42:39 +11:00
libraryaddict
505dcc1e8e
Add friends gui, deprecate the old chatbased friends display
2015-01-30 13:46:07 +13:00
Chiss
e18107a82f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 11:08:37 +11:00
Chiss
6a269cc03b
More SSM Changes
2015-01-30 11:08:23 +11:00
libraryaddict
ebc74e5565
Fireball still too fast
2015-01-29 15:01:00 +13:00
Chiss
7f4bcd1210
Smash Update
...
new scoreboard (not implemented yet)
reward changes
2015-01-29 11:54:59 +11:00
libraryaddict
2dfdde4457
Kit mage will now start with two spells
2015-01-28 03:01:44 +13:00
libraryaddict
1da873ab8f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-27 21:09:31 +13:00
libraryaddict
94f79990e4
Kit changes to wizards
2015-01-27 21:09:15 +13:00
Chiss
f80e640d34
Map Parser voxel update
...
Disabled spec GUI in bridges
other minor changes
2015-01-26 11:23:08 +11:00
Chiss
10ab390bd7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-26 11:20:12 +11:00
Chiss
40ef3317dd
committing necessary files to merge
2015-01-26 11:20:02 +11:00
libraryaddict
76e6b7530f
Meteors now explode everything on contact. Added spellbook for spectators and pregame. Mana cost now obvious when cooling down. Lowered some random item amounts
2015-01-26 09:09:46 +13:00
libraryaddict
b4b8b307b0
Rename Wizard Battles to Wizards
2015-01-25 18:50:45 +13:00
libraryaddict
c19f10aff9
Reduce kit mystic mana regen to 10%
2015-01-25 18:33:22 +13:00
libraryaddict
8262eb9f48
Rebalance explosive rune, fix rank bug and books no longer drop
2015-01-25 18:27:21 +13:00
libraryaddict
7682907478
Wizards modifications - Its amazing how things slip past you
2015-01-25 06:18:07 +13:00
libraryaddict
3525243f9d
Numerous fixes to Wizards
2015-01-24 23:14:23 +13:00
libraryaddict
3ff0592d2d
Mild fix on fireball, fix heal given less cooldown and lower heal spell heals
2015-01-24 13:51:18 +13:00
libraryaddict
31c1be9dd8
Nerf the spell heal
2015-01-23 23:25:03 +13:00
libraryaddict
99c9bfbf33
Left clicking a chest is harmless
2015-01-23 23:18:29 +13:00
libraryaddict
da81d131a7
Don't open wizard spell menu if they right clicked a chest
2015-01-23 23:17:45 +13:00
libraryaddict
b00deb683e
Red overtime
2015-01-23 22:28:07 +13:00
libraryaddict
def2018c8b
Remove center blocks of stone wall wizard spell
2015-01-23 22:15:27 +13:00
libraryaddict
92ef0af39d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
2015-01-23 22:01:51 +13:00
libraryaddict
c5b444ae6e
Wizards push
2015-01-23 21:52:03 +13:00
Jonathan Williams
08078c1622
Removed Logger
2015-01-22 23:18:38 -08:00
libraryaddict
0b8babb36d
Spectator menu shouldn't be opened when standing on pressure plates should it..
2015-01-23 02:31:38 +13:00
libraryaddict
74d7c7df2b
More wizard modifications
2015-01-23 02:30:44 +13:00
libraryaddict
29dc598c00
Update the fireball times to 20min
2015-01-22 01:00:57 +13:00
libraryaddict
eb7e68885b
Hunger now takes longer to decrease
2015-01-21 19:00:26 +13:00
libraryaddict
dd2418232c
Wizards progress
2015-01-21 19:00:07 +13:00
libraryaddict
e11e2090ad
Fix up spells somewhat
2015-01-18 21:23:50 +13:00
libraryaddict
9b574de541
Current wizards
2015-01-18 21:23:49 +13:00
libraryaddict
1ea19ee2e7
Add spell HealingRune, deny weapon crafting, use scoreboard for a simply display
2015-01-18 21:23:49 +13:00
libraryaddict
ea452d8fa5
Wizards progress
2015-01-18 21:23:48 +13:00
libraryaddict
72e61a02df
Changes to wizards
2015-01-18 21:23:48 +13:00
libraryaddict
611d184024
Cleanup code, add custom explosion, add lance and traprune spell
2015-01-18 21:23:47 +13:00
libraryaddict
d6d01241cb
Progress on wizards
2015-01-18 21:23:44 +13:00
libraryaddict
d232bab051
Wizards Game Progress. Now workable
2015-01-18 21:23:43 +13:00
libraryaddict
0648276720
Current progress on wizards
2015-01-18 21:23:03 +13:00
libraryaddict
5a5946c0d0
Current progress on wizards - Working on scoreboards in a new branch
2015-01-18 21:23:02 +13:00
libraryaddict
a3e0a6b4fd
Wizards Commit
2015-01-18 21:23:02 +13:00
Jonathan Williams
c83643564b
Fixed scoreboards reading from file.
...
Fixed scoreboard server name length
Changed how we pull server group on startup.
2015-01-13 12:22:47 -08:00
Jonathan Williams
b32259d7f1
Fixed length checking with team prefix in GameScoreboard
2015-01-12 12:58:40 -08:00
libraryaddict
b2fde6c6ca
Do a for(15) loop instead of while true. Don't update scoreboard if its unchanging
2015-01-12 12:22:01 +13:00
libraryaddict
1006d66e0a
Format Scoreboard, fix displaying more than 15 lines
2015-01-12 12:09:45 +13:00
Jonathan Williams
ac709d09ce
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-11 00:42:55 -08:00
Jonathan Williams
8e04a2a5f2
Portal now checks server status and player's rank before sending them to a server to prevent login spam.
...
Refactored portal method names.
2015-01-11 00:42:31 -08:00
libraryaddict
fa59ed52b9
Fixed arrow count not updating on shoot cancel
...
Spectators are now permitted to walk on enemy turf
2015-01-11 09:49:46 +13:00
libraryaddict
6343a00b53
Instead of removing the shot arrow, cancel the event instead. Fixes kit Shredder being usable during buildtime
2015-01-10 09:08:35 +13:00
libraryaddict
9863b701d8
Fixed typos in descriptions of SSM kits Wolf and WitherSkele
2015-01-10 08:54:00 +13:00
Chiss
9daee9733f
Fixed UHC height limit
...
fixed UHC rejoin health bug
2015-01-08 13:08:15 +11:00
Chiss
8ce097d837
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-04 13:21:35 +11:00
Chiss
5f36c8e424
minor scoreboard changes
...
legend loot bonus
2014-12-30 08:50:37 +11:00
Jonathan Williams
97f57b655b
Prevent horses from spawning in Clans
...
Added Building supplies shop and pvp shop to clans.
2014-12-29 06:44:00 -05:00
Jonathan Williams
81e423fa4f
Fixed Server transfer stuff. Portal send works!
2014-12-24 14:35:34 -05:00
Shaun Bennett
043f67f78c
Fix for max players not displaying properly (MPS)
2014-12-23 17:48:38 -06:00
Chiss
35bcf28c83
champions builds will now load in MPS, even if the current game isnt champs.
2014-12-23 23:44:59 +11:00
Chiss
78977788a1
fixed bug
2014-12-23 23:18:29 +11:00
Chiss
f4c5922b05
added messages for when server is expired
2014-12-23 23:17:21 +11:00
Chiss
78d94320a8
fixed reciptient of message
2014-12-23 22:55:07 +11:00
Jonathan Williams
07cca7a1d4
Fixed NPE in GameHostManager
...
Fixed CD for creating server.
2014-12-23 06:46:05 -05:00
Shaun Bennett
21d255fcd1
Merge remote-tracking branch 'origin/master'
2014-12-23 04:15:55 -06:00
Shaun Bennett
c41b5b0cfb
private server gui, i think?
2014-12-23 04:15:33 -06:00
Chiss
6d2bd84b5b
disabled always joinable motd for minestrike
2014-12-23 20:39:49 +11:00
Jonathan Williams
9a767af018
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 03:44:05 -05:00
Jonathan Williams
f00854ee4c
Removed bad code thats bad from the bad birdy.
...
Hooked in PersonalServer item click and command.
Re-enabled redis transport commands.
Added transfer command sending on personal server start.
Updated Enjin to handle more versatile inventory purchases.
2014-12-23 03:43:56 -05:00
Chiss
521b61c624
disabled free evolutions
2014-12-23 19:42:13 +11:00
Chiss
a15256da88
update
2014-12-23 19:04:10 +11:00
Jonathan Williams
103ff0e6b0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 02:57:24 -05:00
Chiss
07d82b8206
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-23 18:39:22 +11:00
Chiss
39745913ac
re-enabled roggue
2014-12-23 18:39:05 +11:00
Shaun Bennett
eb0f23318f
Fix my fix for scoreboard - mine broke when new players joined
2014-12-23 00:06:30 -06:00
Shaun Bennett
4b4ebd0e36
Change admin item to sparkling melon
2014-12-23 00:06:04 -06:00
Shaun Bennett
8f9794a5f7
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2014-12-22 23:56:18 -06:00
Shaun Bennett
706b3e25ef
Fix broken player count when changing max players
2014-12-22 23:54:51 -06:00
Chiss
64d37d1886
minor snd changes
2014-12-23 16:50:31 +11:00
Jonathan Williams
4cac65a81f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 00:50:20 -05:00
Jonathan Williams
0e85b7e6cc
Added HostName to server groups.
...
Added handling of private server groups in server monitor.
Optimized server group/server status load.
Added ability to add/remove server group.
2014-12-23 00:49:52 -05:00
Shaun Bennett
1957db25d9
Add player head button
2014-12-22 23:20:20 -06:00
Chiss
e8953b0c96
fixed merge errors
2014-12-23 15:14:03 +11:00
Chiss
f961fd0233
Merge remote-tracking branch 'remotes/origin/searchanddestroy'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-12-23 15:09:58 +11:00
Chiss
19a7e6d666
time update
2014-12-23 13:01:44 +11:00
Shaun Bennett
8ed7f34ab6
Sorted game pages
2014-12-22 19:20:08 -06:00
Chiss
4797b251b1
YAY Champions enable/disable works.
2014-12-23 11:39:03 +11:00
Chiss
71cf8e8fd2
undid champs stuff :(
2014-12-23 11:22:41 +11:00
Chiss
ec9401506c
Game servers can now run champions/normal on the fly.
2014-12-23 11:18:48 +11:00
Chiss
a197724de8
fixed le bugs.
2014-12-23 10:48:15 +11:00
Shaun Bennett
1396c3395a
Add kill button, rename ban to remove, add some messages for actions, add remove admin
2014-12-22 17:37:02 -06:00
Chiss
fa0a9ac859
fixed exploit on skylands
2014-12-22 21:08:44 +11:00
Chiss
ec8e1f0546
more MPS stuff
...
fixed bridges exploit
2014-12-22 16:31:13 +11:00
Chiss
2472ca95ec
MPS updates
2014-12-22 13:19:45 +11:00
Chiss
98b614848d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into HEAD
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
2014-12-22 10:54:31 +11:00
Chiss
0e7dec919d
minor updates
2014-12-22 10:51:19 +11:00
Chiss
9321abdaf5
Merge branch 'searchanddestroy' of ssh://184.154.0.242:7999/min/mineplex into searchanddestroy
2014-12-19 13:59:31 +11:00
Chiss
184c6cb4ba
added func to change attackreason for combatmanager
2014-12-19 13:59:18 +11:00
libraryaddict
93314711e7
Modified snd
2014-12-18 17:56:21 +13:00
Chiss
437c1aeabe
MPS rank todo
2014-12-18 13:06:57 +11:00
Chiss
60f567a3fb
fixed some errors ;o
2014-12-18 12:47:00 +11:00
Chiss
679f7909b0
Merge branch 'feature/private-servers' of ssh://184.154.0.242:7999/min/mineplex into feature/private-servers
2014-12-18 12:45:56 +11:00
Chiss
56d14b7bc0
Particle stuff
2014-12-18 12:45:45 +11:00
Shaun Bennett
604243dfa3
UI improvements - icon changes, whitelist toggle, notify messages
2014-12-17 19:42:11 -06:00
Shaun Bennett
2677d2e557
Fancy icons for 1.8!
2014-12-17 19:15:31 -06:00
Shaun Bennett
a63c48e338
Refactoring private server menu
2014-12-17 18:45:15 -06:00
Shaun Bennett
d19431a47f
Rename Clicked to onClick
2014-12-17 18:40:44 -06:00
Shaun Bennett
6e42894d5c
Refactor button again
2014-12-17 18:33:24 -06:00
Chiss
12973aba7d
Merge branch 'master' into feature/private-servers
2014-12-17 16:47:19 +11:00
libraryaddict
0e7adab3eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-17 18:32:50 +13:00
libraryaddict
17ac36d9ae
Add wither pet, pets are no longer stackable. Enderdragon no longer has his health changed in the hub
2014-12-17 18:31:51 +13:00
Shaun Bennett
6eb3efa0b6
More changes
2014-12-16 20:37:14 -06:00
Shaun Bennett
62a621270e
More work on private server gui. Still need to do a bunch of refactoring
2014-12-16 13:43:01 -06:00
Shaun Bennett
83218c9a73
Pushing unfinished code for laptop
2014-12-16 11:42:06 -06:00
libraryaddict
5b1f4f16fb
Modify giveGems for new give gems
2014-12-16 21:58:17 +13:00
Chiss
a433ad764d
Wither Morph
...
Legend Particle
2014-12-16 16:18:09 +11:00
Jonathan Williams
c43ee95c55
Added 1.8 hooks for disguise setName and getName
...
Refactored method names in some disguise classes.
2014-12-15 21:46:14 -05:00
libraryaddict
7e6b6bd1b2
Add evolve effect
2014-12-16 15:23:31 +13:00
libraryaddict
6d3a1116b9
Changes to SnD
2014-12-16 15:14:10 +13:00
libraryaddict
913f827ced
Changes to SnD
2014-12-16 15:14:09 +13:00
libraryaddict
da6b4b6a79
Current work for SnD
2014-12-16 15:14:09 +13:00
libraryaddict
0026127647
More work done on SnD
2014-12-16 15:14:08 +13:00
libraryaddict
f5d9d8dcf0
Modify scoreboard to use teams to support duplicate lines and up to 32 in length
2014-12-16 15:14:08 +13:00
libraryaddict
715862b365
Commit current changes
2014-12-16 15:14:07 +13:00
libraryaddict
6d7a71d043
Modifications for SnD test
2014-12-16 15:14:07 +13:00
Chiss
2e7d101850
added material/data for gametypes
2014-12-16 12:26:37 +11:00
Chiss
ee363f55a6
re-enabled gems for CC
2014-12-15 15:50:25 +11:00
Chiss
d7eb01e8f0
fixed CC Bug :D
2014-12-15 15:49:52 +11:00
Chiss
d1be64d7e7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
2014-12-15 14:56:09 +11:00
Chiss
95081a8ab7
Gems cannot be given multiple times for certain things (prevents bugs giving mass gems)
2014-12-15 14:33:38 +11:00
Jonathan Williams
230c6ede13
Disabled gem reward in ChristmasChaos
2014-12-14 22:14:41 -05:00
Chiss
19dfafe9ed
disabled gems
2014-12-15 13:58:36 +11:00
Chiss
909c0d9be7
christmas no longer rewards gems
2014-12-15 13:56:48 +11:00
Chiss
d0f8a6a063
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-15 12:26:25 +11:00
Chiss
9136165d4f
fixed christmas elf name
...
pet names now have limited range
2014-12-15 12:24:40 +11:00
Jonathan Williams
5b67e2182a
Added disguise to Pet Manager for eventual wither disguised pet.
2014-12-14 02:30:39 -05:00
Chiss
78a34b1517
hopefully fixed a bug where pumpking king despawned.
...
removed 11 disc from loot
2014-12-13 11:55:12 +11:00
Chiss
3f24325c3c
removed +50% player limit for CC
2014-12-12 21:23:01 +11:00
Chiss
4fd6ed80c4
final xmas Updates
...
xmas hub
2014-12-12 19:44:04 +11:00
libraryaddict
9a16616e6c
Add fix for wither bossbar and add a checkpoint hologram for snake bit in xmas
2014-12-12 12:40:23 +13:00
Chiss
adafc95d3f
boss weaker
2014-12-12 10:26:32 +11:00
Chiss
2be4d7d6d2
XMAS UPDATE
2014-12-12 10:03:25 +11:00
Chiss
3af8a90d3b
near final xmas push :D
2014-12-11 15:23:01 +11:00
libraryaddict
3a8ab0afb0
Uncomment SleighHorse
2014-12-11 15:24:10 +13:00
Chiss
6b1fa91565
Xmas Updates
2014-12-11 12:42:06 +11:00
Chiss
86b9d8342f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Sleigh.java
2014-12-11 11:27:47 +11:00
libraryaddict
ee8d699bd1
Minor text cleanup in the sleighhorse code because you guys seem to like that
2014-12-11 07:25:40 +13:00
libraryaddict
2a13255af3
Turn christmas chaos game horses into reindeer
2014-12-11 07:23:47 +13:00
Chiss
068a0901f9
xmas updatre
2014-12-11 00:16:15 +11:00
Chiss
358d5fde44
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-10 22:38:19 +11:00
Chiss
450d3eb923
merge
2014-12-10 22:38:08 +11:00
Jonathan Williams
c4fee8e681
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/.classpath
2014-12-10 03:34:53 -08:00
Jonathan Williams
ea034812b9
Fixed path finder crap in UtilEnt
...
Cleaned up unused code in OutfitRaveSuit
Fixed eclipse bug for NotificationManager
Removed christmas/Sleigh columns.
2014-12-10 03:32:35 -08:00
Chiss
db8e0484ab
missing files + new pet
2014-12-10 18:23:22 +11:00
Chiss
0aba82eee6
fixed some eclipse java6 stuff with mail
...
Christmas game update
2014-12-10 15:38:57 +11:00
Chiss
bee81ff455
lowered coin rewards
2014-12-09 20:23:56 +11:00
Chiss
828fabb80a
Initial Christmas Chaos update
2014-12-09 20:04:59 +11:00
Chiss
50358c0c30
removed EULA breach in bridges private blocks
2014-12-08 18:23:47 +11:00
Chiss
ef8e5104f1
SnD Kits
...
minor bug fixes
2014-12-08 17:28:18 +11:00
Chiss
64c8edc292
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-08 17:25:03 +11:00
libraryaddict
048aa40590
Remove comments and add comments
2014-12-06 03:25:53 +13:00
libraryaddict
307d280534
Read merge message
2014-12-06 02:22:52 +13:00
Chiss
4430efd7be
minor updates
2014-12-05 16:25:34 +11:00
Chiss
38639fb58f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Taunt.java
2014-12-04 13:34:08 +11:00
Chiss
6cc4ec034b
Champs Updates
...
UHC Y Limit in middle
2014-12-04 13:33:31 +11:00
Jonathan Williams
abaf9f4693
Refactored IRelation method names
...
Added support for negative amounts in Support server.
Clans in core testing state.
2014-12-03 13:06:50 -08:00
Chiss
a8deee5292
fixed a spelling error
2014-12-02 18:04:48 +11:00
Chiss
6319bffd42
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-02 09:50:47 +11:00
Chiss
185b182061
fixed teleports removing you from the game
2014-12-02 09:50:30 +11:00
Jonathan Williams
e7cf4eb51d
Removed use of Gem Boosters
...
Cleaned up some unused imports.
2014-12-01 02:27:39 -08:00
Jonathan Williams
9d39cb922c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-01 01:22:51 -08:00
Jonathan Williams
433483dcca
Fixed error in GameLootManager
2014-12-01 01:22:43 -08:00
Chiss
cee48f1978
made it so you can use fireworks without aiming against block in blockhunt
...
removed fire from magma blast
private blocks are no longer private if owner is dead
2014-12-01 19:33:36 +11:00
libraryaddict
9ddd0bd9cc
Player now sees theirselves disguised as the same block they are disguised as.
2014-11-30 16:39:27 +13:00
libraryaddict
e654b23a50
We don't need that debug output
2014-11-30 15:06:50 +13:00
libraryaddict
5157c2bf37
Disable hiders from seeing their own block
2014-11-30 15:06:18 +13:00
libraryaddict
54fe312251
Untested fix I'm 99% sure will fix hide and seek players being blinded
2014-11-30 13:47:07 +13:00
libraryaddict
f8869a84ba
Don't send the player himself the block change..
2014-11-30 13:22:01 +13:00
libraryaddict
751731a1ad
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-30 12:14:51 +13:00
libraryaddict
00d3e66ac4
Commit my current work on SnD kits
2014-11-30 12:12:02 +13:00
libraryaddict
8afb803d5d
Modify the bow kits a little
2014-11-30 10:26:12 +13:00
Jonathan Williams
f507db7664
Reworked spawn to save to database.
...
Work on Clans:
Fixed clan loading/updating/adding.
Refactored some code for Clans.
2014-11-29 03:16:37 -08:00
libraryaddict
e57bd8b473
Finish making the bow kit tree
2014-11-29 16:39:09 +13:00
libraryaddict
e3b0843b2c
Modify Barrage perk to support setting levels to indicate arrows
2014-11-29 16:38:54 +13:00
Chiss
b3beadf8b5
made recharge look nicer for 1.7
...
added missing files
2014-11-29 09:14:33 +11:00
Chiss
ca34ac4e02
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-29 09:09:23 +11:00
libraryaddict
b0e62bfedf
Cleanup imports and rename fields to your _ and non _
2014-11-29 10:51:34 +13:00
libraryaddict
24bc581f35
Add the kits I have
2014-11-29 10:36:34 +13:00
libraryaddict
e587fca8f1
Move KitBow to its own package
2014-11-29 07:53:33 +13:00
libraryaddict
5544bbb440
Add KitEvolve inventory
2014-11-29 07:22:18 +13:00
libraryaddict
e6fac6de39
Small typo in UpgradeKit stuff
2014-11-29 07:22:02 +13:00
Chiss
8f9f88987b
mods can no longer use /tp Here
...
only disqualifies on tp in live games.
2014-11-28 10:09:18 +11:00
Chiss
fdc67e021c
Staff using /tp commands will take them out of the game (Mod to Admin only)
...
Changed spec /tp command to /spec
2014-11-28 10:00:31 +11:00
libraryaddict
d5d9e2eb14
Don't bother with these checks in ItemLayout
2014-11-28 09:30:57 +13:00
libraryaddict
d731b6ee69
Registering of KitManager
2014-11-27 09:47:43 +13:00
libraryaddict
1bb4d902c6
Start on a kit manager
2014-11-27 06:44:46 +13:00
libraryaddict
9350aeb89a
Use holograms in game
2014-11-27 03:18:52 +13:00
libraryaddict
f5533dbce2
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SearchAndDestroy
2014-11-27 01:13:14 +13:00
libraryaddict
52411a188f
Fixed entityId not using UtilEnt
2014-11-27 01:08:43 +13:00
libraryaddict
b68c95c6a2
Finish up adding bombs and turn this into a working game. Add demo kit Bow
2014-11-27 01:08:42 +13:00
libraryaddict
3ae27ccc55
Store PacketHandler so that games can use it
2014-11-27 01:08:41 +13:00
libraryaddict
5bf185e588
Register Search and Destroy in GameFactory
2014-11-27 01:08:40 +13:00
libraryaddict
60fd6b01cc
Add Search and Destroy code
2014-11-27 01:08:40 +13:00
libraryaddict
aa0659828a
Register game SearchAndDestroy
2014-11-27 01:08:39 +13:00
libraryaddict
9928811a71
Merge pull request #2 from Better-Holograms to master
...
* commit 'ef59cb7a9db25b8688ee6e3254661d9cc65a5e89':
Remove the 'Made by Shaun'
Fix up mistakes in the previous modifications
You have your HologramManager presented in a light most fair. Should be worth noting I didn't test it thoroughly
Ignore wither skulls for CustomTagFix
Remove old holograms and add new holograms
2014-11-26 06:07:57 -06:00
libraryaddict
ef59cb7a9d
Merging changes from master to Better-Holograms
...
* master:
Antistack replacement
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2014-11-27 01:01:19 +13:00
Chiss
95e428eb4f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/inventory/data/InventoryRepository.java
2014-11-26 12:34:47 +11:00
Chiss
731b0d89dd
Merge
2014-11-26 12:33:39 +11:00
libraryaddict
03075fecae
You have your HologramManager presented in a light most fair.
...
Should be worth noting I didn't test it thoroughly
2014-11-26 10:28:37 +13:00
Jonathan Williams
484dfaaea9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-25 13:25:41 -08:00
Jonathan Williams
3b54789767
Optimized logins dealing with mysql with multiqueries.
...
Added lazy loading of Pool data and Loaded check before performing anything.
Refactored MiniClientPlugin and created MiniDbClientPlugin
Renamed RankBenefitManager9000 to BenefitManager
Removed /send ability for now.
2014-11-25 13:25:13 -08:00
Shaun Bennett
f1fbc21570
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-11-23 20:02:09 -06:00
Shaun Bennett
c7f2a8072e
Antistack replacement
2014-11-23 19:51:23 -06:00
Jonathan Williams
cb43bc04d3
Added /lobby
2014-11-23 03:35:16 -08:00
Chiss
0c5ec503be
reduced fireworks in dragons
2014-11-23 15:00:05 +11:00
Chiss
089fdf8a64
sparklers no longer attract once they're in water or below 0
2014-11-23 14:55:06 +11:00
Chiss
d4a127b8ad
reduced fps lag in runner
2014-11-23 14:47:28 +11:00
Chiss
f0c87e439a
fixed nametag color in paintball
2014-11-23 11:16:01 +11:00
Chiss
19d3bba461
fixed fence glitch in dom
2014-11-22 13:20:34 +11:00
Chiss
6dfcdce027
increased illusion cooldown
...
cleaned axethrow
2014-11-22 10:29:00 +11:00
Chiss
f1ba5947a4
Some more wither updates
2014-11-21 16:32:12 +11:00
Chiss
0d78433bd2
updated mapparser
...
buffed withers a little
2014-11-21 10:36:41 +11:00
Chiss
7a8759dfba
updated disguisemanager so it uses player arg
...
fixed invisibility bug on disguises for specific players
updated champs skills
made some hard achievements a bit easier
2014-11-21 09:42:05 +11:00
Chiss
972911fe05
set achievement skills
2014-11-20 18:01:46 +11:00
Jonathan Williams
d1a4080cbd
Added GUI support for achievement skills.
2014-11-19 22:47:10 -08:00
Chiss
450cc9ada2
Champions achievement update
...
Wither update
2014-11-20 17:21:22 +11:00
Chiss
4961b55986
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-18 16:43:53 +11:00
Chiss
f5022ecf16
Fixed dupe glitch (all games)
...
Some champions skill fixes
created GameSpectatorManager to handle spec stuffz
2014-11-18 16:43:39 +11:00
Shaun Bennett
e99a3f6544
Merge remote-tracking branch 'origin/master'
2014-11-17 18:19:06 -06:00
Shaun Bennett
f071d2e727
Fix for TNT explosion in Bridges
2014-11-17 18:09:58 -06:00
Chiss
cd890e6c6c
disabled spec menu in minestrike - fixes shop bug.
2014-11-16 14:40:50 +11:00
Chiss
4c3610c3ac
fixed DMT silence
2014-11-16 10:46:26 +11:00
Chiss
454deb03db
fixed SG crash bug
2014-11-16 09:31:03 +11:00
Chiss
057594205e
Only closing CREATIVE Inv for non-ops.
2014-11-15 22:40:56 +11:00
Chiss
ca58f11174
specs should be able to view stats now
2014-11-15 22:32:00 +11:00
Chiss
fb70b76d29
FINGERS CROSSED
2014-11-15 22:29:53 +11:00
Shaun Bennett
d16896e493
Merge remote-tracking branch 'origin/master'
2014-11-15 05:04:57 -06:00
Shaun Bennett
1ca23390cc
Fix my derp
2014-11-15 05:04:48 -06:00
Chiss
41b6296788
Wither no longer shoots in pregame lobby
2014-11-15 20:16:18 +11:00
Chiss
51bc53262d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-15 19:32:08 +11:00
Chiss
ca4eec20ed
Wither Assault update
2014-11-15 19:31:56 +11:00
Shaun Bennett
521b1e5f3b
Merge remote-tracking branch 'origin/master'
2014-11-13 21:54:15 -06:00
Chiss
8ab0116a27
initial push of Wither Assault
2014-11-14 14:14:31 +11:00
Shaun Bennett
223bc2d0c0
Remove some debug messages that we no longer need
2014-11-13 19:34:55 -06:00
Shaun Bennett
6038c72e86
Add cleaner page for when there is only 1 team
2014-11-13 19:33:39 -06:00
Shaun Bennett
ea8b8dca15
Disable spectator menu for castle siege and uhc until I work out a better way to show that many players
2014-11-13 19:18:28 -06:00
Shaun Bennett
af31f4cd42
Add Tab handling for MultiCommandBase and "game set" command
2014-11-13 18:22:00 -06:00
Shaun Bennett
48c09aa311
Making spectator gui look better
2014-11-13 18:05:28 -06:00
Shaun Bennett
eb4b451e12
Fixing some spectator gui bugs
2014-11-13 16:41:42 -06:00
Shaun Bennett
8b73b89a17
Merging spectator gui with main branch
2014-11-13 16:03:14 -06:00
Chiss
112f76a29a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-13 18:10:10 +11:00
Chiss
9eaacd20ab
fixed slime healing
...
fixed sheep quest brute not dropping sheep
updated punish page
2014-11-13 18:09:54 +11:00
CoderTim
09ca2234c4
Fixed survival games death match bug: https://trello.com/c/jNGSUUGI
2014-11-13 01:49:14 -05:00
CoderTim
7667aa25a8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-13 00:26:53 -05:00
Jonathan Williams
7cad40044a
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/report/ReportPlugin.java
2014-11-12 19:36:00 -08:00
Jonathan Williams
1372f74921
Refactored some names in MiniPlugin
...
Work on clans.
2014-11-12 19:21:12 -08:00
CoderTim
d363637015
Achievement bug fixes
2014-11-12 20:56:57 -05:00
Chiss
71a93bead5
Updated punish to be even less confuse.
2014-11-12 09:49:03 +11:00
Chiss
debf8ebcba
fixed chat not being unsilenced when someone picks word
2014-11-11 18:52:00 +11:00
Chiss
c37026e4df
SSM Dom changes
2014-11-11 18:36:32 +11:00
Chiss
a1eff92bbb
fixed achievement kit for sneaky not being accessible
2014-11-11 12:25:36 +11:00
Chiss
d2301337d2
fixed non-charged block toss not having any velocity.
2014-11-10 19:28:36 +11:00
Chiss
d362fb3b1c
fixed punish error
2014-11-10 19:15:56 +11:00
Chiss
0252db5a05
Punish simplification update
2014-11-10 18:40:39 +11:00
Chiss
d6ade5a15b
ensured that exp cannot be given multiple times for a game
2014-11-09 14:43:06 +11:00
Chiss
b65d2f491e
exp gives less for losing
2014-11-09 10:33:50 +11:00
Chiss
2a04ed6eda
losing games no longer gives exp
2014-11-09 10:30:26 +11:00
Chiss
ad933400b9
Sheep Quest update
...
lowered exp on loss
removed Participation exp
2014-11-09 10:06:04 +11:00
Chiss
7e26def6a1
centralised SneakyAssassins module cleanup
2014-11-08 18:40:23 +11:00
Chiss
5ce38c3030
removed final from npcManager
2014-11-08 18:37:18 +11:00
Chiss
c0ec9f92fc
nulled reference too, just to be safe :D
2014-11-08 18:36:05 +11:00
Chiss
2b0befdc13
fixed listener leak in SneakyAssassins
2014-11-08 18:35:34 +11:00
Chiss
fc2bba7eeb
reverted idlemanager stuff for dmt(had already made talking in chat count as action)
2014-11-08 11:08:13 +11:00
Chiss
8c74022996
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-08 11:04:06 +11:00
Chiss
601c1912f5
may have fixed sheep teams not working.
2014-11-08 11:03:53 +11:00
CoderTim
80226a20fa
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-07 18:55:20 -05:00
CoderTim
4c98d833e0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-07 18:33:46 -05:00
Chiss
e286bec777
added a little msg for people in UHC, informing that it will start soon
2014-11-08 10:30:32 +11:00
CoderTim
5b1a185a5f
Fixed Bad Hider achievement
2014-11-07 18:28:28 -05:00
CoderTim
ae35e82e22
Disabled AFK kick in Draw My Thing
2014-11-07 18:28:06 -05:00
Chiss
75c07588a5
UHC wont start for 2 minutes after creation
2014-11-08 10:22:23 +11:00
Chiss
c61ad8907a
set minimum MP level for staff
2014-11-08 09:15:27 +11:00
Chiss
5da0c53997
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-08 08:56:52 +11:00
Chiss
e773d44564
limited max exp so UHC doesnt give you a billion exp.
2014-11-08 08:56:30 +11:00
Jonathan Williams
4ac70281d4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-07 13:54:22 -08:00
Jonathan Williams
3309c0406b
Added ∞ for admin/owners as player level.
...
Fixed customer support issue where it wasn't totaling coins correctly.
Fixed Recharge memory leak.
2014-11-07 13:54:11 -08:00
Chiss
bd730b1e5a
Fixed OITQ not giving wins.
...
Added silence during word selection in DMT
2014-11-08 08:46:26 +11:00
Chiss
c64e4e3b5f
fixed winners/losers for death tag.
2014-11-07 23:35:43 +11:00
Chiss
908a8506a7
fixed broken OITQ kit
2014-11-07 23:21:30 +11:00
Chiss
519e63a1c1
re-unlocked kits for single game ultra chaps.
2014-11-07 23:10:33 +11:00
Chiss
c93862f299
updated player level
...
added /givestat command for owners (must use full string; Global.ExpEarned)
2014-11-07 22:10:41 +11:00
Chiss
9c80103d6e
completely disabled gamehost manager (double safe)
2014-11-07 21:32:44 +11:00
Jonathan Williams
2c098e531a
Added error catching for arcade configuration.
2014-11-07 02:14:34 -08:00
Chiss
fadaa59526
added mineplex level
...
removed ability to go into negative gems as villager morph
2014-11-07 19:20:15 +11:00
Chiss
6ded835ba4
MAC will no longer false positive on people standing blocks from block morph.
2014-11-07 14:14:43 +11:00
Chiss
a67842b504
returned hub to normal
...
removed flaming pumpkins from arcade
2014-11-07 12:54:38 +11:00
Chiss
b7ce12165e
game host stuff
2014-11-07 12:14:33 +11:00
Chiss
4c675cca9c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2014-11-07 11:54:14 +11:00
Chiss
91e0b42de8
Added start of MPS stuff
...
Some new gadgets
2014-11-07 11:52:58 +11:00
Jonathan Williams
f931bd26e6
Updated ServerConfiguration to support resourcepack and Arcade settings.
2014-11-06 00:25:49 -08:00
Jonathan Williams
6f2a6a6ebd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-05 14:45:54 -08:00
Jonathan Williams
1a09c14642
Reverted database connection pooling because it caused severe login delays.
2014-11-05 14:39:22 -08:00
Chiss
f3b9ad8adf
Chatting will reset Idle Timer in games (for DMT)
...
Minor kit changes
2014-11-05 14:46:49 +11:00
Chiss
b00fb0952a
Updated Sheep Quest to be 1.8 comptible.
...
Fixed fissure not working on slabs
Fixed a bug in recharge
Added ability for admins to give other people creative (they lose it when the admin quits)
2014-11-05 11:26:39 +11:00
Chiss
f6df7705b1
- Added 3 kits for DMT
...
- Added achievement kit for OITQ/Sneaky Assassins/DMT
- Fixed stats/achievements not working (Keen Eye, I See You, Incompetence, DMT Wins)
- Various improvements/fixes for Champions
- Nerfed trollability of Digger kit in DE
2014-11-04 19:17:06 +11:00
Chiss
ab62708883
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-03 16:34:20 +11:00
Chiss
20fe69b596
added skills to lore of custom builds
...
fixed skeleton not having enough arrows
2014-11-02 11:09:20 +11: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
Chiss
7f642673bc
fixed deathbomber achievement
2014-11-01 11:25:08 +11:00
Chiss
0095a03df7
returned bridges to normal
2014-11-01 11:11:35 +11: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
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
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
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
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
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
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
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
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
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
727e137cc4
Final HH Update
2014-10-17 12:12:22 +11:00
Chiss
5db2c072a0
Halloween update
2014-10-16 16:27:09 +11:00
Chiss
eb5af41323
Added halloween reward pet
...
minor bug fixes
2014-10-15 15:44:26 +11: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
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
Jonathan Williams
3e92b02bab
Fixed max slot bug with ultra/hero
2014-10-11 05:56:47 -07:00
Chiss
1d3b792ed8
UHC head apple fixes
2014-10-11 23:09:56 +11: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
797dd002ad
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-11 02:43:56 -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
8701f9ddcc
Added TabTitle
...
Converted MineStrike to use scoreboard name hiding
2014-10-09 10:35:54 +11: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
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
Chiss
cda9234ad3
Fixed TimeInGame stat not recording sometimes
2014-10-03 11:17:36 +10: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
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
7892c442d0
Add show mac reports user pref for mod+
2014-09-29 11:14:20 -05:00
Chiss
79e808814a
Minestrike cleans up incendiary at the end of rounds
2014-09-25 20:52:13 +10: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
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
77e21c0d99
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-22 02:53:55 -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
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
96498af626
Fixed parkour bug with gadget blocks.
...
Removed a ton of debug messages with inventory close.
2014-09-19 09:06:42 -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
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
Shaun Bennett
5d643c00d5
treasssssurreeeeees
2014-09-18 21:03:46 -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
Chiss
fed3d31374
MineStrike fixes
2014-09-18 15:44:48 +10: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
8780d5e4ee
MS fixes
2014-09-17 11:18:59 +10:00
Chiss
e6797582f9
Minor fixes
2014-09-17 08:59:09 +10: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
c5ff9da552
Record basic game stats (game type, timestamp, duration, winners, losers)
2014-09-15 23:31:53 -04: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
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
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
Chiss
e36f843feb
Fixed bug in MineStrike
2014-09-13 12:29:35 +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
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
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
Chiss
092e9ba479
Modified UHC borders for release
2014-09-11 17:44:57 +10:00
CoderTim
235cf8cae7
Fixed win stats on solo games
2014-09-09 02:18:20 -04: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
Chiss
347e2b1bf5
Changed FIRE items to Blaze Powder
2014-09-08 10:14:55 +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
Chiss
644d3da050
JOOQ for Eclipse
2014-09-06 11:31:55 +10: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
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
2d5c676e1b
Merge remote-tracking branch 'origin/master'
2014-09-02 18:57:35 -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
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
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
Chiss
2b333859d1
PUUSH
2014-08-30 19:24:04 +10:00
Chiss
3767911718
updated game desc output
2014-08-30 19:07:43 +10: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
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
526ca42add
Fixed Gem booster problem.
...
FIxed stat problem.
2014-08-27 12:48:24 -07: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
Chiss
f25f7d3aa2
Fixed 1v3 achievement not giving achievement if players quit (required 4 at END)
2014-08-27 09:52:33 +10:00
Chiss
5540835052
removed micro debug
...
fixed a bug in achievement output
2014-08-27 09:09:06 +10:00
Chiss
f9ce0d353c
Achievements now need 75%+ players at START of game
2014-08-27 08:57:11 +10: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
Chiss
17649ce36c
Fixed bug where desc for past-completed achievements was still showing
2014-08-26 21:51:59 +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
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
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
28d523d696
Added Achievements
2014-08-26 13:42:42 +10: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
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
Chiss
3ec43f90e8
GameAchievementManager now utilises TaskManager to record whether or not people have previously completed Achievements
2014-08-23 15:04:43 +10:00
CoderTim
4afafe2d51
Some stats fixes
2014-08-22 21:54:08 -04: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
231ef2bbe1
Cosmetic Update
2014-08-23 04:30:41 +10: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
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
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
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
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
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
CoderTim
05686cb584
Work on achievements
2014-08-18 16:41:16 -04:00
Chiss
d8123795aa
changed the way disguises show rank.
2014-08-16 16:33:18 +10:00
Chiss
508ef65fcf
Added missing file
2014-08-16 14:17:15 +10:00
CoderTim
19222c6815
Updated IntelliJ environment to be compatible with latest changes
2014-08-15 15:51:29 -04:00
Chiss
29db90837d
Spleef Update
...
Map parser block stuff
2014-08-15 15:28:50 +10:00
Chiss
85522cddca
Debug (will clean once fixed)
...
Game stats
2014-08-15 09:49:00 +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
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
6039168601
Updated code base to build #1604 spigot
2014-08-13 18:57:37 -05: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
Shaun Bennett
d63137ead2
Merge remote-tracking branch 'origin/master'
2014-08-11 12:44:28 -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
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
3d1ddecffb
Smash Kit fix
...
Gem Booster (dragons) fix
2014-08-09 23:25:13 +10:00
Chiss
cac7f85410
Single game ultra kit unlock
2014-08-09 23:10:40 +10:00
Chiss
23f93e55cf
fixed dragons destroying pregame lobby
2014-08-09 22:59:54 +10:00
Chiss
ff6ea3c798
Added Cosmetics to Arcade
...
Set prices on cosmetics
2014-08-09 19:55:05 +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
Chiss
91a79f0345
Pig Morph
...
Morphs have tags/
2014-08-09 14:57:01 +10: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
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
313f675ae4
Hub Parkour update
...
Smash kit prices
2014-08-09 12:16:37 +10: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
1a33dbb5ee
Achievement Module
...
Gem Booster/Achivement
2014-08-08 13:46:35 +10: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
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
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
CoderTim
8a74b08b0d
Fixed silly mistake I made
2014-08-06 23:59:52 -04: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
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
Chiss
07fe476fd3
fix for stuff that jon broke
2014-08-01 17:45:22 +10:00
Chiss
b6fe33e6fb
Ultra/hero gems removed
2014-08-01 17:03:07 +10: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
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
Jonathan Williams
4d397438be
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-29 21:11:15 -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
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
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
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
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
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
1455b4001f
Parser Update
2014-07-08 15:13:30 -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
cf25bdc44f
Bridges fix being able to break mid chests before gamestart
...
Map parser Updates
2014-07-07 19:04:44 -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
38e4240a61
Fully implemented Sneaky Assassins Power-Ups
2014-07-07 19:10:29 -04:00