AlexTheCoder
3ee6c5c7c8
- Fix Merge Error
2015-09-23 13:25:41 -04:00
AlexTheCoder
c709980db3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-09-23 13:08:25 -04:00
Cheese
119dc8ab52
changed name of method
2015-09-12 15:01:18 +10:00
Sarah
5c0ada3df6
Implementing RequiredRank file and command.
2015-09-12 06:39:40 +02:00
AlexTheCoder
6fefcbd953
Kit Changes/Fixes:
...
- Fixed Kit Mobs not opening guis in Champions games
- Fixed Abilities not working in CTF
- Added new event when a player attempts to choose a kit
- Cancelled changing kit while holding a flag
2015-08-30 17:13:08 -04:00
Mysticate
ebd3fbe6d5
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-28 20:19:27 -06:00
Jonathan Williams
e9b33668bc
Added donorsOnline to MinecraftServer snapshot
...
Refactored Rank class to use lowercase methods.
2015-08-28 13:22:04 -07:00
libraryaddict
ba41118da7
Load boss battles properly
2015-08-25 01:58:57 +12:00
Mini-Chiss
1487692609
completely disabled team armor in arcade. avoids typing it just as game starts.
2015-08-13 12:57:30 +02:00
Mini-Chiss
f3b58fe9b6
disabled team armor command in games D:
2015-08-13 12:51:57 +02:00
Sarah
be699558f1
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-12 08:38:18 +02:00
Sarah
af19754bcd
Implementing Carl to Arcade.
2015-08-12 08:37:54 +02:00
Sarah
2c30d20cb1
changing OP method, setHost permissions and /e command.
2015-08-11 09:26:01 +02:00
Sarah
d457e3a955
changing the setOP Event.
2015-08-11 08:36:39 +02:00
Sarah
0d70fb6b96
removing deop of Admins and adding OP condition to setHost.
2015-08-09 16:55:10 +02:00
Mysticate
a9350bfacd
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-07 11:58:53 -04:00
Mini-Chiss
afc41c8831
converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity
2015-08-02 11:50:26 +02:00
Mysticate
53a3a29cd2
Extreme revisions. Cheers!
2015-07-31 00:50:32 -06:00
Mini-Chiss
52844d7b80
Merge branch 'EventGameUpdates'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
2015-07-29 16:41:35 +02:00
Mini-Chiss
932fe197b4
Merge branch 'perm-changes'
...
Conflicts:
Plugins/.idea/encodings.xml
reverted it.
2015-07-29 14:06:21 +02:00
Mini-Chiss
b42be044ae
whtielisted MPS will be hidden from GUI
2015-07-29 13:20:20 +02:00
Ben Sihota
0b53bca385
Needed permission changes for Jr Developers (Pending approval)
2015-07-26 18:58:35 -07:00
Jonathan Williams
d3fede790a
Merge pull request #17 in MIN/mineplex from MinorTweaks to master
...
* commit '335eb5eacdcf9d837af48445d9fa9a59b4ef986a':
Fixed report link
http://pastebin.com/BRhT7pZP
Reverted things
Reverted Trainee to Helper due to popular demand.
LOTS of tweaks :D
Cleaned up somethings (lib's request)
I'm a dumbass
Fixed a few achievements
Changed mineplex.com/supporthub > mineplex.com/reports
2015-07-25 03:37:28 -05:00
Mini-Chiss
71148ef387
gave twitch same perms as youtubers
2015-07-23 16:29:42 +02:00
Sarah
de1ed4ca59
Improving the Event System with ShinyRukii's requests.
2015-07-23 12:06:40 +02:00
Mysticate
e4ecc9e858
http://pastebin.com/BRhT7pZP
2015-07-22 23:31:07 -04:00
Mysticate
d38fc1a603
Reverted things
2015-07-20 16:40:37 -04:00
Mysticate
6addf00037
LOTS of tweaks :D
2015-07-20 14:27:10 -04:00
Jeremiah Bishop
a05c2d085d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars
2015-06-21 16:17:51 -04:00
Jonathan Williams
91b5beaff2
Fixed new Chat constructor requirement.
2015-06-20 03:43:38 -05:00
Cheese
8a224950b3
Added sale notifications
...
Added 3s chat delay
2015-06-19 13:27:59 +10:00
Jeremiah Bishop
dd9e6a6866
Started adding SkyWars game mechanics
2015-06-18 14:54:26 -04:00
libraryaddict
ae41f232b0
GameType: Change to reflection for creating game instances
2015-05-30 10:23:46 +12:00
Jonathan Williams
f0c7f2fe76
Merge branch 'MSSQL_Conversion'
...
Conflicts:
Website/LOCWebsite.suo
2015-05-17 23:11:50 -07:00
Mini-Chiss
e13e735246
UHC updates!
2015-05-12 14:46:21 -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
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
libraryaddict
b58bef1bd8
ResourcePack: Lengthen timeout from 10 seconds to 20 seconds
2015-05-04 04:13:23 +12:00
libraryaddict
08140f8863
ResourcePack: Resource pack refused now links to a forum guide
2015-05-03 08:10:25 +12:00
libraryaddict
b136be0d47
ResourcePack: Removed code that demanded a enum and changed to boolean
2015-05-02 03:03:53 +12:00
libraryaddict
93a25d5a67
ResourcePack: Fixed links and declined message
2015-05-01 21:26:42 +12: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
Jonathan Williams
d161d62773
Added chat filtering to private messages.
2015-04-30 23:56:08 -05: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
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
Cheese
9b2c4662c3
fixed minestrike bug where newly joined specs could buy/drop items
...
removed easter baskets
2015-04-11 11:25:25 +10: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
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
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
43c58bd31c
removed april fools from arcade :(
2015-04-01 20:22:13 +11:00
Cheese
ed35d2a992
April Fools update
2015-04-01 16:56:13 +11:00
Cheese
4a25265c7c
Added utility methods to check for players within a sight pyramid
2015-03-25 17:13:22 +11:00
libraryaddict
52f0941fb9
Add resourcepack options
2015-03-17 23:59:24 +13: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
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
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
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
CoderTim
0bf6866ad7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-23 20:56:34 -05:00
libraryaddict
56e03221ad
Improve party system
2015-02-24 13:03:51 +13:00
CoderTim
44f453c56e
Updated jOOQ and database tables
2015-02-18 18:51:36 -05:00
Shaun Bennett
a5f7050e40
Remove arcade repository stuff
2015-02-13 07:33:50 -05:00
Mini-Chiss
884df48695
disguise command (not yet working fully)
2015-02-10 19:08:54 +13:00
Chiss
f80e640d34
Map Parser voxel update
...
Disabled spec GUI in bridges
other minor changes
2015-01-26 11:23:08 +11: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
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
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
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
ec8e1f0546
more MPS stuff
...
fixed bridges exploit
2014-12-22 16:31:13 +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
d7eb01e8f0
fixed CC Bug :D
2014-12-15 15:49:52 +11:00
Chiss
9136165d4f
fixed christmas elf name
...
pet names now have limited range
2014-12-15 12:24:40 +11:00
Chiss
3f24325c3c
removed +50% player limit for CC
2014-12-12 21:23:01 +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
Jonathan Williams
e7cf4eb51d
Removed use of Gem Boosters
...
Cleaned up some unused imports.
2014-12-01 02:27:39 -08: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
3ae27ccc55
Store PacketHandler so that games can use it
2014-11-27 01:08:41 +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
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
