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

1856 Commits

Author SHA1 Message Date
fooify d2cc8d5077 fix grammar bug 2015-06-30 09:19:21 -07:00
fooify 11fb02a594 add stained glass to list of blocks that can be broken in quiver 2015-06-30 09:03:43 -07:00
Cheese de36e3d8e4 added WATER_DAMAGE support for maps 
modified some bridges code
 2015-07-01 00:18:06 +10:00
Cheese e3d060376b disabled double gem 2015-06-30 13:10:08 +10:00
fooify 4ff456b722 Merge remote-tracking branch 'origin/master' into foo 2015-06-29 11:29:22 -07:00
Cheese 48f5fa118a fixed a few sky bugs 2015-06-29 14:26:00 +10:00
Cheese b0f8369bcd lowered block falling speed. 
fixed a bug where some chests didnt fall
 2015-06-29 10:09:36 +10:00
Cheese ead402d026 skywars art 2015-06-28 14:31:25 +10:00
Cheese 08e4ef199e added twitch to dguisecmd 2015-06-28 12:53:18 +10:00
Cheese faca14dd23 fixed disguise permission 2015-06-28 12:50:27 +10:00
Cheese 840ebabf2a added delay on mad scientist eggSpawn 
fixed Exp bug
 2015-06-27 20:39:05 +10:00
Cheese 1f34bc40a3 increased time you can hold TNT for in CS 2015-06-27 14:08:16 +10:00
Cheese 4c164ce2a6 enabled double gems 2015-06-27 12:44:43 +10:00
Cheese d0368a19d8 Players who quit early do not get full game worth of EXP. 2015-06-27 12:38:04 +10:00
Cheese 754026f403 chicken teleport fix 
scientist minion name fix
 2015-06-27 12:18:12 +10:00
Cheese 4183d6f21d some balance 2015-06-27 11:40:40 +10:00
Cheese 4e06a1aae3 fixed a few skywars bugs 
improved warning for bridges
 2015-06-27 11:24:01 +10:00
fooify 4b634d1bc3 Fix slashes (this won't affect windows users, right?) 2015-06-26 10:14:37 -07:00
fooify 333c54cff9 Merge branch 'master' into foo 2015-06-26 10:07:13 -07:00
Cheese 9a0ac821a2 fixed stat bug 2015-06-26 19:44:13 +10:00
Cheese 750769d03a fixed gem thing 2015-06-26 19:12:34 +10:00
Cheese 62a7fd6a99 you now get levels for kills/assists 
fixed scoreboard bug
 2015-06-26 19:12:11 +10:00
Cheese b0019242e7 skywars scoreboard fix 2015-06-26 19:02:34 +10:00
Jonathan Williams 8c427bee24 Fix _gameDisplay bug. 
Fix Skywars quickmenu link.
 2015-06-26 03:57:39 -05:00
Jonathan Williams 8f2c0cf9d8 Fix file names. 2015-06-26 03:15:16 -05:00
Cheese 1aa0832bb9 SkyWars to Skywars 2015-06-26 17:55:49 +10:00
Cheese 9bf58a2d98 disabled pistons 2015-06-26 17:47:04 +10:00
Cheese 1564a8bc51 disabled hoppers 2015-06-26 17:46:05 +10:00
Shaun Bennett 2657ef336a Merge remote-tracking branch 'origin/master' 2015-06-26 02:33:00 -05:00
Shaun Bennett 60901cc17e Merge remote-tracking branch 'origin/master' 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
 2015-06-26 02:32:51 -05:00
Cheese c31d3609bb soup no longer spawns in stacks 2015-06-26 17:32:46 +10:00
Shaun Bennett 7c698f65cf Quick Menu, and Stats adjustments for SkyWars. Updated Private server page to show game icon instead of player heads 2015-06-26 02:31:35 -05:00
Cheese a5aa2bc0e9 text changes 2015-06-26 17:28:23 +10:00
Cheese c514cacd5d more skywars fixes 2015-06-26 17:05:29 +10:00
Cheese 027efe02fc skywars! 2015-06-26 16:38:44 +10:00
Cheese 257c088948 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 16:08:17 +10:00
Cheese b744320ecc pearl trail fix 2015-06-26 16:08:04 +10:00
Cheese 16af8453e3 pearl fix 2015-06-26 16:04:07 +10:00
Cheese 338797f4a6 skywars update 2015-06-26 15:57:47 +10:00
Cheese aef8a00017 update! 2015-06-26 15:25:43 +10:00
Cheese 8f3d0ad84b fixed some bugs :O 2015-06-26 14:38:39 +10:00
Cheese 0874178973 skywars update! 2015-06-26 14:14:22 +10:00
Cheese 2d1d65b239 skywars fixes 2015-06-26 13:15:03 +10:00
fooify 7f7edddf42 Fix TNT bug in SG - tested, works fine! :) 2015-06-25 19:36:31 -07:00
Cheese 5710831777 fixed webs dropping webs 2015-06-26 12:34:26 +10:00
Cheese 7d4e36651f less random chests 2015-06-26 12:26:57 +10:00
Cheese fdbaa4e9c7 dont allow overfill 2015-06-26 12:18:25 +10:00
Cheese f1da68a82a fixed chickens not spawning 2015-06-26 12:14:35 +10:00
Cheese 00da27a3d6 added middle chests 
added chicken spawns
added zombie/chicken loot
 2015-06-26 12:06:40 +10:00
