Cheese
2decc049c5
fixed my muddling of perks
2015-12-09 07:47:07 +11:00
Christopher Jozsa
0b8e0409b6
Merge pull request #92 in MIN/mineplex from update-SSM to master
...
* commit '504a49278cb7e140029e4c2ceb85f3defe524a33':
SSM kit description change, grammar mistake
SSM Pig bomb bug fix
2015-12-08 14:29:32 -06:00
Shaun Bennett
ca71f1f64f
Merge remote-tracking branch 'origin/master'
2015-12-08 14:32:17 -05:00
William Burns
d598f83ec0
More progress
2015-12-08 18:17:43 +00:00
Teddy
504a49278c
SSM kit description change, grammar mistake
2015-12-08 16:35:49 +00:00
William Burns
f8f95c64e5
Fixing arena moving
2015-12-08 15:10:29 +00:00
William Burns
4e2a422f27
Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java
2015-12-08 13:13:18 +00:00
William Burns
2b12016e14
Progress
2015-12-08 13:12:30 +00:00
Shaun Bennett
addb2c8c0e
Fix java 8 compiler issue
2015-12-08 08:02:40 -05:00
William Burns
e6d995008e
Arenas
2015-12-08 10:44:24 +00:00
Shaun Bennett
42a0354c9e
Now Playing, Preference to disable ads
2015-12-07 18:28:05 -05:00
William Burns
43192317ad
Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-07 23:20:21 +00:00
William Burns
55f0453897
Start of re-write
2015-12-07 23:20:03 +00:00
Sarah
0619fb857f
fixing invisibility.
2015-12-07 23:44:02 +01:00
Shaun Bennett
7984c0ac31
Add !
2015-12-07 06:12:49 -05:00
Cheese
a39b11ce67
slowed meteors
2015-12-07 21:56:00 +11:00
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
Sarah
072856be7d
teleportations.
2015-12-06 23:19:53 +01:00
Cheese
6f16eeead7
missin files
2015-12-07 08:48:55 +11:00
Sarah
10d26ca32b
timer fixes.
2015-12-06 22:41:04 +01:00
Sarah
64f8ee7280
fixing some timings.
2015-12-06 21:48:21 +01: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
Sarah
35534afd4a
overall runtime.
2015-12-04 19:54:02 +01:00
Sarah
1bb40b21d3
Tutorial/Phase Time.
2015-12-04 19:49:28 +01: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
fooify
91aaf5f2fb
world's smallest bugfix - admin->co-host
2015-12-03 16:45:30 -08:00
fooify
348f2d8e4c
Merge remote-tracking branch 'origin/master' into foo
2015-12-03 16:31:16 -08:00
Sarah
19254fc4a0
Prepare Timer flag.
2015-12-03 18:06:27 +01:00
Sarah
27f335779a
adding tutorial sounds and flag for it.
2015-12-02 19:39:44 +01:00
fooify
06ef964000
removed important debug thing
2015-11-30 19:33:03 -08:00
fooify
ed96c8e3b3
fixed ssm enderman always facing south on teleport
2015-11-30 19:27:34 -08:00
Cheese
7217cd0f33
remove conditions upon death
2015-12-01 10:44:13 +11:00
Sarah
e2cfcef55b
RunTasksSync Flag.
2015-11-30 16:58:41 +01:00
Sarah
dc68375ec8
TimeBetweenPhase Flag.
2015-11-29 21:48:39 +01:00
Sarah
66fd85af1f
Adding Phase Event.
2015-11-28 23:32:09 +01:00
fooify
8cdae7ce1a
Merge remote-tracking branch 'origin/master' into foo
2015-11-28 09:33:47 -08:00
fooify
0dff0ffe1d
fixed bacon blast exloding blocks
...
fixed sg compass pointing to teammates
2015-11-28 09:32:54 -08:00
Cheese
963caae719
Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes'
2015-11-28 16:00:28 +11:00
Sarah
ad54d28b0d
fixing teleportation issues.
2015-11-27 22:29:29 +01:00
Sarah
fd0c5cf273
Adding some more flags.
2015-11-27 20:47:57 +01: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
Sarah
c74732af39
One more fix.
2015-11-26 16:37:18 +01:00
Sarah
21f859f579
fixing 2 seconds delay.
2015-11-26 16:26:49 +01:00
Sarah
a653f053a5
Adding 2 Seconds delay.
2015-11-26 16:12:13 +01:00
Sarah
eddbde5ebd
Changing length formula.
2015-11-26 16:06:15 +01: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
Sarah
809faf3098
changing teleport mechanic.
2015-11-26 00:14:15 +01: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
Sarah
95b4ad74e8
fixed silencing and adding possibilty to change text.
2015-11-24 16:23:03 +01: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
fooify
f300fd2c98
Merge remote-tracking branch 'origin/master' into foo
2015-11-23 15:34:27 -08:00
Sarah
66598ce97e
adding teleport flag.
2015-11-23 16:16:33 +01:00
Morten
19803a00ab
Added the Wither Assault fixes to it's own Branch
2015-11-22 19:06:24 +01:00
Sarah
cba5aef9f1
small fix
2015-11-21 18:18:13 +01:00
Sarah
6a29d2a2d6
adding some getters.
2015-11-21 17:01:17 +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
AlexTheCoder
1274dc860d
- Stuff for chiss
2015-11-20 18:40:20 -05:00
Cheese
2f91ca5a8a
fixed errors
2015-11-21 10:35:17 +11:00
Cheese
4a70e4da90
more fixies
2015-11-21 10:34:08 +11:00
Cheese
4d128d9c7a
fixed some skills and wierd hitbox error
2015-11-21 10:29:48 +11:00
Cheese
e0885feea6
Merge branch 'master' into alex-ctf
2015-11-21 09:40:07 +11:00
Sarah
97471b0d9c
Finalizing Game Tutorials.
2015-11-20 23:38:02 +01:00
