Commit Graph

149 Commits

Author SHA1 Message Date
TadahTech 36f2873e15 Map Parser update. 2016-07-18 19:00:11 -05:00
xGamingDudex f550df5a4b Initial game commit. 2016-05-24 13:31:59 +02:00
William Burns 9a8c410448 Fix lore being null. 2016-02-25 15:39:18 +00:00
William Burns 009d48659b Add commands for naming items. 2016-02-25 15:29:47 +00:00
Shaun Bennett f72ee95759 Merge pull request #139 in MIN/mineplex from virizion_speed_builder to develop
* commit 'b6db99806ab171774ffd9c9db11cf361ad76dc94': (83 commits)
  Remove debug message.
  Fix flickering judge laser.
  Borders for spec are fixed.
  Leaves fix.
  Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket.
  Make dependable require 50 perfect builds instead of 10.
  Multiply by less
  negative!
  Trying different hologram location
  Fix messages, fix /stats
  Center hologram
  Make achievement category classics
  hologram changes
  Holograms maybe?
  Chiss' checklist.
  Remove unnecessary tabs. Make the judge guardian use it's own laser again.
  Fixed builds with only mobs not loading.
  Fixed mobs.
  TICK TICK TICK TICK.
  all players equal, no one loses
  ...
2016-01-28 21:02:23 -06:00
Cheese c1ff7f4fc2 all players equal, no one loses 2016-01-23 19:32:23 +11:00
md_5 bb4091c7a6 Use Maven for Compilation 2016-01-20 11:20:58 +11:00
libraryaddict e7213fdb7e Remove project specific settings 2015-12-13 16:41:37 +13:00
Cheese d095e14b4c Merge branch 'monster-league' 2015-12-06 16:33:21 +11:00
Cheese 98d988584d titan cosmetics 2015-11-27 13:35:25 +11:00
Cheese 7454cf7443 MS + Champs bugs, balance and more 2015-11-24 15:23:37 +11:00
Cheese 3a5ab3f17c Merge branch 'master' into monster-league 2015-11-20 11:51:07 +11:00
Cheese 259397b6ae READY 2 GO 2015-11-14 12:52:14 +11:00
fooify 394d680470 Merge remote-tracking branch 'origin/master' into monster-league 2015-11-10 07:09:19 -08:00
fooify ca1177685f totally WIP commit 2015-11-10 07:08:08 -08:00
libraryaddict 3de906ab19 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
2015-11-03 14:57:25 +13:00
Cheese cdb0fcae75 modified hideme a little :) 2015-11-02 14:37:12 +11:00
libraryaddict f71cb80bd0 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
2015-10-16 22:26:07 +13:00
libraryaddict dab258dcdd Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
	Plugins/Libraries/BungeeCord.jar
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
	Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
2015-10-12 16:22:52 +13:00
Mysticate 20dd9c683b Merge remote-tracking branch 'origin/master' into monster-maze
Conflicts:
	Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java

