Sarah
8c66ef7f15
changing Hub items and adding Profile GUI.
2015-08-09 18:33:44 +02:00
Sarah
85c8e42f53
Finalizing and improving the Carl spinner and adding creeper explosion animations.
2015-08-09 15:00:54 +02:00
Shaun Bennett
4f6dfdb856
Update carl spin button to consume tickets, Updates to Votifier Plugin, Redis Vote Command, Various bug fixes
2015-08-08 06:35:25 -05:00
Shaun Bennett
be18dc1bf5
Add experience rewards to reward manager
2015-08-06 21:41:56 -05:00
Shaun Bennett
6311ceaa0f
Reward work for new Game reward rarity and setup for carl, work on carl spinner
2015-08-06 21:15:17 -05:00
Shaun Bennett
44e30a0903
SimpleGui Improvements, Change daily timer to 20 hours, Add Carl Spin button, Starter code for Spin Gui
2015-08-06 15:34:56 -05:00
Shaun Bennett
c67f4fa7e6
Votifier fixes
2015-08-06 06:45:47 -05:00
Shaun Bennett
35d999d747
Remove some debug messages
2015-08-06 05:56:31 -05:00
Shaun Bennett
9e9f9862d0
Bonus bonus bonus!
2015-08-06 05:47:32 -05:00
Shaun Bennett
4cad99eb76
Lots of bonus work, start adding Votifier plugin
2015-08-06 00:45:39 -05:00
Shaun Bennett
b33b0ac935
More bonus work
2015-08-04 04:00:51 -05:00
Shaun Bennett
e200ddd777
Merge branch 'master' into Bonus
...
# Conflicts:
# Plugins/.idea/misc.xml
2015-08-03 08:32:45 -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
Shaun Bennett
06be7b2cdd
Fix stats
2015-08-02 05:24:25 -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
Shaun Bennett
fd65f27f0f
Fix some typos/formatting issues
2015-07-31 10:01:19 -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
Aaron Brock
b5e8c0886e
Stuff and things
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-28 17:38:26 -04: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
