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
Mysticate
5378ece214
Fixed chicken being able to fly..
2015-10-06 21:09:53 -04:00
Mysticate
a0d0590777
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-10-06 21:04:49 -04:00
Shaun Bennett
8fb82507e1
Merge remote-tracking branch 'origin/master'
2015-10-06 12:24:34 -04:00
Shaun Bennett
9cb3f250e2
Remove streak record data until a better solution is done
2015-10-06 12:24:16 -04:00
Cheese
e2e2356b04
stuffs
2015-10-06 13:25:15 +11:00
Mysticate
643f47763e
Improved consistency with the F5 message
2015-10-04 20:28:21 -04:00
Mysticate
0de34c15ab
NO more endercrystal go boom boom yay
2015-10-04 20:23:41 -04:00
Thanos paravantis
9c1ba5f3d1
Changes on bomb error messages after QA recommendations.
2015-10-04 21:23:50 +03:00
Jonathan Williams
0eeea58a01
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-04 11:50:20 -05:00
Jonathan Williams
9f1c4653f4
Fix for Customer support item command with the removal of item categories.
2015-10-04 11:48:16 -05:00
alexmack929
6c73b1a5ac
Start moving i18n into master.
2015-10-04 15:24:58 +01:00
Thanos paravantis
c2518bc6c4
Some additional bug fixes were applied on the previous commit.
...
Water damage by TNT on game lobbies is now patched.
2015-10-04 16:32:34 +03:00
Thanos paravantis
50a8191fcb
Merge branch 'master' into thanos-bug-fixes
2015-10-04 13:27:00 +03:00
Thanos paravantis
026c596de2
Minestrike bug fixes and minor changes
...
- Added a right-click message tip when the player with a bomb tries to place by left clicking.
- Changes in one of the tip messages while in game lobby.
- Moltovs and Incendiaries were not triggered once thrown to the ground.
- Players were able to extinguish grenade fire with a knife.
- The bomb was able to be planted after a round was over.
- On sniper rifles, scope was not removed if the match was ended.
2015-10-04 13:22:12 +03:00
Jonathan Williams
f9ea325da1
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-04 00:24:11 -05:00
Jonathan Williams
80bc493b6f
Merge pull request #67 in MIN/mineplex from thanos-bug-fixes to master
...
* commit '2504493ebc9cc9b0043d7a64f949f2237ba71381':
Fixed four super paintball bugs.
2015-10-04 00:23:23 -05:00
Jonathan Williams
ba17404212
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-04 00:20:52 -05:00
Jonathan Williams
1830705692
Removed ItemCategories to reduce strain on the database with queries that are more complex than they need to be.
...
Increased Firework recharge time.
2015-10-04 00:20:41 -05:00
Thanos paravantis
2504493ebc
Fixed four super paintball bugs.
...
- Projectiles could paint wool in the waiting lobby.
- When players fell in the void, they didn't got killed.
- Players that were painted could take off their armor.
- Players that were painted could logout and the skeleton would still stay there.
2015-10-04 00:34:00 +03:00
Mysticate
a7ab0cd723
ADDED MORE KITS I'M DONE HOORAY LOVE ME @CHISS
2015-10-02 22:43:29 -04:00
Mysticate
c9ff420a79
Now chooses a different maze every game.
2015-10-02 20:43:57 -04:00