Mysticate
b71bcfab4b
Fixed achievements. Merge ASAP
2015-08-29 00:19:39 -06:00
Jonathan Williams
d4d0c4bed6
Updated Motd.
2015-08-28 23:17:14 -07:00
Jonathan Williams
c98a85c2ba
Added local storage of login time.
...
Hooked in onlineTime bonus feature to real values.
2015-08-28 22:09:42 -07:00
Jonathan Williams
ad4ba010b7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-28 20:59:08 -07:00
Jonathan Williams
6f0309622c
Removed AccountCache.
...
Converted that to PlayerCache and store account id in there.
2015-08-28 20:58:58 -07:00
Mysticate
ebd3fbe6d5
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-28 20:19:27 -06:00
Jonathan Williams
e9b33668bc
Added donorsOnline to MinecraftServer snapshot
...
Refactored Rank class to use lowercase methods.
2015-08-28 13:22:04 -07:00
Mysticate
f2f6afb6ca
Fixes :D
2015-08-26 20:10:58 -06:00
Mysticate
cfdb0dfa4f
Added kits + achievements. Hurrah!
2015-08-26 13:19:17 -06:00
Jonathan Williams
6d3c965f14
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-23 16:26:02 -07:00
Jonathan Williams
1e7f2f01a7
Fixed problem where UUID api was preventing client loading from db.
2015-08-23 15:38:43 -07:00
libraryaddict
cdc92f8b2f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-22 00:38:55 +12:00
libraryaddict
7841b17d03
Add PacketPlayOutCamera for locking view to entity
2015-08-22 00:38:37 +12:00
libraryaddict
bad339cf04
Tweak dead bodies more
2015-08-21 20:52:57 +12:00
libraryaddict
c41328d726
Dead bodies: Change to Item from disguised arrow, fix body positioning, move to Game.java to enable in all games
2015-08-21 20:40:09 +12:00
Mini-Chiss
15c873392a
updated give to allow naming of items.
2015-08-20 20:38:07 +02:00
Jonathan Williams
bbe5b79c7e
Disabled AntiHack create table.
...
Fixed NPE with ServerManager
2015-08-19 04:11:34 -05:00
Mini-Chiss
14bf8faf3a
disabled big sale
2015-08-18 09:49:53 +02:00
fooify
d489b31738
merge
2015-08-17 16:27:28 -07:00
Mini-Chiss
b7854e6cab
added big larry to chests
2015-08-17 13:05:41 +02:00
Mini-Chiss
9eed03237b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-17 12:39:06 +02:00
Mini-Chiss
58e517a4d7
fixed null args more
2015-08-17 12:38:41 +02:00
Shaun Bennett
8ab8388344
Merge remote-tracking branch 'origin/master'
2015-08-17 05:05:36 -05:00
Shaun Bennett
5c71522b2d
Return the first UUID instead of last (AccountRepository)
2015-08-17 05:05:25 -05:00
Mini-Chiss
0a23f91592
fixed two little bogs
2015-08-17 11:53:50 +02:00
Mini-Chiss
7a7543886f
fixed a ton of commands NPEing on no args
2015-08-17 09:04:39 +02:00
Shaun Bennett
555908a3c1
Rename preferences gui, add shop items for gold and emeralds (commented out right now), fix typo
2015-08-15 02:03:46 -05:00
Shaun Bennett
fda052ea90
Add treasure chest stats
2015-08-14 21:34:37 -05:00
Shaun Bennett
e89961380b
Merge remote-tracking branch 'origin/master'
2015-08-14 21:14:41 -05:00
Shaun Bennett
1eaa6446af
Fix double hologram and hopefully NPE
2015-08-14 21:14:34 -05:00
Shaun Bennett
c520bd7921
Add recharge to carl spins so that they don't get triggered twice
2015-08-14 20:43:58 -05:00
Jonathan Williams
a2d7aa77fe
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-14 00:37:55 -05:00
Jonathan Williams
f5d934fe53
Fixed sync db calls for pets.
...
Make sure to add/remove pets in mysql.
2015-08-14 00:37:43 -05:00
Shaun Bennett
0b4dbab871
Change ticket command access to admin
2015-08-13 11:23:29 -05:00
Shaun Bennett
bd7317cf7b
Fix ticket command rollback >:D
2015-08-13 11:03:12 -05:00
Shaun Bennett
bc8aff31cb
Merge remote-tracking branch 'origin/master'
2015-08-13 06:12:24 -05:00
Shaun Bennett
af15476f19
Use login query to handle logins
2015-08-13 06:12:11 -05:00
Mini-Chiss
878ac82ade
fixed error!
2015-08-13 13:01:41 +02:00
Mini-Chiss
1487692609
completely disabled team armor in arcade. avoids typing it just as game starts.
2015-08-13 12:57:30 +02:00
Mini-Chiss
fc1a8e4e25
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-13 12:52:11 +02:00
Mini-Chiss
f3b58fe9b6
disabled team armor command in games D:
2015-08-13 12:51:57 +02:00
Shaun Bennett
e1d04354fb
Use dummy record for AddPlayer
2015-08-13 05:18:53 -05:00
Shaun Bennett
4d6e827739
Remove vote3!
2015-08-13 04:03:03 -05:00
Shaun Bennett
92c0e1452b
Add vote3
2015-08-13 04:01:53 -05:00
Shaun Bennett
0c68321e81
Global button
2015-08-13 03:58:05 -05:00
Shaun Bennett
11a4805c38
Stat stuff!
2015-08-13 03:54:23 -05:00
Shaun Bennett
4aac057956
Merge remote-tracking branch 'origin/master'
2015-08-13 03:32:40 -05:00
Shaun Bennett
05b1b91686
Carl!
2015-08-13 03:32:31 -05:00
Jonathan Williams
8476578bc0
Merge pull request #28 in MIN/mineplex from Myst_LOBBERS to master
...
* commit 'f8a6a25b46b9336ae8a727e1f3478f3a7a394324':
Various Fixes.
2015-08-13 01:52:16 -05: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
Shaun Bennett
37e5e97020
Fix experience reward displaying as game
2015-08-12 03:08:40 -05:00
Shaun Bennett
f81f5d82d6
Merge remote-tracking branch 'origin/master'
2015-08-12 03:00:16 -05:00
Shaun Bennett
30f20801c7
Lets hope everything works!
2015-08-12 03:00:07 -05:00
Mini-Chiss
860127631c
fixed item insta-despawn
2015-08-12 09:27:05 +02:00
Mini-Chiss
ade76791b3
optimized item cleaning
2015-08-12 09:12:49 +02:00
Sarah
a1ba0f6d86
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-12 09:01:20 +02:00
Sarah
2a40eee9e7
Increasing radius of items despawning.
2015-08-12 09:00:13 +02:00
Mini-Chiss
7ea148a802
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-12 08:58:36 +02:00
Sarah
e4eb286225
Fixing despawning.
2015-08-12 08:56:20 +02:00
Mini-Chiss
c00f9a7aaa
Merge branch 'Bonus'
2015-08-12 08:39:31 +02:00
Sarah
be699558f1
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-12 08:38:18 +02:00
Sarah
af19754bcd
Implementing Carl to Arcade.
2015-08-12 08:37:54 +02:00
Mini-Chiss
e8963cc2af
fixed paintbrush
2015-08-12 08:10:43 +02:00
Mini-Chiss
2ed388552b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-12 07:59:39 +02:00
Shaun Bennett
99a94251fd
Fixes
2015-08-12 00:56:20 -05:00
Shaun Bennett
8e4ae35256
Merge remote-tracking branch 'remotes/origin/master' into Bonus
2015-08-12 00:56:04 -05:00
Shaun Bennett
4549c810d4
Fix for voting
2015-08-11 22:59:59 -05:00
Mini-Chiss
a7cc3e1aa6
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-11 21:13:59 +02:00
Mini-Chiss
d41ab3432f
remove paintbrush when moved away
2015-08-11 21:13:45 +02:00
libraryaddict
72adf21bff
Gadget Paintball: Add particles on impact, change block break effect to stone break sound.
2015-08-12 06:23:13 +12:00
fooify
10f979772b
Merge remote-tracking branch 'origin/master' into foo
2015-08-11 09:51:13 -07:00
Mini-Chiss
83a010c215
enabled summer sale msg
2015-08-11 17:05:41 +02:00
Mini-Chiss
89dab7ec85
some little fixes
2015-08-11 16:33:32 +02:00
Sarah
f7d9476191
Hidden egg fix
2015-08-11 13:53:36 +02:00
Sarah
5c7d140521
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-11 13:49:53 +02:00
Sarah
e25558fc91
Animation improvements.
2015-08-11 13:49:06 +02:00
Mini-Chiss
49d54d4dd3
doesnt count rank thingy as reward if no rank. yknow
2015-08-11 13:22:58 +02:00
Sarah
2d7d7f6dde
Improving messages, animations and some Items.
2015-08-11 13:01:20 +02:00
Sarah
f3558b144c
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-11 12:05:23 +02:00
Sarah
c821523240
removed vote broadcast.
2015-08-11 12:04:54 +02:00
Shaun Bennett
1c484367a1
Add hasPoll
2015-08-11 04:57:45 -05:00
Shaun Bennett
3eb7e91fbb
Removing the magical 3
2015-08-11 04:38:37 -05:00
Sarah
8abefaf856
The magical +3.
2015-08-11 11:31:51 +02:00
Mini-Chiss
4c32f32ced
removed game reward type
2015-08-11 11:17:20 +02:00
Mini-Chiss
74b83d6851
fixed!
2015-08-11 10:56:07 +02:00
Mini-Chiss
184feec875
cleany and logic
2015-08-11 10:54:24 +02:00
Mini-Chiss
f66a0439e8
no need to gen so many
2015-08-11 10:34:33 +02:00
Mini-Chiss
a1c10a7ec5
clean up
2015-08-11 10:33:44 +02:00
Mini-Chiss
1c40478e6e
SPIN DOGGY SPIN
2015-08-11 10:32:49 +02:00
Shaun Bennett
fe153bee11
Fix revert issues
2015-08-11 03:19:27 -05:00
Shaun Bennett
184c592786
Merge remote-tracking branch 'origin/Bonus' into Bonus
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/VoteButton.java
2015-08-11 03:12:55 -05:00
Shaun Bennett
13e7e58986
Creeper visual!
2015-08-11 03:09:21 -05:00
Shaun Bennett
c177307f70
Votifier fixes
2015-08-11 02:53:54 -05:00
Sarah
b99c526169
Implementing Carl message.
2015-08-11 09:09:16 +02:00
Shaun Bennett
5d3503b733
Carl rewards
2015-08-11 01:55:27 -05:00
Shaun Bennett
d2983b831e
Merge remote-tracking branch 'origin/Bonus' into Bonus
2015-08-11 00:35:44 -06:00
Shaun Bennett
d833385df4
Fix carl spinner and ticket command, Fix polls not displaying in available count, Visual fixes
2015-08-11 00:35:02 -06:00
Mini-Chiss
66f2a5df5e
renamed GAME
2015-08-11 08:32:12 +02:00
Sarah
3bedc4ce84
Improving animation timing.
2015-08-11 05:37:58 +02:00
Mysticate
bd414cd231
Merge remote-tracking branch 'origin/master' into Myst_EVO
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
2015-08-10 19:47:53 -04:00
Sarah
186e3028c2
removing temp fix "there was an error processing your request" for the Spinner.
2015-08-10 17:15:56 +02:00
Sarah
3be811e480
Fixing Spinner announcements.
2015-08-10 17:08:03 +02:00
Sarah
ed7b8949bb
Adding SpinnerFiller and SpinnerRewards.
2015-08-10 17:04:47 +02:00
Sarah
2253a63e96
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-10 16:43:05 +02:00
Sarah
c6beb122e3
Adding firework animations for spinner.
2015-08-10 16:42:43 +02:00
Mini-Chiss
ad8781fd84
Merge branch 'Bonus' of ssh://184.154.0.242:7999/min/mineplex into Bonus
2015-08-10 16:14:24 +02:00
Mini-Chiss
18d11f7d68
new enums
2015-08-10 16:13:17 +02:00
Sarah
65fc81a2aa
improving animations again.
2015-08-10 15:33:00 +02:00
Sarah
5781009f4e
Improving animations and some text.
2015-08-10 14:00:40 +02:00
Shaun Bennett
aa13bcf5c6
Bug fix!
2015-08-10 04:54:01 -05:00
Shaun Bennett
adb76b0681
Fix giving out gold
2015-08-10 04:51:46 -05:00
Shaun Bennett
8745884153
Various fixes
2015-08-10 04:51:11 -05:00
Shaun Bennett
b8b19ed4a5
Merge remote-tracking branch 'remotes/origin/master' into Bonus
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-08-10 03:24:59 -05:00
Shaun Bennett
6f8d6f8a40
Move Bonus and Poll to core
2015-08-10 01:55:50 -05:00
Shaun Bennett
511cc76bef
Allow servers to process votifier votes, redis command gets sent to all servers (Until I can figure out why EU playertracker isnt working)
2015-08-10 00:47:36 -05:00
Shaun Bennett
d20fe54010
Disable carl features when carl can't be found
2015-08-09 16:36:48 -05:00
Mysticate
f8a6a25b46
Various Fixes.
...
• Merged w/ master
• Changed to William's method of Projectile limiting.
- Prevented TNT hitting Teammates
• Fixed gem count for Sniper
• Added gems for direct hits + TNT Thrown
• Removed assists counting for kills in 6 kill.
2015-08-09 15:01:27 -04:00
Mysticate
d9a8830e75
Few changes
2015-08-09 14:34:55 -04:00
Sarah
8c66ef7f15
changing Hub items and adding Profile GUI.
2015-08-09 18:33:44 +02:00
Mini-Chiss
5a7de8ef3d
hub fixes
2015-08-09 17:21:56 +02:00
Sarah
85c8e42f53
Finalizing and improving the Carl spinner and adding creeper explosion animations.
2015-08-09 15:00:54 +02:00
Mysticate
5298fa341e
Removed the revolving thing.
2015-08-08 16:13:54 -04:00
Mini-Chiss
328c31de88
hub Update
...
fixed bad gameid
2015-08-08 13:47:09 +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
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
090c1f135d
Merge branch 'SarahsAwesomeBugFixes'
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
2015-08-07 21:48:35 +02:00
Mini-Chiss
b22706e649
hub update part 1
2015-08-07 21:45:38 +02:00
Mysticate
a9350bfacd
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-07 11:58:53 -04:00
Jonathan Williams
e8c60e6e84
Added storage of pets in mysql. Going to have live while backend process is copying data over.
...
Updated ServerTypePage to resolve clicking issues with solo/team pages.
2015-08-07 02:22:13 -05:00
Sarah
181b778a9c
Fixing some bugs and disallow MPS while disguised.
2015-08-07 07:39:40 +02:00
Morten
f37e25e9d7
Finish push for today <3
2015-08-07 07:03:15 +02:00
Morten
608e8bf693
For Sarah <3
2015-08-07 05:40:16 +02: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
Morten
1680b652db
Added Hat layer skin
...
Added Sneak animation
With love from Morten <3
2015-08-07 03:10:17 +02: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
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
Shaun Bennett
4cad99eb76
Lots of bonus work, start adding Votifier plugin
2015-08-06 00:45:39 -05: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
Mini-Chiss
cba1c3bcca
disallowed negative stats completely
2015-08-05 09:03:22 +02:00
Sarah
e55557e1fd
Improving the /disguise command.
2015-08-05 07:57:52 +02:00
Shaun Bennett
b33b0ac935
More bonus work
2015-08-04 04:00:51 -05: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
Shaun Bennett
e200ddd777
Merge branch 'master' into Bonus
...
# Conflicts:
# Plugins/.idea/misc.xml
2015-08-03 08:32:45 -05: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
libraryaddict
4fdd42c599
Mysticate's request: Add PacketPlayOutCamera
2015-08-03 01:51:15 +12: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
fooify
7c4786e7d2
Merge remote-tracking branch 'origin/master' into foo
2015-07-29 14:15:24 -07:00
fooify
5da23fa322
Merge branch 'foo' of http://Fooify@184.154.0.242:7990/scm/min/mineplex.git into foo
2015-07-29 14:13:07 -07:00
fooify
db5c5a9888
*crosses fingers* please work!
2015-07-29 14:12:52 -07:00
Mini-Chiss
97a144150b
fixed an NPE that was causing games not to end in MS
2015-07-29 21:51:18 +02:00
fooify
389bf7a74c
please work...
2015-07-29 10:55:03 -07: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
Shaun Bennett
16bad71dcc
1.8 Updates
2015-07-27 20:26:37 -05:00
Shaun Bennett
da3500cc32
Merge remote-tracking branch 'remotes/origin/master' into MC_1.8
...
# Conflicts:
# Plugins/Libraries/craftbukkit.jar
# Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
# Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
# Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseLiving.java
# Plugins/Mineplex.Core/src/mineplex/core/map/BlockMap.java
# Plugins/Mineplex.Core/src/mineplex/core/memory/MemoryFix.java
# Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
# Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java
# Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java
# Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
2015-07-27 19:39:18 -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
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
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
335eb5eacd
Fixed report link
2015-07-23 13:35:06 -04: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
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
b9762bddc4
Fixes
2015-07-22 16:50:57 -04:00
Mysticate
e55ca81d48
Reverted Trainee to Helper due to popular demand.
2015-07-20 15:45:16 -04:00
Mysticate
6addf00037
LOTS of tweaks :D
2015-07-20 14:27:10 -04:00
Mysticate
8b2b4c2826
Added to MPS
2015-07-19 15:51:34 -04:00
Mysticate
6edc923002
Changed mineplex.com/supporthub > mineplex.com/reports
2015-07-19 15:43:13 -04:00
fooify
5d820edd41
remove custom level to fix merge conflicts
2015-07-15 14:34:42 -07:00
Mysticate
1e1cf6403d
Added achievements
2015-07-14 13:31:41 -04:00
Sarah
a224e5937d
Merge branch 'EventGameUpdates' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams
2015-07-14 07:11:48 +02:00
Sarah
e72d612379
Implementing the mapSource parameter in GameType and setting up SkywarsTeams and SurvivalGamesTeams.
2015-07-14 05:25:08 +02:00
Cheese
f2cc2a2c86
youtubers wont get kicked by mac
2015-07-14 10:16:42 +10:00
Cheese
cb05049c4a
youtubes can turn off vel in hubs
2015-07-14 10:08:41 +10:00
Mysticate
0a09ae29f3
Merge remote-tracking branch 'origin/master' into BombLobbers
2015-07-12 18:14:25 -04:00
Mysticate
1b3d7f1c20
Fixed and added things
2015-07-08 23:57:48 -04:00
Cheese
7d073fdc0d
fixed skywars icon
...
changed LOSSES to GAMESPLAYED for consistency
2015-07-09 12:47:40 +10:00
fooify
5d34716521
squirrel!
2015-07-08 06:20:40 -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
fooify
8149d61343
Merge remote-tracking branch 'origin/master' into foo
2015-07-07 07:59:46 -07:00
Cheese
cca26165cd
swapped sale back to 50%
2015-07-06 11:42:54 +10:00
libraryaddict
2c249e37b5
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-07-06 07:07:56 +12:00
libraryaddict
e16cb4cef7
Disguise: Initite armorstand vector
2015-07-06 07:07:41 +12:00
Shaun Bennett
abaa0ddee8
Level for Bobby
2015-07-05 13:30:16 -05:00
Cheese
7182205fde
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-05 15:13:33 +10:00
Cheese
8d2b1650af
world component for MCPE
2015-07-05 15:13:18 +10:00
libraryaddict
e002e4af18
Disguises: Added ArmorStandDisguise, removed unused DisguiseType and added ability to add fake armor to disguises
2015-07-05 13:37:07 +12:00
Cheese
556e524e18
changed notifications back to 75% sale
2015-07-02 16:14:47 +10:00
fooify
e7b51ac1c1
add jnr_dev to updaterank
2015-07-01 16:40:15 -07:00
fooify
b9b9c5f801
ishh also wanted this :P (let me know if I should remove it)
2015-06-30 13:37:46 -07:00
fooify
c824a39058
ishh wanted it...k
2015-06-30 13:33:41 -07:00
Jonathan Williams
2069524f15
Merge remote-tracking branch 'remotes/origin/foo'
2015-06-29 18:14:07 -04:00
Jonathan Williams
bbb661d686
Fixed up BenefitManager.
2015-06-29 18:07:06 -04:00
fooify
4ff456b722
Merge remote-tracking branch 'origin/master' into foo
2015-06-29 11:29:22 -07:00
Jonathan Williams
d426c24970
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-29 06:14:30 -04:00
Cheese
da3c5eeaaf
40k b enefit
2015-06-29 20:14:15 +10:00
Jonathan Williams
9f384b0d3e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-29 06:02:57 -04:00
Cheese
48f5fa118a
fixed a few sky bugs
2015-06-29 14:26:00 +10:00
Cheese
0ea388379a
reduced win req for skywars ach
...
enabled beenfit for 40k reward
2015-06-28 15:16:05 +10:00