Cheese beb78270e5 skywars loot changes 2015-06-26 11:54:35 +10:00
Cheese bb569a26e2 skywars update 2015-06-26 11:22:33 +10:00
Cheese b48820a753 ore gen fixed! 2015-06-26 10:50:38 +10:00
Cheese d9a8d2b6ab ore changes 2015-06-26 10:36:45 +10:00
Jeremiah Bishop 0342a5ac61 Fixed Achievements 
Reordered Kits
Added new Kit
etc, etc, etc...
 2015-06-25 19:03:25 -04:00
Cheese 2179795677 Merge branch 'SkyWars' of ssh://184.154.0.242:7999/min/Mineplex into SkyWars 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SkyWars.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
 2015-06-25 20:48:34 +10:00
Cheese 2bf1faa70d fixed a few skywars bugs 
added ore generation (but theres some wierd bug, still working on it)
 2015-06-25 20:24:31 +10:00
Jonathan Williams 5bdb90b459 Changed disguise perm to YOUTUBE 2015-06-25 04:57:56 -05:00
Jeremiah Bishop ed667fedee Added more achievements 2015-06-24 22:59:28 -04:00
Jeremiah Bishop cd10a2ad79 Fixed both kits 
Added game achievements.
 2015-06-24 20:08:31 -04:00
Jeremiah Bishop 5b4a3249ca Added chest loot and such. 2015-06-22 21:42:45 -04:00
Jeremiah Bishop 03c45116ef Various fixes, and added the new data to Zoologist kit 2015-06-21 23:38:25 -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
Jeremiah Bishop e12ff7ef7d Fixed? 2015-06-20 22:20:30 -04:00
Jeremiah Bishop 3cf1297d89 Added SkyWars ;) 2015-06-20 22:08:15 -04:00
Jonathan Williams 91b5beaff2 Fixed new Chat constructor requirement. 2015-06-20 03:43:38 -05:00
Aaron Brock 8ea23f96fc Froze time using doDayNightCycle instead of setting the time on UpdateEvent. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 01:36:05 -04:00
Aaron Brock 1f0accd2a1 Fixed a little boolean derp that stopped people from breaking blocks. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 01:09:21 -04:00
Cheese 478a3c8591 some champs fixes/balance 
duplicate message improvement
 2015-06-20 15:00:16 +10:00
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
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