Commit Graph

2874 Commits

Author SHA1 Message Date
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
Jonathan Williams 3e17638bf0 Customer support re-add Dooskee. 2015-03-17 16:22:18 -07:00
Cheese ee237c9f5b re-enabled SG in gamefactory 2015-03-17 22:20:40 +11:00
libraryaddict 5718df4fb5 Merge pull request #14 in MIN/mineplex from SurvivalGames to master
* commit '1f0e204eb30599e711eaddc12fac5956dc0677b5':
  Update SurvivalGames
  Allow disabling of game start sounds, and changing of the game PrepareTime.
  SG kit fletcher no longer can pickup fletched arrows
  Remove SG wolf pet on quit
  Add new loot classes to manage loot
  Change wizards spells to use conditions for potion effects
  Don't allow people holding gold ingots to deal a lot of damage
  Update disguises for 1.8, add sleeping ability to player disguises
  Add border packet and resource pack status packet. Add ability to listen to incoming packet Use Entity
  No longer need to constantly set the durability of items in the sheep game
  Add relative teleports to /teleport command
  Add Wither to ConditionFactory
  Fixed GameScoreboard demanding strings are shortened to 15 chars when the max is 16
  Formatted SpellType, fixed lightning spell description
  Change UtilPlayer.sendPacket(Packet) to UtilPlayer.sendPacket(Packet...)
  Fixed UtilTime for displaying decimals when trimmed
  Change Blood to unstackable items
  Add method getEntityById to UtilEnt
2015-03-17 06:11:54 -05: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 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 ec30269a14 Add new loot classes to manage loot 2015-03-17 18:08:47 +13:00
libraryaddict 41469b198a Change wizards spells to use conditions for potion effects 2015-03-17 18:07:43 +13:00
libraryaddict 03d77abed3 Don't allow people holding gold ingots to deal a lot of damage 2015-03-17 17:49:10 +13:00
libraryaddict 921deb5270 Update disguises for 1.8, add sleeping ability to player disguises 2015-03-17 17:48:29 +13:00
libraryaddict 65a9073c69 Add border packet and resource pack status packet. Add ability to listen to incoming packet Use Entity 2015-03-17 17:42:16 +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 44e887ec61 fixed give command to properly assign item data 2015-03-17 12:06:41 +11:00
Cheese 28c683a37a fixed display for effects 2015-03-16 15:16:17 +11:00
Cheese b3320d7cbe Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-16 15:01:48 +11:00
Cheese c941c383e7 fixed hosts not being able to use creative inventroy 2015-03-16 15:01:35 +11:00
Jonathan Williams 2dade32499 Added support for creating Event servers. 2015-03-15 20:50:54 -07:00
Jonathan Williams 8a027872aa Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-15 20:50:14 -07: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 4581f49948 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-16 13:39:54 +11:00
Cheese 420c4e7229 More work on Event game 2015-03-16 13:39:33 +11:00
Jonathan Williams d1bc6e4567 Updated EnjinTranslator. 2015-03-15 19:30:37 -07:00
Jonathan Williams eca5651d83 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-15 19:29:06 -07:00
Jonathan Williams 4d557cb392 Code to improve stat recording, commented out for now. 2015-03-15 19:28:58 -07:00
Jonathan Williams de780ae2f0 Some geolocation call test code. 2015-03-15 19:28:38 -07:00