JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,457 Commits 1 Branch 0 Tags 481 MiB
365968f41d
Commit Graph

1638 Commits

Author SHA1 Message Date
Cheese
2c43dc76c9 DMT no longer effected by 3s chat delay 
Minestrike no longer has 'terrorists'
Jr.Dev rank up!
 2015-06-20 11:12:24 +10:00
Aaron Brock
61494f93ba Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into bench 2015-06-19 18:13:48 -04:00
Cheese
8a224950b3 Added sale notifications 
Added 3s chat delay
 2015-06-19 13:27:59 +10:00
Aaron Brock
76e4dc6056 Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-18 19:50:06 -04:00
Jeremiah Bishop
dd9e6a6866 Started adding SkyWars game mechanics 2015-06-18 14:54:26 -04:00
Cheese
9a3a014dd5 removed debug! 2015-06-18 12:04:49 +10:00
Aaron Brock
41e77b1ade Fixed double-half-slabs (line 68) 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-17 20:49:35 -04:00
Cheese
6886484d79 Fixed Micro Battles lag (stupid lava) 
cmds for jnr devs
smaller head hitbox in MS
added MB to parser plugin
 2015-06-17 13:02:12 +10:00
Cheese
3014521e79 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-17 10:43:01 +10:00
libraryaddict
b0c026e67c Mineware: Commit what I have, fix DisguiseVillager not extending agable and adding new option to disable auto respawn 2015-06-16 14:01:52 +12:00
Cheese
a141cec104 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-11 08:57:04 +10:00
Cheese
390ffcab6d bridges support for lillypads map 2015-06-11 08:56:32 +10:00
Shaun Bennett
a20f41be09 Merge remote-tracking branch 'origin/master' 2015-06-09 13:21:26 -05:00
Shaun Bennett
3f9010fb7a Fix GameScore comparator 2015-06-09 13:21:15 -05:00
libraryaddict
2971761a5e Game stop command: Move unregister of game listener after the gamestate has been changed 2015-06-09 22:19:03 +12:00
libraryaddict
1f08c989b5 Minestrike: Enforce resource pack 2015-06-09 03:31:24 +12:00
libraryaddict
8cf10afb1b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-06-06 18:31:08 +12:00
libraryaddict
fd3232f45d Mineware: Rename old MineWare and move packages 2015-06-06 18:30:47 +12:00
libraryaddict
ef9c69f356 UtilShapes: Fix a method, add a space in OldMineWare in GameType 2015-06-06 18:08:37 +12:00
libraryaddict
5f2810ae37 SurvivalGames: Fix anyone able to start game 2015-06-06 18:07:55 +12:00
Cheese
f9b49caeed More gems for bridges/sg kills 
Changed Al'Jaha MS name to Bombers
Added Reporting functionality to Builders
Nerfed Iron Hook
Allowed longer AFk during games
 2015-06-05 12:21:20 +10:00
libraryaddict
a961e5f0d5 Wizards: Don't gain wands from stats page 2015-06-02 18:49:50 +12:00
libraryaddict
4d8a54e7ba Wizards: Add spellbook on /spec 2015-06-02 18:49:27 +12:00
libraryaddict
bcdb851e21 Teleport: Don't disqualify staff if they are not alive 2015-06-02 18:48:45 +12:00
libraryaddict
35c005feb8 Game: add isInsideMap(Player) and have border call that on Game.java in order to have games able to define specific borders for players 2015-05-30 10:30:30 +12:00
libraryaddict
092447170e Game Border: Fix typo that offsets border by one block 2015-05-30 10:24:15 +12:00
libraryaddict
ae41f232b0 GameType: Change to reflection for creating game instances 2015-05-30 10:23:46 +12:00
Shaun Bennett
a900a2a70a [Arcade] Another attempt at fixing spectator gui.... :^) 2015-05-26 19:50:01 -05:00
Shaun Bennett
25ba20e411 [Arcade] Fixes for DMT and DT not counting loses properly 2015-05-26 19:28:42 -05:00
libraryaddict
e15e42afae UHC: Expanded from 32 blocks to 36 2015-05-27 02:40:27 +12:00
libraryaddict
b8cd2aaece UHC: Expand anti-build protection from 16 blocks to 32 2015-05-26 11:04:27 +12:00
libraryaddict
c53d52ee42 UHC: Disable gadgets 2015-05-24 20:17:39 +12:00
libraryaddict
21aa97b3b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-24 20:13:43 +12:00
libraryaddict
63e28e25c9 HoleInTheWall: Push the failed game 2015-05-24 20:10:56 +12:00
libraryaddict
0d0d5eea64 Game: Change GameFlagManager to use Game.isInsideMap(), change isInsideMap to treat MaxX,Y,Z with a +1 2015-05-24 20:10:16 +12:00
Jonathan Williams
303cfd02fa Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-17 23:12:27 -07:00
Jonathan Williams
f0c7f2fe76 Merge branch 'MSSQL_Conversion' 
Conflicts:
	Website/LOCWebsite.suo
 2015-05-17 23:11:50 -07:00
