Commit Graph

3205 Commits

Author SHA1 Message Date
libraryaddict
0751876622 Wizards: Do a null check and event is cancelled check on damage 2015-05-09 14:12:46 +12:00
Shaun Bennett
ef86f8bb6f merge 2015-05-08 12:22:58 -05:00
Shaun Bennett
bca162588f Fix Achievement page bugs (layout needs to be reviewed by chiss) 2015-05-08 02:27:53 -05:00
libraryaddict
689ca94c57 Wizards: Nerf rainbow beam damage, rebalance gust spell, raise armor effectiveness 2015-05-08 18:57:33 +12:00
libraryaddict
29c4a033a7 Achievement: Fix wizards 10 win to 50 wins, change wizards to blaze rod, change stats layout 2015-05-08 18:56:00 +12:00
libraryaddict
5ec04263d4 Map stuff: First commit (or second?) 2015-05-08 07:31:03 +12:00
Jonathan Williams
b7df5c43db Updated all name lookups to only use most recently logged in account. 2015-05-07 11:26:26 -07:00
Jonathan Williams
f2c8086421 Updated default motd on bungees. 2015-05-06 22:41:36 -07:00
Jonathan Williams
e999f943b5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-06 20:20:07 -07:00
Jonathan Williams
d3e5dd9c8a Fixed so name searching only returns the last account logged in with that name. 2015-05-06 20:19:58 -07:00
libraryaddict
3e02806b75 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-07 02:57:20 +12:00
libraryaddict
531fe11916 Maps: Rename Map.class to BlockMap.class 2015-05-07 02:57:12 +12:00
libraryaddict
7a8efee1e0 Modify builder to include png files in the built jar 2015-05-07 02:56:37 +12:00
libraryaddict
47acf7fb85 DrawMyThing: Ignore guesses containing more than two answers. 2015-05-07 02:54:55 +12:00
Ty Sayers
cf4caf8fc0 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-05-05 15:44:07 -04:00
Jonathan Williams
a7407d8b8c Added all minigames standalones into mixed arcade player count. 2015-05-04 22:51:21 -05:00
Jonathan Williams
f9f1d9b1ad Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-04 22:31:14 -05:00
Shaun Bennett
ae03743c63 Build sort of bug fix for teleported into block 2015-05-04 19:27:16 -05:00
Mini-Chiss
4cb0c01f59 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-04 15:35:10 -05:00
Mini-Chiss
7505bbc1a2 gravity fix 2015-05-04 15:34:57 -05:00
Peter Miller
4f54b9aa04 Bamboo... 2015-05-04 05:10:37 -04:00
Peter Miller
ad82e9733a Moarerer Bamboo changes. 2015-05-04 04:33:28 -04:00
Peter Miller
93656f7659 Moarer Bamboo changes. 2015-05-04 04:28:34 -04:00
Peter Miller
c93cd0d36c Moar Bamboo changes. 2015-05-04 04:25:44 -04:00
Peter Miller
3b518aec3f More build changes for Bamboo. 2015-05-04 04:14:19 -04:00
Jonathan Williams
4252bf70df Fix Master Builder game button in quick menu. 2015-05-04 01:40:57 -05:00
Mini-Chiss
0d1de153ec Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-04 00:56:19 -05:00
Mini-Chiss
b959bcaa90 fixed 1.8 req 2015-05-04 00:56:12 -05:00
Jonathan Williams
677c8d1198 Updated default MOTD. 2015-05-04 00:42:59 -05:00
Jonathan Williams
c8b5c84aa6 Added Master Builder quick game menu option.
Added player counts to quick game menu
2015-05-04 00:42:49 -05:00
Mini-Chiss
50cd692c62 fixed wither morph damaging blocks in grav lobby 2015-05-04 00:34:03 -05:00
Mini-Chiss
4f4aeac12c fixed typo 2015-05-03 23:34:09 -05:00
Mini-Chiss
fa1ac52f78 grav balance 2015-05-03 20:21:00 -05:00
Mini-Chiss
838c369b7c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-03 20:12:13 -05:00
Mini-Chiss
95c9be47b6 missing kit 2015-05-03 20:12:06 -05:00
Shaun Bennett
cb2666c4a5 Merge remote-tracking branch 'origin/master' 2015-05-03 20:06:19 -05:00
Shaun Bennett
af1f735a43 Add lightning packets, various gui improvements 2015-05-03 20:06:10 -05:00
Mini-Chiss
e013f8af8a sky text for hub change 2015-05-03 19:49:16 -05:00
Mini-Chiss
58671fa229 more words 2015-05-03 19:36:50 -05:00
Mini-Chiss
6978a176b1 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-03 19:10:55 -05:00
Mini-Chiss
7f0e175ba1 build update 2015-05-03 19:10:49 -05:00
Shaun Bennett
044d1098f4 Merge remote-tracking branch 'origin/master' 2015-05-03 19:10:22 -05:00
Shaun Bennett
a435ed5bae More build changes 2015-05-03 19:10:13 -05:00
Mini-Chiss
1576085d87 more words 2015-05-03 18:33:31 -05:00
Mini-Chiss
73132d96b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-03 18:33:03 -05:00
Mini-Chiss
f36d7774cc Gravity update 2015-05-03 18:32:57 -05:00
Shaun Bennett
de1f432be4 Build bug fixes 2015-05-03 18:31:56 -05:00
Shaun Bennett
74474c6227 Use itemstackfactory for formatted name 2015-05-03 18:26:20 -05:00
Shaun Bennett
f98ac0874c Merge remote-tracking branch 'origin/master' 2015-05-03 18:22:14 -05:00
Shaun Bennett
83ff3c96aa Close inventory when game starts 2015-05-03 18:21:59 -05:00