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
4cc810f1c0
Merge branch 'Myst_KITS'
2015-08-02 17:55:53 +02: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
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
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
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
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
97a144150b
fixed an NPE that was causing games not to end in MS
2015-07-29 21:51:18 +02: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
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
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
ae5c74680c
SMALL CHANGE OMG DON'T MERGE WITH MASTER YET PELASE
2015-07-25 04:30:56 -04:00
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
59d14624c0
Merge branch 'Myst_LOBBERS'
2015-07-25 10:26:47 +02:00
d295cead09
Final stuff
2015-07-25 04:18:18 -04:00
a002da4c0f
Redid how lobbers works
2015-07-25 03:21:56 -04:00
5d87d9e1e4
.
2015-07-25 02:01:55 -04:00
c1e5c2a9dc
MPS changed requested by <insert meow here>.
2015-07-24 21:15:19 +01:00
956d685549
Added MPS Game Voting.
2015-07-24 20:24:21 +01:00
13fa6bca8b
Make it go back to game choose page.
2015-07-24 16:24:17 +01:00
dcb6e0ec59
Added rejected games and whitelist to MPS.
2015-07-24 16:03:53 +01:00
a50455acf5
Fising last character bug.
2015-07-24 15:44:36 +02:00
c3742ec794
Fixing the too long String bug.
2015-07-24 15:00:49 +02:00
609199a6b8
Improving Team names in Team games.
2015-07-24 13:14:41 +02:00
7205065a56
Merge branch 'master' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into Myst_KITS
2015-07-23 17:47:33 -04:00
9a3c4f3a00
Added Ninja Kit to OITQ. New Achievement kit.
2015-07-23 17:46:10 -04:00
365968f41d
Added a bomb token thing
2015-07-23 16:26:43 -04:00
335eb5eacd
Fixed report link
2015-07-23 13:35:06 -04:00
06d4de16cf
Changed particle methods
2015-07-23 13:34:11 -04:00
5deb699b02
Added rejected games and whitelist to MPS.
2015-07-23 18:24:41 +01:00
71148ef387
gave twitch same perms as youtubers
2015-07-23 16:29:42 +02:00
91db076053
Fixed lobbers icon in stats
2015-07-23 09:28:35 -04:00
68b04574b6
Merge remote-tracking branch 'origin/master'
2015-07-23 13:04:19 +01:00
de1ed4ca59
Improving the Event System with ShinyRukii's requests.
2015-07-23 12:06:40 +02:00
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
e4ecc9e858
http://pastebin.com/BRhT7pZP
2015-07-22 23:31:07 -04:00
e638674444
Fixed fuse on detonator
2015-07-22 20:17:19 -04:00
a2f6a8cbd3
Merge remote-tracking branch 'origin/master'
2015-07-22 15:38:55 -07:00
b9762bddc4
Fixes
2015-07-22 16:50:57 -04:00
eff71c3e17
Champions: Add Morten G's changes to fix BlockToss
2015-07-22 08:10:57 +12:00
b4df9f47c5
Added a mortar kit ;o (Please don't fire me b2)
2015-07-21 11:01:45 -04:00
d38fc1a603
Reverted things
2015-07-20 16:40:37 -04:00
e55ca81d48
Reverted Trainee to Helper due to popular demand.
2015-07-20 15:45:16 -04:00
b239f0af28
Fixed some bugs with the Editor kit
2015-07-20 20:40:43 +02:00
6addf00037
LOTS of tweaks :D
2015-07-20 14:27:10 -04:00
63df369700
Cleaned up somethings (lib's request)
2015-07-20 10:18:50 -04:00
bb769aa0f4
I'm a dumbass
2015-07-20 10:02:50 -04:00
87cc40fc0c
Fixed a few achievements
2015-07-19 22:38:03 -04:00
8b2b4c2826
Added to MPS
2015-07-19 15:51:34 -04:00
6edc923002
Changed mineplex.com/supporthub > mineplex.com/reports
2015-07-19 15:43:13 -04:00
c5f7c4fe0e
Finalized after QA testing. Pretty much ready to go
2015-07-19 19:50:53 +02:00
05c18e6a83
Merge remote-tracking branch 'origin/master'
2015-07-18 19:07:11 -07:00
2cad6223a7
Ubs.. Forgot to actually upload the new kits.. :D
2015-07-18 15:15:53 +02:00
b986cf968e
Added new kits, Changed Compass feature, Fixed a lot of bugs
2015-07-18 15:10:03 +02:00
2dc2b8792c
Fixes, updates
2015-07-17 17:01:24 -04:00
52dd9df834
Motd changes.
2015-07-17 11:39:01 -05:00
8b26ffaecd
Improving Team names in SG, SSM and Skywars and disabled friendly fire.
2015-07-17 14:05:27 +02:00
5e05530b1d
spawn near allies!
2015-07-17 21:28:46 +10:00
Jonathan Williams
Mini-Chiss
Ty Sayers
William Burns
Sarah
Morten
Ben Sihota
Christopher Jozsa
Conrad
libraryaddict