Commit Graph

2014 Commits

Author SHA1 Message Date
Mysticate
3eb36a6581 Prevented farming 2015-10-11 22:43:21 -04:00
Mysticate
b6d573a4d5 Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 2015-10-11 22:25:25 -04:00
Mysticate
7a4ccdf680 Bug fixes 2015-10-11 22:17:34 -04:00
Mysticate
dda65b4c77 Fixed tnt exploding lobbies 2015-10-11 19:56:36 -04:00
Mysticate
606937d227 Fixed flashbang glitch 2015-10-11 09:42:36 -04:00
Cheese
cb9e8f8e0b pumpkin smasher achievement 2015-10-11 14:48:02 +11:00
Mysticate
435e74225a Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 2015-10-10 23:35:33 -04:00
Mysticate
83d1e011fc Changes. 2015-10-10 23:33:54 -04:00
Cheese
8b75664627 queued holiday transactions 2015-10-11 12:54:35 +11:00
Cheese
6860fa608a titan placeholder perks
art
fixed pumpkin gem count
2015-10-11 11:26:09 +11:00
Mysticate
5a8e500ec0 Fixed another thing 2015-10-10 16:15:10 -04:00
Mysticate
5e7ddb968e Changes and bug fixes. 2015-10-10 15:54:18 -04:00
Cheese
da6b1316d3 removed pumpkins from MPS 2015-10-10 22:47:19 +11:00
Cheese
6f14c75f70 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-10 19:28:26 +11:00
Cheese
6cf786eb8c Merge branch 'Myst_HALLOWEEN' 2015-10-10 19:28:08 +11:00
Cheese
1026a2ae22 fixed explosions 2015-10-10 19:27:54 +11:00
Shaun Bennett
a242c6b592 Halloween Update finishes 2015-10-10 03:23:37 -04:00
Cheese
7bc3b4970b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java
2015-10-10 17:34:17 +11:00
Mysticate
7851cb451a Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
2015-10-09 22:34:05 -04:00
Shaun Bennett
aa9fd1abf3 Titan giveaway work 2015-10-09 22:14:10 -04:00
Cheese
02c6eccfda Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
2015-10-10 10:36:42 +11:00
Cheese
7dbd9da582 dragon sale Bar 2015-10-10 10:35:48 +11:00
Shaun Bennett
97ef4a4252 Pushing titan giveaway stuff for laptop 2015-10-09 18:23:47 -04:00
Mysticate
ff1431b652 Fixed players glitching to chests before game starts. 2015-10-09 10:21:35 -04:00
Cheese
c03c8163c5 fixed exploision stuff 2015-10-09 14:01:58 +11:00
Mysticate
90d0fcb36d Merge branch 'Myst_HALLOWEEN' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into Myst_HALLOWEEN 2015-10-08 22:53:45 -04:00
Mysticate
598ea84e7a Fixed explosions and cleaned up. 2015-10-08 22:52:57 -04:00
Cheese
d18353e592 Merge branch 'Myst_HALLOWEEN' of ssh://184.154.0.242:7999/min/Mineplex into Myst_HALLOWEEN
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
2015-10-09 13:44:41 +11:00
Cheese
41678eaf35 fixed scoreboard bug 2015-10-09 13:42:37 +11:00
Mysticate
1011c36c43 Fixed lobby being destroyed. 2015-10-08 22:41:45 -04:00
Mysticate
96f14f4fda Fixed kit item names. 2015-10-08 22:31:20 -04:00
Mysticate
3802d47a37 Made the thing bold. 2015-10-08 22:29:22 -04:00
Mysticate
082b16fe0d Stuff and things to help make mounts be cool. 2015-10-08 22:28:07 -04:00
Cheese
a234fbce1e Merge branch 'Myst_HALLOWEEN' 2015-10-09 12:17:57 +11:00
Mysticate
ed31bf9886 Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 2015-10-08 21:16:24 -04:00
Mysticate
9254ca9162 K reverted + fixed bug 2015-10-08 21:12:38 -04:00
Cheese
483ab13c2b workaround for error where accountid is never set 2015-10-09 12:04:35 +11:00
Mysticate
2cace7419f Made Destructor sexi 2015-10-08 20:42:29 -04:00
Mysticate
92bab25a3f Fixed Gust void stealing. 2015-10-08 20:38:33 -04:00
Mysticate
b8597d7161 Paintball stats. 2015-10-08 20:37:26 -04:00
Mysticate
97d6f8fb42 Fixed placing walls in water. 2015-10-08 19:10:19 -04:00
Mysticate
8f826f6e83 Fixed blocks falling into floor in Build. 2015-10-08 19:04:51 -04:00
Mysticate
30e3c56635 Fixed ground issues in BUILD. 2015-10-08 18:58:30 -04:00
Mysticate
46bf963d44 Fixes not being able to reload dropped guns w/ 0 ammo. 2015-10-08 18:56:23 -04:00
Mysticate
979e68dcc7 Fixed the Minestrike multiple grenades bug. 2015-10-08 18:41:40 -04:00
Mysticate
ef62fb5adf Made it so that when played on an MPS, HH won't give items. Yay! 2015-10-07 22:57:30 -04:00
Mysticate
8a8591ae7f Merge branch 'master' of
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
Myst_HALLOWEEN

Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/mount/MountManager.java
2015-10-07 22:19:10 -04:00
Mysticate
e864e0867a Adds mount spider and fixes a BH bug. 2015-10-07 21:47:10 -04:00
Cheese
3c437925f1 halloween prep 2015-10-08 12:36:00 +11:00
Cheese
191392825f Merge branch 'Myst_EVO' 2015-10-08 12:07:21 +11:00