44ee735f4a
Merge branch 'master' into MPS-Maps
2015-08-03 11:46:38 +01:00
4ad19e4579
Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps
2015-08-03 10:52:00 +01:00
7c028ae936
fixed skywars teams icon in MPS
2015-08-03 11:44:13 +02:00
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
1ca3c8527a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-03 10:01:06 +01:00
8d7b7f8c8b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-03 10:56:54 +02:00
1d0bfbdf2d
fixed team sheep displaying in UHC lobby
2015-08-03 10:56:23 +02:00
6c0666c59b
Fix for server groups / teams.
2015-08-03 03:20:27 -05:00
b26e01649b
removed requirement for ach kit
2015-08-03 10:13:46 +02:00
eac8a3cd1c
fixed OITQ kit being unobtainable
2015-08-03 10:12:37 +02:00
a87b3a9284
fixed kits not sharing for team vers
2015-08-03 10:10:29 +02:00
8ec271bd82
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-03 10:06:30 +02:00
472409dc4b
fixed broadcast formatting
2015-08-03 10:06:15 +02:00
302252f193
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-03 02:56:31 -05:00
af0d769d3d
Fixed skywars quick shop.
...
Fixed issue with skywars not opening.
Fixed chest size for MPS
2015-08-03 02:56:24 -05:00
5bb2f80b8e
fixed text
2015-08-03 09:54:34 +02:00
6ccc897841
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-03 08:53:38 +01:00
72c473ad6b
removed annoying mineplex thing from subtext in news
2015-08-03 09:51:10 +02:00
530c40ad0c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-03 02:07:31 -05:00
adcd91bf61
Servers with more than 40 max slots always send to largest server.
...
Fixed space in Solo lore.
2015-08-03 02:07:23 -05:00
2e1bccb3ad
DUN ALLOW overful
2015-08-03 09:02:28 +02:00
6a1e5d6bfc
changed item text
2015-08-03 08:23:49 +02:00
c32074e733
Fixed MPS/Event server guis so they open up like old.
...
Changed sticks to player heads in solo/team selection.
2015-08-03 00:53:06 -05:00
bfaa0e6849
Fixed event/mps hardcode.
2015-08-02 23:51:43 -05:00
58933fc855
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-02 21:19:00 -04:00
944a4a9535
Fix accidental double-queueing bug when left clicking server NPCs and add two second cooldown before attempting to auto-join servers. Fix bug with server groups not properly loading server NPC names into shops. Fix bug with server key/name/npc name not being properly interchangeable during server selection and auto-joining process.
2015-08-02 21:18:24 -04:00
3b090d369d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-02 19:41:49 -05:00
a561bbbf12
Added hardcode for EVENT/MPS :D
2015-08-02 19:41:42 -05:00
38cc318387
Update JOOQ, downcast BigInteger to Long in stats for now
2015-08-02 19:36:24 -05:00
32a2687991
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-02 20:00:15 -04:00
d9a641fd92
Updated ServerManager to read server npc stuff from redis.
...
Updated ServerGroup to have NPC name in it.
2015-08-02 18:59:43 -05:00
a2250ea343
Fix for blocking logins if redis can't add account cache.
2015-08-02 18:59:13 -05:00
4852e69991
Temporary un-finished changes for adding in team/solo UI pages and allowing players to select.
2015-08-02 19:19:40 -04:00
f520908f8d
Added team and portal location info to server group.
2015-08-02 17:52:51 -05:00
41189b9838
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-02 17:23:17 -05:00
fa2bcf7f69
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-02 18:21:01 -04:00
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
d3ba621e86
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-02 17:00:49 -05:00
0a84bd69d8
fixed some OITQ stuff
2015-08-02 23:17:23 +02:00
c2f6c402da
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-02 13:25:09 -04:00
612d967aa0
Add ability for auto-joining of gametypes to bypass manual server selection by player.
2015-08-02 13:24:59 -04:00
0a20a04903
Used packets to spectate the rotation bat.
2015-08-02 10:48:00 -06:00
4cc810f1c0
Merge branch 'Myst_KITS'
2015-08-02 17:55:53 +02:00
4fdd42c599
Mysticate's request: Add PacketPlayOutCamera
2015-08-03 01:51:15 +12:00
8ea967b37e
fixed possible NPE
2015-08-02 12:35:25 +02:00
638406254b
refactored a little so theres no data stored in the util
2015-08-02 12:07:00 +02:00
afc41c8831
converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity
2015-08-02 11:50:26 +02:00
ac4755a5a9
Fixed incorrect velocity
2015-08-02 11:24:34 +02:00
9c14e3d35a
Worked on evolution
2015-08-01 17:24:12 -06:00
7910170327
fixed achievemnt amount
2015-08-01 18:39:18 +02:00
f361ae94dc
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
# Conflicts:
# Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml
# Plugins/.idea/compiler.xml
# Plugins/.idea/encodings.xml
# Plugins/.idea/misc.xml
# Plugins/.idea/modules.xml
2015-08-01 16:09:15 +01:00
a964f343c7
xml files are ew
2015-08-01 14:55:01 +01:00
62072077c1
Fixed evolution rotation
2015-08-01 00:47:44 -06:00
992c0fc36f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-01 01:12:24 -05:00
d3c5d0cbe6
Only store account cache stuff for 6 hours.
...
Update MOtd.
2015-08-01 01:12:01 -05:00
ae8d351145
Merge branch 'SSM2PlayerTeams'
2015-07-31 14:09:55 +02:00
fba10e4cbd
fixing the long term "Kit" bug ;D
2015-07-31 14:08:08 +02:00
b2c538b189
little tag fix.
2015-07-31 13:40:39 +02:00
60a1768821
Fixing Team display bug on disbanding.
2015-07-31 13:05:28 +02:00
b2a567673c
disabled sale msg
...
added double gem weekend
2015-07-31 09:53:52 +02:00
53a3a29cd2
Extreme revisions. Cheers!
2015-07-31 00:50:32 -06:00
a3d768af6b
added res pack for HH
2015-07-30 15:07:40 +02:00
31fd19aab5
added res pack for CC
2015-07-30 15:07:05 +02:00
8d7c42134b
fixed mounts having nametags
2015-07-30 14:54:23 +02:00
8a5088e181
fixed SGT deathmatch not working
2015-07-30 14:47:59 +02:00
45d117a95a
added armor hotbar to smash
...
fixed scoreboard in snowfight
2015-07-30 14:45:28 +02:00
0cf333ec00
lowered win req
2015-07-30 14:12:17 +02:00
f02924987e
Did things
2015-07-30 04:30:19 -06:00
8ef93c0b33
Merge branch 'SSM2PlayerTeams'
2015-07-30 08:42:50 +02:00
30fa3b3309
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams
2015-07-30 03:07:41 +02:00
37e432f0b2
Git fix.
2015-07-30 03:07:21 +02:00
bf75594853
Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams
2015-07-30 02:33:51 +02:00
de4d0a7dc3
Fixing needler, projectiles in SW and "Banannas...".
2015-07-30 02:33:06 +02:00
a5d73d791a
Thing
2015-07-29 16:14:38 -06:00
97a144150b
fixed an NPE that was causing games not to end in MS
2015-07-29 21:51:18 +02:00
ab49407584
Things
2015-07-29 11:52:44 -06:00
be910cced9
gamemode color change
2015-07-29 17:00:36 +02:00
0e55ce1879
removed old hint
2015-07-29 16:54:30 +02:00
1004203b34
fixed up some merge issues
2015-07-29 16:48:49 +02:00
13af2cec74
Pick highest voting button
2015-07-29 15:44:29 +01:00
52844d7b80
Merge branch 'EventGameUpdates'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
2015-07-29 16:41:35 +02:00
71bedbe0fc
Merge branch 'WitherAssaultUpdate'
2015-07-29 16:37:29 +02:00
c32e959f61
Merge branch 'SnowFightUpdate'
2015-07-29 16:36:33 +02:00
1a27dea32c
Why was these not added...
2015-07-29 16:35:57 +02:00
d570cce1b0
Merge branch 'WitherAssaultUpdate'
2015-07-29 16:33:06 +02:00
862cdae14f
team modes
2015-07-29 16:32:11 +02:00
e47a343e2e
added mode for team games
2015-07-29 16:20:49 +02:00
f714bfbb0f
Adding testing achievement lol
2015-07-29 16:06:43 +02:00
b5d3ad0e0d
Adding perks
2015-07-29 16:05:43 +02:00
9c5ca750cf
Improving /e mob command and implementing other commands.
2015-07-29 15:53:45 +02:00
ab2c865ab3
better colors
2015-07-29 15:48:12 +02:00
51cef64554
improved text
2015-07-29 15:29:12 +02:00
deba3f23fa
Merge branch 'MPS-Maps'
2015-07-29 15:27:11 +02:00
2b3fec754f
Colour change cause colour!
2015-07-29 14:25:38 +01:00
3bc66f16b6
Woo a push
2015-07-29 14:22:49 +01:00
b2db2e988f
Merge branch 'WitherAssaultUpdate'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
2015-07-29 15:13:28 +02:00
1c2bd988f9
fixed spawns for team gameds
2015-07-29 15:10:21 +02:00
f6e64d25a2
Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps
2015-07-29 13:27:45 +01:00
f82defb1db
Whitelist
2015-07-29 13:27:26 +01:00
30f0b3cb60
fixed close spawn stuff
2015-07-29 14:25:15 +02:00
c9c3db70f3
Merge branch 'SSM2PlayerTeams'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-07-29 14:08:17 +02:00
932fe197b4
Merge branch 'perm-changes'
...
Conflicts:
Plugins/.idea/encodings.xml
reverted it.
2015-07-29 14:06:21 +02:00
ef89b96144
fixed game page bug
2015-07-29 14:02:56 +02:00
b42be044ae
whtielisted MPS will be hidden from GUI
2015-07-29 13:20:20 +02:00
e0ab853e57
Merge branch 'MPS-Maps'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
2015-07-29 13:03:05 +02:00
c3e07522b4
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-07-29 12:22:11 +02:00
5af68e5628
Fulfill Shaun's request
2015-07-28 23:55:27 -07:00
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
d0a45461d0
Fixed bug with direct hit
2015-07-28 21:25:29 -06:00
3e0eb03112
Final tweaks. this is as good as it's goign to get! ;d
2015-07-28 20:39:55 -06:00
99946ef1f3
Tweaks
2015-07-28 17:29:51 -06:00
e4da4aa0ed
Remove NPC commands
2015-07-28 10:14:25 -07:00
2e58b75a1b
Fixed waller achievement thing
2015-07-28 08:51:21 -04:00
dd53d268e4
Fixed waller kit bc I was stupid before ;c
2015-07-28 08:46:37 -04:00
c5cf306097
Thing
2015-07-28 08:41:35 -04:00
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
0e00086b9e
Redid evolution!
2015-07-28 00:15:41 -04:00
8385c8a7c7
Whitelist fix
2015-07-27 22:18:41 +01:00
76e5d3d562
Finish update
2015-07-27 18:18:37 +01:00
aaf4991737
Fixing Banana team.
2015-07-27 18:31:01 +02:00
572ae1e99b
Updating Team names.
2015-07-27 18:22:24 +02:00
0557e10257
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-07-27 15:53:57 +02:00
0c4a7a847f
fixed annoying color bug!
2015-07-27 15:53:39 +02:00
421eb12228
Add jedis pool caching.
...
This commit seeks to reduce the number of idle connections to redis that
our code uses by making clients share thread-safe connection pools
(which is the point of a connection pool). This only changes utility
methods to generate and access jedis pools, and does not seek to address
any issues relating to the use of the connections that may or may not be
causing problems.
The changes are as follows:
1. Add a static cache of all connection pools - Each connection pool is
distinguished by its ip and port. Two requested connections to the same
ip:port combinations will use the same connection pool.
2. Increase the max size of each pool to 20 - Overall, by having fewer
idle connections, this commit should still end up with fewer connections
going at any given time.
3. Make explicit setting to block while waiting for a connection - This
should already be the default, but it is made explicit just in case.
2015-07-27 08:50:04 -04:00
7d9fd61c8e
Display changes
2015-07-26 22:31:40 -07:00
0b53bca385
Needed permission changes for Jr Developers (Pending approval)
2015-07-26 18:58:35 -07:00
47d410370d
Merge branch 'horus-bug-fixes'
2015-07-26 18:20:39 -07:00
a917dc4714
Merge remote-tracking branch 'origin/master'
2015-07-26 18:19:35 -07:00
02f1211ddb
Misc
2015-07-26 18:12:56 -07:00
8fd3a3a838
Merge branch 'Myst_LOBBERS'
2015-07-26 18:31:55 +02:00
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
727427165f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-26 08:49:49 -07:00
26ed7ebb94
Fixes to redis
...
Fixes for stat handler.
2015-07-26 08:49:35 -07:00
1247f33b1e
end game stats will display, even if no gems awarded.
2015-07-26 11:43:24 +02:00
0586e5fb77
Added an exception for a map to make it night.
2015-07-26 00:27:09 -04:00
4ceb156e69
Various improvements.
2015-07-25 23:44:55 -04:00
0fd59e9fdb
Added an achievement, removed team one, touched up another. Swag.
2015-07-25 21:50:37 -04:00
cf61b50d98
More changes.
2015-07-25 17:35:43 +01:00
2b240f3dfa
removed visdata debug
2015-07-25 17:16:20 +02:00
dffde68982
fixed bug
...
removed debug
2015-07-25 17:11:02 +02:00
7c7b166b4d
reduced particles a little
2015-07-25 16:05:12 +02:00
aebd3eeb4f
Merge branch 'Myst_LOBBERS' of ssh://184.154.0.242:7999/min/mineplex into Myst_LOBBERS
2015-07-25 15:56:23 +02:00
9feac87a15
Fixed not being able to buy Armorer. Lowered view distance on particles.
2015-07-25 09:51:23 -04:00
65ea7b99ab
Merge remote-tracking branch 'origin/master'
2015-07-25 13:06:23 +01:00
91d0a37d77
Animation change etc.
2015-07-25 12:48:39 +01:00
d64d713a87
Merge branch 'Myst_LOBBERS'
2015-07-25 10:50:55 +02:00
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
6d367e3cee
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-25 01:38:54 -07:00
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
a1ce1ed45d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-25 01:31:01 -07:00
William Burns
Mini-Chiss
Jonathan Williams
Ty Sayers
Shaun Bennett
Mysticate
libraryaddict
Sarah
Ben Sihota
Christopher Jozsa
Conrad