JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,716 Commits 1 Branch 0 Tags 481 MiB
6a3d888f5b
Commit Graph

1365 Commits

Author SHA1 Message Date
Sarah
6a3d888f5b fix git 2015-08-06 08:44:16 +02:00
Sarah
16a8164030 Fixing last bugs and disabling coin bombs while diguised. 2015-08-06 08:42:09 +02:00
Sarah
a15e8e1b95 Fixing more /disguise bugs. 2015-08-05 15:23:16 +02:00
Sarah
83da6b7a9a Improving the /disguise command even more. ;D 2015-08-05 13:32:05 +02:00
Sarah
e55557e1fd Improving the /disguise command. 2015-08-05 07:57:52 +02:00
Mini-Chiss
2f571aed25 fixed bugs from my vel fixes, WHOOPS. normalisation :( 2015-08-03 18:19:31 +02:00
Jonathan Williams
a623cc16ce Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-03 09:37:12 -05:00
Mini-Chiss
e10d26dae1 reduced respawn time in OITQ 
removed respawn msg for short respawn times
 2015-08-03 16:18:59 +02:00
Mini-Chiss
ccdb859f11 lowered mythical change a little :) 2015-08-03 16:11:11 +02:00
Jonathan Williams
ab20d35917 Wipe personal server groups on restart of monitor. 
Cleanup of unused code.
 2015-08-03 08:08:51 -05:00
Mini-Chiss
7c028ae936 fixed skywars teams icon in MPS 2015-08-03 11:44:13 +02:00
Mini-Chiss
bb2e15c4fd made it so games can set another game as its 'kit source' so games can share kit unlocks 2015-08-03 11:38:16 +02:00
Mini-Chiss
a87b3a9284 fixed kits not sharing for team vers 2015-08-03 10:10:29 +02:00
Shaun Bennett
38cc318387 Update JOOQ, downcast BigInteger to Long in stats for now 2015-08-02 19:36:24 -05:00
Jonathan Williams
a2250ea343 Fix for blocking logins if redis can't add account cache. 2015-08-02 18:59:13 -05:00
Jonathan Williams
41189b9838 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-02 17:23:17 -05:00
Ty Sayers
70c1b883db Fix bug with NPC server shops not properly calling the central method used for intervening and auto-joining. Also add in base for team/solo separation for specific server groups. 2015-08-02 18:20:52 -04:00
Jonathan Williams
d3ba621e86 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-02 17:00:49 -05:00
Mini-Chiss
638406254b refactored a little so theres no data stored in the util 2015-08-02 12:07:00 +02:00
Mini-Chiss
afc41c8831 converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity 2015-08-02 11:50:26 +02:00
Mini-Chiss
ac4755a5a9 Fixed incorrect velocity 2015-08-02 11:24:34 +02:00
Mini-Chiss
7910170327 fixed achievemnt amount 2015-08-01 18:39:18 +02:00
Jonathan Williams
992c0fc36f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-01 01:12:24 -05:00
Jonathan Williams
d3c5d0cbe6 Only store account cache stuff for 6 hours. 
Update MOtd.
 2015-08-01 01:12:01 -05:00
Mini-Chiss
b2a567673c disabled sale msg 
added double gem weekend
 2015-07-31 09:53:52 +02:00
Mini-Chiss
8d7c42134b fixed mounts having nametags 2015-07-30 14:54:23 +02:00
Mini-Chiss
0cf333ec00 lowered win req 2015-07-30 14:12:17 +02:00
Mini-Chiss
97a144150b fixed an NPE that was causing games not to end in MS 2015-07-29 21:51:18 +02:00
Mini-Chiss
862cdae14f team modes 2015-07-29 16:32:11 +02:00
Mini-Chiss
c9c3db70f3 Merge branch 'SSM2PlayerTeams' 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-07-29 14:08:17 +02:00
Mini-Chiss
932fe197b4 Merge branch 'perm-changes' 
Conflicts:
	Plugins/.idea/encodings.xml
reverted it.
 2015-07-29 14:06:21 +02:00
Mini-Chiss
c3e07522b4 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-29 12:22:11 +02:00
Ben Sihota
5af68e5628 Fulfill Shaun's request 2015-07-28 23:55:27 -07:00
Jonathan Williams
10549601f8 Merge pull request #21 in MIN/mineplex from Myst_LOBBERS to master 
* commit 'd0a45461d07904f70b5e42dee391f69843fb3978':
  Fixed bug with direct hit
  Final tweaks. this is as good as it's goign to get! ;d
  Tweaks
  Fixed waller achievement thing
  Fixed waller kit bc I was stupid before ;c
  Added an exception for a map to make it night.
  Various improvements.
  Added an achievement, removed team one, touched up another. Swag.
 2015-07-29 00:15:41 -05:00
Ben Sihota
e4da4aa0ed Remove NPC commands 2015-07-28 10:14:25 -07:00
Christopher Jozsa
c2cb86087a Merge pull request #22 in MIN/mineplex from horus-bug-fixes to master 
* commit '02f1211ddb7688737dc66605c174167cce708d0e':
  Misc
  Fix numerous trello bugs
  Update IntelliJ builds
 2015-07-28 02:24:15 -05:00
Mini-Chiss
0557e10257 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-27 15:53:57 +02:00
Mini-Chiss
0c4a7a847f fixed annoying color bug! 2015-07-27 15:53:39 +02:00
Ben Sihota
7d9fd61c8e Display changes 2015-07-26 22:31:40 -07:00
Ben Sihota
0b53bca385 Needed permission changes for Jr Developers (Pending approval) 2015-07-26 18:58:35 -07:00
Ben Sihota
47d410370d Merge branch 'horus-bug-fixes' 2015-07-26 18:20:39 -07:00
Ben Sihota
02f1211ddb Misc 2015-07-26 18:12:56 -07:00
Mini-Chiss
8fd3a3a838 Merge branch 'Myst_LOBBERS' 2015-07-26 18:31:55 +02:00
Mini-Chiss
e0b1567e54 Merge branch 'Myst_LOBBERS' of ssh://184.154.0.242:7999/min/mineplex into Myst_LOBBERS 2015-07-26 18:31:11 +02:00
Jonathan Williams
727427165f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-26 08:49:49 -07:00
Jonathan Williams
26ed7ebb94 Fixes to redis 
Fixes for stat handler.
 2015-07-26 08:49:35 -07:00
Mysticate
0fd59e9fdb Added an achievement, removed team one, touched up another. Swag. 2015-07-25 21:50:37 -04:00
Mini-Chiss
2b240f3dfa removed visdata debug 2015-07-25 17:16:20 +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