Commit Graph

3751 Commits

Author SHA1 Message Date
Mini-Chiss 2b240f3dfa removed visdata debug 2015-07-25 17:16:20 +02:00
Mini-Chiss dffde68982 fixed bug
removed debug
2015-07-25 17:11:02 +02:00
Mini-Chiss 7c7b166b4d reduced particles a little 2015-07-25 16:05:12 +02:00
Mini-Chiss aebd3eeb4f Merge branch 'Myst_LOBBERS' of ssh://184.154.0.242:7999/min/mineplex into Myst_LOBBERS 2015-07-25 15:56:23 +02:00
Mysticate 9feac87a15 Fixed not being able to buy Armorer. Lowered view distance on particles. 2015-07-25 09:51:23 -04:00
William Burns 65ea7b99ab Merge remote-tracking branch 'origin/master' 2015-07-25 13:06:23 +01:00
William Burns 91d0a37d77 Animation change etc. 2015-07-25 12:48:39 +01:00
Mini-Chiss d64d713a87 Merge branch 'Myst_LOBBERS' 2015-07-25 10:50:55 +02:00
Mini-Chiss 9fa8c6ac45 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
2015-07-25 10:48:06 +02:00
Jonathan Williams 6d367e3cee Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-25 01:38:54 -07:00
Jonathan Williams d3fede790a Merge pull request #17 in MIN/mineplex from MinorTweaks to master
* commit '335eb5eacdcf9d837af48445d9fa9a59b4ef986a':
  Fixed report link
  http://pastebin.com/BRhT7pZP
  Reverted things
  Reverted Trainee to Helper due to popular demand.
  LOTS of tweaks :D
  Cleaned up somethings (lib's request)
  I'm a dumbass
  Fixed a few achievements
  Changed mineplex.com/supporthub > mineplex.com/reports
2015-07-25 03:37:28 -05:00
Jonathan Williams a1ce1ed45d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-25 01:31:01 -07:00
Mysticate ae5c74680c SMALL CHANGE OMG DON'T MERGE WITH MASTER YET PELASE 2015-07-25 04:30:56 -04:00
Jonathan Williams 84be48f264 Updated MiniDbClientPlugin to include accountId in the processLoginResultSet method.
Added conversion of stats to new stat table via StatHandler.

Changed stats value from int to long.
2015-07-25 01:30:50 -07:00
Mini-Chiss 59d14624c0 Merge branch 'Myst_LOBBERS' 2015-07-25 10:26:47 +02:00
Mysticate d295cead09 Final stuff 2015-07-25 04:18:18 -04:00
Mysticate a002da4c0f Redid how lobbers works 2015-07-25 03:21:56 -04:00
Mysticate 5d87d9e1e4 . 2015-07-25 02:01:55 -04:00
William Burns c1e5c2a9dc MPS changed requested by <insert meow here>. 2015-07-24 21:15:19 +01:00
William Burns 956d685549 Added MPS Game Voting. 2015-07-24 20:24:21 +01:00
William Burns 13fa6bca8b Make it go back to game choose page. 2015-07-24 16:24:17 +01:00
William Burns dcb6e0ec59 Added rejected games and whitelist to MPS. 2015-07-24 16:03:53 +01:00
Sarah a50455acf5 Fising last character bug. 2015-07-24 15:44:36 +02:00
Sarah c3742ec794 Fixing the too long String bug. 2015-07-24 15:00:49 +02:00
Sarah 609199a6b8 Improving Team names in Team games. 2015-07-24 13:14:41 +02:00
Mysticate 7205065a56 Merge branch 'master' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into Myst_KITS 2015-07-23 17:47:33 -04:00
Mysticate 9a3c4f3a00 Added Ninja Kit to OITQ. New Achievement kit. 2015-07-23 17:46:10 -04:00
Mysticate 365968f41d Added a bomb token thing 2015-07-23 16:26:43 -04:00
Mysticate 335eb5eacd Fixed report link 2015-07-23 13:35:06 -04:00
Mysticate 06d4de16cf Changed particle methods 2015-07-23 13:34:11 -04:00
William Burns 5deb699b02 Added rejected games and whitelist to MPS. 2015-07-23 18:24:41 +01:00
Mini-Chiss 71148ef387 gave twitch same perms as youtubers 2015-07-23 16:29:42 +02:00
Mysticate 91db076053 Fixed lobbers icon in stats 2015-07-23 09:28:35 -04:00
William Burns 68b04574b6 Merge remote-tracking branch 'origin/master' 2015-07-23 13:04:19 +01:00
Sarah de1ed4ca59 Improving the Event System with ShinyRukii's requests. 2015-07-23 12:06:40 +02:00
Ben Sihota fe80ed373a Fix numerous trello bugs
- Stacker as Block morph
- Punish mistake
- Achievement mistake
- Stacking a chest opener
2015-07-22 22:28:44 -07:00
Mysticate e4ecc9e858 http://pastebin.com/BRhT7pZP 2015-07-22 23:31:07 -04:00
Mysticate e638674444 Fixed fuse on detonator 2015-07-22 20:17:19 -04:00
Ben Sihota a2f6a8cbd3 Merge remote-tracking branch 'origin/master' 2015-07-22 15:38:55 -07:00
Mysticate b9762bddc4 Fixes 2015-07-22 16:50:57 -04:00
libraryaddict eff71c3e17 Champions: Add Morten G's changes to fix BlockToss 2015-07-22 08:10:57 +12:00
Mysticate b4df9f47c5 Added a mortar kit ;o (Please don't fire me b2) 2015-07-21 11:01:45 -04:00
Mysticate d38fc1a603 Reverted things 2015-07-20 16:40:37 -04:00
Mysticate e55ca81d48 Reverted Trainee to Helper due to popular demand. 2015-07-20 15:45:16 -04:00
Morten b239f0af28 Fixed some bugs with the Editor kit 2015-07-20 20:40:43 +02:00
Mysticate 6addf00037 LOTS of tweaks :D 2015-07-20 14:27:10 -04:00
Mysticate 63df369700 Cleaned up somethings (lib's request) 2015-07-20 10:18:50 -04:00
Mysticate bb769aa0f4 I'm a dumbass 2015-07-20 10:02:50 -04:00
Mysticate 87cc40fc0c Fixed a few achievements 2015-07-19 22:38:03 -04:00
Mysticate 8b2b4c2826 Added to MPS 2015-07-19 15:51:34 -04:00