Commit Graph

2369 Commits

Author SHA1 Message Date
Cheese
d318a5cf87 interacto! 2015-12-07 21:53:34 +11:00
Cheese
e1efcabfbf chat sale msgs 2015-12-07 20:39:31 +11:00
Cheese
7b11baf24b Christmas sale bossbars 2015-12-07 20:20:49 +11:00
Cheese
8c4615203c sale message 2015-12-07 20:07:20 +11:00
Cheese
ed3bea8e85 DONE! 2015-12-07 18:36:05 +11:00
Cheese
5c632a1e3a sharper target 2015-12-07 18:20:12 +11:00
Cheese
1a0d90a495 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-07 18:06:43 +11:00
Cheese
fea637db80 fixed some freeze 2015-12-07 18:06:26 +11:00
Shaun Bennett
ecde1dd314 Merge remote-tracking branch 'origin/master' 2015-12-07 02:06:09 -05:00
Shaun Bennett
44a5bcb793 remove titan chest message, update pumkin message, holiday MB/DMT words 2015-12-07 02:06:00 -05:00
Cheese
d75d7a2c8f snowfight finish 2015-12-07 17:56:35 +11:00
Cheese
1ada06af91 rewrote lots! 2015-12-07 17:36:45 +11:00
Cheese
5486d8acf6 more prep 2015-12-07 13:42:59 +11:00
Cheese
54ec0e39bb more polisshhhh on snowfight
enabled xmas chests
2015-12-07 13:25:32 +11:00
Cheese
cbafb2ba91 fixes 2015-12-07 13:04:45 +11:00
Cheese
0c397d6a81 simplified kits and intro 2015-12-07 13:02:26 +11:00
Cheese
b2a595b01b snwo fight changes 2015-12-07 12:02:53 +11:00
Cheese
6f16eeead7 missin files 2015-12-07 08:48:55 +11:00
Cheese
35c362b8bf small youtuber perms 2015-12-06 18:08:36 +11:00
Cheese
d095e14b4c Merge branch 'monster-league' 2015-12-06 16:33:21 +11:00
Cheese
9880e9a3c7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-06 16:32:59 +11:00
Cheese
040e94f1fb bouncy 2015-12-06 16:32:45 +11:00
Shaun Bennett
32a6d572ee Disable gadgets in arcade for player count > 40 2015-12-05 22:56:15 -05:00
Cheese
5aabd00972 set hub to christmas
removed snowball pickup
disabled arrows sticking into players from ALL projectiles
2015-12-06 14:55:28 +11:00
Virizion
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
Cheese
7217cd0f33 remove conditions upon death 2015-12-01 10:44:13 +11:00
Cheese
963caae719 Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes' 2015-11-28 16:00:28 +11:00
Shaun Bennett
a5ebf9b059 Fixes for release 2015-11-27 05:53:57 -05:00
Shaun Bennett
0b0710458f Hub updates/try to fix chiss stuff 2015-11-27 03:22:17 -05:00
Cheese
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
libraryaddict
55ff04ca93 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-11-26 15:49:54 +13:00
libraryaddict
3e8a53562e Add new hologram interaction thingy so holograms can catch interactions that they would normally block 2015-11-26 15:49:28 +13:00
Cheese
55f5f95869 added no ammo display 2015-11-26 13:05:27 +11:00
Cheese
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
Shaun Bennett
cc75bafb4c Bugs and thugs 2015-11-25 16:45:04 -05:00
Shaun Bennett
ff5d828dd7 Merge with master, lots of clans fixes/work 2015-11-25 14:50:49 -05:00
xGamingDudex
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
Cheese
360f3db2ed fixed grenade vertical rebound bug 2015-11-25 17:48:32 +11:00
Cheese
8ceb6ccfca minestrike update! 2015-11-25 17:41:00 +11:00
Cheese
913d079623 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-24 15:23:53 +11:00
Cheese
7454cf7443 MS + Champs bugs, balance and more 2015-11-24 15:23:37 +11:00
Morten
19803a00ab Added the Wither Assault fixes to it's own Branch 2015-11-22 19:06:24 +01:00
Cheese
91e40d0e61 hide testing server MOTD 2015-11-21 13:37:19 +11:00
Cheese
5b8191e57c fixed kick history stack direction 2015-11-21 11:42:59 +11:00
Cheese
02d09f2843 fixed slime dying bug
removed morphs
2015-11-21 11:37:17 +11:00
Cheese
9ef99cee20 fixed merge issues 2015-11-21 11:21:54 +11:00
Cheese
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
Cheese
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
Cheese
4a0cc79abf fixed silence not working in non-champs servers 2015-11-21 11:08:09 +11:00
AlexTheCoder
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