Cheese
|
d99c64e45d
|
fixed merge error
|
2015-10-10 10:37:20 +11: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
|
ba36ff565d
|
Merge remote-tracking branch 'origin/master'
|
2015-10-09 18:23:55 -04:00 |
|
Shaun Bennett
|
97ef4a4252
|
Pushing titan giveaway stuff for laptop
|
2015-10-09 18:23:47 -04:00 |
|
Jonathan Williams
|
586cc6e3e0
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-09 09:40:58 -06:00 |
|
Mysticate
|
ff1431b652
|
Fixed players glitching to chests before game starts.
|
2015-10-09 10:21:35 -04:00 |
|
Cheese
|
ff42e05a8d
|
Merge branch 'Myst_HALLOWEEN'
|
2015-10-09 14:20:58 +11:00 |
|
Cheese
|
99fd88473b
|
rank colors
|
2015-10-09 14:20:02 +11:00 |
|
Mysticate
|
fb4d08931c
|
Spider mount improvements.
|
2015-10-08 23:18:37 -04:00 |
|
Cheese
|
d9dd471db6
|
removed annoying debug
|
2015-10-09 14:04:12 +11: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
|
54c76c9d9c
|
fixed text
|
2015-10-09 12:27:30 +11: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
|
24568a40f3
|
Merge branch 'Myst_HALLOWEEN'
|
2015-10-09 12:05:24 +11:00 |
|
Cheese
|
483ab13c2b
|
workaround for error where accountid is never set
|
2015-10-09 12:04:35 +11:00 |
|
Cheese
|
17ba04348d
|
stats debug
|
2015-10-09 11:53:08 +11:00 |
|
Mysticate
|
84cbee4535
|
Fixed it again
|
2015-10-08 20:52:17 -04:00 |
|
Mysticate
|
145832b326
|
Fixed mounts bc chiss is bad
|
2015-10-08 20:50:39 -04:00 |
|
Cheese
|
21dc0dc962
|
Merge branch 'Myst_HALLOWEEN'
|
2015-10-09 11:47:20 +11:00 |
|
Cheese
|
ec5694737c
|
statsmanager debug
rank fix
|
2015-10-09 11:44:12 +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
|
cdb9741438
|
Changed the SG icon in hub, fixed EULA breaking thing in Class Shop
|
2015-10-08 20:36:16 -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
|
668454f156
|
Fixed things
|
2015-10-07 22:10:57 -04:00 |
|
Mysticate
|
f2485854ef
|
Improved spider.
|
2015-10-07 22:06:57 -04:00 |
|
Mysticate
|
70f3ccf703
|
Fixed spider morph
|
2015-10-07 21:53:23 -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 |
|
Cheese
|
f28d83cbd7
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-08 12:05:51 +11:00 |
|
Cheese
|
c94184c5ae
|
reduced number of falling blocks in skywars by 80%
added halloween horror mount
|
2015-10-08 12:04:28 +11:00 |
|