Mini-Chiss
deba3f23fa
Merge branch 'MPS-Maps'
2015-07-29 15:27:11 +02:00
William Burns
2b3fec754f
Colour change cause colour!
2015-07-29 14:25:38 +01:00
William Burns
3bc66f16b6
Woo a push
2015-07-29 14:22:49 +01:00
Mini-Chiss
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
Mini-Chiss
1c2bd988f9
fixed spawns for team gameds
2015-07-29 15:10:21 +02:00
William Burns
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
William Burns
f82defb1db
Whitelist
2015-07-29 13:27:26 +01:00
Mini-Chiss
30f0b3cb60
fixed close spawn stuff
2015-07-29 14:25:15 +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
ef89b96144
fixed game page bug
2015-07-29 14:02:56 +02:00
Mini-Chiss
b42be044ae
whtielisted MPS will be hidden from GUI
2015-07-29 13:20:20 +02:00
Mini-Chiss
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
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
Mysticate
d0a45461d0
Fixed bug with direct hit
2015-07-28 21:25:29 -06:00
Mysticate
3e0eb03112
Final tweaks. this is as good as it's goign to get! ;d
2015-07-28 20:39:55 -06:00
Mysticate
99946ef1f3
Tweaks
2015-07-28 17:29:51 -06:00
Aaron Brock
da94c30c02
Stuff
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-28 18:06:00 -04:00
Aaron Brock
971908d38b
Stuff
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-28 17:52:43 -04:00
Aaron Brock
832fb4638a
More things
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-28 17:42:00 -04: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
Mysticate
2e58b75a1b
Fixed waller achievement thing
2015-07-28 08:51:21 -04:00
Mysticate
dd53d268e4
Fixed waller kit bc I was stupid before ;c
2015-07-28 08:46:37 -04:00
Mysticate
c5cf306097
Thing
2015-07-28 08:41:35 -04: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
Mysticate
0e00086b9e
Redid evolution!
2015-07-28 00:15:41 -04:00
William Burns
8385c8a7c7
Whitelist fix
2015-07-27 22:18:41 +01:00
William Burns
76e5d3d562
Finish update
2015-07-27 18:18:37 +01:00
Sarah
aaf4991737
Fixing Banana team.
2015-07-27 18:31:01 +02:00
Sarah
572ae1e99b
Updating Team names.
2015-07-27 18:22:24 +02: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
Jonathan Williams
a9654c01e3
Merge pull request #25 in MIN/mineplex from fixed-redis-improvements to master
...
* commit '421eb12228eeeafeb6ae72f677350a511ddde723':
Add jedis pool caching.
2015-07-27 07:55:08 -05:00
Conrad
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
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
a917dc4714
Merge remote-tracking branch 'origin/master'
2015-07-26 18:19:35 -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
Mini-Chiss
1247f33b1e
end game stats will display, even if no gems awarded.
2015-07-26 11:43:24 +02:00
Mysticate
0586e5fb77
Added an exception for a map to make it night.
2015-07-26 00:27:09 -04:00
Mysticate
4ceb156e69
Various improvements.
2015-07-25 23:44:55 -04:00
Mysticate
0fd59e9fdb
Added an achievement, removed team one, touched up another. Swag.
2015-07-25 21:50:37 -04:00