Shaun Bennett
c107f4d0d9 [Arcade] Working on private servers 2015-05-17 16:31:09 -05:00
Shaun Bennett
5cd191f582 Merge remote-tracking branch 'origin/master' 2015-05-17 16:29:01 -05:00
Shaun Bennett
1e9abaf002 [Arcade] Add more games to private servers 2015-05-15 23:38:43 -05:00
libraryaddict
f899194e3b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-15 12:23:27 +12:00
libraryaddict
091f98fa9d DrawMyThing: Remove all found words from the checked string when looking for multiple guesses 2015-05-15 12:23:05 +12:00
Shaun Bennett
6b7c52cb87 [Arcade] Add additional hub clock check 2015-05-14 15:17:45 -05:00
Mini-Chiss
d390d83dd1 removed some meh words 2015-05-13 22:35:26 -05:00
Mini-Chiss
f49c2ca546 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-13 22:27:41 -05:00
Mini-Chiss
e68a2775e8 ex p chnage 2015-05-13 22:27:33 -05:00
libraryaddict
67f1e4ad1f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-14 14:29:43 +12:00
libraryaddict
0fc1d680af UHC: Add 20 seconds of invincibility on game start 2015-05-14 14:29:30 +12:00
Mini-Chiss
44cb6d8a62 increased exp more 2015-05-13 17:08:56 -05:00
libraryaddict
4bc38e3396 Arcade: Removed ocean, river and swampland from biome generation for UHC 2015-05-14 09:55:22 +12:00
libraryaddict
c46bdfd2dc Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-14 09:18:51 +12:00
libraryaddict
1b27e84e54 DrawMyThing: Fixed a check being in the wrong brackets 2015-05-14 09:18:35 +12:00
Mini-Chiss
bd58c06017 fixed being able to team with self in UHC 
fixed eventgame admin toggle
 2015-05-13 13:32:20 -05:00
Mini-Chiss
c34cac42ee Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-13 13:20:14 -05:00
Mini-Chiss
c26174ffa2 fixed team name 2015-05-13 13:20:05 -05:00
libraryaddict
938386bf77 Wizards: Removed chainmail loot, added gold armor instead 2015-05-13 19:14:40 +12:00
libraryaddict
20aeccb3be Wizards: Lowered ice shards max level to 3, removed damage from web shot 2015-05-13 14:04:19 +12:00
libraryaddict
744c867990 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-13 13:19:09 +12:00
libraryaddict
d2e37df4ca DrawMyThing: Prevented all multiple guesses, not just when it contains an accurate word 2015-05-13 13:18:54 +12:00
libraryaddict
a75aab7f98 DrawMyThing: Added more words, fixed the multiple guesses prevention never firing. 2015-05-13 13:15:53 +12:00
libraryaddict
03c384e7e6 Wizards: Remove boat from loot, fix napalm typo 2015-05-13 10:04:05 +12:00
Mini-Chiss
e1dd3a318e UHC!!!!! 2015-05-12 15:52:19 -05:00
Shaun Bennett
32338cfce4 [MB] More words for update 2015-05-12 17:25:37 -05:00
Shaun Bennett
bdfffa3a4c Merge remote-tracking branch 'origin/master' 2015-05-12 17:14:57 -05:00
Shaun Bennett
26db4fa269 [MB] Add more build themes 2015-05-12 16:15:44 -05:00
Mini-Chiss
2928c73767 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-12 14:46:30 -05:00
Mini-Chiss
e13e735246 UHC updates! 2015-05-12 14:46:21 -05:00
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