5486d8acf6
more prep
2015-12-07 13:42:59 +11:00
54ec0e39bb
more polisshhhh on snowfight
...
enabled xmas chests
2015-12-07 13:25:32 +11:00
cbafb2ba91
fixes
2015-12-07 13:04:45 +11:00
0c397d6a81
simplified kits and intro
2015-12-07 13:02:26 +11:00
b2a595b01b
snwo fight changes
2015-12-07 12:02:53 +11:00
072856be7d
teleportations.
2015-12-06 23:19:53 +01:00
6f16eeead7
missin files
2015-12-07 08:48:55 +11:00
10d26ca32b
timer fixes.
2015-12-06 22:41:04 +01:00
64f8ee7280
fixing some timings.
2015-12-06 21:48:21 +01:00
35c362b8bf
small youtuber perms
2015-12-06 18:08:36 +11:00
d095e14b4c
Merge branch 'monster-league'
2015-12-06 16:33:21 +11:00
9880e9a3c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-06 16:32:59 +11:00
040e94f1fb
bouncy
2015-12-06 16:32:45 +11:00
32a6d572ee
Disable gadgets in arcade for player count > 40
2015-12-05 22:56:15 -05:00
5aabd00972
set hub to christmas
...
removed snowball pickup
disabled arrows sticking into players from ALL projectiles
2015-12-06 14:55:28 +11:00
35534afd4a
overall runtime.
2015-12-04 19:54:02 +01:00
1bb40b21d3
Tutorial/Phase Time.
2015-12-04 19:49:28 +01:00
9951701ded
Added a FixSpawnFacing flag to Game which controls whether or not GameTeam will modify the yaw of a spawn when returning it.
2015-12-03 19:51:11 -05:00
19254fc4a0
Prepare Timer flag.
2015-12-03 18:06:27 +01:00
27f335779a
adding tutorial sounds and flag for it.
2015-12-02 19:39:44 +01:00
7217cd0f33
remove conditions upon death
2015-12-01 10:44:13 +11:00
e2cfcef55b
RunTasksSync Flag.
2015-11-30 16:58:41 +01:00
dc68375ec8
TimeBetweenPhase Flag.
2015-11-29 21:48:39 +01:00
66fd85af1f
Adding Phase Event.
2015-11-28 23:32:09 +01:00
963caae719
Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes'
2015-11-28 16:00:28 +11:00
ad54d28b0d
fixing teleportation issues.
2015-11-27 22:29:29 +01:00
fd0c5cf273
Adding some more flags.
2015-11-27 20:47:57 +01:00
a5ebf9b059
Fixes for release
2015-11-27 05:53:57 -05:00
0b0710458f
Hub updates/try to fix chiss stuff
2015-11-27 03:22:17 -05:00
4e2f48b37e
Merge branch 'master' into clans-beta
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
2015-11-27 19:16:30 +11:00
c74732af39
One more fix.
2015-11-26 16:37:18 +01:00
21f859f579
fixing 2 seconds delay.
2015-11-26 16:26:49 +01:00
a653f053a5
Adding 2 Seconds delay.
2015-11-26 16:12:13 +01:00
eddbde5ebd
Changing length formula.
2015-11-26 16:06:15 +01:00
55ff04ca93
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-11-26 15:49:54 +13:00
3e8a53562e
Add new hologram interaction thingy so holograms can catch interactions that they would normally block
2015-11-26 15:49:28 +13:00
55f5f95869
added no ammo display
2015-11-26 13:05:27 +11:00
65a1441e1f
-Fixed smoke being removed when bomb was planted in it
...
-Fixed being unable to defuse bomb in smoke
-Fixed older smokes removing newer intersecting smokes
-Grenades will still detonate after being burned
-Bizon now gives $600 per kill
-Added replacement smoke on gun fire
-Added shell ejecting particles on gun fire
-Removed gun bobbing when firing
-Changed ammo display location
2015-11-26 12:56:26 +11:00
809faf3098
changing teleport mechanic.
2015-11-26 00:14:15 +01:00
cc75bafb4c
Bugs and thugs
2015-11-25 16:45:04 -05:00
ff5d828dd7
Merge with master, lots of clans fixes/work
2015-11-25 14:50:49 -05:00
84fde1c087
Fixed double jump and entity ground tool.
...
Fixed isGrounded so that it doesn't return false positives when too
close to a wall.
Added 500ms recharge to double jump, preventing instant recharge
allowing players to jump twice before having to touch the ground again.
2015-11-25 16:42:32 +01:00
360f3db2ed
fixed grenade vertical rebound bug
2015-11-25 17:48:32 +11:00
8ceb6ccfca
minestrike update!
2015-11-25 17:41:00 +11:00
95b4ad74e8
fixed silencing and adding possibilty to change text.
2015-11-24 16:23:03 +01:00
913d079623
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-24 15:23:53 +11:00
7454cf7443
MS + Champs bugs, balance and more
2015-11-24 15:23:37 +11:00
66598ce97e
adding teleport flag.
2015-11-23 16:16:33 +01:00
19803a00ab
Added the Wither Assault fixes to it's own Branch
2015-11-22 19:06:24 +01:00
cba5aef9f1
small fix
2015-11-21 18:18:13 +01:00
6a29d2a2d6
adding some getters.
2015-11-21 17:01:17 +01:00
91e40d0e61
hide testing server MOTD
2015-11-21 13:37:19 +11:00
5b8191e57c
fixed kick history stack direction
2015-11-21 11:42:59 +11:00
02d09f2843
fixed slime dying bug
...
removed morphs
2015-11-21 11:37:17 +11:00
9ef99cee20
fixed merge issues
2015-11-21 11:21:54 +11:00
6eb1bef1c6
Merge branch 'master' into minestrike-update
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
2015-11-21 11:09:28 +11:00
87a30513de
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-21 11:08:23 +11:00
4a0cc79abf
fixed silence not working in non-champs servers
2015-11-21 11:08:09 +11:00
8b480cc32b
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-20 18:40:42 -05:00
1274dc860d
- Stuff for chiss
2015-11-20 18:40:20 -05:00
2f91ca5a8a
fixed errors
2015-11-21 10:35:17 +11:00
4a70e4da90
more fixies
2015-11-21 10:34:08 +11:00
4d128d9c7a
fixed some skills and wierd hitbox error
2015-11-21 10:29:48 +11:00
e0885feea6
Merge branch 'master' into alex-ctf
2015-11-21 09:40:07 +11:00
97471b0d9c
Finalizing Game Tutorials.
2015-11-20 23:38:02 +01:00
0bc64fec16
Proxy limit fixes
2015-11-21 09:28:15 +11:00
cfc0aa7d05
reverted to size 2 ball
2015-11-21 08:20:02 +11:00
386032a4f5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-20 06:03:30 -05:00
f51358552a
-B
2015-11-20 05:57:29 -05:00
3067d9f281
final push for the day
2015-11-20 15:22:43 +11:00
ed2f3a064c
MORE ML!
2015-11-20 14:31:01 +11:00
3a5ab3f17c
Merge branch 'master' into monster-league
2015-11-20 11:51:07 +11:00
1cc92cea1b
and the files
2015-11-20 11:50:33 +11:00
c4745c18b6
ML update
2015-11-20 11:50:20 +11:00
e14f5a36bd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-20 08:34:19 +11:00
f33eedf36d
text fix
2015-11-20 08:33:51 +11:00
1eff698a34
Merge pull request #75 in MIN/mineplex from william-global to master
...
* commit 'a11ca138e764417c23a0060dd134ef7c49741295':
ranks
woops easy fix
rawr and fixes
Added the ability to give out game loot.
Reformatting titles
Added GlobalGiveCoins. Changes Gems a little and the manager.
More global stuff! Added GlobalGiveGems.
Global Packet work. Added giveitem sub-command.
2015-11-18 10:15:33 -06:00
e16ee9036a
Added the ability to give out game loot.
2015-11-18 14:35:40 +00:00
a28adc9673
More global stuff! Added GlobalGiveGems.
2015-11-17 18:26:19 +00:00
0f7c52391f
Global Packet work. Added giveitem sub-command.
2015-11-17 08:19:36 +00:00
adfc2f19eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-17 09:20:15 +11:00
46505a8e8e
converted to new res pack locations
2015-11-17 09:19:33 +11:00
208d90c4bc
Fixed getTargetBlock being 0 when its infinite
2015-11-17 10:18:42 +13:00
259397b6ae
READY 2 GO
2015-11-14 12:52:14 +11:00
016e54977d
- Finish game [FINALLY]
2015-11-12 21:16:58 -05:00
9de3981dec
ms update
2015-11-13 11:24:11 +11:00
0b41450603
Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta""
...
This reverts commit 6c17b2926c
2015-11-12 17:51:13 -05:00
6c17b2926c
Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"
...
This reverts commit ce1c09b88f1aef7fe0b9
2015-11-12 16:35:31 -05:00
bc1b185f0e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-12 02:44:54 -05:00
a8b27e66d1
- Finalized game to chiss and sigils' requirements minus flag status in scoreboard, will add next commit
...
- Fixed items ever being lost from treasurechests
2015-11-12 00:06:21 -05:00
ce1c09b88f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
...
Conflicts:
Plugins/.idea/compiler.xml
Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java
Plugins/Libraries/craftbukkit.jar
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java
Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
2015-11-11 19:35:44 +00:00
3ed680e1c2
ms update
2015-11-11 15:55:48 +11:00
d971e3c8a3
ms update
2015-11-11 12:46:58 +11:00
520eb55b88
Merge branch 'master' into minestrike-update
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-11-11 07:43:50 +11:00
b3125e40ff
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-11 07:43:01 +11:00
394d680470
Merge remote-tracking branch 'origin/master' into monster-league
2015-11-10 07:09:19 -08:00
ca1177685f
totally WIP commit
2015-11-10 07:08:08 -08:00
d654f1f4b1
- Fixed class edit in lobbies
...
- Fixed conflict between rave suit and assassin
2015-11-10 06:17:25 -05:00
1a2c163ce2
Fix scoreboard out of bounds error
2015-11-11 00:03:08 +13:00
e165cad50f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-10 04:53:32 -05:00
Cheese
Sarah
Shaun Bennett
Virizion
libraryaddict
Shaun Bennett
xGamingDudex
Morten
AlexTheCoder
William Burns
NewGarbo
fooify