Chiss
95e428eb4f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/inventory/data/InventoryRepository.java
2014-11-26 12:34:47 +11:00
Chiss
731b0d89dd
Merge
2014-11-26 12:33:39 +11:00
Jonathan Williams
484dfaaea9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-25 13:25:41 -08:00
Jonathan Williams
3b54789767
Optimized logins dealing with mysql with multiqueries.
...
Added lazy loading of Pool data and Loaded check before performing anything.
Refactored MiniClientPlugin and created MiniDbClientPlugin
Renamed RankBenefitManager9000 to BenefitManager
Removed /send ability for now.
2014-11-25 13:25:13 -08:00
Shaun Bennett
f1fbc21570
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-11-23 20:02:09 -06:00
Shaun Bennett
c7f2a8072e
Antistack replacement
2014-11-23 19:51:23 -06:00
Jonathan Williams
cb43bc04d3
Added /lobby
2014-11-23 03:35:16 -08:00
Chiss
0c5ec503be
reduced fireworks in dragons
2014-11-23 15:00:05 +11:00
Chiss
089fdf8a64
sparklers no longer attract once they're in water or below 0
2014-11-23 14:55:06 +11:00
Chiss
d4a127b8ad
reduced fps lag in runner
2014-11-23 14:47:28 +11:00
Chiss
f0c87e439a
fixed nametag color in paintball
2014-11-23 11:16:01 +11:00
Chiss
19d3bba461
fixed fence glitch in dom
2014-11-22 13:20:34 +11:00
Chiss
6dfcdce027
increased illusion cooldown
...
cleaned axethrow
2014-11-22 10:29:00 +11:00
Chiss
f1ba5947a4
Some more wither updates
2014-11-21 16:32:12 +11:00
Chiss
0d78433bd2
updated mapparser
...
buffed withers a little
2014-11-21 10:36:41 +11:00
Chiss
7a8759dfba
updated disguisemanager so it uses player arg
...
fixed invisibility bug on disguises for specific players
updated champs skills
made some hard achievements a bit easier
2014-11-21 09:42:05 +11:00
Chiss
972911fe05
set achievement skills
2014-11-20 18:01:46 +11:00
Jonathan Williams
d1a4080cbd
Added GUI support for achievement skills.
2014-11-19 22:47:10 -08:00
Chiss
450cc9ada2
Champions achievement update
...
Wither update
2014-11-20 17:21:22 +11:00
Chiss
4961b55986
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-18 16:43:53 +11:00
Chiss
f5022ecf16
Fixed dupe glitch (all games)
...
Some champions skill fixes
created GameSpectatorManager to handle spec stuffz
2014-11-18 16:43:39 +11:00
Shaun Bennett
e99a3f6544
Merge remote-tracking branch 'origin/master'
2014-11-17 18:19:06 -06:00
Shaun Bennett
f071d2e727
Fix for TNT explosion in Bridges
2014-11-17 18:09:58 -06:00
Chiss
cd890e6c6c
disabled spec menu in minestrike - fixes shop bug.
2014-11-16 14:40:50 +11:00
Chiss
4c3610c3ac
fixed DMT silence
2014-11-16 10:46:26 +11:00
Chiss
454deb03db
fixed SG crash bug
2014-11-16 09:31:03 +11:00
Chiss
057594205e
Only closing CREATIVE Inv for non-ops.
2014-11-15 22:40:56 +11:00
Chiss
ca58f11174
specs should be able to view stats now
2014-11-15 22:32:00 +11:00
Chiss
fb70b76d29
FINGERS CROSSED
2014-11-15 22:29:53 +11:00
Shaun Bennett
d16896e493
Merge remote-tracking branch 'origin/master'
2014-11-15 05:04:57 -06:00
Shaun Bennett
1ca23390cc
Fix my derp
2014-11-15 05:04:48 -06:00
Chiss
41b6296788
Wither no longer shoots in pregame lobby
2014-11-15 20:16:18 +11:00
Chiss
51bc53262d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-15 19:32:08 +11:00
Chiss
ca4eec20ed
Wither Assault update
2014-11-15 19:31:56 +11:00
Shaun Bennett
521b1e5f3b
Merge remote-tracking branch 'origin/master'
2014-11-13 21:54:15 -06:00
Chiss
8ab0116a27
initial push of Wither Assault
2014-11-14 14:14:31 +11:00
Shaun Bennett
223bc2d0c0
Remove some debug messages that we no longer need
2014-11-13 19:34:55 -06:00
Shaun Bennett
6038c72e86
Add cleaner page for when there is only 1 team
2014-11-13 19:33:39 -06:00
Shaun Bennett
ea8b8dca15
Disable spectator menu for castle siege and uhc until I work out a better way to show that many players
2014-11-13 19:18:28 -06:00
Shaun Bennett
af31f4cd42
Add Tab handling for MultiCommandBase and "game set" command
2014-11-13 18:22:00 -06:00
Shaun Bennett
48c09aa311
Making spectator gui look better
2014-11-13 18:05:28 -06:00
Shaun Bennett
eb4b451e12
Fixing some spectator gui bugs
2014-11-13 16:41:42 -06:00
Shaun Bennett
8b73b89a17
Merging spectator gui with main branch
2014-11-13 16:03:14 -06:00
Chiss
112f76a29a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-13 18:10:10 +11:00
Chiss
9eaacd20ab
fixed slime healing
...
fixed sheep quest brute not dropping sheep
updated punish page
2014-11-13 18:09:54 +11:00
CoderTim
09ca2234c4
Fixed survival games death match bug: https://trello.com/c/jNGSUUGI
2014-11-13 01:49:14 -05:00
CoderTim
7667aa25a8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-13 00:26:53 -05:00
Jonathan Williams
7cad40044a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
Plugins/Mineplex.Core/src/mineplex/core/report/ReportPlugin.java
2014-11-12 19:36:00 -08:00
Jonathan Williams
1372f74921
Refactored some names in MiniPlugin
...
Work on clans.
2014-11-12 19:21:12 -08:00
CoderTim
d363637015
Achievement bug fixes
2014-11-12 20:56:57 -05:00