Changed the scoreboard a bit, added it to MPS.
2015-10-11 10:52:45 -04:00
Cheese 6860fa608a titan placeholder perks
art
fixed pumpkin gem count
2015-10-11 11:26:09 +11:00
Mysticate 9350386361 Lots of things. :D 2015-09-26 15:08:43 -04:00
fooify 0581474a16 lots of work on Monster Maze 2015-09-18 08:25:11 -07:00
fooify 55ac104e2c took forever to get it working, but the maze parsing works! :) 2015-09-12 09:50:06 -07:00
fooify a47022d242 Merge remote-tracking branch 'origin/master' into monster-maze 2015-08-17 14:54:19 -07:00
Mini-Chiss 4f163af909 fixed a uid problem with maps 2015-08-12 18:36:29 +02:00
Mini-Chiss b974fcf838 map parser fixes 2015-08-09 00:09:26 +02:00
Mini-Chiss 33c96f51ae fixed some stuff 2015-08-07 22:59:50 +02:00
Mini-Chiss b22706e649 hub update part 1 2015-08-07 21:45:38 +02:00
fooify 519449e015 lots of stuff (: 2015-08-01 11:42:32 -07:00
fooify 6c39c08abf some progress on snow sprint 2015-07-30 11:59:04 -07:00
Shaun Bennett da3500cc32 Merge remote-tracking branch 'remotes/origin/master' into MC_1.8
# Conflicts:
#	Plugins/Libraries/craftbukkit.jar
#	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
#	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
#	Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseLiving.java
#	Plugins/Mineplex.Core/src/mineplex/core/map/BlockMap.java
#	Plugins/Mineplex.Core/src/mineplex/core/memory/MemoryFix.java
#	Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
#	Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java
#	Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
2015-07-27 19:39:18 -05:00
Cheese 1e26ebe0bd disabled ice forming 2015-07-02 10:09:39 +10:00
fooify 4b634d1bc3 Fix slashes (this won't affect windows users, right?) 2015-06-26 10:14:37 -07:00
Cheese 1aa0832bb9 SkyWars to Skywars 2015-06-26 17:55:49 +10:00
Cheese 648355ac17 mapparser skywars 2015-06-22 11:33:25 +10: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
Shaun Bennett ed0db983f8 More work on 1.8 update 2015-04-23 08:28:19 -04:00
Cheese ff0883e7d7 fixed easter egg duration
parser list improvement
2015-04-03 21:47:43 +11:00
Cheese 420c4e7229 More work on Event game 2015-03-16 13:39:33 +11:00
Cheese 683f86bd89 event server fixes and parser gamtypes 2015-03-07 11:13:17 +11:00
libraryaddict c09a23f2bc Save MapParser's new world spawn location to 0,0 on creation 2015-03-02 03:45:26 +13:00
libraryaddict 9802c00ec5 Add /spawn and /setspawn commands to MapParser 2015-02-26 21:40:09 +13:00
Shaun Bennett 58eaaaa2ee Treasure fixes 2015-02-10 21:15:44 -05:00
Mini-Chiss 26463ba75d Treasure changes :O 2015-02-09 20:24:20 +13:00
Chiss 6a269cc03b More SSM Changes 2015-01-30 11:08:23 +11:00
Chiss 7f4bcd1210 Smash Update
new scoreboard (not implemented yet)
reward changes
2015-01-29 11:54:59 +11:00
Chiss 290e4d69df map parser update 2015-01-27 13:59:28 +11:00
Chiss 19208de075 mroe map parser ^_^ 2015-01-26 11:53:48 +11:00
Chiss 90573903da added new gametypes for parser 2015-01-26 11:33:47 +11:00
Chiss b98950b121 map parser visual changes 2015-01-26 11:31:42 +11:00
Chiss f80e640d34 Map Parser voxel update
Disabled spec GUI in bridges
other minor changes
2015-01-26 11:23:08 +11:00
libraryaddict b4b8b307b0 Rename Wizard Battles to Wizards 2015-01-25 18:50:45 +13:00
libraryaddict 9b574de541 Current wizards 2015-01-18 21:23:49 +13:00
Chiss db8e0484ab missing files + new pet 2014-12-10 18:23:22 +11:00
Chiss 0d78433bd2 updated mapparser
buffed withers a little
2014-11-21 10:36:41 +11:00
Chiss 8ab0116a27 initial push of Wither Assault 2014-11-14 14:14:31 +11:00
Chiss 519e63a1c1 re-unlocked kits for single game ultra chaps. 2014-11-07 23:10:33 +11: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 c2bb53c887 Halloween pumpkins
Minestrike balance
bug fixes
2014-10-23 14:05:35 +11:00
Chiss 075bc0af1d Added gem rewards for MS achievements 2014-10-17 21:20:04 +11:00
Shaun Bennett ec81e9f511 Merge remote-tracking branch 'origin/master'
Conflicts:
	Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
2014-10-16 17:51:32 -05:00
Shaun Bennett 5cdd502d11 Auto backups for MapParser. (Only tested on mac) 2014-10-15 15:04:44 -05:00
Chiss b83b0e61e6 fixed long lines in achievements
added night to halloween maps in parser
2014-10-15 16:57:25 +11:00
Shaun Bennett efa03945cb Delete the MapParser zip file from root directory after copied 2014-09-23 17:05:21 -05:00
Chiss 1943dbeaab Removing PermissionsEx dependency for MapParser 2014-09-09 10:52:51 +10:00
Chiss 3f5cff3e21 Killing cheaters for a few things in bridges 2014-08-24 16:45:47 +10:00
Shaun Bennett f60a818e6a Update craftbukkit to remove the extra _INVALID mappings 2014-08-19 21:22:04 -05:00
Chiss 65c880b300 Parser changes 2014-08-20 12:06:24 +10:00
Chiss 2ffcfb7737 Parser changes 2014-08-20 11:02:12 +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
Shaun Bennett e1a57a673e Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors 2014-08-19 16:58:55 -05:00
Shaun Bennett 6793deffd0 Copy Command
Small Fixes
Single Imports IntellIJ config
2014-08-16 20:17:21 -05:00
Shaun Bennett b6c31294c7 Parse map properly, bug fixes 2014-08-16 16:19:33 -05:00
Shaun Bennett e286a45de8 Code cleanup for spawn location, remove JoinCommand 2014-08-16 16:01:00 -05:00
Shaun Bennett 18e1265afd Remove join list, adjust intellij import style to be more like eclipse 2014-08-16 15:55:29 -05:00
Shaun Bennett eac0f9fd6a MapParser refactoring/changes 2014-08-16 15:50:33 -05:00
Shaun Bennett ef6871491d Add MapParser IntellIj configurations 2014-08-16 12:12:59 -05:00
Chiss 29db90837d Spleef Update
Map parser block stuff
2014-08-15 15:28:50 +10:00
Chiss c647e6b48d Missing morphs
Bacon brawl knockback increase over time
Parse color error fix
2014-08-07 09:47:11 +10:00
Chiss 248111749f Sneaky Changes 2014-08-06 17:14:07 +10:00
Chiss c8dfb2f02e Parser Fixes
Sneaky Stuff
2014-08-06 11:07:49 +10:00
Chiss 107388baa3 Added game flag to allow clicking in inventory during games 2014-07-26 17:03:03 +10:00
Mini-Chiss 03c56535ef MAPDATA 2014-07-08 18:08:37 -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 2e5b003cff More work on internet status stuff.
Fixed some buggies with parser.
2014-07-08 13:18:27 -07:00
Mini-Chiss 848f843fbf Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.MapParser/src/mineplex/mapparser/WorldManager.java
2014-07-08 12:41:25 -07:00
Mini-Chiss 22709b0cd8 merge 2014-07-08 12:40:28 -07:00
Jonathan Williams 39b2ad57be Fix for map parser zipping. 2014-07-08 12:37:39 -07:00
Mini-Chiss 65e7e1e0b3 Parser 2014-07-08 12:18:43 -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 62f6ea815d Champs Balance Update
Map Parser Update
2014-07-07 16:23:55 -07:00
Mini-Chiss c65712c260 UHC fixes
Sneaky Assassin listener leak fix
Some map parser stuffs.
2014-07-04 23:04:46 -07:00
Jonathan Williams 681dfc5f7c Added ability to copy in schematics from build server.
Added in gametype checking on parse.
2014-06-26 12:09:29 -07:00
Jonathan Williams 57c52cb9c8 Improved MapParser to allow world loading/saving for immediate testing. 2014-06-25 20:53:28 -07:00
Chiss 9a79d0ede7 Fixed CME
Gadget cost fix
MapParser fix
2014-06-15 15:10:19 +10:00
Chiss bac071e084 Map Parser 2014-06-15 10:12:08 +10:00