Commit Graph

186 Commits

Author SHA1 Message Date
Mini-Chiss
5fa9135b08 renamed soccer to slimeball :) 2015-08-13 14:11:22 +02:00
Mini-Chiss
534c91c706 remove items from inside soccer 2015-08-13 13:24:55 +02:00
Jonathan Williams
a308244966 Merge pull request #29 in MIN/mineplex from foo to master
* commit '07bdbdde46e2a9e7b49f4e8606c9068a0534c18d': (22 commits)
  minor grammar issue
  remove duplicate method
  manually updating something
  *crosses fingers* please work!
  please work...
  Freezes the time using doDayLightCycle instead of using a UpdateEvent.
  Fixed double-half-slabs (line 68)
  remove custom level to fix merge conflicts
  squirrel!
  fix getting snowballs from bedrock
  add jnr_dev to updaterank
  fix this agaaaaain
  FOOIFY IS A NOOB OKAY
  fix concurrentmodificationexception
  fix turfforts bug
  prevent STATIONARY_LAVA from breaking in creeper smash
  fix creeper smash exploding lava and bedrock
  fix spleef lava issue
  ishh also wanted this :P (let me know if I should remove it)
  ishh wanted it...k
  ...
2015-08-13 01:49:00 -05:00
Mini-Chiss
fcfb2559b8 players cannot grab slime :O 2015-08-12 14:41:33 +02:00
Mini-Chiss
d1302e8dc3 fixed full msg 2015-08-12 12:42:59 +02:00
Mini-Chiss
5293e24469 fixed text 2015-08-12 11:58:40 +02:00
Mini-Chiss
cd5c7e7110 fixed kb 2015-08-12 11:23:19 +02:00
Mini-Chiss
f19efb4a93 renamed football to soccer 2015-08-12 09:23:00 +02:00
fooify
10f979772b Merge remote-tracking branch 'origin/master' into foo 2015-08-11 09:51:13 -07:00
Mini-Chiss
bd2c9aa5e6 hub stuff 2015-08-10 14:00:02 +02:00
Mini-Chiss
5a7de8ef3d hub fixes 2015-08-09 17:21:56 +02:00
Mini-Chiss
cbb0cb96c8 ensured white 2015-08-08 13:54:35 +02:00
Mini-Chiss
e030331565 fixed some bugs 2015-08-08 13:51:37 +02:00
Mini-Chiss
fa7f19bde5 removed debug 2015-08-08 13:47:30 +02:00
Mini-Chiss
328c31de88 hub Update
fixed bad gameid
2015-08-08 13:47:09 +02:00
Mini-Chiss
eab7aa59f2 hub update! 2015-08-08 09:27:49 +02:00
Mini-Chiss
47cb98066d Hub fixes 2015-08-08 08:19:07 +02:00
Mini-Chiss
33c96f51ae fixed some stuff 2015-08-07 22:59:50 +02:00
Mini-Chiss
b22706e649 hub update part 1 2015-08-07 21:45:38 +02:00
Mini-Chiss
2f571aed25 fixed bugs from my vel fixes, WHOOPS. normalisation :( 2015-08-03 18:19:31 +02:00
Mini-Chiss
72c473ad6b removed annoying mineplex thing from subtext in news 2015-08-03 09:51:10 +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
fooify
b623f025ff manually updating something 2015-07-29 14:31:11 -07:00
fooify
db5c5a9888 *crosses fingers* please work! 2015-07-29 14:12:52 -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
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
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
Cheese
e36b0440a4 Merge branch 'bench'
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
	Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
	Plugins/Mineplex.StaffServer/.classpath
2015-07-08 13:55:01 +10:00
Cheese
2963f7a61c stacker wont give too many msgs 2015-06-29 10:13:33 +10:00
Jonathan Williams
c78ef9d93d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 02:30:01 -05:00
Cheese
015ba53bbe skywars hub text 2015-06-26 16:39:25 +10:00
Jonathan Williams
86e2514e37 Fixed callbacks for gem/coin rewards. 2015-06-26 01:13:28 -05:00
Aaron Brock
da981980df Added world.setThundering(false);
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-20 01:35:11 -04:00
Aaron Brock
b0ca5ca4aa Freezes the time using doDayLightCycle instead of using a UpdateEvent.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-17 20:54:28 -04:00
Jonathan Williams
f0c7f2fe76 Merge branch 'MSSQL_Conversion'
Conflicts:
	Website/LOCWebsite.suo
2015-05-17 23:11:50 -07:00
Mini-Chiss
f9735006b8 removed hub uhc hourly announcements 2015-05-13 00:05:00 -05:00
Jonathan Williams
b1a46d0f0d Converted TaskManager 2015-05-11 01:21:27 -07:00
Mini-Chiss
4f4aeac12c fixed typo 2015-05-03 23:34:09 -05:00
Mini-Chiss
e013f8af8a sky text for hub change 2015-05-03 19:49:16 -05:00
Mini-Chiss
40d56c3500 Converted all code to updated UtilParticle methods
/suicide
2015-05-03 16:37:00 -05:00
Cheese
c79432c8b9 Fixed projectile hitboxes and specific values 2015-04-04 10:54:03 +11:00
Cheese
ff0883e7d7 fixed easter egg duration
parser list improvement
2015-04-03 21:47:43 +11:00
Cheese
ed35d2a992 April Fools update 2015-04-01 16:56:13 +11:00
Jonathan Williams
f4061854cd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-25 15:11:17 -07:00
Jonathan Williams
6472194d44 Optimized queries to retrieve and update player information by removing inner join calls on the account.
Added account id retrieval on login.
Added account id caching in redis.
2015-03-25 15:10:59 -07:00
Jonathan Williams
09fe3ad6a8 NewsManager : Reduced dynamic string generation every time news changes 2015-03-25 15:04:00 -07:00
Cheese
5fded981d9 Timings for Visibility 2015-03-23 16:38:17 +11:00
Cheese
28b3828007 slowed hub invis update 2015-03-20 23:48:17 +11:00
Cheese
c5d48a82a3 Fixed invisibility bug 2015-03-13 11:34:45 +11:00